diff --git a/doc/meta.xml b/doc/meta.xml index 0f9dccfb91b5..356325991860 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -53,7 +53,7 @@ $ nix-env -qa hello --json "x86_64-linux", "armv5tel-linux", "armv7l-linux", - "mips64el-linux", + "mips32-linux", "x86_64-darwin", "i686-cygwin", "i686-freebsd", diff --git a/lib/customisation.nix b/lib/customisation.nix index 823395f04d4a..d942f54ee798 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -155,12 +155,6 @@ rec { outPath = assert condition; drv.outPath; }; - /* Add attributes to each output of a derivation without changing - the derivation itself. */ - addPassthru = - lib.warn "`addPassthru drv passthru` is deprecated, replace with `extendDerivation true passthru drv`" - (drv: passthru: extendDerivation true passthru drv); - /* Strip a derivation of all non-essential attributes, returning only those needed by hydra-eval-jobs. Also strictly evaluate the result to ensure that there are no thunks kept alive to prevent diff --git a/lib/default.nix b/lib/default.nix index 77cfa712557c..a25a23299b39 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -88,7 +88,7 @@ let inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith extendDerivation addPassthru + callPackageWith callPackagesWith extendDerivation hydraJob makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 901875236f2a..c4f8d6dcae40 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -71,6 +71,7 @@ auntie = "Jonathan Glines "; avnik = "Alexander V. Nikolaev "; aycanirican = "Aycan iRiCAN "; + babariviere = "Bastien Riviere "; bachp = "Pascal Bach "; backuitist = "Bruno Bieth"; badi = "Badi' Abdul-Wahid "; @@ -198,6 +199,7 @@ dzabraev = "Maksim Dzabraev "; e-user = "Alexander Kahl "; earldouglas = "James Earl Douglas "; + earvstedt = "Erik Arvstedt "; ebzzry = "Rommel Martinez "; edanaher = "Evan Danaher "; edef = "edef "; @@ -224,6 +226,7 @@ erictapen = "Justin Humm "; erikryb = "Erik Rybakken "; ertes = "Ertugrul Söylemez "; + erosennin = "Andrey Golovizin "; ethercrow = "Dmitry Ivanov "; etu = "Elis Hirwing "; exfalso = "Andras Slemmer <0slemi0@gmail.com>"; @@ -373,12 +376,14 @@ lasandell = "Luke Sandell "; lassulus = "Lassulus "; layus = "Guillaume Maudoux "; + lblasc = "Luka Blaskovic "; ldesgoui = "Lucas Desgouilles "; league = "Christopher League "; lebastr = "Alexander Lebedev "; ledif = "Adam Fidel "; leemachin = "Lee Machin "; leenaars = "Michiel Leenaars "; + lejonet = "Daniel Kuehn "; leonardoce = "Leonardo Cecchi "; lethalman = "Luca Bruno "; lewo = "Antoine Eiche "; @@ -671,6 +676,7 @@ stumoss = "Stuart Moss "; SuprDewd = "Bjarki Ágúst Guðmundsson "; suvash = "Suvash Thapaliya "; + svsdep = "Vasyl Solovei "; swarren83 = "Shawn Warren "; swflint = "Samuel W. Flint "; swistak35 = "Rafał Łasocha "; @@ -689,6 +695,7 @@ TealG = "Teal Gaure <~@Teal.Gr>"; teh = "Tom Hunger "; telotortium = "Robert Irelan "; + teozkr = "Teo Klestrup Röijezon "; teto = "Matthieu Coudron "; tex = "Milan Svoboda "; thall = "Niclas Thall "; @@ -702,6 +709,7 @@ tilpner = "Till Höppner "; timbertson = "Tim Cuthbertson "; timokau = "Timo Kaufmann "; + timor = "timor "; tiramiseb = "Sébastien Maccagnoni "; titanous = "Jonathan Rudenberg "; tnias = "Philipp Bartsch "; @@ -713,6 +721,7 @@ treemo = "Matthieu Chevrier "; trevorj = "Trevor Joynson "; trino = "Hubert Mühlhans "; + troydm = "Dmitry Geurkov "; tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>"; ttuegel = "Thomas Tuegel "; tv = "Tomislav Viljetić "; diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 0729cc7ef293..d5a206e620c8 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -23,13 +23,15 @@ rec { config = parse.tripleFromSystem final.parsed; # Just a guess, based on `system` platform = platforms.selectBySystem final.system; + # Derived meta-data libc = - /**/ if final.isDarwin then "libSystem" - else if final.isMinGW then "msvcrt" - else if final.isMusl then "musl" - else if final.isLinux /* default */ then "glibc" + /**/ if final.isDarwin then "libSystem" + else if final.isMinGW then "msvcrt" + else if final.isMusl then "musl" + else if final.isAndroid then "bionic" + else if final.isLinux /* default */ then "glibc" # TODO(@Ericson2314) think more about other operating systems - else "native/impure"; + else "native/impure"; extensions = { sharedLibrary = /**/ if final.isDarwin then ".dylib" @@ -39,7 +41,10 @@ rec { /**/ if final.isWindows then ".exe" else ""; }; + # Misc boolean options + useAndroidPrebuilt = false; } // mapAttrs (n: v: v final.parsed) inspect.predicates // args; - in final; + in assert final.useAndroidPrebuilt -> final.isAndroid; + final; } diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index f39bfff13dec..20294a28a110 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -9,7 +9,7 @@ let "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" - "mips64el-linux" + "mipsel-linux" "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index bd68ee9460e7..848737700b0b 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -38,6 +38,13 @@ rec { platform = platforms.aarch64-multiplatform; }; + aarch64-android-prebuilt = rec { + config = "aarch64-unknown-linux-android"; + arch = "aarch64"; + platform = platforms.aarch64-multiplatform; + useAndroidPrebuilt = true; + }; + scaleway-c1 = armv7l-hf-multiplatform // rec { platform = platforms.scaleway-c1; inherit (platform.gcc) fpu; @@ -51,7 +58,7 @@ rec { }; fuloongminipc = rec { - config = "mips64el-unknown-linux-gnu"; + config = "mipsel-unknown-linux-gnu"; arch = "mips"; float = "hard"; platform = platforms.fuloong2f_n32; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 0fce5254dcb4..ab220af46e30 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -34,7 +34,15 @@ rec { Cygwin = { kernel = kernels.windows; abi = abis.cygnus; }; MinGW = { kernel = kernels.windows; abi = abis.gnu; }; + Android = [ { abi = abis.android; } { abi = abis.androideabi; } ]; Musl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; + + Kexecable = map (family: { kernel = kernels.linux; cpu.family = family; }) + [ "x86" "arm" "aarch64" "mips" ]; + Efi = map (family: { cpu.family = family; }) + [ "x86" "arm" "aarch64" ]; + Seccomputable = map (family: { kernel = kernels.linux; cpu.family = family; }) + [ "x86" "arm" "aarch64" "mips" ]; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 95759b93ae08..03d052f5f192 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -75,7 +75,10 @@ rec { aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; }; i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; - mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; + mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; + mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; }; riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; @@ -173,6 +176,7 @@ rec { types.abi = enum (attrValues abis); abis = setTypes types.openAbi { + android = {}; cygnus = {}; gnu = {}; msvc = {}; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 9350a16017dd..f39e890fbf1c 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -561,6 +561,6 @@ rec { "armv6l-linux" = raspberrypi; "armv7l-linux" = armv7l-hf-multiplatform; "aarch64-linux" = aarch64-multiplatform; - "mips64el-linux" = fuloong2f_n32; + "mipsel-linux" = fuloong2f_n32; }.${system} or pcBase; } diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 523fd3feb3b0..ffdd8ae929c8 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -16,7 +16,7 @@ in with lib.systems.doubles; lib.runTests { arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]); i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]); - mips = assertTrue (mseteq mips [ "mips64el-linux" ]); + mips = assertTrue (mseteq mips [ "mipsel-linux" ]); x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]); cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]); @@ -24,7 +24,7 @@ in with lib.systems.doubles; lib.runTests { freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]); gnu = assertTrue (mseteq gnu (linux /* ++ hurd ++ kfreebsd ++ ... */)); illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]); - linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]); + linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]); netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]); openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]); unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos)); diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh deleted file mode 100755 index d44bda53f8d6..000000000000 --- a/maintainers/scripts/gnome.sh +++ /dev/null @@ -1,192 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail - -GNOME_FTP=ftp.gnome.org/pub/GNOME/sources - -# projects that don't follow the GNOME major versioning, or that we don't want to -# programmatically update -NO_GNOME_MAJOR="ghex gtkhtml gdm gucharmap" - -usage() { - echo "Usage: $0 || [major.minor]" >&2 - exit 0 -} - -if [ "$#" -lt 1 ]; then - usage -fi - -GNOME_TOP=pkgs/desktops/gnome-3 - -action=$1 - -# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have -# any conversations with sysadmin. Somehow lftp works. -if [ "$FTP_CLIENT" = "lftp" ]; then - ls_ftp() { - lftp -c "open $1; cls" - } -else - ls_ftp() { - curl -s -l "$1"/ - } -fi - -find_project() { - exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d "$@" -} - -show_project() { - local project=$1 - local majorVersion=$2 - local version= - - if [ -z "$majorVersion" ]; then - echo "Looking for available versions..." >&2 - local available_baseversions=$(ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n) - if [ "$?" -ne 0 ]; then - echo "Project $project not found" >&2 - return 1 - fi - - echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2 - echo -en "Choose one of them: " >&2 - read majorVersion - fi - - if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then - # not a major version - version=$majorVersion - majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2) - fi - - local FTPDIR=${GNOME_FTP}/${project}/${majorVersion} - - #version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//` - # gnome's LATEST-IS is broken. Do not trust it. - - if [ -z "$version" ]; then - local files=$(ls_ftp "${FTPDIR}") - declare -A versions - - for f in $files; do - case $f in - (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*): - ;; - ($project-*.*.9*.tar.*): - tmp=${f#$project-} - tmp=${tmp%.tar*} - echo "Ignored unstable version ${tmp}" >&2 - ;; - ($project-*.tar.*): - tmp=${f#$project-} - tmp=${tmp%.tar*} - versions[${tmp}]=1 - ;; - (*): - echo "UNKNOWN FILE $f" >&2 - ;; - esac - done - echo "Found versions ${!versions[@]}" >&2 - version=$(echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1) - if [ -z "$version" ]; then - echo "No version available for major $majorVersion" >&2 - return 1 - fi - - echo "Latest version is: ${version}" >&2 - fi - - local name=${project}-${version} - echo "Fetching .sha256 file" >&2 - local sha256out=$(curl -s -f http://"${FTPDIR}"/"${name}".sha256sum) - - if [ "$?" -ne "0" ]; then - echo "Version not found" >&2 - return 1 - fi - - extensions=( "xz" "bz2" "gz" ) - echo "Choosing archive extension (known are ${extensions[@]})..." >&2 - for ext in ${extensions[@]}; do - if echo -e "$sha256out" | grep -q "\\.tar\\.${ext}$"; then - ext_pref=$ext - sha256=$(echo -e "$sha256out" | grep "\\.tar\\.${ext}$" | cut -f1 -d\ ) - break - fi - done - echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 - - echo "# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = \"${project}-${version}\"; - - src = fetchurl { - url = mirror://gnome/sources/${project}/${majorVersion}/${project}-${version}.tar.${ext_pref}; - sha256 = \"${sha256}\"; - }; -}" - - return 0 -} - -update_project() { - local project=$1 - local majorVersion=$2 - - # find project in nixpkgs tree - projectPath=$(find_project -name "$project" -print) - if [ -z "$projectPath" ]; then - echo "Project $project not found under $GNOME_TOP" - exit 1 - fi - - src=$(show_project "$project" "$majorVersion") - - if [ "$?" -eq "0" ]; then - echo "Updating $projectPath/src.nix" >&2 - echo -e "$src" > "$projectPath"/src.nix - fi - - return 0 -} - -if [ "$action" = "update-all" ]; then - majorVersion=$2 - if [ -z "$majorVersion" ]; then - echo "No major version specified" >&2 - usage - fi - - # find projects - projects=$(find_project -exec basename '{}' \;) - for project in $projects; do - if echo "$NO_GNOME_MAJOR"|grep -q $project; then - echo "Skipping $project" - else - echo "= Updating $project to $majorVersion" >&2 - update_project "$project" "$majorVersion" - echo >&2 - fi - done -else - project=$2 - majorVersion=$3 - - if [ -z "$project" ]; then - echo "No project specified, exiting" >&2 - usage - fi - - if [ "$action" = show ]; then - show_project "$project" "$majorVersion" - elif [ "$action" = update ]; then - update_project "$project" "$majorVersion" - else - echo "Unknown action $action" >&2 - usage - fi -fi diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 2035950da3e3..7c54821f66cb 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -1,5 +1,6 @@ { package ? null , maintainer ? null +, path ? null }: # TODO: add assert statements @@ -9,22 +10,24 @@ let pkgs = import ./../../default.nix { }; packagesWith = cond: return: set: - pkgs.lib.flatten - (pkgs.lib.mapAttrsToList - (name: pkg: - let - result = builtins.tryEval ( - if pkgs.lib.isDerivation pkg && cond name pkg - then [(return name pkg)] - else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false - then packagesWith cond return pkg + pkgs.lib.unique + (pkgs.lib.flatten + (pkgs.lib.mapAttrsToList + (name: pkg: + let + result = builtins.tryEval ( + if pkgs.lib.isDerivation pkg && cond name pkg + then [(return name pkg)] + else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false + then packagesWith cond return pkg + else [] + ); + in + if result.success then result.value else [] - ); - in - if result.success then result.value - else [] + ) + set ) - set ); packagesWithUpdateScriptAndMaintainer = maintainer': @@ -47,6 +50,14 @@ let (name: pkg: pkg) pkgs; + packagesWithUpdateScript = path: + let + attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." path) null pkgs; + in + packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg) + (name: pkg: pkg) + attrSet; + packageByName = name: let package = pkgs.lib.attrByPath (pkgs.lib.splitString "." name) null pkgs; @@ -63,6 +74,8 @@ let [ (packageByName package) ] else if maintainer != null then packagesWithUpdateScriptAndMaintainer maintainer + else if path != null then + packagesWithUpdateScript path else builtins.throw "No arguments provided.\n\n${helpText}"; @@ -76,7 +89,11 @@ let % nix-shell maintainers/scripts/update.nix --argstr package garbas - to run update script for specific package. + to run update script for specific package, or + + % nix-shell maintainers/scripts/update.nix --argstr path gnome3 + + to run update script for all package under an attribute path. ''; runUpdateScript = package: '' diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index ce58c4dc95b0..d5150d25d375 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -18,6 +18,18 @@ has the following highlights: + + + Linux kernel defaults to the 4.14 branch (it was 4.9). + + + + + + GCC defaults to 7.x (it was 6.x). + + + MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes @@ -80,6 +92,11 @@ has the following highlights: following incompatible changes: + + + sound.enable now defaults to false. + + Dollar signs in options under are @@ -176,7 +193,7 @@ following incompatible changes: - lib.addPassthru drv passthru is removed. Use lib.extendDerivation true passthru drv instead. TODO: actually remove it before branching 18.03 off. + lib.addPassthru drv passthru is removed. Use lib.extendDerivation true passthru drv instead. @@ -239,6 +256,58 @@ following incompatible changes: here. + + + The Piwik analytics software was renamed to Matomo: + + + The package pkgs.piwik was renamed to pkgs.matomo. + + + The service services.piwik was renamed to services.matomo. + + + + The data directory /var/lib/piwik was renamed to /var/lib/matomo. + All files will be moved automatically on first startup, but you might need to adjust your backup scripts. + + + + + The default for the nginx configuration changed from + piwik.${config.networking.hostName} to + matomo.${config.networking.hostName}.${config.networking.domain} + if is set, + matomo.${config.networking.hostName} if it is not set. + If you change your , remember you'll need to update the + trustedHosts[] array in /var/lib/matomo/config/config.ini.php + as well. + + + + + The piwik user was renamed to matomo. + The service will adjust ownership automatically for files in the data directory. + If you use unix socket authentication, remember to give the new matomo user + access to the database and to change the username to matomo + in the [database] section of /var/lib/matomo/config/config.ini.php. + + + + + If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean, + but this is neither enforced nor required. + + + + + + + + nodejs-4_x is end-of-life. + nodejs-4_x, nodejs-slim-4_x and nodePackages_4_x are removed. + + @@ -373,6 +442,13 @@ following incompatible changes: and stopJob provide an optional $user argument for that purpose. + + + Enabling bash completion on NixOS, programs.bash.enableCompletion, will now also enable + completion for the Nix command line tools by installing the + nix-bash-completions package. + + diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index e1c4d0d602af..d8980944adc0 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -28,13 +28,13 @@ with lib; nixpkgs.config.packageOverrides = pkgs: { dbus = pkgs.dbus.override { x11Support = false; }; - networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; }; - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; }; - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; }; - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; }; - networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; }; - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; }; - networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; }; + networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { withGnome = false; }; + networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; }; + networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; }; + networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; }; + networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; }; + networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; }; + networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; }; pinentry = pkgs.pinentry_ncurses; }; }; diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index afaa65f6ce35..b61acf1815d9 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -37,8 +37,9 @@ in { hardware.firmware = with pkgs; [ firmwareLinuxNonfree intel2200BGFirmware - rtl8723bs-firmware rtl8192su-firmware + ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ + rtl8723bs-firmware ]; }) (mkIf cfg.enableAllFirmware { diff --git a/nixos/modules/hardware/digitalbitbox.nix b/nixos/modules/hardware/digitalbitbox.nix new file mode 100644 index 000000000000..0888cfbef2a8 --- /dev/null +++ b/nixos/modules/hardware/digitalbitbox.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.digitalbitbox; +in + +{ + options.hardware.digitalbitbox = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables udev rules for Digital Bitbox devices. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.digitalbitbox; + defaultText = "pkgs.digitalbitbox"; + description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 5725938465f5..4c4e69d60d9c 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -69,7 +69,7 @@ with lib; in '' mkdir -p /root/Desktop ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop - cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop + cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop chmod a+rx /root/Desktop/gnome-terminal.desktop cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop chmod a+rx /root/Desktop/gparted.desktop diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index a82ee63fd0cd..0e0744a52e42 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -603,6 +603,10 @@ $bootLoaderConfig # Enable CUPS to print documents. # services.printing.enable = true; + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + # Enable the X11 windowing system. # services.xserver.enable = true; # services.xserver.layout = "us"; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c0c6a6ef9244..8d775ffc82d3 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -304,6 +304,7 @@ mighttpd2 = 285; hass = 286; monero = 287; + ceph = 288; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -576,6 +577,7 @@ mighttpd2 = 285; hass = 286; monero = 287; + ceph = 288; # 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/misc/label.nix b/nixos/modules/misc/label.nix index 250914e8f82e..8e5e57b3b83b 100644 --- a/nixos/modules/misc/label.nix +++ b/nixos/modules/misc/label.nix @@ -65,8 +65,8 @@ in # This is set here rather than up there so that changing it would # not rebuild the manual system.nixos.label = mkDefault (maybeEnv "NIXOS_LABEL" - (concatStringsSep "-" (sort (x: y: x < y) cfg.tags) - + "-" + maybeEnv "NIXOS_LABEL_VERSION" cfg.version)); + (concatStringsSep "-" ((sort (x: y: x < y) cfg.tags) + ++ [ (maybeEnv "NIXOS_LABEL_VERSION" cfg.version) ]))); }; } diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e747fbc6755c..11bd148d5dee 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -93,7 +93,7 @@ in default = {}; example = literalExample '' - { firefox.enableGeckoMediaPlayer = true; } + { allowBroken = true; allowUnfree = true; } ''; type = configType; description = '' diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 098fac7a0c2d..3bb65c6b295a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -31,6 +31,7 @@ ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix + ./hardware/digitalbitbox.nix ./hardware/sensor/iio.nix ./hardware/ksm.nix ./hardware/mcelog.nix @@ -78,6 +79,7 @@ ./programs/command-not-found/command-not-found.nix ./programs/criu.nix ./programs/dconf.nix + ./programs/digitalbitbox/default.nix ./programs/environment.nix ./programs/fish.nix ./programs/freetds.nix @@ -109,6 +111,7 @@ ./programs/sway.nix ./programs/thefuck.nix ./programs/tmux.nix + ./programs/udevil.nix ./programs/venus.nix ./programs/vim.nix ./programs/way-cooler.nix @@ -436,6 +439,7 @@ ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/xtreemfs.nix + ./services/network-filesystems/ceph.nix ./services/networking/amuled.nix ./services/networking/aria2.nix ./services/networking/asterisk.nix @@ -637,7 +641,7 @@ ./services/web-apps/nixbot.nix ./services/web-apps/nexus.nix ./services/web-apps/pgpkeyserver-lite.nix - ./services/web-apps/piwik.nix + ./services/web-apps/matomo.nix ./services/web-apps/pump.io.nix ./services/web-apps/restya-board.nix ./services/web-apps/tt-rss.nix diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 1abdb4973a44..1a62f04972df 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -211,6 +211,9 @@ in "/share/bash-completion" ]; + environment.systemPackages = optional cfg.enableCompletion + pkgs.nix-bash-completions; + environment.shells = [ "/run/current-system/sw/bin/bash" "/var/run/current-system/sw/bin/bash" diff --git a/nixos/modules/programs/browserpass.nix b/nixos/modules/programs/browserpass.nix index a073c7e66eb8..5f8a44a9848e 100644 --- a/nixos/modules/programs/browserpass.nix +++ b/nixos/modules/programs/browserpass.nix @@ -18,5 +18,6 @@ with lib; "opt/chrome/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json"; "opt/chrome/policies/managed/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-policy.json"; }; + nixpkgs.config.firefox.enableBrowserpass = true; }; } diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 54739feab976..41c49db8c71c 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -36,6 +36,7 @@ in "chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet "mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere + "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin ] ''; }; @@ -52,8 +53,7 @@ in description = "Chromium default search provider url."; default = null; example = - "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google: - ↪searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}"; + "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}"; }; defaultSearchProviderSuggestURL = mkOption { @@ -79,7 +79,11 @@ in ###### implementation config = lib.mkIf cfg.enable { + # for chromium environment.etc."chromium/policies/managed/default.json".text = builtins.toJSON defaultProfile; environment.etc."chromium/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; + # for google-chrome https://www.chromium.org/administrators/linux-quick-start + environment.etc."opt/chrome/policies/managed/default.json".text = builtins.toJSON defaultProfile; + environment.etc."opt/chrome/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; }; } diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 27bfdf022e7d..b7d8a345e65c 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -36,7 +36,7 @@ in "${pkgs.gnome3.dconf.lib}/lib/gio/modules"; # https://github.com/NixOS/nixpkgs/pull/31891 #environment.variables.XDG_DATA_DIRS = optional cfg.enable - # "$(echo ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; + # "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; }; } diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixos/modules/programs/digitalbitbox/default.nix new file mode 100644 index 000000000000..7c727489c6c9 --- /dev/null +++ b/nixos/modules/programs/digitalbitbox/default.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.digitalbitbox; +in + +{ + options.programs.digitalbitbox = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Installs the Digital Bitbox application and enables the complementary hardware module. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.digitalbitbox; + defaultText = "pkgs.digitalbitbox"; + description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + hardware.digitalbitbox = { + enable = true; + package = cfg.package; + }; + }; + + meta = { + doc = ./doc.xml; + maintainers = with stdenv.lib.maintainers; [ vidbina ]; + }; +} diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml new file mode 100644 index 000000000000..7acbc2fc4dde --- /dev/null +++ b/nixos/modules/programs/digitalbitbox/doc.xml @@ -0,0 +1,85 @@ + + + Digital Bitbox + + + Digital Bitbox is a hardware wallet and second-factor authenticator. + + + + The digitalbitbox programs module may be + installed by setting programs.digitalbitbox + to true in a manner similar to + + + programs.digitalbitbox.enable = true; + + + and bundles the digitalbitbox package (see ), which contains the + dbb-app and dbb-cli binaries, + along with the hardware module (see ) which sets up the + necessary udev rules to access the device. + + + + Enabling the digitalbitbox module is pretty much the easiest way to + get a Digital Bitbox device working on your system. + + + + For more information, see + . + + +
+ Package + + + The binaries, dbb-app (a GUI tool) and + dbb-cli (a CLI tool), are available through the + digitalbitbox package which could be installed + as follows: + + + environment.systemPackages = [ + pkgs.digitalbitbox + ]; + + +
+ + +
+ Hardware + + + The digitalbitbox hardware package enables the udev rules for + Digital Bitbox devices and may be installed as follows: + + + hardware.digitalbitbox.enable = true; + + + + + In order to alter the udev rules, one may provide different values for + the udevRule51 and udevRule52 + attributes by means of overriding as follows: + + + programs.digitalbitbox = { + enable = true; + package = pkgs.digitalbitbox.override { + udevRule51 = "something else"; + }; + }; + + +
+ diff --git a/nixos/modules/programs/udevil.nix b/nixos/modules/programs/udevil.nix new file mode 100644 index 000000000000..ba5670f9dfe9 --- /dev/null +++ b/nixos/modules/programs/udevil.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.udevil; + +in { + options.programs.udevil.enable = mkEnableOption "udevil"; + + config = mkIf cfg.enable { + security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil"; + }; +} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index da83baed3719..489d7d8b9b50 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -148,6 +148,12 @@ with lib; # parsoid (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] [ "services" "parsoid" "wikis" ]) + # piwik was renamed to matomo + (mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ]) + (mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ]) + (mkRenamedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] [ "services" "matomo" "phpfpmProcessManagerConfig" ]) + (mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ]) + # tarsnap (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir") diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index f39f64033ca7..e1cad03e66e2 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -311,7 +311,7 @@ let ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring - ("auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so")} + ("auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so")} ${optionalString cfg.googleAuthenticator.enable "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} '') + '' @@ -384,7 +384,7 @@ let ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} ${optionalString (cfg.enableGnomeKeyring) - "session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start"} + "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"} ''); diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index acf48d3c3d03..e3e8bb28c58b 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -21,7 +21,7 @@ in enable = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether to enable ALSA sound. ''; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 0dd59e4fb444..54047a50caa6 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -208,7 +208,7 @@ in { ''; postStart = '' - until [[ $(${pkgs.curl.bin}/bin/curl -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do + until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do sleep 1 done ''; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 5b7390503552..21a131b90a81 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -133,7 +133,7 @@ in ''; example = [ "nextcloud" - "piwik" + "matomo" ]; }; @@ -289,10 +289,10 @@ in # Create initial databases if ! test -e "${cfg.dataDir}/${database.name}"; then echo "Creating initial database: ${database.name}" - ( echo "create database `${database.name}`;" + ( echo 'create database `${database.name}`;' ${optionalString (database ? "schema") '' - echo "use `${database.name}`;" + echo 'use `${database.name}`;' if [ -f "${database.schema}" ] then diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 9b5e3735239f..0dcbfe2e47ac 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -122,7 +122,7 @@ in extraPlugins = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]"; + example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]"; description = '' When this list contains elements a new store path is created. PostgreSQL and the elements are symlinked into it. Then pg_config, diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 9e382241348b..cca98c43dc7a 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -30,9 +30,9 @@ with lib; config = mkMerge [ (mkIf config.services.gnome3.at-spi2-core.enable { - environment.systemPackages = [ pkgs.at_spi2_core ]; - services.dbus.packages = [ pkgs.at_spi2_core ]; - systemd.packages = [ pkgs.at_spi2_core ]; + environment.systemPackages = [ pkgs.at-spi2-core ]; + services.dbus.packages = [ pkgs.at-spi2-core ]; + systemd.packages = [ pkgs.at-spi2-core ]; }) (mkIf (!config.services.gnome3.at-spi2-core.enable) { diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix index 86a47488d865..7e312a1b81eb 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.gnome3.evolution-data-server.enable { - environment.systemPackages = [ pkgs.gnome3.evolution_data_server ]; + environment.systemPackages = [ pkgs.gnome3.evolution-data-server ]; - services.dbus.packages = [ pkgs.gnome3.evolution_data_server ]; + services.dbus.packages = [ pkgs.gnome3.evolution-data-server ]; - systemd.packages = [ pkgs.gnome3.evolution_data_server ]; + systemd.packages = [ pkgs.gnome3.evolution-data-server ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index 2a68af5a7dd8..aa1165ab3bba 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -31,9 +31,9 @@ with lib; config = mkIf config.services.gnome3.gnome-keyring.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_keyring ]; + environment.systemPackages = [ pkgs.gnome3.gnome-keyring ]; - services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ]; + services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix index 0da4aca73ecb..4286251357f7 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix @@ -30,9 +30,9 @@ with lib; config = mkIf config.services.gnome3.gnome-online-accounts.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ]; + environment.systemPackages = [ pkgs.gnome3.gnome-online-accounts ]; - services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ]; + services.dbus.packages = [ pkgs.gnome3.gnome-online-accounts ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix index 3ac767bfa00d..fd14efee5f2e 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.gnome3.gnome-terminal-server.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_terminal ]; + environment.systemPackages = [ pkgs.gnome3.gnome-terminal ]; - services.dbus.packages = [ pkgs.gnome3.gnome_terminal ]; + services.dbus.packages = [ pkgs.gnome3.gnome-terminal ]; - systemd.packages = [ pkgs.gnome3.gnome_terminal ]; + systemd.packages = [ pkgs.gnome3.gnome-terminal ]; }; diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix index 2554f3a1666f..f5401c180984 100644 --- a/nixos/modules/services/desktops/telepathy.nix +++ b/nixos/modules/services/desktops/telepathy.nix @@ -30,9 +30,9 @@ with lib; config = mkIf config.services.telepathy.enable { - environment.systemPackages = [ pkgs.telepathy_mission_control ]; + environment.systemPackages = [ pkgs.telepathy-mission-control ]; - services.dbus.packages = [ pkgs.telepathy_mission_control ]; + services.dbus.packages = [ pkgs.telepathy-mission-control ]; }; diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index f69706ebff34..0f05876aee32 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -53,6 +53,12 @@ in description = "Whether to enable the ACPI daemon."; }; + logEvents = mkOption { + type = types.bool; + default = false; + description = "Log all event activity."; + }; + handlers = mkOption { type = types.attrsOf (types.submodule { options = { @@ -142,7 +148,7 @@ in ConditionPathExists = [ "/proc/acpi" ]; }; - script = "acpid --confdir ${acpiConfDir}"; + script = "acpid ${optionalString config.services.acpid.logEvents "--logevents"} --confdir ${acpiConfDir}"; }; }; diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 1f4acd21eccf..d8abde2a600a 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -8,12 +8,8 @@ let cfg = config.services.fwupd; originalEtc = let - isRegular = v: v == "regular"; - listFiles = d: builtins.attrNames (filterAttrs (const isRegular) (builtins.readDir d)); - copiedDirs = [ "fwupd/remotes.d" "pki/fwupd" "pki/fwupd-metadata" ]; - originalFiles = concatMap (d: map (f: "${d}/${f}") (listFiles "${pkgs.fwupd}/etc/${d}")) copiedDirs; mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; }; - in listToAttrs (map mkEtcFile originalFiles); + in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc); extraTrustedKeys = let mkName = p: "pki/fwupd/${baseNameOf (toString p)}"; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index e96645c79c77..39d23610b064 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -32,11 +32,17 @@ in description = "Whether to enable Disnix"; }; + enableMultiUser = mkOption { + type = types.bool; + default = true; + description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; + }; + useWebServiceInterface = mkOption { default = false; description = "Whether to enable the DisnixWebService interface running on Apache Tomcat"; }; - + package = mkOption { type = types.path; description = "The Disnix package"; @@ -52,7 +58,7 @@ in config = mkIf cfg.enable { dysnomia.enable = true; - + environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; services.dbus.enable = true; @@ -71,7 +77,7 @@ in }; systemd.services = { - disnix = { + disnix = mkIf cfg.enableMultiUser { description = "Disnix server"; wants = [ "dysnomia.target" ]; wantedBy = [ "multi-user.target" ]; @@ -92,7 +98,7 @@ in } // (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {}) // (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {}); - + serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service"; }; diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 66148431709f..5bd9cf9086f1 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -1,8 +1,12 @@ { config, lib, pkgs, ... }: with lib; - -{ +let cfg = config.nix.sshServe; + command = + if cfg.protocol == "ssh" + then "nix-store --serve" + else "nix-daemon --stdio"; +in { options = { nix.sshServe = { @@ -10,7 +14,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = "Whether to enable serving the Nix store as a binary cache via SSH."; + description = "Whether to enable serving the Nix store as a remote store via SSH."; }; keys = mkOption { @@ -20,14 +24,20 @@ with lib; description = "A list of SSH public keys allowed to access the binary cache via SSH."; }; + protocol = mkOption { + type = types.enum [ "ssh" "ssh-ng" ]; + default = "ssh"; + description = "The specific Nix-over-SSH protocol to use."; + }; + }; }; - config = mkIf config.nix.sshServe.enable { + config = mkIf cfg.enable { users.extraUsers.nix-ssh = { - description = "Nix SSH substituter user"; + description = "Nix SSH store user"; uid = config.ids.uids.nix-ssh; useDefaultShell = true; }; @@ -41,11 +51,11 @@ with lib; PermitTTY no PermitTunnel no X11Forwarding no - ForceCommand ${config.nix.package.out}/bin/nix-store --serve + ForceCommand ${config.nix.package.out}/bin/${command} Match All ''; - users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = config.nix.sshServe.keys; + users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = cfg.keys; }; } diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index d48b78ae6d02..921be23f3681 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -249,7 +249,7 @@ in { }; preStart = '' ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir} - ln -fs ${cfg.package}/share/grafana/vendor ${cfg.dataDir} + ln -fs ${cfg.package}/share/grafana/tools ${cfg.dataDir} ''; }; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix new file mode 100644 index 000000000000..5de8ae79a246 --- /dev/null +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -0,0 +1,371 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + ceph = pkgs.ceph; + cfg = config.services.ceph; + # function that translates "camelCaseOptions" to "camel case options", credits to tilpner in #nixos@freenode + translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars); + generateDaemonList = (daemonType: daemons: extraServiceConfig: + mkMerge ( + map (daemon: + { "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; } + ) daemons + ) + ); + generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: { + enable = true; + description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}"; + after = [ "network-online.target" "local-fs.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target"; + wants = [ "network-online.target" "local-fs.target" "time-sync.target" ]; + partOf = [ "ceph-${daemonType}.target" ]; + wantedBy = [ "ceph-${daemonType}.target" ]; + + serviceConfig = { + LimitNOFILE = 1048576; + LimitNPROC = 1048576; + Environment = "CLUSTER=${clusterName}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + PrivateDevices = "yes"; + PrivateTmp = "true"; + ProtectHome = "true"; + ProtectSystem = "full"; + Restart = "on-failure"; + StartLimitBurst = "5"; + StartLimitInterval = "30min"; + ExecStart = "${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} -f --cluster ${clusterName} --id ${if daemonType == "rgw" then "client.${daemonId}" else daemonId} --setuser ceph --setgroup ceph"; + } // extraServiceConfig + // optionalAttrs (daemonType == "osd") { ExecStartPre = "${ceph.out}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}"; }; + } // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) { preStart = '' + daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}" + if [ ! -d ''$daemonPath ]; then + mkdir -m 755 -p ''$daemonPath + chown -R ceph:ceph ''$daemonPath + fi + ''; + } // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; } + ); + generateTargetFile = (daemonType: + { + "ceph-${daemonType}" = { + description = "Ceph target allowing to start/stop all ceph-${daemonType} services at once"; + partOf = [ "ceph.target" ]; + before = [ "ceph.target" ]; + }; + } + ); +in +{ + options.services.ceph = { + # Ceph has a monolithic configuration file but different sections for + # each daemon, a separate client section and a global section + enable = mkEnableOption "Ceph global configuration"; + + global = { + fsid = mkOption { + type = types.str; + example = '' + 433a2193-4f8a-47a0-95d2-209d7ca2cca5 + ''; + description = '' + Filesystem ID, a generated uuid, its must be generated and set before + attempting to start a cluster + ''; + }; + + clusterName = mkOption { + type = types.str; + default = "ceph"; + description = '' + Name of cluster + ''; + }; + + monInitialMembers = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + node0, node1, node2 + ''; + description = '' + List of hosts that will be used as monitors at startup. + ''; + }; + + monHost = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + 10.10.0.1, 10.10.0.2, 10.10.0.3 + ''; + description = '' + List of hostname shortnames/IP addresses of the initial monitors. + ''; + }; + + maxOpenFiles = mkOption { + type = types.int; + default = 131072; + description = '' + Max open files for each OSD daemon. + ''; + }; + + authClusterRequired = mkOption { + type = types.enum [ "cephx" "none" ]; + default = "cephx"; + description = '' + Enables requiring daemons to authenticate with eachother in the cluster. + ''; + }; + + authServiceRequired = mkOption { + type = types.enum [ "cephx" "none" ]; + default = "cephx"; + description = '' + Enables requiring clients to authenticate with the cluster to access services in the cluster (e.g. radosgw, mds or osd). + ''; + }; + + authClientRequired = mkOption { + type = types.enum [ "cephx" "none" ]; + default = "cephx"; + description = '' + Enables requiring the cluster to authenticate itself to the client. + ''; + }; + + publicNetwork = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + 10.20.0.0/24, 192.168.1.0/24 + ''; + description = '' + A comma-separated list of subnets that will be used as public networks in the cluster. + ''; + }; + + clusterNetwork = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + 10.10.0.0/24, 192.168.0.0/24 + ''; + description = '' + A comma-separated list of subnets that will be used as cluster networks in the cluster. + ''; + }; + }; + + mgr = { + enable = mkEnableOption "Ceph MGR daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of names for manager daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in mgr.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + description = '' + Extra configuration to add to the global section for manager daemons. + ''; + }; + }; + + mon = { + enable = mkEnableOption "Ceph MON daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of monitor daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in mon.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + description = '' + Extra configuration to add to the monitor section. + ''; + }; + }; + + osd = { + enable = mkEnableOption "Ceph OSD daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of OSD daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in osd.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = { + "osd journal size" = "10000"; + "osd pool default size" = "3"; + "osd pool default min size" = "2"; + "osd pool default pg num" = "200"; + "osd pool default pgp num" = "200"; + "osd crush chooseleaf type" = "1"; + }; + description = '' + Extra configuration to add to the OSD section. + ''; + }; + }; + + mds = { + enable = mkEnableOption "Ceph MDS daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of metadata service daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in mds.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + description = '' + Extra configuration to add to the MDS section. + ''; + }; + }; + + rgw = { + enable = mkEnableOption "Ceph RadosGW daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of rados gateway daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in client.name1, radosgw daemons + aren't daemons to cluster in the sense that OSD, MGR or MON daemons are. They are simply + daemons, from ceph, that uses the cluster as a backend. + ''; + }; + }; + + client = { + enable = mkEnableOption "Ceph client configuration"; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + example = '' + { + # This would create a section for a radosgw daemon named node0 and related + # configuration for it + "client.radosgw.node0" = { "some config option" = "true"; }; + }; + ''; + description = '' + Extra configuration to add to the client section. Configuration for rados gateways + would be added here, with their own sections, see example. + ''; + }; + }; + }; + + config = mkIf config.services.ceph.enable { + assertions = [ + { assertion = cfg.global.fsid != ""; + message = "fsid has to be set to a valid uuid for the cluster to function"; + } + { assertion = cfg.mgr.enable == true; + message = "ceph 12.x requires atleast 1 MGR daemon enabled for the cluster to function"; + } + { assertion = cfg.mon.enable == true -> cfg.mon.daemons != []; + message = "have to set id of atleast one MON if you're going to enable Monitor"; + } + { assertion = cfg.mds.enable == true -> cfg.mds.daemons != []; + message = "have to set id of atleast one MDS if you're going to enable Metadata Service"; + } + { assertion = cfg.osd.enable == true -> cfg.osd.daemons != []; + message = "have to set id of atleast one OSD if you're going to enable OSD"; + } + { assertion = cfg.mgr.enable == true -> cfg.mgr.daemons != []; + message = "have to set id of atleast one MGR if you're going to enable MGR"; + } + ]; + + warnings = optional (cfg.global.monInitialMembers == null) + ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function''; + + environment.etc."ceph/ceph.conf".text = let + # Translate camelCaseOptions to the expected camel case option for ceph.conf + translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global; + # Merge the extraConfig set for mgr daemons, as mgr don't have their own section + globalAndMgrConfig = translatedGlobalConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig; + # Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf + globalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) (filterAttrs (name: value: value != null) globalAndMgrConfig); + totalConfig = { + "global" = globalConfig; + } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { "mon" = cfg.mon.extraConfig; } + // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { "mds" = cfg.mds.extraConfig; } + // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { "osd" = cfg.osd.extraConfig; } + // optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig; + in + generators.toINI {} totalConfig; + + users.extraUsers = singleton { + name = "ceph"; + uid = config.ids.uids.ceph; + description = "Ceph daemon user"; + }; + + users.extraGroups = singleton { + name = "ceph"; + gid = config.ids.gids.ceph; + }; + + systemd.services = let + services = [] + ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; }) + ++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; }) + ++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; }) + ++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { }) + ++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; }); + in + mkMerge services; + + systemd.targets = let + targets = [ + { "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; }; } + ] ++ optional cfg.mon.enable (generateTargetFile "mon") + ++ optional cfg.mds.enable (generateTargetFile "mds") + ++ optional cfg.osd.enable (generateTargetFile "osd") + ++ optional cfg.rgw.enable (generateTargetFile "rgw") + ++ optional cfg.mgr.enable (generateTargetFile "mgr"); + in + mkMerge targets; + + systemd.tmpfiles.rules = [ + "d /run/ceph 0770 ceph ceph -" + ]; + }; +} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 62afbf32c2f6..f83fb7a6d5dc 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -133,10 +133,10 @@ in { basePackages = mkOption { type = types.attrsOf types.package; default = { inherit networkmanager modemmanager wpa_supplicant - networkmanager_openvpn networkmanager_vpnc - networkmanager_openconnect networkmanager_fortisslvpn - networkmanager_pptp networkmanager_l2tp - networkmanager_iodine; }; + networkmanager-openvpn networkmanager-vpnc + networkmanager-openconnect networkmanager-fortisslvpn + networkmanager-pptp networkmanager-l2tp + networkmanager-iodine; }; internal = true; }; @@ -273,28 +273,28 @@ in { { source = configFile; target = "NetworkManager/NetworkManager.conf"; } - { source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name"; + { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name"; target = "NetworkManager/VPN/nm-openvpn-service.name"; } - { source = "${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name"; + { source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name"; target = "NetworkManager/VPN/nm-vpnc-service.name"; } - { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name"; + { source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name"; target = "NetworkManager/VPN/nm-openconnect-service.name"; } - { source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; + { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; target = "NetworkManager/VPN/nm-fortisslvpn-service.name"; } - { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; + { source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; target = "NetworkManager/VPN/nm-pptp-service.name"; } - { source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; + { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name"; target = "NetworkManager/VPN/nm-strongswan-service.name"; } - { source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name"; + { source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name"; target = "NetworkManager/VPN/nm-iodine-service.name"; } ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) @@ -335,6 +335,7 @@ in { preStart = '' mkdir -m 700 -p /etc/NetworkManager/system-connections + mkdir -m 700 -p /etc/ipsec.d mkdir -m 755 -p ${stateDirs} ''; }; diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix index 9087b75c29c1..65df93a00da9 100644 --- a/nixos/modules/services/networking/softether.nix +++ b/nixos/modules/services/networking/softether.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.softether; + package = cfg.package.override { dataDir = cfg.dataDir; }; + in { @@ -49,7 +51,7 @@ in dataDir = mkOption { type = types.string; - default = "${cfg.package.dataDir}"; + default = "/var/lib/softether"; description = '' Data directory for SoftEther VPN. ''; @@ -64,11 +66,8 @@ in config = mkIf cfg.enable ( mkMerge [{ - environment.systemPackages = [ - (pkgs.lib.overrideDerivation cfg.package (attrs: { - dataDir = cfg.dataDir; - })) - ]; + environment.systemPackages = [ package ]; + systemd.services."softether-init" = { description = "SoftEther VPN services initial task"; wantedBy = [ "network.target" ]; @@ -80,11 +79,11 @@ in for d in vpnserver vpnbridge vpnclient vpncmd; do if ! test -e ${cfg.dataDir}/$d; then ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d - install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 + install -m0600 ${package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 fi done rm -rf ${cfg.dataDir}/vpncmd/vpncmd - ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd + ln -s ${package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd ''; }; } @@ -97,12 +96,12 @@ in wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${cfg.package}/bin/vpnserver start"; - ExecStop = "${cfg.package}/bin/vpnserver stop"; + ExecStart = "${package}/bin/vpnserver start"; + ExecStop = "${package}/bin/vpnserver stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver - ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver + ln -s ${package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver ''; postStop = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver @@ -118,12 +117,12 @@ in wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${cfg.package}/bin/vpnbridge start"; - ExecStop = "${cfg.package}/bin/vpnbridge stop"; + ExecStart = "${package}/bin/vpnbridge start"; + ExecStop = "${package}/bin/vpnbridge stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge - ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge + ln -s ${package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge ''; postStop = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge @@ -139,12 +138,12 @@ in wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${cfg.package}/bin/vpnclient start"; - ExecStop = "${cfg.package}/bin/vpnclient stop"; + ExecStart = "${package}/bin/vpnclient start"; + ExecStop = "${package}/bin/vpnclient stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnclient/vpnclient - ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient + ln -s ${package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient ''; postStart = '' sleep 1 diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 3a3f64221c42..707d24b9220f 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -32,13 +32,13 @@ let ${caConf} ''; - strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' + strongswanConf = {setup, connections, ca, secretsFile, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' charon { ${if managePlugins then "load_modular = no" else ""} ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""} plugins { stroke { - secrets_file = ${ipsecSecrets secrets} + secrets_file = ${secretsFile} } } } @@ -135,7 +135,18 @@ in }; }; - config = with cfg; mkIf enable { + + config = with cfg; + let + secretsFile = ipsecSecrets cfg.secrets; + in + mkIf enable + { + + # here we should use the default strongswan ipsec.secrets and + # append to it (default one is empty so not a pb for now) + environment.etc."ipsec.secrets".source = secretsFile; + systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; @@ -143,11 +154,15 @@ in wants = [ "keys.target" ]; after = [ "network-online.target" "keys.target" ]; environment = { - STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; }; + STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; }; serviceConfig = { ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork"; }; + preStart = '' + # with 'nopeerdns' setting, ppp writes into this folder + mkdir -m 700 -p /etc/ppp + ''; }; }; } diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index dcdc203bdc62..e485c073cbdd 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -16,12 +16,6 @@ in { available on http://127.0.0.1:8384/. ''; - useInotify = mkOption { - type = types.bool; - default = false; - description = "Provide syncthing-inotify as a service."; - }; - systemService = mkOption { type = types.bool; default = true; @@ -90,6 +84,12 @@ in { }; }; + imports = [ + (mkRemovedOptionModule ["services" "syncthing" "useInotify"] '' + This option was removed because syncthing now has the inotify functionality included under the name "fswatcher". + It can be enabled on a per-folder basis through the webinterface. + '') + ]; ###### implementation @@ -100,8 +100,7 @@ in { allowedUDPPorts = [ 21027 ]; }; - systemd.packages = [ pkgs.syncthing ] - ++ lib.optional cfg.useInotify pkgs.syncthing-inotify; + systemd.packages = [ pkgs.syncthing ]; users = mkIf (cfg.user == defaultUser) { extraUsers."${defaultUser}" = @@ -125,7 +124,6 @@ in { STNOUPGRADE = "yes"; inherit (cfg) all_proxy; } // config.networking.proxy.envVars; - wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { Restart = "on-failure"; @@ -141,20 +139,6 @@ in { syncthing-resume = { wantedBy = [ "suspend.target" ]; }; - - syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) { - description = "Syncthing Inotify File Watcher service"; - after = [ "network.target" "syncthing.service" ]; - requires = [ "syncthing.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - SuccessExitStatus = "2"; - RestartForceExitStatus = "3"; - Restart = "on-failure"; - User = cfg.user; - ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0"; - }; - }; }; }; } diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index adb80ea29840..e3c9b5282b8c 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -178,6 +178,8 @@ in preStart = '' mkdir -p /etc/tinc/${network}/hosts chown tinc.${network} /etc/tinc/${network}/hosts + mkdir -p /etc/tinc/${network}/invitations + chown tinc.${network} /etc/tinc/${network}/invitations # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index c1f945773e23..cb0e6b158651 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -69,7 +69,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = - { ExecStart = "${pkg}/bin/tox-bootstrapd ${cfgFile}"; + { ExecStart = "${pkg}/bin/tox-bootstrapd --config=${cfgFile}"; Type = "forking"; inherit PIDFile; User = "tox-bootstrapd"; diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index 4e685e633354..5d469cabe2cb 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -192,7 +192,7 @@ in { serviceConfig = { Type = "simple"; - ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -d -k -c ${daemonConfFile}''; + ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -P -d -k -c ${daemonConfFile}''; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml similarity index 58% rename from nixos/modules/services/web-apps/piwik-doc.xml rename to nixos/modules/services/web-apps/matomo-doc.xml index a393a182d36a..456aae6cc366 100644 --- a/nixos/modules/services/web-apps/piwik-doc.xml +++ b/nixos/modules/services/web-apps/matomo-doc.xml @@ -2,16 +2,16 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="module-services-piwik"> + xml:id="module-services-matomo"> - Piwik + Matomo - Piwik is a real-time web analytics application. - This module configures php-fpm as backend for piwik, optionally configuring an nginx vhost as well. + Matomo is a real-time web analytics application. + This module configures php-fpm as backend for Matomo, optionally configuring an nginx vhost as well. - An automatic setup is not suported by piwik, so you need to configure piwik itself in the browser-based piwik setup. + An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup. @@ -19,7 +19,7 @@ Database Setup - You also need to configure a MariaDB or MySQL database and -user for piwik yourself, + You also need to configure a MariaDB or MySQL database and -user for Matomo yourself, and enter those credentials in your browser. You can use passwordless database authentication via the UNIX_SOCKET authentication plugin with the following SQL commands: @@ -27,20 +27,20 @@ # For MariaDB INSTALL PLUGIN unix_socket SONAME 'auth_socket'; - CREATE DATABASE piwik; - CREATE USER 'piwik'@'localhost' IDENTIFIED WITH unix_socket; - GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost'; + CREATE DATABASE matomo; + CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket; + GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; # For MySQL INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; - CREATE DATABASE piwik; - CREATE USER 'piwik'@'localhost' IDENTIFIED WITH auth_socket; - GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost'; + CREATE DATABASE matomo; + CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; + GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - Then fill in piwik as database user and database name, and leave the password field blank. - This authentication works by allowing only the piwik unix user to authenticate as the - piwik database user (without needing a password), but no other users. + Then fill in matomo as database user and database name, and leave the password field blank. + This authentication works by allowing only the matomo unix user to authenticate as the + matomo database user (without needing a password), but no other users. For more information on passwordless login, see . @@ -55,9 +55,9 @@ Backup You only need to take backups of your MySQL database and the - /var/lib/piwik/config/config.ini.php file. - Use a user in the piwik group or root to access the file. - For more information, see . + /var/lib/matomo/config/config.ini.php file. + Use a user in the matomo group or root to access the file. + For more information, see . @@ -67,14 +67,14 @@ - Piwik's file integrity check will warn you. + Matomo's file integrity check will warn you. This is due to the patches necessary for NixOS, you can safely ignore this. - Piwik will warn you that the JavaScript tracker is not writable. + Matomo will warn you that the JavaScript tracker is not writable. This is because it's located in the read-only nix store. You can safely ignore this, unless you need a plugin that needs JavaScript tracker access. @@ -88,7 +88,7 @@ You can use other web servers by forwarding calls for index.php and - piwik.php to the /run/phpfpm-piwik.sock fastcgi unix socket. + piwik.php to the /run/phpfpm-matomo.sock fastcgi unix socket. You can use the nginx configuration in the module code as a reference to what else should be configured. diff --git a/nixos/modules/services/web-apps/piwik.nix b/nixos/modules/services/web-apps/matomo.nix similarity index 73% rename from nixos/modules/services/web-apps/piwik.nix rename to nixos/modules/services/web-apps/matomo.nix index ce86c6873dd4..ef6ac9698e21 100644 --- a/nixos/modules/services/web-apps/piwik.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -1,10 +1,11 @@ { config, lib, pkgs, services, ... }: with lib; let - cfg = config.services.piwik; + cfg = config.services.matomo; - user = "piwik"; + user = "matomo"; dataDir = "/var/lib/${user}"; + deprecatedDataDir = "/var/lib/piwik"; pool = user; # it's not possible to use /run/phpfpm/${pool}.sock because /run/phpfpm/ is root:root 0770, @@ -13,17 +14,22 @@ let phpExecutionUnit = "phpfpm-${pool}"; databaseService = "mysql.service"; + fqdn = + let + join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; + in join config.networking.hostName config.networking.domain; + in { options = { - services.piwik = { + services.matomo = { # NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963 - # piwik issue for automatic piwik setup: https://github.com/piwik/piwik/issues/10257 - # TODO: find a nice way to do this when more NixOS MySQL and / or piwik automatic setup stuff is implemented. + # matomo issue for automatic matomo setup: https://github.com/matomo-org/matomo/issues/10257 + # TODO: find a nice way to do this when more NixOS MySQL and / or matomo automatic setup stuff is implemented. enable = mkOption { type = types.bool; default = false; description = '' - Enable piwik web analytics with php-fpm backend. + Enable matomo web analytics with php-fpm backend. Either the nginx option or the webServerUser option is mandatory. ''; }; @@ -32,8 +38,9 @@ in { type = types.nullOr types.str; default = null; example = "lighttpd"; + # TODO: piwik.php might get renamed to matomo.php in future releases description = '' - Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for piwik if the nginx + Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for matomo if the nginx option is not used. Either this option or the nginx option is mandatory. If you want to use another webserver than nginx, you need to set this to that server's user and pass fastcgi requests to `index.php` and `piwik.php` to this socket. @@ -55,7 +62,7 @@ in { catch_workers_output = yes ''; description = '' - Settings for phpfpm's process manager. You might need to change this depending on the load for piwik. + Settings for phpfpm's process manager. You might need to change this depending on the load for matomo. ''; }; @@ -65,7 +72,7 @@ in { (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { # enable encryption by default, - # as sensitive login and piwik data should not be transmitted in clear text. + # as sensitive login and matomo data should not be transmitted in clear text. options.forceSSL.default = true; options.enableACME.default = true; } @@ -73,15 +80,19 @@ in { ); default = null; example = { - serverName = "stats.$\{config.networking.hostName\}"; + serverAliases = [ + "matomo.$\{config.networking.domain\}" + "stats.$\{config.networking.domain\}" + ]; enableACME = false; }; description = '' - With this option, you can customize an nginx virtualHost which already has sensible defaults for piwik. + With this option, you can customize an nginx virtualHost which already has sensible defaults for matomo. Either this option or the webServerUser option is mandatory. Set this to {} to just enable the virtualHost if you don't need any customization. - If enabled, then by default, the serverName is piwik.$\{config.networking.hostName\}, SSL is active, - and certificates are acquired via ACME. + If enabled, then by default, the is + ${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}, + SSL is active, and certificates are acquired via ACME. If this is set to null (the default), no nginx virtualHost will be configured. ''; }; @@ -90,12 +101,12 @@ in { config = mkIf cfg.enable { warnings = mkIf (cfg.nginx != null && cfg.webServerUser != null) [ - "If services.piwik.nginx is set, services.piwik.nginx.webServerUser is ignored and should be removed." + "If services.matomo.nginx is set, services.matomo.nginx.webServerUser is ignored and should be removed." ]; assertions = [ { assertion = cfg.nginx != null || cfg.webServerUser != null; - message = "Either services.piwik.nginx or services.piwik.nginx.webServerUser is mandatory"; + message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory"; }]; users.extraUsers.${user} = { @@ -106,19 +117,20 @@ in { }; users.extraGroups.${user} = {}; - systemd.services.piwik_setup_update = { - # everything needs to set up and up to date before piwik php files are executed + systemd.services.matomo_setup_update = { + # everything needs to set up and up to date before matomo php files are executed requiredBy = [ "${phpExecutionUnit}.service" ]; before = [ "${phpExecutionUnit}.service" ]; # the update part of the script can only work if the database is already up and running requires = [ databaseService ]; after = [ databaseService ]; - path = [ pkgs.piwik ]; + path = [ pkgs.matomo ]; serviceConfig = { Type = "oneshot"; User = user; # hide especially config.ini.php from other UMask = "0007"; + # TODO: might get renamed to MATOMO_USER_PATH in future versions Environment = "PIWIK_USER_PATH=${dataDir}"; # chown + chmod in preStart needs root PermissionsStartOnly = true; @@ -127,27 +139,32 @@ in { # e.g. after restoring from backup or moving from another system. # Note that ${dataDir}/config/config.ini.php might contain the MySQL password. preStart = '' + # migrate data from piwik to matomo folder + if [ -d ${deprecatedDataDir} ]; then + echo "Migrating from ${deprecatedDataDir} to ${dataDir}" + mv -T ${deprecatedDataDir} ${dataDir} + fi chown -R ${user}:${user} ${dataDir} chmod -R ug+rwX,o-rwx ${dataDir} ''; script = '' - # Use User-Private Group scheme to protect piwik data, but allow administration / backup via piwik group + # Use User-Private Group scheme to protect matomo data, but allow administration / backup via matomo group # Copy config folder chmod g+s "${dataDir}" - cp -r "${pkgs.piwik}/config" "${dataDir}/" + cp -r "${pkgs.matomo}/config" "${dataDir}/" chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" # check whether user setup has already been done if test -f "${dataDir}/config/config.ini.php"; then # then execute possibly pending database upgrade - piwik-console core:update --yes + matomo-console core:update --yes fi ''; }; systemd.services.${phpExecutionUnit} = { - # stop phpfpm on package upgrade, do database upgrade via piwik_setup_update, and then restart - restartTriggers = [ pkgs.piwik ]; + # stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart + restartTriggers = [ pkgs.matomo ]; # stop config.ini.php from getting written with read permission for others serviceConfig.UMask = "0007"; }; @@ -175,14 +192,14 @@ in { # References: # https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html # https://github.com/perusio/piwik-nginx - "${user}.${config.networking.hostName}" = mkMerge [ cfg.nginx { - # don't allow to override the root easily, as it will almost certainly break piwik. + "${user}.${fqdn}" = mkMerge [ cfg.nginx { + # don't allow to override the root easily, as it will almost certainly break matomo. # disadvantage: not shown as default in docs. - root = mkForce "${pkgs.piwik}/share"; + root = mkForce "${pkgs.matomo}/share"; # define locations here instead of as the submodule option's default # so that they can easily be extended with additional locations if required - # without needing to redefine the piwik ones. + # without needing to redefine the matomo ones. # disadvantage: not shown as default in docs. locations."/" = { index = "index.php"; @@ -191,6 +208,7 @@ in { locations."= /index.php".extraConfig = '' fastcgi_pass unix:${phpSocket}; ''; + # TODO: might get renamed to matomo.php in future versions # allow piwik.php for tracking locations."= /piwik.php".extraConfig = '' fastcgi_pass unix:${phpSocket}; @@ -212,6 +230,7 @@ in { locations."= /robots.txt".extraConfig = '' return 200 "User-agent: *\nDisallow: /\n"; ''; + # TODO: might get renamed to matomo.js in future versions # let browsers cache piwik.js locations."= /piwik.js".extraConfig = '' expires 1M; @@ -221,7 +240,7 @@ in { }; meta = { - doc = ./piwik-doc.xml; + doc = ./matomo-doc.xml; maintainers = with stdenv.lib.maintainers; [ florianjacob ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 7f3dc0d7847b..da3287aaea6e 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -33,7 +33,7 @@ in pkgs.xorg.xauth # used by kdesu pkgs.gtk2 # To get GTK+'s themes. pkgs.tango-icon-theme - pkgs.shared_mime_info + pkgs.shared-mime-info pkgs.gnome2.gnomeicontheme pkgs.xorg.xcursorthemes ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 21d30df5b695..7256013d5d8b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -27,7 +27,7 @@ let nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {} '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages} @@ -60,7 +60,7 @@ in { example = literalExample "[ pkgs.gnome3.gpaste ]"; description = "Additional list of packages to be added to the session search path. Useful for gnome shell extensions or gsettings-conditionated autostart."; - apply = list: list ++ [ pkgs.gnome3.gnome_shell pkgs.gnome3.gnome-shell-extensions ]; + apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; }; extraGSettingsOverrides = mkOption { @@ -118,13 +118,13 @@ in { services.packagekit.enable = mkDefault true; hardware.bluetooth.enable = mkDefault true; services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center - services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ]; + services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ]; systemd.packages = [ pkgs.gnome3.vino ]; # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; - fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; + fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; services.xserver.desktopManager.session = singleton { name = "gnome3"; @@ -164,7 +164,7 @@ in { # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update - ${pkgs.gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} & + ${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} & waitPID=$! ''; }; @@ -172,7 +172,7 @@ in { services.xserver.updateDbusEnvironment = true; environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" - "${pkgs.gnome3.glib_networking.out}/lib/gio/modules" + "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages); @@ -180,10 +180,10 @@ in { # Use the correct gnome3 packageSet networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant; - inherit (pkgs.gnome3) networkmanager_openvpn networkmanager_vpnc - networkmanager_openconnect networkmanager_fortisslvpn - networkmanager_pptp networkmanager_iodine - networkmanager_l2tp; }; + inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc + networkmanager-openconnect networkmanager-fortisslvpn + networkmanager-pptp networkmanager-iodine + networkmanager-l2tp; }; # Needed for themes and backgrounds environment.pathsToLink = [ "/share" ]; diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 814503ab0bc4..0117dc9d132b 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -102,7 +102,7 @@ in services.dbus.packages = [ pkgs.gnome3.dconf - pkgs.at_spi2_core + pkgs.at-spi2-core ]; services.gnome3.gnome-keyring.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index b794e2b12d73..91d091d7d7e2 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -154,7 +154,7 @@ in print-manager breeze-icons - pkgs.hicolor_icon_theme + pkgs.hicolor-icon-theme kde-gtk-config breeze-gtk diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index c0c9d7ea47f7..489bffbee917 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -61,12 +61,12 @@ in # utilities-terminal, accessories-text-editor gnome3.defaultIconTheme - hicolor_icon_theme + hicolor-icon-theme tango-icon-theme xfce4-icon-theme - desktop_file_utils - shared_mime_info + desktop-file-utils + shared-mime-info # Needed by Xfce's xinitrc script # TODO: replace with command -v diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 07642a8b13db..70fc7388c2ac 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -133,7 +133,7 @@ in StandardError = "inherit"; }; - systemd.services.display-manager.path = [ pkgs.gnome3.gnome_session ]; + systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ]; services.dbus.packages = [ gdm ]; @@ -193,7 +193,7 @@ in auth required pam_env.so envfile=${config.system.build.pamEnvironment} auth required pam_succeed_if.so uid >= 1000 quiet - auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so + auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth ${optionalString config.security.pam.enableEcryptfs "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -213,7 +213,7 @@ in "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_loginuid.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so - session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start + session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start ''; gdm-password.text = '' @@ -221,7 +221,7 @@ in auth required pam_env.so envfile=${config.system.build.pamEnvironment} auth required pam_succeed_if.so uid >= 1000 quiet - auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so + auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth ${optionalString config.security.pam.enableEcryptfs "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -240,7 +240,7 @@ in "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_loginuid.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so - session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start + session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start ''; gdm-autologin.text = '' diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 35b715b98fcd..2a71d2338607 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -68,8 +68,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.gnome_themes_standard; - defaultText = "pkgs.gnome3.gnome_themes_standard"; + default = pkgs.gnome3.gnome-themes-standard; + defaultText = "pkgs.gnome3.gnome-themes-standard"; description = '' The package path that contains the theme given in the name option. ''; diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix index 28fc92024bcb..a614559970e9 100644 --- a/nixos/modules/services/x11/xautolock.nix +++ b/nixos/modules/services/x11/xautolock.nix @@ -26,9 +26,9 @@ in }; locker = mkOption { - default = "xlock"; # default according to `man xautolock` - example = "i3lock -i /path/to/img"; - type = types.string; + default = "${pkgs.xlockmore}/bin/xlock"; # default according to `man xautolock` + example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img"; + type = types.str; description = '' The script to use when automatically locking the computer. @@ -37,8 +37,8 @@ in nowlocker = mkOption { default = null; - example = "i3lock -i /path/to/img"; - type = types.nullOr types.string; + example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img"; + type = types.nullOr types.str; description = '' The script to use when manually locking the computer with xautolock -locknow. @@ -56,10 +56,8 @@ in notifier = mkOption { default = null; - example = literalExample '' - "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\"" - ''; - type = types.nullOr types.string; + example = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; + type = types.nullOr types.str; description = '' Notification script to be used to warn about the pending autolock. @@ -68,8 +66,8 @@ in killer = mkOption { default = null; # default according to `man xautolock` is none - example = "systemctl suspend"; - type = types.nullOr types.string; + example = "${pkgs.systemd}/bin/systemctl suspend"; + type = types.nullOr types.str; description = '' The script to use when nothing has happend for as long as @@ -131,6 +129,12 @@ in assertion = cfg.killer != null -> cfg.killtime >= 10; message = "killtime has to be at least 10 minutes according to `man xautolock`"; } - ]; + ] ++ (lib.flip map [ "locker" "notifier" "nowlocker" "killer" ] + (option: + { + assertion = cfg."${option}" != null -> builtins.substring 0 1 cfg."${option}" == "/"; + message = "Please specify a canonical path for `services.xserver.xautolock.${option}`"; + }) + ); }; } diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index cdeff4845948..8b3dc2d90eb3 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -118,7 +118,7 @@ in echo ${escapeShellArg key} >> /root/.ssh/authorized_keys '') cfg.authorizedKeys)} - dropbear -s -j -k -E -m -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} + dropbear -s -j -k -E -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} ''; boot.initrd.secrets = diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 9056121fa7d1..0d83391de893 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -110,7 +110,7 @@ in device = mkOption { default = ""; - example = "/dev/hda"; + example = "/dev/disk/by-id/wwn-0x500001234567890a"; type = types.str; description = '' The device on which the GRUB boot loader will be installed. @@ -123,7 +123,7 @@ in devices = mkOption { default = []; - example = [ "/dev/hda" ]; + example = [ "/dev/disk/by-id/wwn-0x500001234567890a" ]; type = types.listOf types.str; description = '' The devices on which the boot loader, GRUB, will be @@ -135,8 +135,8 @@ in mirroredBoots = mkOption { default = [ ]; example = [ - { path = "/boot1"; devices = [ "/dev/sda" ]; } - { path = "/boot2"; devices = [ "/dev/sdb" ]; } + { path = "/boot1"; devices = [ "/dev/disk/by-id/wwn-0x500001234567890a" ]; } + { path = "/boot2"; devices = [ "/dev/disk/by-id/wwn-0x500009876543210a" ]; } ]; description = '' Mirror the boot configuration to multiple partitions and install grub @@ -178,7 +178,7 @@ in devices = mkOption { default = [ ]; - example = [ "/dev/sda" "/dev/sdb" ]; + example = [ "/dev/disk/by-id/wwn-0x500001234567890a" "/dev/disk/by-id/wwn-0x500009876543210a" ]; type = types.listOf types.str; description = '' The path to the devices which will have the GRUB MBR written. diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index eefee5a479e7..8b390e1b60c4 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -228,10 +228,6 @@ in [ "aes" "aes_generic" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" - # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged - # remove once 'modprobe --show-depends xts' shows ecb as a dependency - "ecb" - (if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586") ]; description = '' @@ -441,7 +437,10 @@ in # Some modules that may be needed for mounting anything ciphered # Also load input_leds to get caps lock light working (#12456) boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ] - ++ luks.cryptoModules; + ++ luks.cryptoModules + # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged + # remove once 'modprobe --show-depends xts' shows ecb as a dependency + ++ (if builtins.elem "xts" luks.cryptoModules then ["ecb"] else []); # copy the cryptsetup binary and it's dependencies boot.initrd.extraUtilsCommands = '' diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index eea10613ea58..7bf7a51a2417 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -650,7 +650,11 @@ let unitFiles = map (name: { target = "systemd/network/${name}"; source = "${cfg.units.${name}.unit}/${name}"; - }) (attrNames cfg.units); + }) (attrNames cfg.units) ++ + (map (entry: { + target = "systemd/network/${entry}"; + source = "${config.systemd.package}/lib/systemd/network/${entry}"; + }) (attrNames (builtins.readDir "${config.systemd.package}/lib/systemd/network"))); in { diff --git a/nixos/release.nix b/nixos/release.nix index c85150190587..2d8b6c6b8263 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -228,7 +228,9 @@ in rec { tests.boot = callSubTests tests/boot.nix {}; tests.boot-stage1 = callTest tests/boot-stage1.nix {}; tests.borgbackup = callTest tests/borgbackup.nix {}; + tests.buildbot = callTest tests/buildbot.nix {}; tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {}; + tests.ceph = callTestOnTheseSystems ["x86_64-linux"] tests/ceph.nix {}; tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable; tests.cjdns = callTest tests/cjdns.nix {}; tests.cloud-init = callTest tests/cloud-init.nix {}; @@ -258,7 +260,7 @@ in rec { tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {}; - #tests.fwupd = callTest tests/fwupd.nix {}; # build during evaluation + tests.fwupd = callTest tests/fwupd.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; tests.gjs = callTest tests/gjs.nix {}; @@ -318,6 +320,7 @@ in rec { tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nginx = callTest tests/nginx.nix { }; tests.nghttpx = callTest tests/nghttpx.nix { }; + tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { }; tests.novacomd = callTestOnTheseSystems ["x86_64-linux"] tests/novacomd.nix { }; tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; @@ -352,6 +355,7 @@ in rec { tests.snapper = callTest tests/snapper.nix {}; tests.statsd = callTest tests/statsd.nix {}; tests.sudo = callTest tests/sudo.nix {}; + tests.systemd = callTest tests/systemd.nix {}; tests.switchTest = callTest tests/switch-test.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; @@ -361,6 +365,7 @@ in rec { tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; + tests.xrdp = callTest tests/xrdp.nix {}; tests.yabar = callTest tests/yabar.nix {}; tests.zookeeper = callTest tests/zookeeper.nix {}; diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix new file mode 100644 index 000000000000..b9993062c079 --- /dev/null +++ b/nixos/tests/ceph.nix @@ -0,0 +1,140 @@ +import ./make-test.nix ({pkgs, ...}: rec { + name = "All-in-one-basic-ceph-cluster"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lejonet ]; + }; + + nodes = { + aio = { config, pkgs, ... }: { + virtualisation = { + emptyDiskImages = [ 20480 20480 ]; + vlans = [ 1 ]; + }; + + networking = { + firewall.allowPing = true; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + + environment.systemPackages = with pkgs; [ + bash + sudo + ceph + xfsprogs + ]; + nixpkgs.config.packageOverrides = super: { + ceph = super.ceph.override({ nss = super.nss; libxfs = super.libxfs; libaio = super.libaio; jemalloc = super.jemalloc; }); + }; + + boot.kernelModules = [ "xfs" ]; + + services.ceph.enable = true; + services.ceph.global = { + fsid = "066ae264-2a5d-4729-8001-6ad265f50b03"; + monInitialMembers = "aio"; + monHost = "192.168.1.1"; + }; + + services.ceph.mon = { + enable = true; + daemons = [ "aio" ]; + }; + + services.ceph.mgr = { + enable = true; + daemons = [ "aio" ]; + }; + + services.ceph.osd = { + enable = true; + daemons = [ "0" "1" ]; + }; + }; + }; + + testScript = { nodes, ... }: '' + startAll; + + $aio->waitForUnit("network.target"); + + # Create the ceph-related directories + $aio->mustSucceed( + "mkdir -p /var/lib/ceph/mgr/ceph-aio/", + "mkdir -p /var/lib/ceph/mon/ceph-aio/", + "mkdir -p /var/lib/ceph/osd/ceph-{0..1}/", + "chown ceph:ceph -R /var/lib/ceph/" + ); + + # Bootstrap ceph-mon daemon + $aio->mustSucceed( + "mkdir -p /var/lib/ceph/bootstrap-osd && chown ceph:ceph /var/lib/ceph/bootstrap-osd", + "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'", + "ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'", + "ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring", + "monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap", + "sudo -u ceph ceph-mon --mkfs -i aio --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring", + "touch /var/lib/ceph/mon/ceph-aio/done", + "systemctl start ceph-mon-aio" + ); + $aio->waitForUnit("ceph-mon-aio"); + + # Can't check ceph status until a mon is up + $aio->succeed("ceph -s | grep 'mon: 1 daemons'"); + + # Start the ceph-mgr daemon, it has no deps and hardly any setup + $aio->mustSucceed( + "ceph auth get-or-create mgr.aio mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-aio/keyring", + "systemctl start ceph-mgr-aio" + ); + $aio->waitForUnit("ceph-mgr-aio"); + $aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'"); + + # Bootstrap both OSDs + $aio->mustSucceed( + "mkfs.xfs /dev/vdb", + "mkfs.xfs /dev/vdc", + "mount /dev/vdb /var/lib/ceph/osd/ceph-0", + "mount /dev/vdc /var/lib/ceph/osd/ceph-1", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-0/keyring --name osd.0 --add-key AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-1/keyring --name osd.1 --add-key AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==", + "echo '{\"cephx_secret\": \"AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==\"}' | ceph osd new 55ba2294-3e24-478f-bee0-9dca4c231dd9 -i -", + "echo '{\"cephx_secret\": \"AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==\"}' | ceph osd new 5e97a838-85b6-43b0-8950-cb56d554d1e5 -i -" + ); + + # Initialize the OSDs with regular filestore + $aio->mustSucceed( + "ceph-osd -i 0 --mkfs --osd-uuid 55ba2294-3e24-478f-bee0-9dca4c231dd9", + "ceph-osd -i 1 --mkfs --osd-uuid 5e97a838-85b6-43b0-8950-cb56d554d1e5", + "chown -R ceph:ceph /var/lib/ceph/osd", + "systemctl start ceph-osd-0", + "systemctl start ceph-osd-1" + ); + + $aio->waitUntilSucceeds("ceph osd stat | grep '2 osds: 2 up, 2 in'"); + $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active)'"); + $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'"); + + $aio->mustSucceed( + "ceph osd pool create aio-test 100 100", + "ceph osd pool ls | grep 'aio-test'", + "ceph osd pool rename aio-test aio-other-test", + "ceph osd pool ls | grep 'aio-other-test'", + "ceph -s | grep '1 pools, 100 pgs'", + "ceph osd getcrushmap -o crush", + "crushtool -d crush -o decrushed", + "sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush", + "crushtool -c modcrush -o recrushed", + "ceph osd setcrushmap -i recrushed", + "ceph osd pool set aio-other-test size 2" + ); + $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'"); + $aio->waitUntilSucceeds("ceph -s | grep '100 active+clean'"); + $aio->mustFail( + "ceph osd pool ls | grep 'aio-test'", + "ceph osd pool delete aio-other-test aio-other-test --yes-i-really-really-mean-it" + ); + ''; +}) diff --git a/nixos/tests/nix-ssh-serve.nix b/nixos/tests/nix-ssh-serve.nix new file mode 100644 index 000000000000..aa366d8612d7 --- /dev/null +++ b/nixos/tests/nix-ssh-serve.nix @@ -0,0 +1,39 @@ +import ./make-test.nix ({ pkgs, lib, ... }: +let inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey snakeOilPublicKey; + ssh-config = builtins.toFile "ssh.conf" '' + UserKnownHostsFile=/dev/null + StrictHostKeyChecking=no + ''; +in + { name = "nix-ssh-serve"; + meta.maintainers = [ lib.maintainers.shlevy ]; + nodes = + { server.nix.sshServe = + { enable = true; + keys = [ snakeOilPublicKey ]; + protocol = "ssh-ng"; + }; + server.nix.package = pkgs.nixUnstable; + client.nix.package = pkgs.nixUnstable; + }; + testScript = '' + startAll; + + $client->succeed("mkdir -m 700 /root/.ssh"); + $client->copyFileFromHost("${ssh-config}", "/root/.ssh/config"); + $client->succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa"); + $client->succeed("chmod 600 /root/.ssh/id_ecdsa"); + + $client->succeed("nix-store --add /etc/machine-id > mach-id-path"); + + $server->waitForUnit("sshd"); + + $client->fail("diff /root/other-store\$(cat mach-id-path) /etc/machine-id"); + # Currently due to shared store this is a noop :( + $client->succeed("nix copy --to ssh-ng://nix-ssh\@server \$(cat mach-id-path)"); + $client->succeed("nix-store --realise \$(cat mach-id-path) --store /root/other-store --substituters ssh-ng://nix-ssh\@server"); + $client->succeed("diff /root/other-store\$(cat mach-id-path) /etc/machine-id"); + ''; + } +) diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 291544996889..b2d254e9d9d9 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -1,20 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: -let - snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" '' - -----BEGIN EC PRIVATE KEY----- - MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49 - AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN - r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA== - -----END EC PRIVATE KEY----- - ''; - - snakeOilPublicKey = pkgs.lib.concatStrings [ - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" - "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" - "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil" - ]; - +let inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey snakeOilPublicKey; in { name = "openssh"; meta = with pkgs.stdenv.lib.maintainers; { diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index f6ce3fe38ed3..7fe905eb4254 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.postgresql = let mypg = pkgs.postgresql100; in { enable = true; package = mypg; - extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ]; + extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ]; }; }; }; diff --git a/nixos/tests/ssh-keys.nix b/nixos/tests/ssh-keys.nix new file mode 100644 index 000000000000..07d422196efa --- /dev/null +++ b/nixos/tests/ssh-keys.nix @@ -0,0 +1,15 @@ +pkgs: +{ snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" '' + -----BEGIN EC PRIVATE KEY----- + MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49 + AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN + r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA== + -----END EC PRIVATE KEY----- + ''; + + snakeOilPublicKey = pkgs.lib.concatStrings [ + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" + "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" + "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil" + ]; +} diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix new file mode 100644 index 000000000000..2df6f341c4ef --- /dev/null +++ b/nixos/tests/systemd.nix @@ -0,0 +1,66 @@ +import ./make-test.nix { + name = "systemd"; + + machine = { lib, ... }: { + imports = [ common/user-account.nix common/x11.nix ]; + + virtualisation.emptyDiskImages = [ 512 ]; + + fileSystems = lib.mkVMOverride { + "/test-x-initrd-mount" = { + device = "/dev/vdb"; + fsType = "ext2"; + autoFormat = true; + noCheck = true; + options = [ "x-initrd.mount" ]; + }; + }; + + systemd.extraConfig = "DefaultEnvironment=\"XXX_SYSTEM=foo\""; + systemd.user.extraConfig = "DefaultEnvironment=\"XXX_USER=bar\""; + services.journald.extraConfig = "Storage=volatile"; + services.xserver.displayManager.auto.user = "alice"; + + systemd.services.testservice1 = { + description = "Test Service 1"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + if [ "$XXX_SYSTEM" = foo ]; then + touch /system_conf_read + fi + ''; + }; + + systemd.user.services.testservice2 = { + description = "Test Service 2"; + wantedBy = [ "default.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + if [ "$XXX_USER" = bar ]; then + touch "$HOME/user_conf_read" + fi + ''; + }; + }; + + testScript = '' + $machine->waitForX; + + # Regression test for https://github.com/NixOS/nixpkgs/issues/35415 + subtest "configuration files are recognized by systemd", sub { + $machine->succeed('test -e /system_conf_read'); + $machine->succeed('test -e /home/alice/user_conf_read'); + $machine->succeed('test -z $(ls -1 /var/log/journal)'); + }; + + # Regression test for https://github.com/NixOS/nixpkgs/issues/35268 + subtest "file system with x-initrd.mount is not unmounted", sub { + $machine->shutdown; + $machine->waitForUnit('multi-user.target'); + # If the file system was unmounted during the shutdown the file system + # has a last mount time, because the file system wasn't checked. + $machine->fail('dumpe2fs /dev/vdb | grep -q "^Last mount time: *n/a"'); + }; + ''; +} diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 63c45b3ba07f..0acd616eeaff 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "1d22fgwdcn343kd95lh389hj417zwbmnhi29cij8n7wc0nz2vpil"; + sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec{ homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; - platforms = platforms.unix; + # bitcoin needs hexdump to build, which doesn't seem to build on darwin at the moment. + platforms = platforms.linux; }; } diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 37df75ae110e..09cf5a057f50 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,11 +1,11 @@ -{ callPackage, boost155, boost164, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: +{ callPackage, boost155, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: rec { aeon = callPackage ./aeon { }; - bitcoin = libsForQt5.callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = false; }; + bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; + bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix index e8fb1c49828e..81b4cb52948f 100644 --- a/pkgs/applications/altcoins/ethabi.nix +++ b/pkgs/applications/altcoins/ethabi.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ethabi-${version}"; - version = "1.0.4"; + version = "4.1.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "ethabi"; - rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f"; - sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd"; + rev = "v${version}"; + sha256 = "0kxflixmgycdh7sv73zf2mrkbcfzzw7f5sjbsjks9crc9cvjqi6p"; }; - cargoSha256 = "0i9617qwc6d4jvlbydwk03rcsnyvxzpbn2ms10ds4r6x7jy2a4sy"; + cargoSha256 = "18rigpsmfiv6im2sspnxadgqrlfdp9dd75ji8s56ksc9g7hrc3wz"; cargoBuildFlags = ["--features cli"]; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index f35213a085b1..18a9d043e189 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -12,6 +12,17 @@ buildGoPackage rec { # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; + # Only install binaries in $out, source is not interesting and takes ~50M + outputs = [ "out" ]; + preFixup = '' + export bin="''${out}" + ''; + installPhase = '' + mkdir -p $out/bin $out + dir="$NIX_BUILD_TOP/go/bin" + [ -e "$dir" ] && cp -r $dir $out + ''; + src = fetchFromGitHub { owner = "ethereum"; repo = "go-ethereum"; diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix index 40fbf2ceb6a7..334ec9277e1b 100644 --- a/pkgs/applications/altcoins/seth.nix +++ b/pkgs/applications/altcoins/seth.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "seth-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "dapphub"; repo = "seth"; rev = "v${version}"; - sha256 = "1lbr7i3rznfp3h03y7pc094r0m992lbzr926rnr0xxbyp755wvm4"; + sha256 = "0la2nfqsscpbq6zwa6hsd73nimdnrhilrmgyy77yr3jca2wjhsjk"; }; nativeBuildInputs = [makeWrapper]; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index ad12609429f5..d09a10a15b2c 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -28,6 +28,6 @@ in stdenv.mkDerivation rec { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index a22866dc031a..32ae107ed9cb 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { name = "aacgain-1.9.0"; @@ -12,7 +12,19 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + postPatch = '' + ( + cd mp4v2 + patch -p0 < ${fetchpatch { + name = "fix_missing_ptr_deref.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_missing_ptr_deref.patch?h=aacgain-cvs&id=e1a19c920f57063e64bab75cb0d8624731f6e3d7"; + sha256 = "1cq7r005nvmwdjb25z80grcam7jv6k57jnl2bh349mg3ajmslbq9"; + }} + ) + ''; + configurePhase = '' + runHook preConfigure cd mp4v2 ./configure @@ -21,9 +33,11 @@ stdenv.mkDerivation { cd .. ./configure + runHook postConfigure ''; buildPhase = '' + runHook preBuild cd mp4v2 make libmp4v2.la @@ -32,18 +46,18 @@ stdenv.mkDerivation { cd .. make + runHook postBuild ''; installPhase = '' - strip -s aacgain/aacgain - install -vD aacgain/aacgain "$out/bin/aacgain" + install -D aacgain/aacgain "$out/bin/aacgain" ''; - meta = { + meta = with stdenv.lib; { description = "ReplayGain for AAC files"; homepage = https://github.com/mulx/aacgain; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.robbinch ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.robbinch ]; }; } diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index afb3c8342731..a99fb80df723 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, - libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify, + libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify, libsoup, avahi, taglib }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext gtk2 expat intltool libgcrypt libunique gnutls - libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib + libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib ]; meta = { diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 99d6357e9216..bb0615df25b8 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.8"; + version = "2.9.2"; name = "asunder-${version}"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; - sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq"; + sha256 = "0vjbxrrjih4c673sc39wj5whp81xp9kmnwqxwzfnmhkky970rg5r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index e5e8640b4fd9..6890b53f407d 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 -, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib +, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis -, libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b +, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack , neon, faad2, lame, libnotify, libsidplayfp }: @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gettext glib gtk3 libmowgli dbus_glib libxml2 + gettext glib gtk3 libmowgli dbus-glib libxml2 xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 - libpulseaudio fluidsynth libmad libogg libvorbis libcdio082 + libpulseaudio fluidsynth libmad libogg libvorbis libcdio libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libmodplug libsamplerate soxr lirc curl wavpack neon faad2 lame libnotify libsidplayfp diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 353865e8ec04..8910fdc1b0a8 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -3,7 +3,7 @@ gettext, pkgconfig, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, - libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug, + libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, wavpack @@ -46,7 +46,7 @@ mkDerivation { # Plugin dependencies alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb - libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli + libcdio libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack ]; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 100bb1c54fd1..b0c47972e385 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.2.2"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "1n05r8b4rnf9fas0py0is8cm97s3h65dgvqkk040aym5d1x6wd7z"; + sha256 = "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index ea0bce368a1a..be70443fd4df 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null -, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null +, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null # input plugins , vorbisSupport ? true, libvorbis ? null , mp123Support ? true, libmad ? null @@ -30,7 +30,7 @@ assert gtk2Support || gtk3Support; assert gtk2Support -> gtk2 != null; -assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null; +assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null; assert vorbisSupport -> libvorbis != null; assert mp123Support -> libmad != null; assert flacSupport -> flac != null; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ jansson ] ++ optional gtk2Support gtk2 - ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ] + ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] ++ optional vorbisSupport libvorbis ++ optional mp123Support libmad ++ optional flacSupport flac diff --git a/pkgs/applications/audio/deadbeef/plugins/opus.nix b/pkgs/applications/audio/deadbeef/plugins/opus.nix new file mode 100644 index 000000000000..55db00c15bf6 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/opus.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromBitbucket, opusfile, libopus, libogg, openssl, deadbeef }: + +stdenv.mkDerivation rec { + name = "deadbeef-opus-plugin-${version}"; + version = "0.8"; + + src = fetchFromBitbucket { + owner = "Lithopsian"; + repo = "deadbeef-opus"; + rev = "v${version}"; + sha256 = "057rgsw4563gs63k05s7zsdc0n4djxwlbyqabf7c88f23z35ryyi"; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${opusfile}/include/opus" + ]; + + buildInputs = [ deadbeef opusfile libopus libogg openssl ]; + + meta = with stdenv.lib; { + description = "Ogg Opus decoder plugin for the DeaDBeeF music player"; + homepage = https://bitbucket.org/Lithopsian/deadbeef-opus; + license = licenses.gpl2; # There are three files, each licensed under different license: zlib, gpl2Plus and lgpl2 + maintainers = [ maintainers.jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 6ed6d1ee86a0..4ceafa1e52e8 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "06xqqm1ylmpp2s7xk7xav325gc50kxlvh9vf1343b0n3i8xkgjfg"; + sha256 = "0fwxrfyp15a4m77mzz4mwj36mhdrj646whlrkvcys33p2w75f8cq"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index f9c9dc2faef0..1ae9a0e5298e 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib -, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas +, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas , makeWrapper, gnome3 }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig intltool ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) + itstool libxml2 gsettings-desktop-schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index ab28c43f66cf..cc453347aea4 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "2.1.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0jazv3d1xaydp2ws1pd5rmga76z5yk74v3a8yqfc8vbb2z6ahimz"; + sha256 = "0l0xbzpy4nnr08z7gqvb4ngrjwzpspa382cbcrpkya3nd40987kr"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 50689886fdd2..789ee35f260e 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "12q7hv0zvgylsdj1ipssv5zr7ap2y410dxsd63dz22y05fa2hwwd"; + sha256 = "0krvmb1idnf95l2ydzfcb08ayyx3n4m71hf9fgwv3srzaikvpf3q"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 2d63245fef63..42285ba4bf86 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl +{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ]; + buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 4bd57e15fe5f..c2adc58f9ce5 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique -, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook +, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ glib gtk2 curl mpd_clientlib libsoup - libunique libmpd libSM libICE sqlite hicolor_icon_theme + libunique libmpd libSM libICE sqlite hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 8c2987352fbb..d111502651ed 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, pkgconfig , gcc , python3 -, gsettings_desktop_schemas -, desktop_file_utils +, gsettings-desktop-schemas +, desktop-file-utils , glib , gtk3 , intltool , libsoup -, json_glib +, json-glib , wrapGAppsHook , meson , ninja @@ -44,15 +44,15 @@ in stdenv.mkDerivation rec { glib intltool libsoup - json_glib + json-glib gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook - desktop_file_utils - gsettings_desktop_schemas + desktop-file-utils + gsettings-desktop-schemas ] ++ gst_plugins; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 7ebdce783527..39cd1a444fa8 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, - libvorbis, hicolor_icon_theme, gdk_pixbuf }: + libvorbis, hicolor-icon-theme, gdk_pixbuf }: stdenv.mkDerivation rec { version = "2.1.5"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta gnome.gdl gnome.defaultIconTheme - hicolor_icon_theme ]; + hicolor-icon-theme ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gtkpod" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index dcb61119ae76..bcb301687089 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python2 -, avahi, bluez, boost, eigen, fftw, glib, glib_networking -, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 +, avahi, bluez, boost, eigen, fftw, glib, glib-networking +, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 , ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom , wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; buildInputs = [ - avahi bluez boost eigen fftw glib glibmm glib_networking.out - gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf + avahi bluez boost eigen fftw glib glibmm glib-networking.out + gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf libsndfile lilv lv2 serd sord sratom zita-convolver zita-resampler ]; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index b5197af64092..24421b527e16 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.4.2"; + version = "3.5.1"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "0gka4na583015jyqva18g85q7vnkjdk0iji2jp88di3kpvqhf1sw"; + sha256 = "09iryxnhg8d9q36a4brb25bqkjprkx5kl0x7vyy82gxivqk0ihl8"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index d6ba094f4584..d16107e4c292 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -2,12 +2,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.2"; + version = "0.9.3"; name = "meterbridge-${version}"; src = fetchurl { url = "http://plugin.org.uk/meterbridge/${name}.tar.gz"; - sha256 = "0jb6g3kbfyr5yf8mvblnciva2bmc01ijpr51m21r27rqmgi8gj5k"; + sha256 = "0s7n3czfpil94vsd7iblv4xrck9c7zvsz4r3yfbkqcv85pjz1viz"; }; patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 219b04b4ec41..cb99f9b5dbe5 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -1,23 +1,26 @@ { stdenv, pythonPackages, mopidy, mopidy-local-images }: pythonPackages.buildPythonApplication rec { - name = "mopidy-iris-${version}"; - version = "3.12.4"; + pname = "Mopidy-Iris"; + version = "3.14.0"; src = pythonPackages.fetchPypi { - inherit version; - pname = "Mopidy-Iris"; - sha256 = "0k64rfnp5b4rybb396zzx12wnnca43a8l1s6s6dr6cflgk9aws87"; + inherit pname version; + sha256 = "2c0ec5138e554e91d299ac72a7049bc00d77770a08c16c17e1a9df7f8ef42feb"; }; propagatedBuildInputs = [ mopidy mopidy-local-images - pythonPackages.configobj - pythonPackages.pylast - pythonPackages.spotipy - pythonPackages.raven - ]; + ] ++ (with pythonPackages; [ + configobj + pylast + spotipy + raven + ]); + + # no tests implemented + doCheck = false; meta = with stdenv.lib; { homepage = https://github.com/jaedb/Iris; diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix index c8afd4c6290f..3754bf763b20 100644 --- a/pkgs/applications/audio/mopidy-moped/default.nix +++ b/pkgs/applications/audio/mopidy-moped/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, pythonPackages, mopidy, glibcLocales }: +{ stdenv, pythonPackages, mopidy, glibcLocales }: pythonPackages.buildPythonApplication rec { - name = "mopidy-moped-${version}"; - version = "0.6.0"; + pname = "Mopidy-Moped"; + version = "0.7.1"; - src = fetchurl { - url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz"; - sha256 = "0xff8y1kc7rwwsd7ppgbvywf6i8lchjwbxjisfl1kmilwsb166yr"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4"; }; LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ mopidy ]; + # no tests implemented doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index 0cb076556c70..d55e711cf330 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-mopify-${version}"; + pname = "Mopidy-Mopify"; + version = "1.6.1"; - version = "1.5.17"; - - src = fetchurl { - url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz"; - sha256 = "1qi7f5i87ygn486gxc84njl22y84xrwabpz58y5a1hw7z1lp7l8s"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "93ad2b3d38b1450c8f2698bb908b0b077a96b3f64cdd6486519e518132e23a5c"; }; propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; + # no tests implemented doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 8541ec6e2727..ad280d382d02 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook -, gst_all_1, glib_networking, gobjectIntrospection +, gst_all_1, glib-networking, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { @@ -18,12 +18,12 @@ pythonPackages.buildPythonApplication rec { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - glib_networking gobjectIntrospection + glib-networking gobjectIntrospection ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado requests dbus-python - ]; + gst-python pygobject3 pykka tornado requests + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests doCheck = false; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index 96b3533a6f5c..ed7a4e786f07 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ stdenv, fetchFromGitHub, ncurses, libvorbis }: stdenv.mkDerivation rec { version = "3.2.6"; @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs"; }; - buildInputs = [ ncurses ]; + buildInputs = [ + ncurses + libvorbis + ]; buildFlags = [ "CXXFLAGS=-Wno-narrowing" ]; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 3561deb1c736..779374aaa080 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "0dyrllxgd74nknixjcz6n7m4gw70v246s8z1qss7zfl5yllhb712"; + sha256 = "1mikab2f9n5q1sfgnp3sbm1rf3v57k4085lsgh0a5gzga2h4hwxq"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index dbf3cd92b5d0..cc4a781ef66c 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -1,19 +1,23 @@ { stdenv, fetchFromGitHub -, autoreconfHook, autoconf-archive, pkgconfig +, pkgconfig, cmake , libpulseaudio, ncurses }: stdenv.mkDerivation rec { name = "pamix-${version}"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "patroclos"; repo = "pamix"; rev = version; - sha256 = "1d6b0iv8p73bwq88kdaanm4igvmp9rkq082vyaxpc67mz398yjbp"; + sha256 = "1d44ggnwkf2gff62959pj45v3a2k091q8v154wc5pmzamam458wp"; }; - nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ]; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg" + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libpulseaudio ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index fa25a474c1df..3e159c843843 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "pamixer-${version}"; - version = "1.3"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/cdemoulins/pamixer/archive/${version}.tar.gz"; - sha256 = "091676ww4jbf4jr728gjfk7fkd5nisy70mr6f3s1p7n05hjpmfjx"; + sha256 = "1lsvb4xk1dq762w9c0jn7xvj3v1lzppql9mj1b55fhzdypbrkm6x"; }; buildInputs = [ boost libpulseaudio ]; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 58054070760b..fe9ed12390a5 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm -, dbus_glib, GConf, gconfmm, intltool }: +, dbus-glib, GConf, gconfmm, intltool }: stdenv.mkDerivation rec { name = "paprefs-0.9.10"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; - buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus_glib gconfmm ]; + buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 91a270a698e6..8425b48166e6 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm +{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm , gtkmm2, libjack2, pkgconfig, python2 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2 + alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2 pkgconfig python2 ]; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 69db9d74ee34..d113b8a49b31 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 -, libcanberra_gtk3, makeWrapper, gnome3 }: +, libcanberra-gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "pavucontrol-3.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''; - buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper + buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 66f68c066c88..677c60399e52 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,7 +1,7 @@ { stdenv, python2Packages, fetchurl, gettext, chromaprint }: let - version = "1.4"; + version = "1.4.2"; pythonPackages = python2Packages; in pythonPackages.buildPythonApplication { name = "picard-${version}"; @@ -9,7 +9,7 @@ in pythonPackages.buildPythonApplication { src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; - sha256 = "0gi7f1h7jcg7n18cx8iw38sd868viv3w377xmi7cq98f1g76d4h6"; + sha256 = "0d12k40d9fbcn801gp5zdsgvjdrh4g97vda3ga16rmmvfwwfxbgh"; }; buildInputs = [ gettext ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 2bb2960afbf1..94b240ebb028 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "5.4.17"; + version = "6.0.37"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "0s2hrksghg686059vc90h3ywhd2702pqcvy99icw27q5mdk6dqsx"; + sha256 = "1c675jfzcrwfn8lcswm5y5kmazkhnb0p4mzlf5sim57hms88ffjq"; }; configurePhase = '' diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index 1e76e769937b..7f5191a02c20 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt4, alsaLib }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.4.0"; name = "qmidiroute-${version}"; src = fetchurl { url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz"; - sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2"; + sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 88db09fac86b..60c8f90b6d15 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -11,7 +11,7 @@ , dbus , glibmm , gnome3 -, hicolor_icon_theme +, hicolor-icon-theme , libappindicator-gtk3 , libnotify , libxdg_basedir @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl boost jsoncpp libbsd pcre - glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify + glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify libxdg_basedir lsb-release wxGTK diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 534fd2f0edb1..5190fe37d8a7 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -7,7 +7,7 @@ , libsoup , gnome3 , tdb -, json_glib +, json-glib , itstool , wrapGAppsHook , gst_all_1 @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { intltool libsoup tdb - json_glib + json-glib itstool gtk3 diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 5966d4253f51..d881afa7f5f0 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -3,12 +3,12 @@ , liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }: stdenv.mkDerivation (rec { - version = "17.04"; + version = "17.12.1"; name = "rosegarden-${version}"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; - sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq"; + sha256 = "155kqbxg85wqv0w97cmmx8wq0r4xb3qpnk20lfma04vj8k6hc1mg"; }; patchPhase = '' diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index a8a368054966..c2c24c29a13e 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1gscwybsbaqbnylmgf2baf71cm2g7a0pd11rqmk3cz9hi3lyjric"; + sha256 = "035bq7yfg1yirsqk63zwkzjw9dxl52lrzq9y0w7nga0vb11xdfij"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 1932ec3d93bc..3fe8ecfe5468 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-17.8"; + name = "snd-18.1"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "161bx2xgz692iqmsmhv9yi8rvd7y31si4rniizwirwz7q4y4vwvf"; + sha256 = "0wdifvpm54j5fxxp867jnrfdy3jb8iff2mxqvp08plp45zfjv6xh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index e91c08c30b77..1afb36571bd9 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -19,8 +19,8 @@ in buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook - gnome3.gnome_themes_standard gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas + gnome3.gnome-themes-standard gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas ]; postPatch = '' @@ -28,7 +28,7 @@ in buildPythonApplication rec { sed -i '/localmpd/d' sonata/consts.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gobjectIntrospection gtk3 pygobject3 diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index cbcdc0ecccd7..c68f2cd4a35f 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero -, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes +, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , makeWrapper }: let @@ -16,8 +16,8 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 - gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes + buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3 + gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes makeWrapper (stdenv.lib.getLib gnome3.dconf) gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { preFixup = '' for f in $out/bin/* $out/libexec/*; do wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" done diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 35c5dff27106..9ac0c49ebc31 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.70.399.g5ffabd56-26"; + version = "1.0.69.336.g7edcc575-39"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0kpakz11xkyqqjvln4jkhc3z5my8zgpw8m6jx954cjdbc6vkxd29"; + sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 8385e1cc5a4d..651e56d0e8e3 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "0mvrqk6jy7h2wg442ixwm49w7x15rs4066c2ljrz4kvxlzp5z69i"; + sha256 = "141ah1gnv5r2k846v5ay15q9q90h01p74240a56vlxqh20z43g92"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 2203586c26e9..4140c5da5a45 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -4,12 +4,12 @@ , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs4 ? null -, enableTelepathy ? false, telepathy_qt ? null +, enableTelepathy ? false, telepathy-qt ? null }: assert enableXMPP -> libjreen != null; assert enableKDE -> kdelibs4 != null; -assert enableTelepathy -> telepathy_qt != null; +assert enableTelepathy -> telepathy-qt != null; stdenv.mkDerivation rec { name = "tomahawk-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen ++ stdenv.lib.optional enableKDE kdelibs4 - ++ stdenv.lib.optional enableTelepathy telepathy_qt; + ++ stdenv.lib.optional enableTelepathy telepathy-qt; postInstall = let pluginPath = stdenv.lib.concatStringsSep ":" [ diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 7382e84fa073..e46ffec39795 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext , gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook -, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror -, appstream-glib, desktop_file_utils, duplicity +, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror +, appstream-glib, desktop-file-utils, duplicity }: stdenv.mkDerivation rec { @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig vala_0_38 gettext intltool itstool - appstream-glib desktop_file_utils libxml2 wrapGAppsHook + appstream-glib desktop-file-utils libxml2 wrapGAppsHook ]; buildInputs = [ libnotify gnome3.libpeas glib gtk3 libsecret pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus - at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror + at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror ]; propagatedUserEnvPkgs = [ duplicity ]; diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 13740dd9dfdb..486a52ef6672 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lightdm, pkgconfig, intltool -, hicolor_icon_theme, makeWrapper +, hicolor-icon-theme, makeWrapper , useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported , exo }: @@ -9,14 +9,14 @@ let ver_branch = "2.0"; - version = "2.0.3"; + version = "2.0.4"; in stdenv.mkDerivation rec { name = "lightdm-gtk-greeter-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; - sha256 = "0c6v2myzqj8nzpcqyvbab7c66kwgcshw2chn5r6dhm7xrx19bcrx"; + sha256 = "1svbyq2l3l2d72k10nw79jz940rqsskryaim2viy6jfpv9k5jfv1"; }; nativeBuildInputs = [ pkgconfig ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" wrapProgram "$out/sbin/lightdm-gtk-greeter" \ - --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" + --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index bf8a5f15c2f2..4a71153cf911 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -29,9 +29,9 @@ in rec { # linux-beta-bundle preview = mkStudio { pname = "android-studio-preview"; - version = "3.1.0.11"; # "Android Studio 3.1 Beta 3" - build = "173.4595152"; - sha256Hash = "0106ggrf4mkxx3a2dn02km8rdq23sf15ifysykcay29skgdmq6wx"; + version = "3.1.0.12"; # "Android Studio 3.1 Beta 4" + build = "173.4615496"; + sha256Hash = "0rp0vg5hwv7kdrirydvnwznpfwibwwm2dxsbhbxfkyahph10ly72"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 39b4b2e045ed..2194ff226b56 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.23.3"; + version = "1.24.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0vq0pics8ajjqwqlk396dxl10k80059f9bik0j4wj2cals42bifc"; + sha256 = "1yvwz4lkf7ya775h3fvrg1wkdc30321j666vfjlmax5mbcjrxkzf"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 1c9c5bc78ef2..c7e1dfe27364 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,11 +1,11 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 6a5bc3e7b0f8..23e4449ee2eb 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2 +, zlib, jdk, glib, gtk2, libXtst, gsettings-desktop-schemas, webkitgtk24x-gtk2 , makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11 + fontconfig freetype glib gsettings-desktop-schemas gtk2 jdk libX11 libXrender libXtst makeWrapper zlib ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index fef508bdf1e5..c69686a0967d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas +, glib, gtk2, libXtst, jdk, gsettings-desktop-schemas , webkitgtk24x-gtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage @@ -15,7 +15,7 @@ rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2 + jdk glib gtk2 libXtst gsettings-desktop-schemas webkitgtk24x-gtk2 makeWrapper; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 4f82696efd58..6d04e8717954 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -409,11 +409,11 @@ rec { jsonedit = buildEclipsePlugin rec { name = "jsonedit-${version}"; - version = "1.0.1"; + version = "1.0.2"; srcFeature = fetchurl { url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar"; - sha256 = "19221409wzcsrlm2fqf6mrxzb5ip1x6y5ba8anw788p7aaz1w30k"; + sha256 = "0zh9ihvaji2v4d4980va8p1c38x5dn2mcw74qmqkwxlz4nglpsr0"; }; srcPlugins = @@ -425,13 +425,13 @@ rec { }; in map fetch [ - { n = "core"; h = "05ipjbh9yz97zhqaqq6cja3zz44n0dn40ms13qnlgf4bxyaf0f6w"; } - { n = "editor"; h = "1i71rh2fd5hsx6gygnafz2gjz4hlb0ckazxn0maxmnlx4p5apjql"; } - { n = "folding"; h = "13p8vqdna23ln82w1jgchm59375f1ky0p2b1v7jih55yfhw1ymam"; } - { n = "model"; h = "0llswhsd58f0rjb9canjncavq4z7q8zidn26yl5gradbbz580p6w"; } - { n = "outline"; h = "1rs8g0iv2kklbl7j0p6nr26m6ii89yyr9bpi05mh21xva40pzkl5"; } - { n = "preferences"; h = "0vs074ahhiba7if43ryf9m8xd81sqj9grppy0pzcnkkdkbk870n0"; } - { n = "text"; h = "0nqpzjw8hhvh9jlpldpmcmg83a170wjdabgsvjq207j12jkvfiqq"; } + { n = "core"; h = "0zc1jpda6sviazsgvvig8zk2zmz0ac1mch5qs8lbcbdmrpq732ni"; } + { n = "editor"; h = "06k2mx7ka0bn0i8dfbv89jna9kmy8wnlwkg9yp1n1pgqmr01944s"; } + { n = "folding"; h = "1525blyhrl495vz5r98dyfws6kcgnhmyf9qgm5vkplhb27474yca"; } + { n = "model"; h = "0rnnkdl3hrp0sxchfzfad97ya5swsw56wfb5zvjwffbby4vln8fd"; } + { n = "outline"; h = "06bday90a7sdpv4idp69m2831z3r99q248n2avw2npc3gzkfy3kl"; } + { n = "preferences"; h = "1d9pcnq6j5p2smkfldb9dw8gdw5nqlmpcy9kh5n34jcyzf37cdac"; } + { n = "text"; h = "0r3g2qhnhl6misi0rrmw152gw0nb7zlcjy7019qvprn9mhwn1n84"; } ]; propagatedBuildInputs = [ antlr-runtime_4_5 ]; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 7264dcb92a37..ac50e829100a 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -400,10 +400,10 @@ }) {}; company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; - version = "0.9.4"; + version = "0.9.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.4.tar"; - sha256 = "1wm2nzjfn9cmjb6f5yvawrss7pg1r0swwwqqx602wg8hjrsiabay"; + url = "https://elpa.gnu.org/packages/company-0.9.6.tar"; + sha256 = "0w1jqhs87g0sqhv2iw6a5i8f4yjkrc65fb3h6vyv11sb8kfnhda7"; }; packageRequires = [ emacs ]; meta = { @@ -713,10 +713,10 @@ ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "ebdb"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.4.2.tar"; - sha256 = "1j9hgxa6csj3iz5vrl22xvhl9lxhig0n1cixgzhs1sb3z3nn2li6"; + url = "https://elpa.gnu.org/packages/ebdb-0.4.3.tar"; + sha256 = "1xq0nhhgzgzrvxbb0lgpz71rfd0dcjakh87wg8wi3cpiw9w7zx41"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -768,10 +768,10 @@ el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.5.4"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.5.4.tar"; - sha256 = "1k0makrk3p6hknpnr3kbiszqzw3rpw18gnx2m8scr9vv0wif4qmk"; + url = "https://elpa.gnu.org/packages/el-search-1.6.tar"; + sha256 = "18pv2l6rl8f9x0yjn4iyf6g94c0ly5mizqg0vxr3m420bkbyk95h"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -861,10 +861,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.16.tar"; - sha256 = "0c4w5k9lzqj8yzhdqipdb4fs7ld2qklc6s137104jnfdvmrwcv2i"; + url = "https://elpa.gnu.org/packages/exwm-0.17.tar"; + sha256 = "03vgrrrc1d3xr9ydl1ydvmqnvpnzg858dzdky2nd65h9ssyp2f5f"; }; packageRequires = [ xelb ]; meta = { @@ -1637,10 +1637,10 @@ }) {}; paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "paced"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/paced-1.1.2.tar"; - sha256 = "1hxbzlzmlndj2gs9n741whi7rj6vbcnxdn89lg2l0997pqmsx58y"; + url = "https://elpa.gnu.org/packages/paced-1.1.3.tar"; + sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl"; }; packageRequires = [ async emacs ]; meta = { @@ -1704,10 +1704,10 @@ python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; - version = "0.25.2"; + version = "0.26"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.25.2.el"; - sha256 = "1ac2ipyg49sb0lz3n0ykj2s6592abd38l5d1cpbmv73j13l8zq5i"; + url = "https://elpa.gnu.org/packages/python-0.26.el"; + sha256 = "197sq42xd4ryqq2zy1802pns6wf6n4vzx90yxgn1zzqpwffpv317"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2400,10 +2400,10 @@ xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.12.tar"; - sha256 = "0i9n0f3ibj4a5pwcsvwrah9m0fz32m0x6a9wsmjn3li20v8pcb81"; + url = "https://elpa.gnu.org/packages/xelb-0.13.tar"; + sha256 = "0sfygy6ihjwszhn6a81fz2yn70rr7vpygl7z49vz4rsd8s0fdgjc"; }; packageRequires = [ cl-generic emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index b66c988580e2..a24cb9e4910b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -229,27 +229,6 @@ license = lib.licenses.free; }; }) {}; - ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-anaconda"; - version = "20160221.1123"; - src = fetchFromGitHub { - owner = "proofit404"; - repo = "ac-anaconda"; - rev = "94f66b4d4bf0fd9683ee77511833b1eceace0462"; - sha256 = "15xkwnadqjkbgvilyfldj7z5kz2wvw1dk2bcgphx2z9qwjc7wd5f"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda"; - sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf"; - name = "ac-anaconda"; - }; - packageRequires = [ anaconda-mode auto-complete dash ]; - meta = { - homepage = "https://melpa.org/#/ac-anaconda"; - license = lib.licenses.free; - }; - }) {}; ac-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-c-headers"; @@ -404,8 +383,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "4f27d04c30a026f24c0ff18c3a7d36e3fb5b57a5"; - sha256 = "1krrm123vzv6hw54kbkbh1xj6j090rdm4r2fcqp76b3hg8j8cpn1"; + rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; + sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -761,8 +740,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; - sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; + rev = "56a18467de4bc1cf408a1910458e1819102312dd"; + sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -778,12 +757,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20180206.202"; + version = "20180222.2209"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; - sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; + rev = "56a18467de4bc1cf408a1910458e1819102312dd"; + sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -824,8 +803,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1030,12 +1009,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20180101.1328"; + version = "20180224.2244"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "43d224546a2a557857294a8e3d13c4fe63508e03"; - sha256 = "0cw4br2nx4fa9jsal6b9gavffqjrhq2xgf87szi61dkgi2gacf7y"; + rev = "177e0f9a60ddca62cc44c2395b075cb230b26f4d"; + sha256 = "1rjxpjanyxfrx4dfsag6g647flxvw75vf0jh6y6y0w2jdiih919i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1097,8 +1076,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "7b8ad628a058d32c420f7615927a34a5d51a7ad3"; - sha256 = "183gc5lidxahfzik9ima2vph2sdi2rd9805kfnghsmwhck275i2r"; + rev = "7b436a0d9e896463d00afbeb7e49a59cc6670e9c"; + sha256 = "0ma5hq0v4kczf7mn1wkqj9pxjy47wryd697gg37l4sszl6ylcs9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1197,12 +1176,12 @@ adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "adafruit-wisdom"; - version = "20180208.2316"; + version = "20180224.1652"; src = fetchFromGitHub { owner = "gonewest818"; repo = "adafruit-wisdom.el"; - rev = "c0fdfcbbbc49927e0c93656f6d4a877cca774224"; - sha256 = "0vjx5aaj9ndpz399czhg5qsfwgibaycvb8j2acfc26mzhpycc2qy"; + rev = "aafc01726f1b3160321d40160298a0e1b054b382"; + sha256 = "18p55zghycsx88dn0iw610fklkhi5chzycrpjb4xzs5x1l5l2v08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; @@ -1344,12 +1323,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20180102.1441"; + version = "20180225.240"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "d00aa65ec2da6944f1ed81da440ad7a9024cfbf0"; - sha256 = "1cjchz7dq42ha6wrn21jqbmf333rg73bz4ppsnd9kz6vqnkgnya0"; + rev = "77b4f50c5372bf219da496567b2b867261f0d354"; + sha256 = "0kwp6bb8fwv76x9r35rz4mvwica1fsappp82rjr1xlhnwwdsc120"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1514,8 +1493,8 @@ src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "4beb4c9ceee0534a36f7669aa35fcbdfd6bef7b7"; - sha256 = "0k1k5rb95nyndzhin47r4nzap4fp3dr57gv557wzy3a6jpl88fgz"; + rev = "38ec1faf4a9cbeb2944b517ec30d999022082bc1"; + sha256 = "1hqr1phkm4mxzfszzraqljb32mpin1h1r26al9bazrsq2azmd5a7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1699,12 +1678,12 @@ all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-ivy"; - version = "20170508.25"; + version = "20180225.630"; src = fetchFromGitHub { owner = "asok"; repo = "all-the-icons-ivy"; - rev = "5357bccddfd30580d5859f3794248efb86a8a054"; - sha256 = "1n6c7vglxkib4irjjafiwdz6cifbb20229n2fpnxkv57hmdarivr"; + rev = "52b3f4a8a4a038998943afaffb5ff25054f65af4"; + sha256 = "1xkrqv6znf1savkg17w41d9rm7wrs8n3c4ad0arrmi522qgp78fr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy"; @@ -1838,8 +1817,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "8d5ff5e8a6d2e585b0f8f2765099e4e6357470ae"; - sha256 = "0483690q1qg3hlx04ngifmc9d3s47879x3nbz14g2xzc91pcni26"; + rev = "b3f742620c17f9866f3a85ec771f4d0b239f2970"; + sha256 = "1ycfq11x1nshv69d891am50j5zclk62krwyfgia8wk3rxmgnaj53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2610,12 +2589,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20171010.1420"; + version = "20180223.1526"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "b4d5a2fedec176d3562943668609766fab0b23ff"; - sha256 = "0y31zx6npv03ygjywy23pvrpvjwi1fh1qhs1qzxsi25pbbk1hkq0"; + rev = "019ed5cf8f1e1abfead7adceeda88938dfe928b7"; + sha256 = "0x6iw9dr3zvy2xqxadlxkjhpkfgig009x0ilipdji20hpa0qhhgm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2739,8 +2718,8 @@ src = fetchFromGitLab { owner = "ukaszg"; repo = "aria2"; - rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0"; - sha256 = "1xkgz3l7idw5bk1xlffdaddf5v1q6fm3grbryl4xvssrbwgnyisf"; + rev = "7a944c5100812269369225af7aa9580fedab175f"; + sha256 = "1pwnx6k7b35xhwqvzd3rl6rf5ydvbrrdmbadns8w0iyz2yafdxji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89a55e7c313066ae1bc0db0af5c289814c85fcb1/recipes/aria2"; @@ -2907,8 +2886,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "15bcbf6beae65d7606f0655711159ca56f050c6b"; - sha256 = "14y3jr636hn9p699ypd3kas6750kpz0lk4xchb0y44b94splczqb"; + rev = "7279cc6bdba7bfcb53ca8f5471631ae8dc3918b3"; + sha256 = "1nmi2ykwbswj6qv2s38518nijmlhjd2jvhabybqs8smc152g58sw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -2987,12 +2966,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20180201.1853"; + version = "20180215.828"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "bf5b76e472d22577fa406c7088a1c2d99fe4b636"; - sha256 = "08hrnv7jyzcnh4iyf5r3b1y4wbynk4fraxhkdgwmxzr666aq7cn7"; + rev = "f67722244554025db1d1ccd2a30e9fa22f8985cd"; + sha256 = "1slk5zbwjr7jv21hxsn61ppijj6p98sqh0k0flnd4512gywdrz2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3026,6 +3005,27 @@ license = lib.licenses.free; }; }) {}; + attrap = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: + melpaBuild { + pname = "attrap"; + version = "20180218.1243"; + src = fetchFromGitHub { + owner = "jyp"; + repo = "attrap"; + rev = "0a733deccaf48350511346b2f5a51d328df4dfc8"; + sha256 = "1ck6m30m76jad7w4mwnpv2gl0kzsjpjvmgjblc5a4gw1wsz3i2iz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b7420eca80a8c1776d68b1f121511cc265cc70dc/recipes/attrap"; + sha256 = "1gxnrlsn9xcnnx0nhjxnhrz9bdpk2kpzjhj8jhjmwws9y361fimh"; + name = "attrap"; + }; + packageRequires = [ dash emacs f flycheck s ]; + meta = { + homepage = "https://melpa.org/#/attrap"; + license = lib.licenses.free; + }; + }) {}; auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; @@ -3110,15 +3110,36 @@ license = lib.licenses.free; }; }) {}; + aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "aurora-config-mode"; + version = "20180216.1502"; + src = fetchFromGitHub { + owner = "bdd"; + repo = "aurora-config-mode.el"; + rev = "8273ec7937a21b469b9dbb6c11714255b890f410"; + sha256 = "1dlhf35hhjgkd9bqbpwrb825g1z6nh14mg31jg2avv55s28j0riy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode"; + sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; + name = "aurora-config-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/aurora-config-mode"; + license = lib.licenses.free; + }; + }) {}; auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "20180129.34"; + version = "20180214.558"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "0470e6bde546b34677e393c92e2b064db61b6e9b"; - sha256 = "0m309nhiqbyrk2mwymha66xcl05x5vryzz0vj90pak62yil15mnr"; + rev = "6af0458a6b586cc5004fa652f23615433304924d"; + sha256 = "150cx8ida9bl0g84iq051rziy64ic2pxz6hn0blsys1qcp9lf8wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3551,22 +3572,22 @@ license = lib.licenses.free; }; }) {}; - auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-org-md"; - version = "20160923.708"; + version = "20180213.1543"; src = fetchFromGitHub { owner = "jamcha-aa"; repo = "auto-org-md"; - rev = "7604c06c1b2f1d01c2e88f114bb0d2d00f21dabb"; - sha256 = "18js1pa60095fs8qjzhjhkx9sjwa2h2iribb27gqv59796qxkfsg"; + rev = "9318338bdb7fe8bd698d88f3af89b2d6413efdd2"; + sha256 = "1dzxc1f4yvj8xww5drcpzmn3fyi8ziimh1cmy6l3i399l1zl0njj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39f934f86b5dc04078c204bcbd268af60857e268/recipes/auto-org-md"; sha256 = "1yh9g8407kym6r0b8kr18qshxlrkw47ac17a9lvql0ksshfmnqvk"; name = "auto-org-md"; }; - packageRequires = [ emacs org ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/auto-org-md"; license = lib.licenses.free; @@ -4041,8 +4062,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "990cc94d708c923f761be083b3a57f6f844566c8"; - sha256 = "0kjxfg8wx5c8cixazih24s0mv4crk648v9bb6pd1i6lmh266rc6g"; + rev = "b133564cc438870d9b5505c8104611c8998fd0d5"; + sha256 = "19xqs4hyd5wkh0vd3xfbfwhf8fhq5lbzrafx4fbvai24dhjn5rhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -4121,12 +4142,12 @@ aws-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "aws-snippets"; - version = "20180207.622"; + version = "20180213.835"; src = fetchFromGitHub { owner = "baron42bba"; repo = "aws-snippets"; - rev = "a6e7d102c5b1143f4787a160cbf52c1e8ab48d09"; - sha256 = "08nbcddmi2fq6hf324qhywy29pwixlfd5lnd5qlfirzrvdyz7crv"; + rev = "619c9a401f873042e45547e8cf57f23d0c8947e4"; + sha256 = "19yrdsn76vscqgxmapxn3gv6nrxp7i20p37anylmjss3xkvblxn9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets"; @@ -4278,8 +4299,8 @@ src = fetchFromGitHub { owner = "ccann"; repo = "badger-theme"; - rev = "80fb9f8ace37b2e8807da639f7da499a53ffefd4"; - sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1"; + rev = "493d672d5a5478976da7d5ca752008cc7837c57f"; + sha256 = "0mrn3sl1xq19k6v4mw98zqgs11fidnarvidmxayx805k21pana6v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/298e43769c6cd855526d847e8e3b237912360777/recipes/badger-theme"; @@ -4341,8 +4362,8 @@ src = fetchFromGitHub { owner = "mschuldt"; repo = "bart-mode"; - rev = "3d8573713b6dbaf52402de9c15cb34eb3c89a67b"; - sha256 = "0192fc8fnkmnpwjf1qncvp5h7m8n1hlc697mrsn8ls7pnna01phq"; + rev = "6feeb8f9badbc2ce4b60499bf7bf4acdae4cfed7"; + sha256 = "1i1fcrwcswdqwb59154yzijccv7n0fqvm0ck3d8dqx5vczzmqixh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f9cb09c07cb9fdef15de3e8dbfb6725d97dff6f/recipes/bart-mode"; @@ -4484,12 +4505,12 @@ bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bazel-mode"; - version = "20171226.1551"; + version = "20180222.2253"; src = fetchFromGitHub { owner = "codesuki"; repo = "bazel-mode"; - rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25"; - sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66"; + rev = "b7aa14516feaed40ee4910eafa81db719de0fe56"; + sha256 = "16yjxs62h8dm63nzc04i60bnbyhm2vrpvn98ap8rad6wib2ka3vj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode"; @@ -5445,6 +5466,27 @@ license = lib.licenses.free; }; }) {}; + bmx-mode = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "bmx-mode"; + version = "20180226.256"; + src = fetchFromGitHub { + owner = "josteink"; + repo = "bmx-mode"; + rev = "2093e7041006aa8c142c151bb597af061419aa43"; + sha256 = "12h8h44ni8g6nzh9i2h9w4lmvkca3fxp8cybikln7x4hcnplkfj5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7f456d2b2b8f5a33bcb0f2ffd19e6e0276950f24/recipes/bmx-mode"; + sha256 = "04g8l4cw20k3yhbija9mz1l4nx3bzhzj7nb35s0xdyvwbc2mhrwb"; + name = "bmx-mode"; + }; + packageRequires = [ cl-lib company dash s ]; + meta = { + homepage = "https://melpa.org/#/bmx-mode"; + license = lib.licenses.free; + }; + }) {}; bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bnfc"; @@ -5595,12 +5637,12 @@ borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "borg"; - version = "20180125.849"; + version = "20180220.505"; src = fetchFromGitHub { owner = "emacscollective"; repo = "borg"; - rev = "593314b8f1f4542155eb4dae0ff1be375895b83d"; - sha256 = "095l5cakz0clmna7njqdng3k1gpy4q6h1bld0pvichkkbqh8is6c"; + rev = "28abb4b602d060bba38e6f38623b2d3f309e1ede"; + sha256 = "15iim40gzirw75h6b3alhb95x7pmzmanx6pbdrfmyw7yv4bjsdbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; @@ -5700,12 +5742,12 @@ bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bpr"; - version = "20170930.642"; + version = "20180220.1044"; src = fetchFromGitHub { owner = "ilya-babanov"; repo = "emacs-bpr"; - rev = "314b0d6f69ff5a9c2d25a1ce5a2109d67d4d9bb3"; - sha256 = "02qj8gnhxv39y8kvlw491cbiaknll3hg03pk4xx15rffl7dyrbds"; + rev = "af84a83dea09d86e77d87ac30604f2c5b4bf4117"; + sha256 = "1r2prq9j6fmzzkl1f3r9drn6lna2wzd9qv127x7z5g6n8pgb6ipx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr"; @@ -5991,22 +6033,22 @@ license = lib.licenses.free; }; }) {}; - buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: + buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; - version = "20160811.713"; + version = "20180223.2341"; src = fetchFromGitHub { owner = "killdash9"; repo = "buffer-flip.el"; - rev = "386067141ca77848b266e068f8c6baf6b4c2ab5b"; - sha256 = "1bch4jk6d60aydvcc624026pwfby29fbcwm3zhrsksqc0d2qxdwq"; + rev = "443f74c1186ee91dab42812e864e7ad095f45b9a"; + sha256 = "18ii9gd7hbfcibj7fpx9b9bz3cbpdhvy4z143hmlh3ywj2mjdfii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098"; name = "buffer-flip"; }; - packageRequires = [ key-chord ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/buffer-flip"; license = lib.licenses.free; @@ -6350,12 +6392,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20180128.228"; + version = "20180223.937"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "6848057a224e2548a58ec81ce042c81a44dd481c"; - sha256 = "0qzfj57lwxqff3d9kpdg290ishy8h3il43y114kqs1gxcgyxzsv2"; + rev = "8d27bb99463bc230a76dee96378dd337622988f5"; + sha256 = "0s5vfzcfsiqb6bc6jh95a2dyy23b4bvhdpzn2fcq8awldbpx51fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6581,12 +6623,12 @@ cakecrumbs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cakecrumbs"; - version = "20180127.456"; + version = "20180222.1845"; src = fetchFromGitHub { owner = "kuanyui"; repo = "cakecrumbs.el"; - rev = "b7bfcc46aed139abc1d30f700076f82584084f3f"; - sha256 = "1jl196qfgmn87kzkzhrqliarp9cmvl9c4ka2v20knw6ca2ymzbp9"; + rev = "76cfbfacfaa9d2128fc9218338a0ba2bb47349ab"; + sha256 = "18ni6krymzm1af2vmw2n82s0ifny6pn1p0qifn3646xx4p210a4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c970907affeb4a21fa1b7c350edf171dbdcd8de5/recipes/cakecrumbs"; @@ -6767,6 +6809,27 @@ license = lib.licenses.free; }; }) {}; + call-graph = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }: + melpaBuild { + pname = "call-graph"; + version = "20180226.156"; + src = fetchFromGitHub { + owner = "beacoder"; + repo = "call-graph"; + rev = "bdbd5130476b8ad5606e694f4310678a90bab9c2"; + sha256 = "1a7fcpdnmjmc151d4vma9wng1m9mw102sw8qx02h61gqsg6ia8bc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; + sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc"; + name = "call-graph"; + }; + packageRequires = [ emacs hierarchy ivy tree-mode ]; + meta = { + homepage = "https://melpa.org/#/call-graph"; + license = lib.licenses.free; + }; + }) {}; calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calmer-forest-theme"; @@ -6816,8 +6879,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "932f5db4425fdf7bae491d98e8cd702ab58e9667"; - sha256 = "1m1xm7vagjvc2zlh8iddvjfzlgxm4fgl76afzlpvjhxmwb8zkw5v"; + rev = "70eb179b20d401b2fad43d3ddfd2752fc7925ab1"; + sha256 = "1l0qfkm9jz4yx5rpwr8bxcjpn1z1mm4zi0na6b21zbsspbmpv912"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7319,8 +7382,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "cc2c7d130d7ae5f1402c5edcad53237d9d63fe87"; - sha256 = "18s6bcddwc8h34bn59xq4hkrn1gyhrqrkwc8y2bz4zsffmjd99z7"; + rev = "8a24c2cb8a59bc4eba0a9271e86d078c80a3864c"; + sha256 = "17my98032fx95kbi0hklwnk52c5n8w9npynd24255637fan46x30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7441,12 +7504,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20171229.435"; + version = "20180223.644"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "e0462b42218c94288f5c8a62f2b217bb8037995a"; - sha256 = "1v64yx8pr3aqds3grh79y27qg8x5ad3hwxv96pw0hlhvqc62s4ai"; + rev = "8194c3ade7ba73f6ddfea7dec55f77b5b6fdbcab"; + sha256 = "0rsx9gqkxxkk597liyghw0sjrvmfid4j1kbmz5ff8irm259g7psy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7508,8 +7571,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "3235f8e3c88848ce10d25f84a5da39061fd35c0d"; - sha256 = "05pjfj6g4gdbdj4z63283j5qzkvhvrzsx1jhbc5iih0nsffwapc3"; + rev = "82f0422179737bcb9f93481aebaf1071d54fc859"; + sha256 = "1r5nymx7yj4l4wjhsx6gxvh9rqx322x5n54cqg71mssxiwccpdv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -7903,12 +7966,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20180211.538"; + version = "20180219.1846"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "36f1934dc8ff9557e3abef9a93ac468ac453404c"; - sha256 = "0n3xk50jkj2k04j80p1wlxicagh1mrhgsxs4lfgdqsj4ypb9s1ay"; + rev = "88f4fcf1d39a13ff336657b2cc4161ebb9d955d6"; + sha256 = "13yl09chl8j5n3mlwb25ipxgi4a3cfs8822lahkisjv42n62f234"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7984,27 +8047,6 @@ license = lib.licenses.free; }; }) {}; - cider-profile = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "cider-profile"; - version = "20141120.625"; - src = fetchFromGitHub { - owner = "thunknyc"; - repo = "nrepl-profile"; - rev = "9aa7e404f53f5136ac8d15301ce8ca2924785cb3"; - sha256 = "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/440708bbf501e7b3d0aff1b9432ac71b5f9f8eab/recipes/cider-profile"; - sha256 = "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs"; - name = "cider-profile"; - }; - packageRequires = [ cider ]; - meta = { - homepage = "https://melpa.org/#/cider-profile"; - license = lib.licenses.free; - }; - }) {}; cider-spy = callPackage ({ cider, cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet }: melpaBuild { pname = "cider-spy"; @@ -8113,12 +8155,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20180105.1158"; + version = "20180223.929"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "58fc1a3c7f9f6e3126585b1ab2f3d00f824b7d7c"; - sha256 = "1vsh2x794zaf02zql4s6bn3v0m3xm43icvrn7jfmi660qh3f4bsy"; + rev = "f7f7cb62a992120bf80c3a078bec1c029f8ff0cd"; + sha256 = "122wvsxvv3yzkdjfi8s5gbl371bzi5kw377a7f3cpp7hxz4i24bl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -8201,8 +8243,8 @@ src = fetchFromGitHub { owner = "emacsorphanage"; repo = "clang-format"; - rev = "dee259662042ea4f7f339fd95970bb504e440cca"; - sha256 = "1a02yz62xlaz1acqpvrlmwv5syflyfrdpwlmi26ih3kd2hl6p5sl"; + rev = "e2facf890156ad57a122ed5e79e5a40cc03c8cae"; + sha256 = "09pq0zf5im6kkjwyzdz3np3b4dd5va3as1syygvjnl5dlh6gkjcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format"; @@ -8843,8 +8885,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "0465d3c204e8cc7c677dd6a34d3ea884bc5e7954"; - sha256 = "08xv33w6ai51zfsqh73cfcyc6b2dalqqpgavqh4gxp7g34zncg5h"; + rev = "25613b9fa46e6433f987e9e9f47533db3a0939f3"; + sha256 = "1pnyx2niscm7bs2n48xxlxdfavxvb40vl0sm0j5m8vp9ybl11g4m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8941,6 +8983,27 @@ license = lib.licenses.free; }; }) {}; + cobalt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cobalt"; + version = "20180222.1938"; + src = fetchFromGitHub { + owner = "cobalt-org"; + repo = "cobalt.el"; + rev = "b542c4172ef41bb1d50e1b1dc712acf50c2392d5"; + sha256 = "1614m2m19wa6awvaz8akakbm2kbvj55s2lh7k3lgysaw007wbi1d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b2435d98e7564d333c8224b67ac6ad9c95debda1/recipes/cobalt"; + sha256 = "0r3fx1xx24x4qapbj2p8krc67rjmrjm88y89baf1x2swk7xdza92"; + name = "cobalt"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cobalt"; + license = lib.licenses.free; + }; + }) {}; cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cobra-mode"; @@ -9595,12 +9658,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20180211.1604"; + version = "20180225.1741"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "38ef92d6273113c2b3d2a302129ad37a30f98998"; - sha256 = "0l9hhflmirv1a0znjsg6ysvrsg270pwnkmhakihhqy39fgv3qdfa"; + rev = "a64d52ca033208cda34f2fb7d0a2f951cce8bd29"; + sha256 = "1n44f9kbmp95nbsyp4g60d6pi044vxy2ccai9lgkjm3wlg7xdzrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9812,12 +9875,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20171202.1243"; + version = "20180219.751"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "dcad9c07ecbd90d261520ac09251eaa3480ea98a"; - sha256 = "132dw17d8k8sk3g0vbs0qqb359rw33ck4pqx3w2p8kb2zmzam597"; + rev = "e2bbd06af9661628198d12e7b4725a17ef260dd9"; + sha256 = "01qyy4037isa5ghy7gwl77byydn3s5mc6pvd7w79910cg5h60dkg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9861,12 +9924,12 @@ company-dict = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: melpaBuild { pname = "company-dict"; - version = "20160528.53"; + version = "20180216.156"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-company-dict"; - rev = "0589c2c3980a8f0df1705e3c0e5e075557eaac75"; - sha256 = "1bfl7b1lj4rgifqcpz4p8nhamxyyh29lbgl1g35rizw4nzv9sizq"; + rev = "7ab6331d8095e9b93c726da754102fd708c0002e"; + sha256 = "18lfqankivzdijsklyi49a1v6nqixbmk4d1m6syqd63qj849aixa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict"; @@ -9928,8 +9991,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "4f27d04c30a026f24c0ff18c3a7d36e3fb5b57a5"; - sha256 = "1krrm123vzv6hw54kbkbh1xj6j090rdm4r2fcqp76b3hg8j8cpn1"; + rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; + sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9987,12 +10050,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20170325.810"; + version = "20180225.1359"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "339f502e46e7d9214b61498d539b17f8f0322d17"; - sha256 = "0w2b3fk0q3ia5fjxk8gxj4161rxg43jw0hxpihidl5aak4i6dxb9"; + rev = "76ef585c70d2a3206c2eadf24ba61e59124c3a16"; + sha256 = "0zs9cblnbkxa0dxw4lyllmybqizxcdx96gv8jlhx20nrjpi78piw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -10218,12 +10281,12 @@ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20180211.2052"; + version = "20180216.2325"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "b58c8c4cbfb0e01ee9020f09dfd25cfadda58cc1"; - sha256 = "1fs92qd0ni7bwbbccyjycrklcdb1nwms6yabfwr37aizkbrg28lw"; + rev = "4512d062c38922d8b8cf402ca6043c246e915694"; + sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10348,8 +10411,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; - sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; + rev = "56a18467de4bc1cf408a1910458e1819102312dd"; + sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10501,8 +10564,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10539,12 +10602,12 @@ company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-solidity"; - version = "20180206.821"; + version = "20180221.1330"; src = fetchFromGitHub { owner = "ssmolkin1"; repo = "company-solidity"; - rev = "0687c09671403888b88e27d58e70f1bc969d1425"; - sha256 = "1clxzxyvnnf6mvadlqslbn7is7g2b625mnb4c5k7iyflc081wpz2"; + rev = "9a57a4ff4cad1d423429c78457cd05c38826801c"; + sha256 = "1v9h85vb6lqjlb5w9g2i042zb3w3y916in7h8jph2b74187a9nl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef246601ff6d92d6dfcd809f637e50d9838da0b8/recipes/company-solidity"; @@ -10711,8 +10774,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; - sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; + rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; + sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -11022,12 +11085,12 @@ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copy-file-on-save"; - version = "20171211.1744"; + version = "20180217.914"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "11c2004947e0200e88991e265a5ae971adfbd7b2"; - sha256 = "1snlh828zq6b3znrdg4mfl4an76qbqhmld23pwl89ncp37f2lbhv"; + rev = "1ad10401711a3bf0a0894eeed357b402238be113"; + sha256 = "1ydpsh5j9j168crn30lpzv73rw2z80prp0hn2rybgrhvqfs3rbx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; @@ -11148,12 +11211,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20180211.1029"; + version = "20180225.744"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; - sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; + rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5"; + sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11211,12 +11274,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20180129.219"; + version = "20180222.2023"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "2219bf8d9a4584abc905c7470455777553496056"; - sha256 = "0kcxcbf1rm7cm74s5z87pv0bflx42h4j2lnb8b3r0nznj94ywnj3"; + rev = "9d70490b551503aac22241c8089a46e55dd3deba"; + sha256 = "03yr0y3z0jgh8c1db43nq0888rr561f6ks5fmf254aibh63schff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -11295,12 +11358,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20180204.1147"; + version = "20180217.2349"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "1c1e7eff065e1660981428ef326185c404488705"; - sha256 = "18b66rv73y6gx0hhjjfixywj0ig41rxb4k4ngpxap56cy7b8kfj9"; + rev = "bf98fbd1988885e82129823bf189b777dd52a084"; + sha256 = "0z940554lqsyrj1wljmgl4najrxpv4d6kqf5n60a6sj630ak0blc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11547,12 +11610,12 @@ cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "cquery"; - version = "20180204.912"; + version = "20180226.428"; src = fetchFromGitHub { owner = "cquery-project"; repo = "emacs-cquery"; - rev = "e3ce2127f9937eb0a7b7a22e81f205ff150f4ecd"; - sha256 = "1p3idygppqi5xgbjq9pr5pqpm4isw1cb8qq8szf5mb6ypq2dlszm"; + rev = "0b70a10869581a682ade3730442881250304a331"; + sha256 = "01jf77m3d8ydrnjms62c6zn2xwfcs3wadk7wcc73qrsqz99i81ba"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; @@ -12055,8 +12118,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "84053d1c023721706ac5cbecf152e2cc71080518"; - sha256 = "1v5ya14ayj719x98swbrv7spsa5rzcxzzh1k18fpal7mqmzvy6jz"; + rev = "7f3c7a7cfe60f98da46e6958bec62bac4675ccd2"; + sha256 = "096523m3spfqw72zp2rzcf1b54997yzs7qxwvr3awhicah1z6mv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -12265,8 +12328,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "d2faf26420ac16c4056f6eda067b845d33e102cd"; - sha256 = "0vg0n8xcqiv28i3xmnxzji77dbnyxrld4ncdzpa3hpc1j92s9a09"; + rev = "df449180d28691c9bdbef7bcb25aee75b2af50ca"; + sha256 = "1bni88xdm69m4pq79wq2wb3n50c955amimvlbc63xs1ik3ih52q0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -12303,12 +12366,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "20170907.1648"; + version = "20180213.854"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "829d7bbef5173771bcf9ffdf2e7e30e96f98e99e"; - sha256 = "10671yczbixg90x5c8rgd838w5la21x9jqdm03vcrz03i2ccjs99"; + rev = "cf70c10744aec43df0708f5ee3d692d378fc31f1"; + sha256 = "03ka1lnw4qdg5lzlimdg8w1gynmbf66wvr7iplgszf752cg1q01i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12345,12 +12408,12 @@ d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "d-mode"; - version = "20161022.717"; + version = "20180215.727"; src = fetchFromGitHub { owner = "Emacs-D-Mode-Maintainers"; repo = "Emacs-D-Mode"; - rev = "a97c92ced57224287a84e7fc48ba9aac6b2afc08"; - sha256 = "0ln38lkl8qcnpcpjqck3i6hd5zjv43g7vka3kapz2bnz4s33jn3p"; + rev = "398f1854d53863185e60873b494eec0263bdd0dd"; + sha256 = "0xka4k0j0rl4kjjyzryx7a7ngf9qzry148nhpzc66yirlrp5hjn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode"; @@ -12450,12 +12513,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20180129.634"; + version = "20180221.541"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "13e5ea8758465e7d23081fbb524603394b09a689"; - sha256 = "1zhn2bblafmxc83rg33ipy8pd0i7qrn9630cy74bigl3x5zxs3xd"; + rev = "7b32dcdad3933e0eab03d2702014c0b56fc73b9a"; + sha256 = "1sxqnf8c48p8jnrxabjikijah8d7v11c4k4mvmc67vvn92p20ag5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12471,12 +12534,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20180202.48"; + version = "20180224.1246"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "c1c9bde9a83a87c46731466af56cd31262d057fa"; - sha256 = "01krdh3cz2ddhlhpyc072izm4y29qbpjkmwj0fq4vi5hcqzbalsk"; + rev = "33c8c4afac616e6de30111f8a7f11d572496a838"; + sha256 = "0zv6vqzw299ydgwxiky8b2nlb8cyzzw9zsx44ixaqqf73f63bv1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12681,12 +12744,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dart-mode"; - version = "20171024.2137"; + version = "20180219.1614"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "adef2a5b672d503ae3e92b30bb80095879b030d0"; - sha256 = "0bb790rpijlv4cjdcwgqzb249rnz6br557lnn74rb9g52wpabl69"; + rev = "4feac341db7d2b80841fedcf1798dee9070d68bf"; + sha256 = "031f9lkxyhirasj7m0rj67gk8rh3ry640qcppw2p88k937kc6765"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; @@ -13042,8 +13105,8 @@ src = fetchFromGitHub { owner = "preetpalS"; repo = "decl.el"; - rev = "c097d532de13cb69b0fc390afa6d806d0db97588"; - sha256 = "1zfn4rkv9n96li0pbxn6c22ljwhg7gyih1srymrk482r2zfhkja6"; + rev = "ff7f8a4f1225cbdf141c86172104e67a4cf58c86"; + sha256 = "1ns1ni6aalr541df3a0ylqy0gj68fcsxdfvm4m1ga5532kxnswnj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl"; @@ -13646,12 +13709,12 @@ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dimmer"; - version = "20180210.1348"; + version = "20180217.2011"; src = fetchFromGitHub { owner = "gonewest818"; repo = "dimmer.el"; - rev = "263d330d8f9e99c9c3d3235fe6cf90ecaca90e7c"; - sha256 = "1dg5pf54w9479br40i0b66y86xdn1xj99iq7rmagzva908q5rpyy"; + rev = "d033fdda154e688e45cca35902dbff9915351b98"; + sha256 = "1d457029zyabfjhzrgayibdmxfmia5yr7rqn50kc16k3aavw32f7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; @@ -14129,12 +14192,12 @@ dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sidebar"; - version = "20180126.1812"; + version = "20180218.1717"; src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "6b2d1df460d4b0dd1448b092d3753314cba784c5"; - sha256 = "1i5ia9m7r63gr91ll9xmqq48y9823hg0mqq69rnzfvbw0zjbgkrq"; + rev = "e43864a70ee240bf8dcaddd7bb88b77c6e1e9fe6"; + sha256 = "1s70qlm1jxq7larwq5gr2zc58q4qxch5f2qk6fzqwkpcvsvlv304"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; @@ -14276,12 +14339,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20171221.138"; + version = "20180213.1238"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "b1c14f307652e5a039165d196a799638feb16cd8"; - sha256 = "0vxa29z08idy74y0140c2ddxysj98d644zih9vvddjjmggj7czna"; + rev = "5b55dac12467689083ff995777f54a304ff47be1"; + sha256 = "0sjrnab8rx1bpnxim268b8jfpyh8h0iy3j38925r0jqjgjb19ksn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -14968,12 +15031,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20180107.925"; + version = "20180222.717"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "5a6e407ee9c6035245749ee1f249aed16d651728"; - sha256 = "0gl2rbx649yc4rbljmhdqsa17hnv24lpj5y8fxdh27gnjqksg2zq"; + rev = "ec2b07255e273639ff76303778661f81c5b74000"; + sha256 = "0nlf3rw9xa9hggqkw6nxfswbqlnsgbliz9z652kp7c9hfikfmcsj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -15165,12 +15228,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20180205.1204"; + version = "20180219.1227"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "d84a0172202243f4fe0ae5738d7ea9b1eb2d38c6"; - sha256 = "0za6cq7wr7zpqjq5g6ac7zqnzq544s0zkkhsc0djcwc2x67vr95g"; + rev = "aa57d222b65a4dc9dddd76f66adbe6ac003f57a6"; + sha256 = "05chhg1mpnp3jqjgwwsnzkh19ci4429sgq9xpx4jxfbbalhd4z11"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15585,12 +15648,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "20180211.946"; + version = "20180218.1123"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "34f2e23de514deeb61888557e66ccc9790ff8eed"; - sha256 = "09fjr4m5cxgfdxpnrlc7hdvckz0l0lrx1vyglb7kwyyacyp1vdly"; + rev = "3ea5136bde1240f93fbf3ce30fffc4f279a58d27"; + sha256 = "0lkc8y09lhlpg7vrn2459c5fxn0nvxbzqhwadmkgc046i3aapqpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -15669,12 +15732,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20180123.1100"; + version = "20180225.1541"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "3bd7c23c3e4ac0936679ad6ebb68f14e37c7bc5d"; - sha256 = "0vnbp8q059z9bfhf1bq1n6cvc4ia3rkdk0iambgwd48i959mdsvs"; + rev = "65b9a3aea2bb212cc83d2f9414d0897331278000"; + sha256 = "14g99l038f29wh66ybfi99nvk1niqkk613j0rz7hkw9l0y912m2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -16050,8 +16113,8 @@ src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "ec601f3a8da331dd0a9e7a93d40ae3925bd06700"; - sha256 = "1kgayh2q97rxzds5ba1zc9ah08kbah9lqbwhmb7pxxgvgx9yfagg"; + rev = "0e4d4e016caedbfed8dea0e700a33a043e798029"; + sha256 = "06dcv3ws91ldld3qjpbpp5j7jnjp0s8ng6g7w8wj0rspjbcb2dg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -16109,12 +16172,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20180103.1855"; + version = "20180225.2153"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "abf4dfcddacfc90ee39aad3c9e2e4615fb74c6a1"; - sha256 = "1kxkqpf0xq6w1g8qvy32hjqy42mz17c36wrkqqwdbxhbq7d5ckyw"; + rev = "336fb8ec510c10596d65bfd50f65b59e2f7711e9"; + sha256 = "1bkd3q8lr9admpipad1vi42gvs1sv7l7rzgi6dhl799zq1691kd3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16218,8 +16281,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "3a7a9a66efed30416e2013da80fed2f79b91def1"; - sha256 = "0vxxswbx8l9jcv81akw1bd7ra4k51gjmv79z11fhbzf17n7y910a"; + rev = "b7e5f2c730036197cfa7d819006b91b4dcc2efba"; + sha256 = "0zbcx5ksf02kv7vavdnixblb8xk3zipwp5nrlyxyshmksw7qg3wh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -16256,12 +16319,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20180204.1402"; + version = "20180213.531"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "7212edd2f54f2e289230b8d884dfcb3155c65fcc"; - sha256 = "11fmi0pxx83qmhh62ilc6i2icrl7x8pj34rrkxlc5plyph8cczjd"; + rev = "cbad0a51d7905712201d83e9f4f52a7bb047652f"; + sha256 = "1jmg63q4msy83nr0xzivay9n8nv48kawqj5jxlfq83fwkvnk1szm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16302,8 +16365,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "4f27d04c30a026f24c0ff18c3a7d36e3fb5b57a5"; - sha256 = "1krrm123vzv6hw54kbkbh1xj6j090rdm4r2fcqp76b3hg8j8cpn1"; + rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; + sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -16739,12 +16802,12 @@ editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig-charset-extras"; - version = "20170712.108"; + version = "20180222.2057"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-charset-extras-el"; - rev = "bf2d23c57a485ee41d21a9a0015d5bd52baabf85"; - sha256 = "0qgg2v9xpr8bm97pj4pxd9q6j8i6h94gb1j7lla0sn80cwymxwrx"; + rev = "ddf60923c6f4841cb593b2ea04c9c710a01d262f"; + sha256 = "1v5a6s4x7cm6i0bxaqdpsg8vqj479lp5h45glx4ipk0icdq8cvd9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras"; @@ -16919,8 +16982,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "bbcd5d93f3cd61b593c4d565a374ccc8bafa9020"; - sha256 = "19am1hmi3gjpwqmjnlsqdnvwr225y212lr9ff37jkyhdfny71lnr"; + rev = "a41addef812318bb6bc0a693ce3a22606f27a3cf"; + sha256 = "1303m6d53qdkv3j7bx708ipvrjb4mjdj1b58600x8471bddamgh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16997,12 +17060,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20180124.1435"; + version = "20180226.416"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "63388e5d0cf318bdb687054e2de4a4205108ed73"; - sha256 = "0c1pd2d0yv0d4zclh6ri1mwcj1pa7bxbf376kwia4rz400jx5fah"; + rev = "7a52ebca3527d891ecb7e8a3e46785b271717acc"; + sha256 = "01ifzww8gs4qy9yrhhf5dm0s3ifrlppknvllkajfp6lh9hc7q4cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -17070,12 +17133,12 @@ ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20180212.55"; + version = "20180215.627"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "0981cdf3ecef13a6be1d15bfad303d71ba85e625"; - sha256 = "105y6rfyfcdgzc0xi3dy7y919dm51330sbg2acfpgsqkmiwpp6j7"; + rev = "ef19d5e33b632d776e9e369281c522e26e632384"; + sha256 = "1q8gh79rfcn4v8ps4z3a0s60qr5nf9j93p0mkq0fdll57h2y6cbz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -17116,8 +17179,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "63fa39d86deba5d03ac8f7f9a103e94d6c80739d"; - sha256 = "15jxnkvgk700qi79d8jj96ss2mb7yfsgzhi0mama4dp5gancps27"; + rev = "129789cef476279a7840647a5bf39aa5cd2bc2f6"; + sha256 = "0b20s3bc92jwi4xl2fralj0ffdj1zvagbmnsp2dw5cj94dhm33p1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -17364,12 +17427,12 @@ el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2org"; - version = "20170804.2142"; + version = "20180216.2005"; src = fetchFromGitHub { owner = "tumashu"; repo = "el2org"; - rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e"; - sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b"; + rev = "742b2e4de42026edbff20dfcc6f63200c1d0ad40"; + sha256 = "0ji8ngf6zzhhq2vhn9i04dpgg1sgqcs0vzq7wdyfl9cfa0cpwlps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; @@ -17385,12 +17448,12 @@ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elbank"; - version = "20180206.701"; + version = "20180215.556"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Elbank"; - rev = "817047305e9db1260956ae5ac6b60c9027868895"; - sha256 = "0i5nqfjm69kbvnkvrcvfv8gbz0608cldmi3zwq2vpld7p35d5d26"; + rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5"; + sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; @@ -17406,12 +17469,12 @@ elcontext = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, osx-location, uuidgen }: melpaBuild { pname = "elcontext"; - version = "20180204.138"; + version = "20180225.2211"; src = fetchFromGitHub { owner = "rollacaster"; repo = "elcontext"; - rev = "c223476b62a55b80f6b85b2e016d3ec0d7ec9875"; - sha256 = "1ynwgr1g421liyfyfli2cgfdqx3gijm4z9hd0cmhndfwalrb1xq6"; + rev = "d34e68f0580cc3d3eda8c85fc446c71094fc52fc"; + sha256 = "05z0xfy9s0iqzvy63bnfhdpqc04yikwairb8b00k9xkspd3sdfdl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12bcb0bfc89c1f235e4ac5d7e308e41905725dc6/recipes/elcontext"; @@ -17595,12 +17658,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20180127.1442"; + version = "20180222.746"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "e2b0e255fc3a3cb3e9d69c05df3b8e9d7ca70e86"; - sha256 = "1sq2w40ac8nc6pvifl0r5ri255jcd237x5rxfliwd2wdwqhk9izd"; + rev = "8668227f93a46fdd8d5d8746d428dd2da061e253"; + sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17690,8 +17753,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "e2b0e255fc3a3cb3e9d69c05df3b8e9d7ca70e86"; - sha256 = "1sq2w40ac8nc6pvifl0r5ri255jcd237x5rxfliwd2wdwqhk9izd"; + rev = "8668227f93a46fdd8d5d8746d428dd2da061e253"; + sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17788,22 +17851,22 @@ license = lib.licenses.free; }; }) {}; - elisp-lint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-lint"; - version = "20150430.1558"; + version = "20180224.1242"; src = fetchFromGitHub { - owner = "nschum"; + owner = "gonewest818"; repo = "elisp-lint"; - rev = "1168b12575f1ed54ee523d34a90757459a6e42a3"; - sha256 = "1ci6nyk1vvb3wgxzarbf6448i9rjb74zzrhcmls634gfxbryxdyy"; + rev = "04b0d36ec0e4dc1bb54c2bf4c2d16b2af8cf6a39"; + sha256 = "04hxpfgvkh4ivaxqbhnp3j68i1kqzg1v19bssnvcagll2mm4r3xg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3744ee1bbde7ec8cecf2796d6ee875c327eb698c/recipes/elisp-lint"; - sha256 = "102hrxdw72bm11a29i15g09lv7jlnd7vkv7292fm3mcxf5f4hkw9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint"; + sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63"; name = "elisp-lint"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/elisp-lint"; license = lib.licenses.free; @@ -17879,8 +17942,8 @@ src = fetchFromGitHub { owner = "elixir-lang"; repo = "emacs-elixir"; - rev = "861788186f4dbd500209656dcf38a15b3efe74dd"; - sha256 = "1py8slpda3vsw88v1wp1imnn3r17hz54621c6ks8xm75lnhn60ra"; + rev = "e928aaf118e399fca2df47c91712b9a469eb1764"; + sha256 = "0x0ip0mh7zn6lmzj3p3v3jlc9x1j0afrq5rfgi22zk40zkyh26zn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode"; @@ -18148,12 +18211,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20180210.1445"; + version = "20180223.1119"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "a86165de49f44013ba07d92d90f949a22ff9299a"; - sha256 = "0b2qpsxrda2h2x82sqqqg7vqi6a1hx1jagri4al7sl9s74axdkr4"; + rev = "0c51b0d3aede3e3e3d2107ea86d133c669220948"; + sha256 = "1404r7al2rndy2nqfgdm2iw37mn2dr9hb51fr5f0l0w34mhfhyji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18765,11 +18828,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20180103.520"; + version = "20180217.1219"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "3a8d16d91edae81ffb2bb9efa12d41712edfd4f8"; - sha256 = "1cwsjrjasb2gi28aavy64g4sg9wwfq3wab24klssh3290qrr3gkb"; + rev = "0459003a1686b5742e660d08e7c936d1b06e8e7c"; + sha256 = "1gym522bhxbip4vfg0lxkpjnb00nb4rh08xdmz33r71rclh4vrkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -19414,12 +19477,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20180112.457"; + version = "20180221.1318"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "c8ab0e5e1fda70113633ac6ee01c0aaecd8a1a99"; - sha256 = "0kf1gcyfmh7zids4q2jwz6b0kffdhalfqx9ibk11adla8sf6bvj0"; + rev = "5d0bf705ccb617fafe28f2748d566d2a990aba06"; + sha256 = "1igiwnvl3w907hz83x8hwf298wdv86s5c54zs4naw1pbi875j7zw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19896,12 +19959,12 @@ eredis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eredis"; - version = "20160809.2053"; + version = "20180221.1313"; src = fetchFromGitHub { owner = "justinhj"; repo = "eredis"; - rev = "0d7d524592be488309c7c339d137ba836e52bfff"; - sha256 = "0hj8czwqzdjs7ciyg4xf0imdqfv423c6q862gy83ni09zk5ncm3i"; + rev = "8a96034805fe0664132ce2e12deb9936503af2d4"; + sha256 = "1w4z98vr7iy6yxdk3lha7flk48ckxl2baaq8kx7abkirzfl8j4hh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63f06713d06911f836fe2a4bf199b0794ac89cf0/recipes/eredis"; @@ -19984,8 +20047,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "5e7286acceec0811fd95898c7337921ac91c97b4"; - sha256 = "0ccynwiajdcb3h2xhb2y91kgf61pj9i3h3h4g4d6142j3mr4anl4"; + rev = "1c7938bc9539f1c06b5493ced9f265e05a4824af"; + sha256 = "0vrrxh4ngbmsr2iaw5hqr0xf43vnbqghql2sm9ffm0zh6snd4kag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20064,11 +20127,11 @@ ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-junit"; - version = "20180207.1348"; + version = "20180208.935"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "45a359a94dbeb00838df5dbee15ad42e061af431"; - sha256 = "05nwq8w7rczmn41bxz97sinn561rx8vb01dv0hsx0xllni7xwf59"; + rev = "b335d7fb84d6af381a5dbc40c324078faf397b66"; + sha256 = "0nbpqhpff3my4ndsf148iqgnl84ilsbq6na5jnn3nddyhbmidcxb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; @@ -20105,12 +20168,12 @@ ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "ert-runner"; - version = "20171111.451"; + version = "20180215.857"; src = fetchFromGitHub { owner = "rejeep"; repo = "ert-runner.el"; - rev = "80ff435058f0e9815d0ac8c7a53143c474e00db3"; - sha256 = "1mgbrfgdvby25aaw3l9d0h4b7h5zap6s1m1vlxmmv20fhxza7wbc"; + rev = "0de42343a9de834320397d169c81725b2827e41f"; + sha256 = "0jc7n6mdv1kka47wmjjhgfw46l16mqlj5kkkyw16gd9g8dwcf6sr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner"; @@ -20147,12 +20210,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20180126.711"; + version = "20180212.1425"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "8c1c601a72fbc9b0e0a80974856abfc679843c86"; - sha256 = "0ppci48cz453ivkd37zbs3sgan0v7nf9d65qy77zvkn55qn2f4bq"; + rev = "c5ad728ce3fc2c513108e0ada2cd0c08ab94f870"; + sha256 = "0drmxxqgml36fymn4gqxbjimh8dgmm4yr68hsmsd0iz1lxglgda1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -20235,8 +20298,8 @@ src = fetchFromGitHub { owner = "dieggsy"; repo = "esh-autosuggest"; - rev = "aa921f8975b0f95d1cb0044e6ad7f17529261610"; - sha256 = "19qhpvw5y7hvkqy8jdyrnm4m90jdxxdiaabcrjiwxmkzq3wgnx8q"; + rev = "2fd996c1a29b21e60854a3c90d7d4fc3d5b0aded"; + sha256 = "1vkbyhkvvj5h63ybxg795m61c4157jm2v01y9m98jm4pxysmls7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest"; @@ -20609,12 +20672,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20180211.1419"; + version = "20180216.1616"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "2622184dca12e76c856443251ee61066af5392ee"; - sha256 = "0w7c7g8kxni5bgaxmmjp57z5di7r500yvvcpldr0n4cjx7qf9gjg"; + rev = "f10792493602cb5c77a7010b1b4c7063c7c41add"; + sha256 = "03spbyi24gpmw7wlf0aifg0aa793sm0s1lxk9xw2lm974rj0g6w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20714,12 +20777,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20170923.1328"; + version = "20180226.254"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "a589005a9a888537deef94d6fe38a9b8790c97c7"; - sha256 = "04lxmd0h7mfjjl0qghrycgff0vcv950j1wqv0dbkr61jxp64n5fv"; + rev = "d4db4f3023afff4321cd3f99be75ad44e77cd0b0"; + sha256 = "1z8ban35vrkibr07awfg6z4cy79irjiz6hchcyid94l6iifbwf0y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -20966,12 +21029,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20180126.1159"; + version = "20180222.1032"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "2992858748e6fe8ae706d182b86b684e7b9be8b9"; - sha256 = "18jyqf1k7b09j0q1sxavqyqyx21msbqklia83kbrn51wbhy70k49"; + rev = "3bf198796b2d135776143eac854e8d855cd94475"; + sha256 = "0bzmq988x9734dxgjli70r9dpa3kagbz43md79zr32q4z96rj4y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -21113,12 +21176,12 @@ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180202.1722"; + version = "20180226.21"; src = fetchFromGitHub { owner = "jojojames"; repo = "evil-collection"; - rev = "f04fd5eef32728cb146d2dc5f3701b1d4733a2bf"; - sha256 = "12magy7l325cfi25b8y8gd5b9n3smhn3w07mxb4nbp3rfg7nv2db"; + rev = "7adf05cf25b022197c0542920ddc65acdae1703e"; + sha256 = "1cxsi0aqm2fd344q6nlahhg0q2bf4k6gagi6sxsvjlhwvb80skxq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; @@ -22020,8 +22083,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "5a20c9757eff64e1567d313eb254126aef2bf3b2"; - sha256 = "094vz707iyjknmhmhdlzc8sv8x86yxgx863c23nm6fjn5n5h7jmz"; + rev = "2af81ab3ac64e4b0515a157a672d8cb89f0172b9"; + sha256 = "00bcz353cc82wpk5cai5ni99z2la4gwm0k1fvanysx1amg8vxvfy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -22104,8 +22167,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "2992858748e6fe8ae706d182b86b684e7b9be8b9"; - sha256 = "18jyqf1k7b09j0q1sxavqyqyx21msbqklia83kbrn51wbhy70k49"; + rev = "3bf198796b2d135776143eac854e8d855cd94475"; + sha256 = "0bzmq988x9734dxgjli70r9dpa3kagbz43md79zr32q4z96rj4y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -22230,8 +22293,8 @@ src = fetchFromGitHub { owner = "alexmurray"; repo = "evil-vimish-fold"; - rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15"; - sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn"; + rev = "c617fecb91303f8c63f85a6101a503fdc88aae84"; + sha256 = "05zm0gngdamfs5cqnjq4lh7253hdj0lggdgfphl56ynblhf8qf36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold"; @@ -22394,12 +22457,12 @@ exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exec-path-from-shell"; - version = "20170508.4"; + version = "20180224.1916"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "5e355fbc50913d1ffe48bf86df0bcecd8b369ffb"; - sha256 = "1flkhbyxa7mi97vj4w6c2anzq7qz51sac6yqk308blfvd9z3pf95"; + rev = "885b3de9bb6365771dd09f5267f6ff843d5109e8"; + sha256 = "0x5a0v4z5hgvi7biwbsbxw9l8in0gxwrz77g9vffz9djvlr70r1h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; @@ -22435,12 +22498,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20180211.1557"; + version = "20180212.1529"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "e8e4fbb77008bbb50e6733571655e815cc30a5bf"; - sha256 = "1igbis1784f2hs2cdva87nhzjfxaj6h14n2k07r4fy3igfd9qfa0"; + rev = "ff3ef4f6fa38c93b99becad977c7810c990a4d2f"; + sha256 = "1kp6q55g3dcya4y79x877vqwxa4z2rkkvhs49pkwr3wljf4af2pd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -22624,12 +22687,12 @@ exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170916.2015"; + version = "20180225.1531"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "abb210ff56134cc6a285d91b875f3115bc951ad0"; - sha256 = "1l7578jfn3va6bpkjfbazygsn8asxhc7cpss32mnsrzkm1ix6sz8"; + rev = "d26d719d95b3b3296e113d89ef36972312610f4e"; + sha256 = "0n0b7gxamizmkm2gz1ghyg36i7wvy5ims63nzjgwhbrc3ifig6cn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -23343,12 +23406,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20180201.2102"; + version = "20180224.2103"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "cf20dda6050b11bee871b55f758716d8daa07b46"; - sha256 = "0f4mkhdb56bnyp7wkg4bkv74rl51k4dxciv0zqf5x91lfzhz8jd0"; + rev = "aba912a73d1f3fcff0d184b49008a2fa1655ad7e"; + sha256 = "145n04lid9alrm8nl6gfnll75jz1ssli48pbsc9zyva00ryk83my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23574,12 +23637,12 @@ firrtl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firrtl-mode"; - version = "20180122.1950"; + version = "20180221.1555"; src = fetchFromGitHub { owner = "ibm"; repo = "firrtl-mode"; - rev = "285f5c18722de98fd3dae195a2bd653497cf7daa"; - sha256 = "1a4dhx2dv7ld14jn4r941w5mdrh085nxnlc1w93r93h13fj352q3"; + rev = "1ac00d526018945389bcb2292dbdd8395381774a"; + sha256 = "02xznsiij39lhjr261vl7yz4k4i76vshh5kwa7ax95zpj2zbs0v6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbf9ab9db03410c35b8b73a23bf8062b10f0815/recipes/firrtl-mode"; @@ -23641,8 +23704,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "e053fcc641f1f835f2fdb71143e095c1889b8233"; - sha256 = "1w8vv2ijmsch02xsc1r97r6s3jz0dkd8kwz5wgiizq5ghx7x6x6j"; + rev = "37bc0734a2e71d66245ee3960879577e5ef906bb"; + sha256 = "04k4wqsdbwxbq5a4dxvr3mqqsa5y3c0238llh2wig1r763ligm3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -23683,8 +23746,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "3e3339f5d44dd8be100cec1c88bcaefd328a2bde"; - sha256 = "0hd5bhq57qgabs881xfrz1v1n8sp1nv2hrfs386dx7g5b3ancr0i"; + rev = "8e66b6a7b599c6c5098490e83ef4e69acf307603"; + sha256 = "1p8hz66fyzivvwwya0br3v7dx0fqna9jw9291zgshvhxbin867fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -24018,6 +24081,27 @@ license = lib.licenses.free; }; }) {}; + flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flower"; + version = "20180222.1112"; + src = fetchFromGitHub { + owner = "PositiveTechnologies"; + repo = "flower"; + rev = "6a9ba9f25daecfb994b8d71afbf9ab0cc9de5349"; + sha256 = "1i95nqbcqm0gld74g5r42wwpsgdlv8fjalr8kgcn09wzg4glpvrk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; + sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd"; + name = "flower"; + }; + packageRequires = [ clomacs emacs ]; + meta = { + homepage = "https://melpa.org/#/flower"; + license = lib.licenses.free; + }; + }) {}; fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }: melpaBuild { pname = "fluxus-mode"; @@ -24105,12 +24189,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20180211.911"; + version = "20180224.1046"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "b1c1ead1292b56fdb59916cf9a2e36312979f205"; - sha256 = "1dqkn8j0k2wiv7ycfxgqiblj2dnj95aj7yyy9ijbw1prqmr5dy06"; + rev = "b0edfef87457a13118450969696a68505cce936d"; + sha256 = "146v50nl2a4ryd7p9lpavah01idlsjg3ff1pb0bnblprrs9sg0fw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24252,12 +24336,12 @@ flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-clang-analyzer"; - version = "20170704.2333"; + version = "20180225.2039"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-clang-analyzer"; - rev = "a33752224cb1da13b35d0d60b2017fe73d167781"; - sha256 = "1f6nb92fg1lgf4xz8x1i61njwnqrab94p88kliaa7g9r4hfhgv8j"; + rev = "adc9e7663bafcc9b740c09b691898413627e74ab"; + sha256 = "10c45myq9vgsssp5v3vnip4klj9dxk8dh42zap44f9lw99ascx2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer"; @@ -24588,12 +24672,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20180208.855"; + version = "20180220.15"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "0b374e5cd3cc87954e3b6193a671dbc060d88339"; - sha256 = "0g357wm84yc80g3cfxm6ffk15jw49za3qsfh60jij8619k1d6719"; + rev = "3d378a59492c810842b7c72506d2037bf70b8545"; + sha256 = "0y8iqyml27sx2d765w2hhbyrdx0alaqvj5ls8x1zf53xfwv88x3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -24693,12 +24777,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20171121.514"; + version = "20180216.1156"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "d9d1262b9139df1cab8072e5ab15563571f32b8f"; - sha256 = "0lahgqjp6w8c8b9bfgc3awajlwgr99zsly3jylnd0waiwps5gknz"; + rev = "8173accf0e389f7ba0936d399da84839a7f887af"; + sha256 = "14g3mi8i4iy5f3fd3f7yx8ha18zi0kxqgn3sxkvdnk9rp1cdfnk1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -25390,8 +25474,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -25411,8 +25495,8 @@ src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "c5838f51d41e1330ec69b46e09f25f9764be1d2a"; - sha256 = "1app3vcv1myabj8wmla5dpifh63c21bmljqvvykz8a9d7hagq3gc"; + rev = "962f18603c45e3f9a84d059886c7d13178cbf31e"; + sha256 = "0c3lnfj1z27q1pyhfzwxh26ska1wvcnmqmdzpc6zps72prjfdknd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; @@ -25663,8 +25747,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; - sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; + rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; + sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -26104,8 +26188,8 @@ src = fetchFromGitHub { owner = "benprew"; repo = "flymake-puppet"; - rev = "9579e5c736cb890195464fabf51df113313de88d"; - sha256 = "1bk16l8rbvrwmcd0zd2yg8xmfn7b036716niy21wfizmar0pk7p7"; + rev = "8a772395f4ccc59d883712ab53a92a17c1d9a429"; + sha256 = "00w87qa7r8rigmpv58vpjwpn9x13sv7db5m6z4cqh76qkgkghgqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/302dbe34e7949da9c65e9c7bf2ab924db91b968f/recipes/flymake-puppet"; @@ -26415,12 +26499,12 @@ flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-lazy"; - version = "20141222.652"; + version = "20180224.1306"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "flyspell-lazy"; - rev = "31786fe04a4732d2f845e1c7e96fcb030182ef10"; - sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm"; + rev = "3ebf68cc9eb10c972a2de8d7861cbabbbce69570"; + sha256 = "1n67y90vm041mz172gjqypw3b5za5f18sic54h7wz4a9naynwyb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/flyspell-lazy"; @@ -26625,12 +26709,12 @@ fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fold-this"; - version = "20150601.342"; + version = "20180224.40"; src = fetchFromGitHub { owner = "magnars"; repo = "fold-this.el"; - rev = "90b41d7b588ab1c3295bf69f7dd87bf31b543a6a"; - sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn"; + rev = "4fb509a4176e950d083a5321ad62742f2e9bcb7b"; + sha256 = "1csazxx6wnnriklbrdqxmf7nc67gqb7c5zppr797bk4j4calskgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this"; @@ -26772,12 +26856,12 @@ foreign-regexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "foreign-regexp"; - version = "20160318.907"; + version = "20180224.321"; src = fetchFromGitHub { owner = "k-talo"; repo = "foreign-regexp.el"; - rev = "e368c4dbd3b7a95a14cbc3c25617b5f1bc5a7fb4"; - sha256 = "1459hy5kgp0dkzy1jab41aibixgmrk9lk6ysn1801spd8gwph371"; + rev = "2ec5c44f27c2396ee487aa0ed77ae47d143fa5aa"; + sha256 = "0zww0q8x99sfwzf05pk7blsi3v8xiw4xgmlwnv1qlf2qxjkz1xhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05514013948a520cf0dcaf1dc2ef2300dd55e98/recipes/foreign-regexp"; @@ -26940,12 +27024,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20180211.2037"; + version = "20180215.2005"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "863e9a0d6753ce46e978819a624659ca8d4385a4"; - sha256 = "0smr5a19qvak45hx21j5g507jmrb1g5y19gz3n9yb82darlvpdh5"; + rev = "f131de1052d724f14c6c4a19d72978be7c70e5ad"; + sha256 = "04dqdzyiy6iqi9p8dy8k2zml5nmlrin0p60b9p5hhxabmkwawmbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -27229,12 +27313,12 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20180207.1149"; + version = "20180224.1411"; src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "5fb53c851ca2e37f9e71f165d5536d3fcd553466"; - sha256 = "1bqryhbz9hyjvfagss0rdffhpg0j1ay3c0al99dgs0gd3cx2dp42"; + rev = "f1030159af4a5998a8ea751a20fc8bd6598952da"; + sha256 = "18zy8nmbi6a79rs6n3d8qrm52640fxmg6s9xfflhkr5pprbwi8fn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -27359,8 +27443,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "f3a37a6f749262dee56b4dbdac3a974b2413ff95"; - sha256 = "0pddsg1map44sxdljb1gnrzcb60iahxa7hzzffc5q2y1a8iqpd8d"; + rev = "bb36b2c074449955649907449fa84bd3336528ce"; + sha256 = "1ji4bnwqpbhldjpnkdfvd05y8bv0nc0g52iza1q4azcw4qqdkwql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27689,12 +27773,12 @@ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20180130.2055"; + version = "20180215.1455"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "63333fcc7fc181949601b75a4296fd3a338f287c"; - sha256 = "11lfia2jx1vaizd1afln0v5s8y2czkhrrdgn01j1mq104kapxain"; + rev = "de82992bba6226f1be3aac9ed6568f1a3b23295b"; + sha256 = "1693mrknq0mwzgwrh5z92nv7c80g6ynlymk5qfq8icpii4rlz5n2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -27983,16 +28067,16 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20180201.414"; + version = "20180221.1319"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "b267bb6c55b0c05aec4d3fe0e9385ab0e1139463"; - sha256 = "10rwl2nv8gk9bzj7cwmgzvcsscgb83aw5ag9jj7sv638w4acmn21"; + rev = "bd16d17006488bcbcea32b258752ddf625954c78"; + sha256 = "0fqkl0dhiqq53p51044aw1zx64phdqklz5c0c1kd3vx92j76zsp6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; - sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; + sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps"; name = "ghub"; }; packageRequires = [ emacs let-alist ]; @@ -28022,6 +28106,27 @@ license = lib.licenses.free; }; }) {}; + gif-screencast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gif-screencast"; + version = "20180226.212"; + src = fetchFromGitHub { + owner = "Ambrevar"; + repo = "emacs-gif-screencast"; + rev = "08eebb7e9dc583b02b86d2b62f25b7b8ff8bbd9e"; + sha256 = "1j3bp4ahwk6jdanqspqxhf6jvk78mad6zhn7ym88561hv4gq3ngk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b149509fb245975b450d15470c7d915e3c7b474d/recipes/gif-screencast"; + sha256 = "12kjr76b1180g3grfycghmgr3xf4vmhlhks8x3ri1gigdf0j8vaa"; + name = "gif-screencast"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gif-screencast"; + license = lib.licenses.free; + }; + }) {}; gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gift-mode"; @@ -28218,8 +28323,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "10a1f08f39373bfc2ed86858cf02d82bfcdb7be8"; - sha256 = "1bk1a34yi37gsb6n7a68pkia100q0jyj2x5bs8hkf0q48rh4dvl3"; + rev = "60a167ad12ce9e4dc9637254f39ae11ab2f22a81"; + sha256 = "1s6n2j56cvrdg130w2iy2wvynzsqgjqcrnra3f39llpgl4vw9spl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28512,8 +28617,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe"; + sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -28554,8 +28659,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe"; + sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -28764,8 +28869,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe"; + sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -28883,22 +28988,22 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "glab"; - version = "20170924.359"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "glab"; - rev = "9848182275e0448390ccdd8dcd8e1e3a1853950c"; - sha256 = "1fw1ck85y9r6z331g1wj7rix29fwy6gwbm7vqj3wff0lszy208ba"; + version = "20180218.652"; + src = fetchFromGitHub { + owner = "magit"; + repo = "ghub"; + rev = "bd16d17006488bcbcea32b258752ddf625954c78"; + sha256 = "0fqkl0dhiqq53p51044aw1zx64phdqklz5c0c1kd3vx92j76zsp6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; - sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab"; + sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8"; name = "glab"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs ghub ]; meta = { homepage = "https://melpa.org/#/glab"; license = lib.licenses.free; @@ -29852,12 +29957,12 @@ golint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "golint"; - version = "20150414.1730"; + version = "20180221.1215"; src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d"; - sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p"; + rev = "3ea3fa98a8104b2c8f8a7bffaebc7e54dddf99e1"; + sha256 = "0d2xxvk44i3m4zirl9rzp6dfkf85kssw2kk8wv7h2rqgc3cxi38z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -29919,8 +30024,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "cfce3c3a866cfa9ec12fff08d5e575ca875f787b"; - sha256 = "0h35802dp9y29yvrqvkhd2b9x6jkqlwz46k5lgvabsiddqq4x2sn"; + rev = "209d38166b1a56b177de486d894d39ae6822eee6"; + sha256 = "1qssg9sz6b5mx1x6x9ygi5kjmazi1787h8pph990fblh8gvp41wx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -30192,8 +30297,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "d9021ec5f7105414166ac8b535b7de9f1c115cfd"; - sha256 = "02vdb7xp3dgqv83qcandsyq60i8pxvz4yq0d3lk3xl15hi3l75ji"; + rev = "0f82f03a2bbf14037d2331cf02f1d4157bbef6cc"; + sha256 = "19bbx8jmigflyarmydf03ms8lsjwlpn6hl97s63dcw3l4gz4jab2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -30318,8 +30423,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "186aae7d8b69f2679876c4606c1df3dd0e07403c"; - sha256 = "124abs1gpxmb76wilszrdkxk4hyszj9gc1x0hvwvn7i40shcr22k"; + rev = "771a9f448593216b8d93deb8cb18465f3551406d"; + sha256 = "1gyj8j02if4hlrj06j5mya1qa8c3vm11y1s4qamsak07r7p26n4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -30535,12 +30640,12 @@ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "20171005.1641"; + version = "20180220.1332"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122"; - sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka"; + rev = "374d14b99f4959fa039c0e1ce8e0e7991b726d98"; + sha256 = "135w5vwbk2468b82v6icc8nh50d9flpi7zd63xch8vpvsri0vpw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -30719,22 +30824,22 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20180109.718"; + version = "20180214.810"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "186aae7d8b69f2679876c4606c1df3dd0e07403c"; - sha256 = "124abs1gpxmb76wilszrdkxk4hyszj9gc1x0hvwvn7i40shcr22k"; + rev = "771a9f448593216b8d93deb8cb18465f3551406d"; + sha256 = "1gyj8j02if4hlrj06j5mya1qa8c3vm11y1s4qamsak07r7p26n4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; name = "groovy-mode"; }; - packageRequires = [ emacs s ]; + packageRequires = [ dash emacs s ]; meta = { homepage = "https://melpa.org/#/groovy-mode"; license = lib.licenses.free; @@ -31100,12 +31205,12 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "20180206.1739"; + version = "20180220.419"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "087af78262c40fddf9412fa73f7d4d8c6811282a"; - sha256 = "0s8hazfw1nd7sk7nky22d1lq8vqhfba5a2gm4y96s6g31h5wd71d"; + rev = "309c60c974eb5af4554e0675d4285baa77d89e54"; + sha256 = "0gz5f17654bbjwydznpcy6aqzxbv2infbb4wd8zawf9dmb0wxc3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -31502,8 +31607,8 @@ src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "d75dc57f4eaeb92785bde6c26c1031710be1cf00"; - sha256 = "135rn33ldrhz3z6fg1rcdaxs1dnahliw782qc4ffxkays186id63"; + rev = "6909022bccb7e5c26d1c4e5fa20cbc6b65c62d69"; + sha256 = "0s5y84ih5hy6m5krmbgbr027xzhw0vybha0pdi0njjyggagirgxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -31523,8 +31628,8 @@ src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "7a97d039489ff23b3362b543dea1007357e2ada9"; - sha256 = "1rqj7yypsd25h4x9lx6vkqchq70fwnjs4dpivd7n105h41pz3kiv"; + rev = "b981467f557498de46101ddfcbdfd025e7ec1f8c"; + sha256 = "17vvz8gawih8rksbcn3ndyjqhxaczmjzqm42b1y51j9lky5hmsw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -31707,12 +31812,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180209.2348"; + version = "20180226.417"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "749904ca3e49db17751b906a9781c3da0e4a2b43"; - sha256 = "0zx052y7pxa0zcrgxn2krv6xz4w8l4fcn6wxks64rwkci7n5ywim"; + rev = "07f6dcfabb8904b758c87ea192d9eb44e5d56d35"; + sha256 = "1mzf7lidnz9y6744qh5v66kpmy1lqp7gh2i1ys3cjgfiqk8shy84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31938,12 +32043,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20180124.338"; + version = "20180222.630"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "f5f7d45fb9d636fad1429867ccbc327a446bb350"; - sha256 = "1dpxw8h6aqdajqf929hwmrm2iik7vwhkv05m0vl8vf1i5zbz307i"; + rev = "9002522af7ea199a1453326746ffccbd934d290f"; + sha256 = "1h5czxjxlq16na9rxyg73zpkrvalqyyvdfr7qyknn1avibn2msz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -32316,12 +32421,12 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "20170608.1029"; + version = "20180213.1405"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; repo = "helm-company"; - rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048"; - sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90"; + rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d"; + sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; @@ -32337,12 +32442,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180206.10"; + version = "20180226.417"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "749904ca3e49db17751b906a9781c3da0e4a2b43"; - sha256 = "0zx052y7pxa0zcrgxn2krv6xz4w8l4fcn6wxks64rwkci7n5ywim"; + rev = "07f6dcfabb8904b758c87ea192d9eb44e5d56d35"; + sha256 = "1mzf7lidnz9y6744qh5v66kpmy1lqp7gh2i1ys3cjgfiqk8shy84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -33118,8 +33223,8 @@ src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; - rev = "6490074b81ecbc6d96df662fa076cf9194158f17"; - sha256 = "0xriaaz3qrxc9j68x0fm55hb8iwag5y03xx179yfa6884jx0iik7"; + rev = "f9b5f0dfd51e16278eba70d8fc94a599563dab61"; + sha256 = "1s2y4fyax4487bz7p16jhgwsjjnzqrjz7pq22p8h23jzcvgh6wzx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; @@ -34224,22 +34329,22 @@ license = lib.licenses.free; }; }) {}; - helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, pcre2el }: melpaBuild { pname = "helm-rg"; - version = "20180205.2231"; + version = "20180220.731"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "helm-rg"; - rev = "906aa2af60998b1ac2b37e30d7316f2059c9ea55"; - sha256 = "1yibmlx1na4ff0h9r6j4cqw55z2ggfrzj02b20m2bwm19pyxacm2"; + rev = "775ee76d8b6f45eab1330c714ddac1da20c87fe3"; + sha256 = "11f7m143qnmh2x4987a56ir3acxbp0n54msak3mp5nc1i1h8hq31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg"; sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v"; name = "helm-rg"; }; - packageRequires = [ cl-lib dash emacs helm ]; + packageRequires = [ cl-lib dash emacs helm pcre2el ]; meta = { homepage = "https://melpa.org/#/helm-rg"; license = lib.licenses.free; @@ -34315,8 +34420,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34563,12 +34668,12 @@ helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; - version = "20170923.2127"; + version = "20180215.354"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-swoop"; - rev = "66a951700e0ef0621cc705791bdd6699488ab121"; - sha256 = "1j1qmbj4g5z891i1xyz8p34mk63ckpl1j80pznbhvb9ffl9aw976"; + rev = "c66336b8245ddc51c4206f19c119f1081920985c"; + sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; @@ -34857,12 +34962,12 @@ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20180209.1706"; + version = "20180220.1512"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "874351d34d32f935e3f20485a544681de369c756"; - sha256 = "11mfk5bd1837ln8b2ryi9rksmjsg7lwkylzy8qxb054l5i94vc19"; + rev = "4abe04870467beb8a5a798773e1f145f65298e59"; + sha256 = "1la6im11wmid8k2smsaks1vgw42b4plpy65mr4z22c2bx4q1a24w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -34962,12 +35067,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20171226.2035"; + version = "20180223.1944"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "07c2366d1bdc25e09bebf429050bc0e8a7bb7aa8"; - sha256 = "0xj8jj2mnn2vasiaq7dhx3rd5knqll518ap23wfihnn96cba2rrh"; + rev = "ff21ab2d95e13666f36a243989ffea2027842191"; + sha256 = "1g7i4vlpac7npx8c7f7i9w3f30is7q7zsxp0sqwp7x7rsa5783nn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -36073,11 +36178,11 @@ howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "howm"; - version = "20171225.652"; + version = "20180225.205"; src = fetchgit { url = "https://scm.osdn.net/gitroot/howm/howm.git"; - rev = "1329df206e5de11e78b5064050b5dc6c5b775d9d"; - sha256 = "0k6b03ifz1d5c3055imm6hicvfryss621bcd9i39pdccazpccj67"; + rev = "b932fa603f074049637907d35594f73c3fba45d0"; + sha256 = "189j3061g2s1286434x3zyh6xyjycfrd2sqxx655biicy1xxyk52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm"; @@ -36655,6 +36760,27 @@ license = lib.licenses.free; }; }) {}; + ibuffer-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ibuffer-sidebar"; + version = "20180218.1731"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "ibuffer-sidebar"; + rev = "7ddf1b5a158b33e9a7d3fe5dad7ea626a464d2bc"; + sha256 = "18rl379bfilzvyi4f4kmy74l4vq2q8hhy5i8kflcgvn0ibipwqjz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19c7c36af8e30b9a9ccc4afda2a7b7e39e8d32ff/recipes/ibuffer-sidebar"; + sha256 = "0rzdybkqaf8r6v19isgw4wv0mwdqxvf55gq1ig4shscjc7ys22wp"; + name = "ibuffer-sidebar"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ibuffer-sidebar"; + license = lib.licenses.free; + }; + }) {}; ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-tramp"; @@ -36868,12 +36994,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20180122.1340"; + version = "20180222.1504"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; - sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; + rev = "cb9aa780addb9d9b24a7be777d9fc70807596fa4"; + sha256 = "0pqpjk7gmd28pmlih63c5z8j8h18ph780gba9yd71s2b2vkaw649"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -37183,12 +37309,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20180122.1340"; + version = "20180216.949"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; - sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; + rev = "cb9aa780addb9d9b24a7be777d9fc70807596fa4"; + sha256 = "0pqpjk7gmd28pmlih63c5z8j8h18ph780gba9yd71s2b2vkaw649"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; @@ -37831,12 +37957,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20180131.943"; + version = "20180221.1434"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "71299e9bc0d3c75b25ef65e57e9a57c9a17294b4"; - sha256 = "0f9lnsz8fp68qr67l5rq2ippr1fc0rw8nk2f8cm9x90fd82fxwdl"; + rev = "001ef02a2a3ac0803f0f89fb90ea92d7a6e23db2"; + sha256 = "08plikqy6k1drc1m08c9jsln8laq3mzh6056ib64pxip64fwpl62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -37873,12 +37999,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20180129.1828"; + version = "20180223.1717"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "630471b5141cb493305b623e6800c26bc91b3913"; - sha256 = "00jfx1bavyzla7cid9bhw6fcdfqw8bgnwr920kzg3wmfd8nfv5ry"; + rev = "f420c8a4d27c7c2dfea2ebee230d4d1b632a4e3f"; + sha256 = "06l1mqawpaypxmb8mx7l65nzms7amr2wjz2xyhhx2czg7wdhg7sk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -38376,12 +38502,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20180210.937"; + version = "20180221.149"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "f85e1b47df3bb328be0de34120950cecb3465055"; - sha256 = "1zng4sliygg1l0jamprx9pfs85jiy19gwxpcy2hs3s4hc7yxjdds"; + rev = "752e5ab174bdde87dcadccf478ca43fe328d8aeb"; + sha256 = "0darhg4iwzgfpi62f2l9p83fvl877dw1fml8y4sfn9vrwqnvy93f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -38985,12 +39111,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180211.1010"; + version = "20180225.744"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; - sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; + rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5"; + sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -39006,12 +39132,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20180124.338"; + version = "20180222.630"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "f5f7d45fb9d636fad1429867ccbc327a446bb350"; - sha256 = "1dpxw8h6aqdajqf929hwmrm2iik7vwhkv05m0vl8vf1i5zbz307i"; + rev = "9002522af7ea199a1453326746ffccbd934d290f"; + sha256 = "1h5czxjxlq16na9rxyg73zpkrvalqyyvdfr7qyknn1avibn2msz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -39136,8 +39262,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; - sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; + rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5"; + sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -39213,6 +39339,27 @@ license = lib.licenses.free; }; }) {}; + ivy-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, posframe }: + melpaBuild { + pname = "ivy-posframe"; + version = "20180222.343"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "ivy-posframe"; + rev = "ddaf875d5f5a8629ba49731c199e0ca57effd3d8"; + sha256 = "0k7mc268lrkkv7ril7z4vnm5z1ha7hl4274av8m2vfsd1szryip2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe"; + sha256 = "1sv4xvdvb1g8g5m4f1f159lxbxaz96drsmvhh0k43hp1dh3bhj3b"; + name = "ivy-posframe"; + }; + packageRequires = [ emacs ivy posframe ]; + meta = { + homepage = "https://melpa.org/#/ivy-posframe"; + license = lib.licenses.free; + }; + }) {}; ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: melpaBuild { pname = "ivy-purpose"; @@ -39237,12 +39384,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20180129.2051"; + version = "20180225.1752"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "d5ce9e90003eeac54654d5ce1f19da55448b05f2"; - sha256 = "1jjlrz6af7mkdfg66qsrx6q879l4vxjsljl0fbkld77i9fnm005a"; + rev = "7fc9859802e264afeadb464aa8945f508727e8fa"; + sha256 = "0lw2ywk47cbgdc37m41hm1rin3r79j5w1qrb45mixdw3l5b1vsv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -39262,8 +39409,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39823,12 +39970,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }: melpaBuild { pname = "jdee"; - version = "20180109.1233"; + version = "20180218.919"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "bffcac3e7a8c57da359185e01ae5a6bdce0ba8e0"; - sha256 = "0bv1pkl6a9a9cs7ka3v17lqb45nx11mg779x7l54rvlkxg4ppchs"; + rev = "6244d4608fe1ec1a1cac7b4b45cf6d1edb06cb91"; + sha256 = "00bscgxv2gmxbmb88p8yhb5ckz73srm251h1vsdfz84cn7vsk1wz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -40159,12 +40306,12 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "20171116.815"; + version = "20180213.755"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "8384a1926cc22000e5e42f86f28d807fd6149f8e"; - sha256 = "0fa84jln0vddrc218s8scz6hx12ym0wimh6dm58wqxias7gm9fgk"; + rev = "d1fca4613ec90c2c0b8241f4603eba733dd1ac73"; + sha256 = "0sgpl03dqm4lv081l3ff3xp38c39q5i2miyvpsqdjmgnixg3nm8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -41079,12 +41226,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180210.710"; + version = "20180223.1702"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "3cf42c74e05982f811417a8d5e7b359732462f8e"; - sha256 = "0p32zgmmdnsmvcjnkxfbbqq775n9f29w45q54bhdvw63gicnvdwg"; + rev = "bf301134df90159a8657fe772365fd9c82de977b"; + sha256 = "0gm96xxa2zvmn442cjzqsqhjw6r8fsrxqacphwa19lvmm9csv3wj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -41482,8 +41629,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "d21aa7a12f1a76d47249db36eb9825242df9d512"; - sha256 = "1m790afdrns8afh7f690slq2gcya5bp7630fxwi8fqp5vil7lswg"; + rev = "0ba8f44efe60058ef66b10a059fd30489b42546f"; + sha256 = "09y6905ig6qphfwjk1xn79sv4qxx75gnrmnwd9i80ig3lfp8ps2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -41587,8 +41734,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "1aa4315396c0ee15c282b94f227bbe54b53e7e0a"; - sha256 = "0w856f20brgakxzngvsikaywkhci961vnasnqyn4a4a5913aa8rw"; + rev = "9f64f5e24240cbf7e2cd34315d08131fd31ec822"; + sha256 = "0liyqkwv94wz623ihz5kyzfagdi08qp3q0q2hcvavjyk3j8ih6ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41667,12 +41814,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20180205.1242"; + version = "20180223.1905"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "4be03d90ac8249ce31df3ef0edb71e0ca11b5ff3"; - sha256 = "19xg7xss7j1b8hq1wk3kvfprn1lsnym59728v144cxc2f801fh17"; + rev = "aa8c8bb8e64f1f61fadeb4e93973b14dfe19e4a9"; + sha256 = "1gsaw4yfv68ilf0z130rf13300lnz1fdgi2x8rm8hc0q0dlsp1a6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -41772,12 +41919,12 @@ kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kotlin-mode"; - version = "20171009.1301"; + version = "20180219.853"; src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; repo = "kotlin-mode"; - rev = "ebcf6f3730f455894ebb7ed8e42950f66e8e1c1d"; - sha256 = "1345ahc8i69sl2d9v03gdgrdcj7qkbzrl0pl957hjn3vbvmhrz00"; + rev = "a2c2628d55c4e8b018ffe9f55ca38d89302a1bbc"; + sha256 = "12zng3rq134f0d49fr2rsf0jgmxl3qc7kkhziy7r27hx6ny9h8z2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; @@ -42170,12 +42317,12 @@ latex-preview-pane = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-preview-pane"; - version = "20151023.1303"; + version = "20180222.951"; src = fetchFromGitHub { owner = "jsinglet"; repo = "latex-preview-pane"; - rev = "1a0539ab70eaf5dd31c2c94773dddd6f437fed41"; - sha256 = "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa"; + rev = "e7dbe0df3ca938128ab394cdf04f3e40eb5b139e"; + sha256 = "1i8mc2qdyyg04rm946vqmmw021c4v8aq7yvxsgl53mfbx9snm3dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3227f2e35d701915a8d3479d20581dcbe3a778/recipes/latex-preview-pane"; @@ -42338,12 +42485,12 @@ lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lcr"; - version = "20180202.112"; + version = "20180224.1243"; src = fetchFromGitHub { owner = "jyp"; repo = "lcr"; - rev = "071d23ee5453741a8724d7f8bfa7f5c20612a29d"; - sha256 = "05gvij9lgs9hh04wnxb90zx9ncsdjyp36fjbmrqrq07xbkxaw82a"; + rev = "6caa2bac7056dcf42c4cb88a1d5fbe1c9d71a9b4"; + sha256 = "0xvl0dqxwim6nmm6f9ddyp0r6j1n719zlgm2a3f49dskhnkn798z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; @@ -42422,12 +42569,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20180210.1940"; + version = "20180224.1936"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "980e191e08db0b6719b324b131b3ba042f8487c8"; - sha256 = "0xb5x9wz7bg39x0xhy5fg3k91vdqym63a4r4p3h6n37rg0d0iwcf"; + rev = "3a10229bc1c12f36c9432ec3b459069a07f05498"; + sha256 = "1x0jg0vysab8592882pgbszrshr85ss66s8fsa6mhh61plxd0fw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -42776,6 +42923,27 @@ license = lib.licenses.free; }; }) {}; + line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "line-up-words"; + version = "20180219.224"; + src = fetchFromGitHub { + owner = "janestreet"; + repo = "line-up-words"; + rev = "b2cedc45295fd27f534f3b025d2ce72041850c2d"; + sha256 = "0f3601k1clflan8h7a2g4l8ag2f5i5f1gh37mg5hrny8b98n009z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words"; + sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79"; + name = "line-up-words"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/line-up-words"; + license = lib.licenses.free; + }; + }) {}; lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lingr"; @@ -42997,12 +43165,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20180208.2204"; + version = "20180215.1527"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "9ac289883012a0c973addb0c8fe4db84259a8019"; - sha256 = "0gd9d9qid36vbr23npgnr9356av2mlkf13xcx0gq2xxck2p4gl58"; + rev = "ae975815db5da512ea86c8547e5907cf04af54bc"; + sha256 = "02s5242yc0c93g9wdry75pg3wrf53da9a3hdvm57zg7b1sjw6p4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -43039,12 +43207,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20180120.1206"; + version = "20180218.1555"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "d9ae0dd5e3e86b5c0ae37bd3b469949b0dc71374"; - sha256 = "0a3l5a836slh99vzwc6a46nc6xj0wjcfj9726rs8haxkav6wzv61"; + rev = "d99f08d5971613bcecdd2768241b9c6d617a24c7"; + sha256 = "12kjh2b9jdwrf6naq6qvskbhlv8xkjsqr1igbldg9mi8qmas60b9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -43316,8 +43484,8 @@ src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "e0a5627e6591e1cbb9f93aabc44adbdc50b346c9"; - sha256 = "0dhm7gdd1smlibj5jmzps97kwkpzcigbdp0l26baa2mkc6155y66"; + rev = "22406984b66201441c7ad5689ab010bdfadd768b"; + sha256 = "0ni1cvrabxiprb4gl5rd5hgwl5csy9q6b0yjd40ffvl1x5lmb0qw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -43687,12 +43855,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20180128.1429"; + version = "20180216.1445"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "60b86ec5888d3bbd857f4abb434a6ae3406b7c93"; - sha256 = "0f292yh493lpwllgs9mihfdmp6ian2rqmldfv92qz0jb348khmdn"; + rev = "9ec279d933923dab2d8d1f140adc43073dab6433"; + sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -43918,12 +44086,12 @@ lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "lsp-javacomp"; - version = "20180203.1204"; + version = "20180218.2334"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "57554723983c5d76c21a7a5c16534066de6dcf23"; - sha256 = "0n105j1i8gwayfzwvr9d37b9ra35l9prlgx7vqblvv167q4w9d63"; + rev = "cb080824e1fc08e2724d6ecde7034f1acfd565f0"; + sha256 = "0ihb4bld8pzw2mxfwygxldsv2hclvmzkr7cp8nimzjam1nlgjhic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; @@ -43960,12 +44128,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180210.441"; + version = "20180224.246"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "a38ce26c9ebd56a690085d29a80f4494843e53c3"; - sha256 = "0mlnz3aqa40gavb0lr7bzlyzfm58d1c4np546v1401ljdc95fcgi"; + rev = "14d5626f905d2929e4358cbea3e0106b9f3c0454"; + sha256 = "00py4qp1rivr54h033cjnipx7011cqac49v9x86zn2g2hfclhy7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -44002,11 +44170,11 @@ lsp-php = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-php"; - version = "20180104.152"; + version = "20180214.624"; src = fetchFromGitHub { owner = "tszg"; repo = "lsp-php"; - rev = "6f332a08c28d2f402a783b91e1846234e55ec130"; + rev = "ff5f5ba417342aa05869a1a9c6a0fc2d42c8acc3"; sha256 = "05rq7sqb6chymzfqvk5xk9bgi7nsdf1ldimams8df9ml6242zjsg"; }; recipeFile = fetchurl { @@ -44044,12 +44212,12 @@ lsp-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, markdown-mode, melpaBuild, rust-mode }: melpaBuild { pname = "lsp-rust"; - version = "20180126.6"; + version = "20180213.2304"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "660dfa99917440acf79e1e2d3ede4d3a90f0d196"; - sha256 = "1drr2wlbgn6zyr15hjgdwldw94ryi1dbazbb44f4h9qakw7nqd2b"; + rev = "b4053425d57101f0c16ee3d4f7e3a3c483205f90"; + sha256 = "037y7ns1p6riyycf65gq6myn921zjc2ga3h804yjx1n11wvrw9al"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; @@ -44062,22 +44230,22 @@ license = lib.licenses.free; }; }) {}; - lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, melpaBuild }: + lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180209.1302"; + version = "20180224.2300"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "6a669ca3bb14b48ba61f87e32f3a4eddc95dbf9a"; - sha256 = "0p4lr98asfhz78pj9mq7m7lk7syfz8w16xhrfv012llr8412g8cw"; + rev = "7d73049dc2cf703550decdea42e35920efe7339f"; + sha256 = "0cah4azsgks5qq8iv3g8dv0l18wkc4lca9xr7g79p2vl4z34sgps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; name = "lsp-ui"; }; - packageRequires = [ dash emacs flycheck lsp-mode ]; + packageRequires = [ dash emacs flycheck lsp-mode markdown-mode ]; meta = { homepage = "https://melpa.org/#/lsp-ui"; license = lib.licenses.free; @@ -44380,12 +44548,12 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "20161214.1017"; + version = "20180219.752"; src = fetchFromGitHub { owner = "emacs-php"; repo = "magic-filetype.el"; - rev = "9a20137474697063898902b43a40423daa4eb64d"; - sha256 = "1r16qlm2pqcph0zwy3fhzdjywdrfcwvldqk809vbhw71qkq4a54i"; + rev = "019494add5ff02dd36cb3f500142fc51125522cc"; + sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype"; @@ -44422,12 +44590,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180211.700"; + version = "20180224.1651"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "10a1f08f39373bfc2ed86858cf02d82bfcdb7be8"; - sha256 = "1bk1a34yi37gsb6n7a68pkia100q0jyj2x5bs8hkf0q48rh4dvl3"; + rev = "60a167ad12ce9e4dc9637254f39ae11ab2f22a81"; + sha256 = "1s6n2j56cvrdg130w2iy2wvynzsqgjqcrnra3f39llpgl4vw9spl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; @@ -44578,12 +44746,12 @@ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-imerge"; - version = "20180120.1554"; + version = "20180212.1648"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "1969c445d16e5c59db9548a61a5fe5f0b7448cd3"; - sha256 = "0yiqjaxnrb46z38bbcg1dlswi6sp8994hcmbnp31xf27m29vr2fx"; + rev = "79a2fccc460695df5547204ad6c05529868ba1fd"; + sha256 = "1ks17wl0h4a5rhwfzq47rf60192rxyvkwqhnp3fg9sa85b0nqc3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -44641,12 +44809,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20180119.111"; + version = "20180217.910"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "ab75385a1fb8c0fba0769d448b13ba8324835261"; - sha256 = "0ky4l3k3camh1paa5ap9frr9hcadj7nj40l3imiiqfcvgyl8ijp6"; + rev = "48cf02b8e4d7d4a83bc22cacd64cbf4e6a266aa2"; + sha256 = "0dnfa3djgnfgig279v46xl4gz3lzjmc48nq27gdlksnkp1mwnn3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -44767,12 +44935,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20180209.1711"; + version = "20180225.529"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "eb8a794df0db2e7edea1106a87bf03f94ec7e192"; - sha256 = "1q7s822ygqc8rz0b1fqgwdjnj5l0fhnqahlnf02aqz5by47sgaqg"; + rev = "8d8d136ae4c380f004354675519f4016c735d78c"; + sha256 = "1dnz8rz78wfvpjz652hs4jh90pkkgiak4vp9fzf2kx1j4c9skp97"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -45103,12 +45271,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20180207.2320"; + version = "20180223.2121"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "36fed6ea0ae45b36ef5618d5bd29f4a43c0e2c6d"; - sha256 = "1qsygc90sclk5r1qxsiszi72sg6ryhiw39vf99ixi0pxayljk8px"; + rev = "a07d1cd310f59b28125717620dff5cd3ff674ab1"; + sha256 = "1rpn1c66yi6rdn7f2dgdspbwgdyidvpdwshh52dydgwy4z08lpfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -45587,8 +45755,8 @@ sha256 = "1spyfnkw6j0v947m6yj6mv6ni1za0a9m9iycpjycpcb42q7d9rlg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/matlab-mode"; - sha256 = "128v4rwc99dwyfgi5crbr5649fz4l7dwh4lid8w2mwpknyxaxy28"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f78cff288077e04f8c9e4c2e5be9f3c33d8ff49/recipes/matlab-mode"; + sha256 = "1q3sdmahf915ix4lrv65cxsfh6hrs91c8pmyixbqmbhifqi33d0q"; name = "matlab-mode"; }; packageRequires = []; @@ -45831,12 +45999,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20171230.802"; + version = "20180218.538"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde"; - sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q"; + rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0"; + sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -46694,8 +46862,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "b8cc8d29e185c15a1e43ecc2a78e36a6d2f86b8f"; - sha256 = "17v26116g05py2yd24a5rjlr2lbdacahglxar10k5291v9i4msdw"; + rev = "e860009ce531ee05d2902309db5f804326596b45"; + sha256 = "1l0jh657ndypi9n7dxac8hqc61fxp9c10li3w23c1r9pad4zisy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -46841,8 +47009,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "e69ec8fa01e86cb789f7f2b27b6d5a47e1ca3069"; - sha256 = "10yn56vamcfblilsnfqfagssr4060gr7qbpnqa2fjqv1l8fg6jrf"; + rev = "297d5e66628bbd788f8673656ab5f2da29f7c40b"; + sha256 = "1agb500fc3cmhfq423bii7mz83hwnfas5xs6c1qjv3d89v7wxp69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -47151,12 +47319,12 @@ monotropic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monotropic-theme"; - version = "20180205.2000"; + version = "20180218.357"; src = fetchFromGitHub { owner = "caffo"; repo = "monotropic-theme"; - rev = "a5dc696e79115f96a2482ba2e01f0569c5e4c4be"; - sha256 = "17985wdlgz4d45jznl9df34826mm5xc8h5xcar70rdrw4gqp4ccy"; + rev = "b46e94a712e01cebe69a6f7d950e91d7c7dd1b66"; + sha256 = "0lmyfqi6c5f2cr9ha1l2qnc4ayigb1zj9gz8xi5xxadhad3zymwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38222d109ece0030b0bfafb242aa100694b2bfcf/recipes/monotropic-theme"; @@ -48074,12 +48242,12 @@ mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; - version = "20180116.740"; + version = "20180214.837"; src = fetchFromGitHub { owner = "alezost"; repo = "mwim.el"; - rev = "a27879c4d0ef1d3f8494efa18490dd17d707375b"; - sha256 = "0v2qar878z6imh6ih4qxwc7jmwga8l6c626zrzz81l60b675li8x"; + rev = "508efa3a616d4b371039053b1fa80b057422196c"; + sha256 = "067m1r19fc4zhgwc7gwb6khbh3sz74li2fcxfj42d9sx1dqhy218"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; @@ -48326,12 +48494,12 @@ nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nameless"; - version = "20161012.1214"; + version = "20180215.1421"; src = fetchFromGitHub { owner = "Malabarba"; repo = "Nameless"; - rev = "108f16e743aecd35401c0e914c896572cf1d5082"; - sha256 = "110bxdn2sqxlxqffaxp0yc6g2hglbv91az00mmgc01n6hjxcrc3h"; + rev = "79d7ba8e9b8f3093e93172bdb4c5a4d31b0fa3e0"; + sha256 = "11xghz03csj5w3qfbjyr48liaxr08gl6gy73hmmrq2bl57six5n0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless"; @@ -48913,12 +49081,12 @@ ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "ng2-mode"; - version = "20180206.1128"; + version = "20180216.743"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "00822c2e43ff4793cf030fbbd67f83cfdb689b3a"; - sha256 = "19qbs0c0q98rp506a8sj7wkigrk8xzv0s87q9bcl5zxk9jx6m304"; + rev = "d41ed14f276f1f08fb7eaacc863f471654e2c2fa"; + sha256 = "0rys2gnbw9d32i1gqqf46mbf36x2s9lz7v144yw901b2i8p6c5ja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; @@ -49017,12 +49185,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20171119.1027"; + version = "20180212.1040"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "91450d3117a4dec975d913b58f1ece6808e5c2ba"; - sha256 = "01h0wyjh8s91s1wyy6drwnvc3gw7a905xg85ikv7ddywi920c169"; + rev = "bff7065f6d2419ec517d247f0f3aaf935820064e"; + sha256 = "0iqsm843msw41jxhfi7dbsj6x4qanvd84xhg2j6wl6ncabdmwnjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -49038,12 +49206,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20180129.536"; + version = "20180220.440"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "22c4a1cf1ce8686c01a341477502d2676829699b"; - sha256 = "1sf8ijk08kivfj0dxgmx73l10hkd921z766z5x4w1p3axwc8w9j1"; + rev = "451a570d656e18e66d58182577685da0e43c87a3"; + sha256 = "02bvvrvbfg7cgbd83y7544ra5a0hfrk8kh938hwygq991krc2zhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -49080,12 +49248,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "20170809.1128"; + version = "20180212.718"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "b922497ea0af39fdf1a7e856d0cd2ce81d98d76f"; - sha256 = "1db0cjsq99b1z6786g3j8y39vj3gga7x6yzkilxdp7z6scs1qdwr"; + rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099"; + sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -49101,12 +49269,12 @@ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "20180126.1935"; + version = "20180215.1331"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "664fa51cfa9d8e4c39f2086ad1b6b6fdc1e8fbd7"; - sha256 = "0nnxd2lis4qx2zakfcy5ypvlp1nrw70dq2jcf0gldg0qmr1dhlgk"; + rev = "0ac0271f6c8acdbfddfdbb1211a1972ae562ec17"; + sha256 = "157vy4xkvaqd76km47sh41wykbjmfrzvg40jxgppnalq9pjxfinp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -49458,12 +49626,12 @@ nordless-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nordless-theme"; - version = "20180204.48"; + version = "20180215.454"; src = fetchFromGitHub { owner = "lthms"; repo = "nordless-theme.el"; - rev = "3fb123eaaf7f38d024effdda4b3e88cc66e67300"; - sha256 = "0i5b7qg97qcgvhk8vv7x5xpwps06q140jndkz4i2rakg5hr3z98g"; + rev = "aeecad74c19121fa2f68dfd85efb9a4f34e8a911"; + sha256 = "1ypwh4kz9kjxikmhgh8aac8ihnyinijsvsjwa8s4lc1j4nfzffih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3de9da6cb8c1a75ff1d41a69e156c21be00713b6/recipes/nordless-theme"; @@ -49538,12 +49706,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "20180115.1407"; + version = "20180215.1206"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "4ef20ebb587ffb0ab73c85ad5748d41af1071596"; - sha256 = "03s0qjvwk1f7y3i4wh2p5y3z4hdv00adgz8za3vphzc0q8i1kjzb"; + rev = "b0eab94b84464aa4508ccfee59af5b8df49666a2"; + sha256 = "0r4wy99kpdzs0c8b6ini8k0xixjrb48bbml3nz3sfxy3w7kb4kyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -49664,12 +49832,12 @@ nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }: melpaBuild { pname = "nu-mode"; - version = "20180104.1243"; + version = "20180220.1315"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "91056b70667036bc78d6c8585cf0bc8fe7ba21c0"; - sha256 = "0pf8ng0r829lrbqjz61wjdag9cb27cx0cj2idgpy92hfiy9s6saa"; + rev = "9c9fcb1395a3bd317cb5433c6c4defaa9bb3c7dd"; + sha256 = "0snynh8mk1ivdphrrpznh16szw2jcagxl7w056wv7j2zmb17agcx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -50219,8 +50387,8 @@ src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "ob-fsharp"; - rev = "65ec2b626ac55313d8a04e746940370f615fed1e"; - sha256 = "12k6z3zsh8av3avhl2a62v475bpxpcdy56v8i248bv1wgd3ma2mi"; + rev = "0b2fdd9bb4f38af8b5cf4914627af52f5b43d9f7"; + sha256 = "1z1m2dqnvyyv9ff289p8x1hajnz9n0mmfkrkyl1zvipaqd9mgljw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89bc8c5fe6db0573109e82b3d1350d33d6d8aff5/recipes/ob-fsharp"; @@ -50299,12 +50467,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20180113.929"; + version = "20180224.153"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "75b84cb1ca09dfa84113fa0790e182299b72244c"; - sha256 = "05yhrivsxf8qvnhvsdb5kdq1a881l5c7d3apz1sk2mdxw89vcv7k"; + rev = "7147455230841744fb5b95dcbe03320313a77124"; + sha256 = "1a10fc2jk37ni5sjjvf87s5nyaz2a6h2mlj5dxh4dhv5sd3bb85p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -50828,8 +50996,8 @@ src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "764d8dfa931f2336fa9f469aea7d38bcb4990723"; - sha256 = "1h0rgcifhzqxb7glax7b7whxkcrrd1mmvsdn7z2xgwjla3qmx4w2"; + rev = "9bbd079199ef7308d4fa3cf0fafd2d7d8b4bf2d4"; + sha256 = "117xwqxnmg2f2np1zqyc8hhnxmrrd2gcixqclb5lkwk68kisjmi5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -51652,12 +51820,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20180209.534"; + version = "20180223.1455"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "7f96d1417fa3b676d402524b2de92447174cc101"; - sha256 = "1lrvi15qzqbdgkar2mxzsjhna8wbhr95hnym93rwvksgmn8dgivg"; + rev = "22eacef9fd0e66508888016b5d33b6ce85727573"; + sha256 = "16mz2vv3p4x1x400ylx5321svpczsydzkkb93j21cmk3b6a1jibg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -52386,12 +52554,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20171105.1440"; + version = "20180220.1906"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "64a3f56651369b2a8b0a601abea1cf1216db2ded"; - sha256 = "0jvknbiilik3dwkz1kpjf7ac1fqkdh74pljzpyxxyg3slqha0d50"; + rev = "0752659f7a19cead182584fabc9544464f69b83e"; + sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -52449,12 +52617,12 @@ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mru-clock"; - version = "20171219.314"; + version = "20180219.359"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "ccf477735d76c078b44bba7bff12e7e30e66bdb3"; - sha256 = "17dxdghnh3h24584pa374pmz0a7qr13p0a4rfsndns9xv8wfzbic"; + rev = "0894a5dad148524f6e31cd089eda2879fc85fbe4"; + sha256 = "0ya3f86kryaminjja1868wh6db5hsnczhqldq3hgh7bvlnnsvp6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -52512,12 +52680,12 @@ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-noter"; - version = "20180210.1836"; + version = "20180225.1352"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "8841704afc019c0ebd66795343562be8b8fa77f1"; - sha256 = "1ba2l0nyxxg0x9kn53xif7nzn4di0dp3dkni6qihns9v0n8vl56s"; + rev = "6ef0f4d1ee13a91da837a940f7c6633e4f5d8d65"; + sha256 = "06c35lmy2852n1ss7ry2x1m05s7indb3x5zy6lii64bmqcqr1w7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -52666,12 +52834,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20180102.2349"; + version = "20180225.206"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "645f451df82fb5ebdf42b2c208711d307781062d"; - sha256 = "1iq90f821iycqs1qff1m2vjl1czri01c484gcnn50wnf7mdfynhk"; + rev = "09ef4bf8ff8319c1ac78046c7e6b89f6a0beb82c"; + sha256 = "15zxdq6f6w3l8pzg3b58cj37z61dx106jwslpqni71m8wczdqkz1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview"; @@ -52924,12 +53092,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20180207.1846"; + version = "20180224.1445"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "e828a32d00b24af2c6c657481c3ad163de6c8e02"; - sha256 = "0inmayxdhfdh5lnjzqxkm65f160p2inc0mz7m254wm81z50033km"; + rev = "8e469035a73e3658d818d1665bcfdfb108d7ae41"; + sha256 = "1ff901w7qrlgqzxn0cfnw3a6nqs3nip6vja11ikj9lykrh1pkf44"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -52995,6 +53163,27 @@ license = lib.licenses.free; }; }) {}; + org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-rich-yank"; + version = "20180218.156"; + src = fetchFromGitHub { + owner = "unhammer"; + repo = "org-rich-yank"; + rev = "ffa90b29604e27a60ad341c06d0e43769af19715"; + sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank"; + sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y"; + name = "org-rich-yank"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-rich-yank"; + license = lib.licenses.free; + }; + }) {}; org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }: melpaBuild { pname = "org-rtm"; @@ -53124,12 +53313,12 @@ org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync"; - version = "20150817.754"; + version = "20180221.1127"; src = fetchFromGitHub { owner = "arbox"; repo = "org-sync"; - rev = "7f02167ef805cd76def274be4d3bd0c6e41d9af8"; - sha256 = "18v56lrscpzxq5prigd1pjkx990xf57pzf1d2yj6r1grqfz235yy"; + rev = "095335063b306871970f981898a220f62ad0ae4e"; + sha256 = "0p4xmlhv9xsa111yrgmfl5laznmj9ijpsifqcxmplrf5ckzqbdkn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync"; @@ -53397,12 +53586,12 @@ org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wc"; - version = "20170727.1911"; + version = "20180124.229"; src = fetchFromGitHub { owner = "tesujimath"; repo = "org-wc"; - rev = "d294ad7117c150445e6166fc0d88c14a8386f34e"; - sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl"; + rev = "6ff202a4612fe65b4e96bd551893fe8df67b0f51"; + sha256 = "1yqiqscj7cmnqd4s1lgbf7jbhcqlf3bwr52sabz7mqfs4iwdryhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc"; @@ -53436,22 +53625,22 @@ license = lib.licenses.free; }; }) {}; - org-wild-notifier = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wild-notifier"; - version = "20180125.721"; + version = "20180221.2025"; src = fetchFromGitHub { owner = "akhramov"; repo = "org-wild-notifier.el"; - rev = "3f87465d6c4ea63010b9beab8de3cfa54429bce8"; - sha256 = "1vxjlfdkl6yxgh50nmz87qsyga71wf8cmrggnp6bkljak88vgz98"; + rev = "d0df145d9bbb72b2c315b7d8007cb6a59fea2095"; + sha256 = "1xcnb5x539776b6ljd9qyl9jadp2r4qg805m4m8yfz9sk00dv7yl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; name = "org-wild-notifier"; }; - packageRequires = [ alert dash org ]; + packageRequires = [ alert dash emacs ]; meta = { homepage = "https://melpa.org/#/org-wild-notifier"; license = lib.licenses.free; @@ -53658,12 +53847,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20170731.1003"; + version = "20180217.1320"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663"; - sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf"; + rev = "976f3c7d25ad92c57341b52dad9af89b49c37f0c"; + sha256 = "0m8mghh0iydbvlsrg0zd2xajfhdxgxk79dm4gwircrh6zv8194ax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -54204,12 +54393,12 @@ overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "overseer"; - version = "20170207.2241"; + version = "20180225.2219"; src = fetchFromGitHub { owner = "tonini"; repo = "overseer.el"; - rev = "6be1f2a4df1b7a20298865b85502ee89e327898d"; - sha256 = "0ipq5gflymvznb8xzfl524l09sj90787bzga9ymjjpc4rn9zmqlb"; + rev = "02d49f582e80e36b4334c9187801c5ecfb027789"; + sha256 = "0q4ai7ividy8xv09s342y49s97ismhfdfsjk70zif60fp0ajfzfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer"; @@ -54372,12 +54561,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20180211.2258"; + version = "20180222.1537"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "a8ae44e692f30fa7d0c76c21ad2dd6ebf65da700"; - sha256 = "0856n634k43ingr7smcwvjjzd9h96mvh0d767q7qcg6h2f5lmgg7"; + rev = "d53acbb3f8557583a1a03e92ec7626ccc63f5264"; + sha256 = "0p0a0qfsfg548bymvy57frj9yg5bzbp9r70l31p86q2x3dyjgiyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -54603,12 +54792,12 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20180115.405"; + version = "20180222.533"; src = fetchFromGitHub { owner = "msnoigrs"; repo = "ox-rst"; - rev = "58715dcba3922b5c7fc8ed5e7915277a9732fae3"; - sha256 = "1267rfj1rq04g9ngw0yglsdjma6bb04j3fc8afwsjixnbqv618kj"; + rev = "313640ac945ec63b7de37fe58d4e71098c2fa4d8"; + sha256 = "0frxwb5mi4gzv2qfqjvw10xl2vnxkra8p73hp6hx7dawbgxb56j4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst"; @@ -55212,12 +55401,12 @@ paperless = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "paperless"; - version = "20170213.503"; + version = "20180224.445"; src = fetchFromGitHub { owner = "atgreen"; repo = "paperless"; - rev = "4e8c5d147db5c8ef0a3914e95b4030b28d29c6bb"; - sha256 = "1lnxbn6mwbpfsn8qf8rdn1v7f00jjsk0h1bn4syvzik37x51f2hh"; + rev = "b3b6c05da393f6b1292a3d5937bc4499baabd0b6"; + sha256 = "1b2gm823qd6bllgp9qg2vgskzg4rpdvh8bgic8708hkq6lwpdv70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/921ba9059183a57e08f9c79af2b28bb77a210508/recipes/paperless"; @@ -55233,12 +55422,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "20161117.502"; + version = "20180216.334"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245"; - sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r"; + rev = "e5dd26f67ba8fa8ab1631a00ddea4117805b3fd0"; + sha256 = "09x8glw949hivbzikki5blgjkzyws69hck501ym99663k4irdir1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -55378,12 +55567,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20180208.1751"; + version = "20180214.1040"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "4e0d585e85a0e27c7703dc6c6edbadc1b4ce1ce0"; - sha256 = "0cq1jkizivjkr0mq0fmv0i9vp01g00w0l500s8r25v6npzjmgq6j"; + rev = "05f554bb5633d48e1ffb053aa3cca462c52600cf"; + sha256 = "1dxvwc48z4z23pl317pkcrnlpwpyw1qyggzn89xcv7p3abyqqhpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -55592,8 +55781,8 @@ src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "ffef92ee0ed10551b20521f2d6e5637c8f9da798"; - sha256 = "12j2fjrhxpgha1ay0r4c5cjc6d16s350iclyrvcma35y5dqih2n9"; + rev = "fab65bda88ea979dbbc49f3d856a1d14ee4f1296"; + sha256 = "0yicj227h21lqa97kcaa1pw4xyaakjqh9ynr2pynixkafalfkxhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; @@ -56176,11 +56365,11 @@ pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pelican-mode"; - version = "20171001.503"; + version = "20180217.317"; src = fetchgit { url = "https://git.korewanetadesu.com/pelican-mode.git"; - rev = "64d41f0ee5970b2d875880994eb287b97cad24a1"; - sha256 = "0xivc8sdp6h3fajyj7g73xnyfqlkhfpm2cs9x3mpyr42502lmn2c"; + rev = "524c001eed50ceee40095d6680787e435b9d3624"; + sha256 = "1559x7wxmflgzjykkbdsgw61zayswpil940n71979qkgqzcc5ggq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; @@ -56867,12 +57056,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20180211.751"; + version = "20180219.1806"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "0d7f970dfffc6532814b5f2290d59391e1cabb78"; - sha256 = "16dvhamcy8a4c4g9k7vxgqaic1wz03adshvhbh4nqflwwyzz7ldp"; + rev = "e9e1b5806c169a8c7a7881530dcd2e9a52ab5fe8"; + sha256 = "1d2isgf17sg7n7vg6dif88yn31yxxgargvllys8azl48x0y40hh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -57032,6 +57221,27 @@ license = lib.licenses.free; }; }) {}; + pickle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pickle"; + version = "20180218.1840"; + src = fetchFromGitHub { + owner = "ahungry"; + repo = "pickle-mode"; + rev = "d672186129a19581c908bae3063e09baa815869c"; + sha256 = "10jl9xinljzb8nra59r6wyrmsr8sbbl40yahpzn4558nmmdckcnb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4cb71882f074d3fef1f5a7b504dafcb6adff8ed4/recipes/pickle"; + sha256 = "0fryzmrs6bn6r590qp08jyzx9g6jakf1pahxhcfglsv9k3jbfp13"; + name = "pickle"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/pickle"; + license = lib.licenses.free; + }; + }) {}; picolisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "picolisp-mode"; @@ -57245,12 +57455,12 @@ pipenv = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pipenv"; - version = "20180207.1216"; + version = "20180222.359"; src = fetchFromGitHub { owner = "pwalsh"; repo = "pipenv.el"; - rev = "cb10661cb11bed9f781c2aef01708f3304f83de1"; - sha256 = "1m8pdn3vyrzna0a1adwm4s22zgykr6cr9pp9p1v6q1ar80hxchrx"; + rev = "364eaf1c823a28db97fe55e7fe85106107a23234"; + sha256 = "1f3xx606xvsmcc73mqml0w07xbkkm2xjirc4pfkb2883cfsk3fq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; @@ -57480,8 +57690,8 @@ src = fetchFromGitHub { owner = "Shirakumo"; repo = "plaster"; - rev = "11eb23920410818fe444887b97ad4c8722d66c85"; - sha256 = "0lqz8m8a2ahvgm0i9cz0j4bisi34czc4s29z70p5p6rdg4g21fk1"; + rev = "c6c9c223d634041411d111b4397574f65e140585"; + sha256 = "0pzdw9jb1p1bi5zc59sjvwxzczg8laz5vlsrs73ah1pk9jckqwf5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e363cffa021e649c052f38cedb7cc01dbe9e24a/recipes/plaster"; @@ -57581,12 +57791,12 @@ playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "playground"; - version = "20180207.1011"; + version = "20180224.2325"; src = fetchFromGitHub { owner = "akirak"; repo = "emacs-playground"; - rev = "7e9452ddecc9560ed79cc13af4fe5046996549bb"; - sha256 = "1fbcyds94g0dllr2iq1mf6mxq6300160063zj8r4p3gp3h370sgf"; + rev = "5b8d9eb5ea48313e2b33ed3a390d7a2e04d9dda8"; + sha256 = "1v83mkg4573iy6rjnvi5hshbgp98jhyj2c2swz7p4vfcdcak8j2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground"; @@ -57986,12 +58196,12 @@ pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomidor"; - version = "20171214.727"; + version = "20180224.946"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "000dd3800829c469a072e788a272edca24313ee2"; - sha256 = "1rhc1n4r3yjlrxxj1mkziflb475z7gqcqm2r7r7b667f8k1b5wg4"; + rev = "458ff63f640ba741959670fca0e439374d2d840a"; + sha256 = "0vg38cccjfkn2w7a7fxks26x4v27bhxkpz7nfnq1scw88z9hl1sh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -58322,12 +58532,12 @@ posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "posframe"; - version = "20180212.136"; + version = "20180225.2325"; src = fetchFromGitHub { owner = "tumashu"; repo = "posframe"; - rev = "2073a1f7480aaee8a21405edf44ba28888f64aff"; - sha256 = "0in8nvdgjaj89rg2ckq828vpfpfswj9830zghi7xsky74wysc00k"; + rev = "489620f6bd1ca5a6363d4ab9176b6eeb753e7f3b"; + sha256 = "1p1khm0mcjq6acjh08z5gaw24hns6sg7p1iy8x6zf63c8kyfq2ls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe"; @@ -58557,8 +58767,8 @@ src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "0e8b95c4e5898a03e85dbc555c37b4f968292aec"; - sha256 = "0l8i0fbwwyhllkpk8xd6w5gcv65z4ja1ygf6slh5sd1g0ixh29md"; + rev = "fac9dd29720f8417bd8cd5dd8ab5138c6dd7d701"; + sha256 = "00bgwzvha2i2sfi05jdzgpxvbjfpjhj5gv2vn3bnalgd1z3cz89r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -58763,12 +58973,12 @@ prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "prodigy"; - version = "20171121.512"; + version = "20180214.1249"; src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "da9ab59dc807968841ef369617edd6a67a9ad1de"; - sha256 = "08nr9gppkn1z8s3llhf7vlxg0hfgx7hzbakahw0qfaf1xri4mzg9"; + rev = "a90f917390cac8ae7e95b57e88a1527b7f3242b3"; + sha256 = "0b53xgja04vsw22yqxj5vnn4w2x23zcm3fsjwzfxlcgy4h50y3ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy"; @@ -59417,8 +59627,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "e34ec6077af141dd5dfc1c334ecdcce3c6b51612"; - sha256 = "15hvnhkj2ias3h9zkg713p0gixqpnhdxvjp6msbvnm8k99qxccw6"; + rev = "a6037c5230c0ccb6531f80cef909dbfe37257884"; + sha256 = "1847pbxsh2xwfj7vm1hvf88prwni5k2jbswilply034f1648r9ar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -60093,12 +60303,12 @@ pyenv-mode-auto = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pyenv-mode, s }: melpaBuild { pname = "pyenv-mode-auto"; - version = "20160122.2341"; + version = "20180216.2352"; src = fetchFromGitHub { owner = "ssbb"; repo = "pyenv-mode-auto"; - rev = "783a93488e255346f9b1b2658424ffe0d670e8cf"; - sha256 = "090c5lnw2fz674c49szjsac3hdj5dwbnrbn921kvhw6q5lsn8z47"; + rev = "51248f13e98240ab146ff45a8247e0f5286277b2"; + sha256 = "1y5fmc6jrw9xrafq1j2j0k1p5hydvbw1m3zy47b5c55ll97dsflj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto"; @@ -60286,8 +60496,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "5e79774c5028eb492e59bed92d25088b081cf2db"; - sha256 = "14nxl62cnzab0nrf1j45a9p55sqmcy9mgmkh1wv9lb0v1fyi1x3k"; + rev = "04481735e10c8d4584447a6dba97df8653fc7ec5"; + sha256 = "1v100ccggdhprj7zgs8cs7qi86a6xs2pkzx0whi2hvb8nyyp9gx9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -60307,8 +60517,8 @@ src = fetchFromGitHub { owner = "ebanner"; repo = "pynt"; - rev = "76fa85dd0c791a6493d59bd564ce5f6ec20ab40d"; - sha256 = "06rhaqf5wkwk6xl8mp2kyyncnyjclvykal06iqj9sbd4kn5nnq5p"; + rev = "92b3f0e7ee88dde641b9f62c50431f7c499dcf1e"; + sha256 = "1wn1gjql7g2dg7bnwqgx3r66b0hnxcmpmbh1wc5nc312wnklpz6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; @@ -60468,6 +60678,34 @@ license = lib.licenses.free; }; }) {}; + python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: + melpaBuild { + pname = "python-pytest"; + version = "20180226.305"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-python-pytest"; + rev = "0ed385f7e8edd1a7d0aee72f5112459ea9054cbe"; + sha256 = "1wpvgx8ldrnq0pjr8iq65f3m0kmh1c9hnv1lkrgrglqazs2c6hbm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; + sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4"; + name = "python-pytest"; + }; + packageRequires = [ + dash + dash-functional + emacs + magit-popup + projectile + s + ]; + meta = { + homepage = "https://melpa.org/#/python-pytest"; + license = lib.licenses.free; + }; + }) {}; python-switch-quotes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-switch-quotes"; @@ -60513,12 +60751,12 @@ python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; - version = "20171006.336"; + version = "20180218.1447"; src = fetchFromGitHub { owner = "wavexx"; repo = "python-x.el"; - rev = "9bf0d16cfe7b5f24b98d6b33cbc8763edaceb174"; - sha256 = "0x255lnfyv2i7yz6ipx5adazqmvgmf4mdcixzs1wv85gazmbgfc5"; + rev = "35d6719953e809a07c0bb8f770deb5fa712d00e5"; + sha256 = "1s24a9ji549nhlanm13gq7ghnz0zj6mwpbbmbqk8igsw3arx2nvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x"; @@ -60555,12 +60793,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20180126.303"; + version = "20180223.22"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "f925bcb46ea64b699f7cd06933c48e0d5db88b73"; - sha256 = "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63"; + rev = "71eec02c25006737444dec7dfd004285f6cff6a8"; + sha256 = "1j62qf4llrbmwwi7ynrhnzvh0g4razbc21vdlaa8jkjg6y5id95m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -61926,12 +62164,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20180207.1002"; + version = "20180216.646"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "113c07f5b7ae112d7e199aa33665352852ac7f12"; - sha256 = "106b8nmhdwwpg6l4p9s3jm55r2b9zlj49iklp7qfbjb2wv6qci8n"; + rev = "fcc5b73e2139529e4c0c8b8639cab6bb51dd2b74"; + sha256 = "0kvh84k9k11xpnvs0kpk4q9nhfjrilwnhlzqmimd51pp7jqz5gff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -62138,13 +62376,13 @@ pname = "related"; version = "20161002.2310"; src = fetchgit { - url = "https://bitbucket.org/lyude/related"; + url = "https://bitbucket.org/julien-montmartin/related"; rev = "0065a2e16eeaa9bface49f7f0815b9cf9719f441"; sha256 = "0gaj1mqv77dahw6zfqlf8q624b2ba589chgaa22vy4vg3lz6qzks"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a39b2fd835f6911e3dd2b42987f65d5bbea36091/recipes/related"; - sha256 = "098rd8rvlx9shbh05zdw7lnrawfkbk4cfan1i963h994538sda1w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6248cbbb6c977c9c9332a34b449eb090dd9322b3/recipes/related"; + sha256 = "0nm2dnmz4a5z187mzggsj8xrdy1x84lxx79rmwcrkh1d7jzjhi6f"; name = "related"; }; packageRequires = [ cl-lib ]; @@ -62391,8 +62629,8 @@ src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "0c0ac7451149dac6bfda2adfe959d1df1c273de6"; - sha256 = "0sx3kw1gpliifbc0gh2z1lvig68v3gwqjbj0izgn77js8kqxad84"; + rev = "699d5aa9204c07905db4574406f771c69aa5752c"; + sha256 = "15q8lsld2k8yd8wqrn0hsnj8xvmwj9zgpbrqzjda452jdqsznfcm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -62538,8 +62776,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "0ce4513a6b5ff1e63c73fda30f11efdb7a296c38"; - sha256 = "194526djlzn96b35pqgsdc5vi4nkib0jma0smp97lay8vj22mjs8"; + rev = "7242da37f7a3973c5fc5e84e8a62ff1aa09eef1b"; + sha256 = "0ll1aws1m46c0k1dxgd05bajj09fxf20ya4rs2wapvzm4mwrbz2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -62559,8 +62797,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "0ce4513a6b5ff1e63c73fda30f11efdb7a296c38"; - sha256 = "194526djlzn96b35pqgsdc5vi4nkib0jma0smp97lay8vj22mjs8"; + rev = "7242da37f7a3973c5fc5e84e8a62ff1aa09eef1b"; + sha256 = "0ll1aws1m46c0k1dxgd05bajj09fxf20ya4rs2wapvzm4mwrbz2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -62618,12 +62856,12 @@ reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; - version = "20170721.940"; + version = "20180213.525"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "63fb1edee017177c44f8b663a707201b3dd78345"; - sha256 = "1ha4ldfcnw57rg15mbxspymgs6b2b50f6s0fcb6d7k9xai5idmnp"; + rev = "16931909115a922b1cf3846b1f60509b6590001f"; + sha256 = "0ccpnd1n9z18wpf8m9xyx5gps2xh5kxv8s1q2zan2zs9f46sz9pc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -62702,12 +62940,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20180122.855"; + version = "20180218.1129"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "0a4df0c3a64ace6a5aebbfeea5c0161e752471ab"; - sha256 = "0z1igj5c74qdjx5knsf73d7qwfyybfixyilw7z7chbyffw77z1km"; + rev = "26413536ee71ac6ee07f193b94e60e544d800655"; + sha256 = "1ic4ym575qj38xd3565nvwyrhzw7lx2mflbirb5aycnz7dis9xsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -62769,8 +63007,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4"; - sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b"; + rev = "a50d9b2fd059f6a0e5b22063a5375851a087f61a"; + sha256 = "126slgxa786rcbxdnazyn7svkwk31hy1c2ab7kzswf8f0k81fqk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -63143,12 +63381,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20180130.942"; + version = "20180224.1134"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "4f27c1cc60742622e6616b579c82b5440ad446d3"; + sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -63182,6 +63420,27 @@ license = lib.licenses.free; }; }) {}; + rubik = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rubik"; + version = "20180222.1214"; + src = fetchFromGitHub { + owner = "Kurvivor19"; + repo = "rubik-mode"; + rev = "c8dab1726463dbc9042a0b00186e4a8df02eb868"; + sha256 = "13razzmk70h5sd69ms0a3ljr285zcad0wnrqkfxbgi5rnppqlkh1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik"; + sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267"; + name = "rubik"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/rubik"; + license = lib.licenses.free; + }; + }) {}; rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; @@ -63563,12 +63822,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20180109.544"; + version = "20180221.1130"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "cfb440810a010b099e7196f8701c9d990a3641d8"; - sha256 = "17mm7mk8s4s9ka7035bf7bd6sfxwi3m2iss9q3pg2d7931nzh1dz"; + rev = "cc2435b9e5899c0787929a62dc6e6dcdb982febc"; + sha256 = "0aq665cd28k4szc07m6cfl50dvr87i4pkbggfj8qim0gwzsgc4bi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -63626,12 +63885,12 @@ ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ryo-modal"; - version = "20180114.1004"; + version = "20180222.415"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ryo-modal"; - rev = "4dbe9e472306e5d293213842d9488c0b531eae8b"; - sha256 = "0l4153dczvkl88xnppqwdmj78c9rfj1bhl2d4c2sr1gc6hy7nj9l"; + rev = "4d10e251ca734548e48e7f0785b3b69a6e863f67"; + sha256 = "1pqq2mzrfam7lzilpgqnzr192dsisgxnnnkilyksqfk1q199p9my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; @@ -63752,12 +64011,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20171119.234"; + version = "20180215.35"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "e4e7523178f09270a28b8b712191b1e980e6e8c9"; - sha256 = "11lk7fpzpak36jgihw3bm99j3w6x18zynqhy714rxmjjhy4lpla2"; + rev = "9f07ff835e8d19afe571dbe414afb690c7b1cb5c"; + sha256 = "07al41ir1ab0z2m2acvx63scr33bfp3asshjl05shs4j9d4bkmdp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -64029,8 +64288,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "ec8aded3241766dda3b89e26fa914d07562de429"; - sha256 = "0lh9zlic3iyhxbbsa0pdxl96gi4s8z7x7nphr8hlzl4if3zb5fg0"; + rev = "21f67de6389234d00a2dde437616063a6479402b"; + sha256 = "1vn3i5gvyn8nn5sfd8lm9csgl1v4m6n59mkif6c6h37h04232dqn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -65409,12 +65668,12 @@ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20180108.1712"; + version = "20180201.2145"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "92be3a5bf5940826882bb6e17a85952a6b4eb537"; - sha256 = "1n3020y18brpi7d286s3qia8fp4nbws16224nqga18hcx00zzdna"; + rev = "4b9664bab3794379af42d549d9540735c16b5a25"; + sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; @@ -65829,12 +66088,12 @@ simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-call-tree"; - version = "20171223.1037"; + version = "20180224.1256"; src = fetchFromGitHub { owner = "vapniks"; repo = "simple-call-tree"; - rev = "51cbb9baac4a71c9e2759b3dbbd48829b7b0ea79"; - sha256 = "16blbycmqgkkvx1pqyld7jbb37wpwjh1y8kcd23ckdd9pr8qccfs"; + rev = "20059eb5549408def76aeb03d0d20839903dedef"; + sha256 = "0gvhn2r7h6jz7a3i3a8gwlmghv1xfzj0sdib25kz645iylazji4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree"; @@ -65850,12 +66109,12 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20180205.1031"; + version = "20180218.538"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "be73a176a19fff8260369652f688a316e652fc03"; - sha256 = "1ifl1qsg6vxxmj3vysrvw94nn31x8krydin42vpp35w6pspx9f0z"; + rev = "c252765de191441cc25068b35bdff6a912745268"; + sha256 = "08n41cshzxjjd06n8q94yivc72kmwwnmbg469w61v8sanzv0j04q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -65871,12 +66130,12 @@ simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "simple-mpc"; - version = "20161103.1219"; + version = "20180224.1801"; src = fetchFromGitHub { owner = "jorenvo"; repo = "simple-mpc"; - rev = "61b39d02313fa51a1dd7326fe24871666c64a077"; - sha256 = "1g8s37misx0kl32ngffqgqdzphz22v25k39q571jz4q1dibhmsyz"; + rev = "ad74cb621e04838f8725ab7dc8716f0f38c90413"; + sha256 = "1g3pb0n5j0s4q85zgjqnw1idvpvq3kwrakv8d6if7xb066v21ng9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc"; @@ -66169,8 +66428,8 @@ src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "02ee1d7339e48c64946041f6f4e09447c3f53e82"; - sha256 = "0grx95xxf314m2k35m1kf20l2pwc6j11ibvrngx4pis7wqwjas3h"; + rev = "61dfcaeb4f560406c188390797448747eef1e90d"; + sha256 = "0pmkjdq1dlbsjpfcgnmxrkj7iggwzw1b0qpyvldwp6h8xlnkca54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -66228,12 +66487,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20180208.323"; + version = "20180218.1356"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "8511e9b1180589c307909c623aa5f558f697f203"; - sha256 = "0dbnmvrrd84syn96jz90rgddb3n1cfza2rmzw7p57fzknzmv349w"; + rev = "bb663e97339d1ff217c674d649088493b82d08a9"; + sha256 = "0sc7k7b5fixwpmjx15vpbh3fmaxqz6m21z1ajd4c25jfnxvvhyck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -66396,12 +66655,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20180208.226"; + version = "20180221.1414"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "cbf84c36c4eca8b032e3fd16177a7bc02df3ec4c"; - sha256 = "13dyhsravn591p7g6is01mp2ynzjnnj7pwgi57r6xqmd4611y9vh"; + rev = "486bfbe95612bcdc0960c490207970a188e0fbb9"; + sha256 = "0ib4q4k3h3qn88pymyjjmlmnpizdn1mfg5gpk5a715nqsgxlg09l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -66417,12 +66676,12 @@ sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-company"; - version = "20160308.557"; + version = "20180212.1653"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-company"; - rev = "08aef69394fbef31dfeb3d3bb72a4557df9d7624"; - sha256 = "128gb6hsb7zig4czwgwjcm58lgqk6rmj7qi17a9cz5gsnggjcwii"; + rev = "dfe18218e4b2ee9874394b50f82f5172f41c462c"; + sha256 = "1bj8w2wfq944cnhsk5xx41mfrjv89scrg4w98kqgda5drkpdf8a7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/sly-company"; @@ -66519,6 +66778,27 @@ license = lib.licenses.free; }; }) {}; + sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: + melpaBuild { + pname = "sly-repl-ansi-color"; + version = "20171020.816"; + src = fetchFromGitHub { + owner = "PuercoPop"; + repo = "sly-repl-ansi-color"; + rev = "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048"; + sha256 = "0fgcn6bwgz8yyjza07kfi86siargvpq4kp4j20hs6b67ckxjxx0x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/981e01f562c40e02cb6d56dc1347e922fbad9c18/recipes/sly-repl-ansi-color"; + sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi"; + name = "sly-repl-ansi-color"; + }; + packageRequires = [ cl-lib sly ]; + meta = { + homepage = "https://melpa.org/#/sly-repl-ansi-color"; + license = lib.licenses.free; + }; + }) {}; smart-backspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-backspace"; @@ -66920,12 +67200,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20180212.202"; + version = "20180219.758"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "a03debdf4aeb3232ae54a9712790f6727a592538"; - sha256 = "027nam0jq6ldwgix200w78zj1hp2khqskhcvxavkhychpl8v501y"; + rev = "3452c21f34751bf04f2ede175b3f8eb3fe6ae282"; + sha256 = "0df4q6467a2rkpsml7bg7s9y336cw6zlgrp1s9h04f92fhv8z9c2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -67617,8 +67897,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-clojure"; - rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32"; - sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv"; + rev = "a480c887b53cb007b7b099c5ffcab89b9e59d7bc"; + sha256 = "1gf5fsrjigzxabd9k47lb98y3wdjwpw02x9ldnjzrgxfjfbxgqm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure"; @@ -67872,12 +68152,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20180117.1333"; + version = "20180214.758"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "fb2a88a604b0eb6bdeb02506733b947e155a9e64"; - sha256 = "0ic09n4ddxv78sb4h5gz9a1frnnbsdkvizdhj2lfdr5xy00hais2"; + rev = "0cd15af82bb3adb5fa18bef795a2ea7f021b7e20"; + sha256 = "19mifs075kkn45dxkgcqixvmf9d72rp79g12vpxi0rp5aw90ddfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -68124,12 +68404,12 @@ spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }: melpaBuild { pname = "spiral"; - version = "20180125.900"; + version = "20180223.340"; src = fetchFromGitHub { owner = "unrepl"; repo = "spiral"; - rev = "8e9707af9d6d61d8ec54edc98b958f1c829e98dd"; - sha256 = "1p91k6xvy0w11p08nbk1b9x33ck6kxz4khgsc39wlhyv02rhqqi0"; + rev = "907b9792467139a942ba7b07ca0276b90770baf9"; + sha256 = "1rggzzvya26abbzd8bc2kpv59kzgm75wqv1vwqnj9c8im1jvs1na"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral"; @@ -68544,12 +68824,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20171109.1549"; + version = "20180224.251"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "7824d5f8baf2c97856f5bc7b1ef88befbb1978f3"; - sha256 = "1jqb6d83saliq11q9zkq0ndgpxgyfqjk41srwwnpg66nq031zdxq"; + rev = "e4596accfc29f34388b701c1dd5ebffcb8c70154"; + sha256 = "1jcfhxm2px19b9yy53napj4d22v8s1q76gy68c47yimkbabhmzir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode"; @@ -68562,22 +68842,22 @@ license = lib.licenses.free; }; }) {}; - ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20180129.245"; + version = "20180222.2157"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "5d70d89cddae17e4e412c9246871c3cbc860e3c6"; - sha256 = "02cdd5jx03n1xzkkswlcb0l4zf32ysmz2hn76cc7lh4i20iqi06q"; + rev = "aef539bb4feefe927fa48d01736dfadb7b3d7930"; + sha256 = "0vra7y2icid9sdyp7iygwkp4xaas249nm1lcbcyfpaad250g2pn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm"; name = "ssh-deploy"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ssh-deploy"; license = lib.licenses.free; @@ -68835,6 +69115,27 @@ license = lib.licenses.free; }; }) {}; + stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stgit"; + version = "20171130.759"; + src = fetchFromGitHub { + owner = "ctmarinas"; + repo = "stgit"; + rev = "416a4569ccd644718b694d4c587b313f357c6f4d"; + sha256 = "19d8r0l0bqzwkbzd90symq65w2ay30k5bc2xrgdqpawiqz2sx7qf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit"; + sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g"; + name = "stgit"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/stgit"; + license = lib.licenses.free; + }; + }) {}; sticky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sticky"; @@ -69211,6 +69512,27 @@ license = lib.licenses.free; }; }) {}; + sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sudden-death"; + version = "20180216.1623"; + src = fetchFromGitHub { + owner = "yewton"; + repo = "sudden-death.el"; + rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb"; + sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death"; + sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh"; + name = "sudden-death"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sudden-death"; + license = lib.licenses.free; + }; + }) {}; sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; @@ -69277,12 +69599,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20180206.1327"; + version = "20180214.1523"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "27c5c7722248baff572a0f3a672662618be4eebc"; - sha256 = "0pwd0cic3kj977171mpl0kkzas5l6cr806w1mhymcncgbybnr1pk"; + rev = "66051b2fd3d21a8e103928782a8c926ea434beba"; + sha256 = "1xj3jzsh44ymah8nvjvm7i8g81vkq6wk7mcq2rm2qvaxin4l1bcp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -69547,27 +69869,6 @@ license = lib.licenses.free; }; }) {}; - swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "swbuff"; - version = "20041012.18"; - src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "swbuff"; - rev = "dcde4ddc7beafef3150e8c645724bdbbf8596028"; - sha256 = "1hxwa3hdhdx3ikfkblda748assm0k5mgwpdjv3jif37n0lw0f435"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff"; - sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk"; - name = "swbuff"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/swbuff"; - license = lib.licenses.free; - }; - }) {}; sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; @@ -69592,12 +69893,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "20180124.2324"; + version = "20180222.232"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "7739e4954cc614ecd6b37e935f82ad057e256d56"; - sha256 = "09mvwfi3nv4hkdvh76d7737nl3zaxn4a5vpmv2645q9s4vcq8zj8"; + rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29"; + sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -69634,12 +69935,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20180211.1018"; + version = "20180225.744"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; - sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; + rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5"; + sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -69694,22 +69995,22 @@ license = lib.licenses.free; }; }) {}; - switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + switch-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "20170718.1932"; + version = "20180222.1731"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "67113287ba61ce1951363a49f54148743dcea51e"; - sha256 = "06s1zdy2mlw63w3rnyja9jkvq4m5b46mvi8qjwxcpgqjdihj6f6m"; + rev = "680182240012c2ad8fb35479f915e653315b4803"; + sha256 = "0fkz29spgfbx7d1hi1xm71wa1glk448v7gidqgrdylsmbzwkj1y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2"; name = "switch-window"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/switch-window"; license = lib.licenses.free; @@ -69760,12 +70061,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20180209.1414"; + version = "20180212.1101"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "95100fa3c933f6b00519baa3c7073b882a1b4603"; - sha256 = "010mlsry5s8xdah928zxy55xr51k91sqrbxv7fprir21y7nv044j"; + rev = "833435fbf90d1c9e927d165b155f3b1ef39271de"; + sha256 = "1369xaxq1vy3d9yh862ddnhddikdpg2d0wv1ly00pnvdp9v4cqgd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -69781,12 +70082,12 @@ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symbol-overlay"; - version = "20171103.2306"; + version = "20180218.729"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "305ef1d283923d2b0f1cd751f57f71754ab714e6"; - sha256 = "0j5542283mmdl30syk0k5p6ybb0w3xlnamjrrafdaj618v3anvgv"; + rev = "1d610fa5023e210e59f823e1bbe819f0fb8727ef"; + sha256 = "14v5rw2yby2n3dhzc7y1jwnmz53apljb34a9g64h08wdpg2ff0wq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -70371,8 +70672,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "b6838add6e418eccb557f8261c49ea5d65a7068d"; - sha256 = "157gxkdryzh1zzcinljmzpbmb1vhrmkz37zfkbyl3ls8ibnw3lxb"; + rev = "f10b81de14a71c6cb682a46d1a5012daba321e9b"; + sha256 = "0iwhxikv81i45q6q31yhbij2fli1g7vsbnv5bsaf1rshbwjla3k6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -70535,12 +70836,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20171109.1616"; + version = "20180220.109"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "b3eaf4b8254bb1031f85ce7ac73ffdc856059d9a"; - sha256 = "1g2gpfqxs3mxwskrkdszab02mxfmwfli0h0yw8b5izb4g2a4gkiz"; + rev = "3e73a0ed2457e7b6991ea6555a1379bf9b77053b"; + sha256 = "0bwicz1xymq5j57m2kc8myjnc2dyfljm1jz2l80ifmlkdn549x92"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -71295,8 +71596,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "35d62edd6e9ff84b0fdd472e132a739b663a41c2"; - sha256 = "012sgyx7zqll08zfl2v1jkik5p4wxzvp40njm6h5kps5igx2wnal"; + rev = "d907cc92db5b93e699a4282e979d097ea863215a"; + sha256 = "1zswprjkjyav2502dfsyyvh9w0hs43qpfwq9q4617p909d0sj1nb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -71375,12 +71676,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20180208.246"; + version = "20180212.2229"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "ca8a1c49eff59a07fefadb40d5bd60b4eee73605"; - sha256 = "0avxxgmgl1q23yj087y9vfi0r6w8ckm0l3pj9syd9yj1l05wbrwz"; + rev = "d80f62c07ab880fa486853846dbcda15351b61b5"; + sha256 = "00bky1vxw08s0z1s9jm813acrnawj0s6mkg71d82lc4ig5x4lbvi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -72087,8 +72388,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "58fc1a3c7f9f6e3126585b1ab2f3d00f824b7d7c"; - sha256 = "1vsh2x794zaf02zql4s6bn3v0m3xm43icvrn7jfmi660qh3f4bsy"; + rev = "f7f7cb62a992120bf80c3a078bec1c029f8ff0cd"; + sha256 = "122wvsxvv3yzkdjfi8s5gbl371bzi5kw377a7f3cpp7hxz4i24bl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -72146,12 +72447,12 @@ tramp-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tramp-term"; - version = "20141104.1345"; + version = "20180223.727"; src = fetchFromGitHub { owner = "randymorris"; repo = "tramp-term.el"; - rev = "983ed67ee65d26a51c641f306fa6b921ec83eeaf"; - sha256 = "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip"; + rev = "7c29f888de0385a676dbf9a4e17bac0111f5c10a"; + sha256 = "1ch9y632kggl3q6yx3g685j3dfbhy7yiwqh8cbxs3wja3rvml8xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c84660c641f0bdf3cca8ad2a0f8f6e5d18b59c3/recipes/tramp-term"; @@ -72293,12 +72594,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20180207.2220"; + version = "20180221.1229"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "9ad516c8bd2a8db58ed9934420f6626921ab7b47"; - sha256 = "09qbz4ss5k6wd7r00y280kkhsp4dx57ghrzdld53fkx2gmhq6zr1"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -72318,8 +72619,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "9ad516c8bd2a8db58ed9934420f6626921ab7b47"; - sha256 = "09qbz4ss5k6wd7r00y280kkhsp4dx57ghrzdld53fkx2gmhq6zr1"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -72339,8 +72640,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "9ad516c8bd2a8db58ed9934420f6626921ab7b47"; - sha256 = "09qbz4ss5k6wd7r00y280kkhsp4dx57ghrzdld53fkx2gmhq6zr1"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -72543,12 +72844,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20180207.836"; + version = "20180218.130"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "45f73c8fb4c6467fc54a5a905deea322ffae180c"; - sha256 = "1xhbnz0lv771bbpb6vizacdn2j47y2spdf42m72iv5iix6cgpnmq"; + rev = "b9941efaba0dbf40ee96c9f1829b562052b3f2d3"; + sha256 = "1nlb46mkyzdfb0k98wsqqk7mwyh6dfw4i83wxmdpixskww4iywfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -72624,22 +72925,22 @@ license = lib.licenses.free; }; }) {}; - turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "turing-machine"; - version = "20170512.1438"; + version = "20180221.2038"; src = fetchFromGitHub { owner = "therockmandolinist"; repo = "turing-machine"; - rev = "4b5901a13b38028b05ce19cecc78bcd2f708f97d"; - sha256 = "1avsqqpsbzlm0wi6fc5lgnmhps5wcr6gp05d4hw51sd5r0vx00dk"; + rev = "fa60b76a5bac1f54b7a1b3dc55aae7602c7e385b"; + sha256 = "0k1r0zkcr44kiki8cvdqwx09xpvpz7nkbq9w6i4gqy5h78zy5k79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine"; sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn"; name = "turing-machine"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/turing-machine"; license = lib.licenses.free; @@ -72816,12 +73117,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20180118.2305"; + version = "20180222.534"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "7249d76e2d4580c5c2f1f5978490b1fe0ffc57dc"; - sha256 = "0bvarlk3pmzh1g489rdbsh0c255fj78si99m9a6l4ha9jk4xa5b6"; + rev = "2815dd1b4bbf902fb61e0a8f1aca6319c7b0c940"; + sha256 = "0d97frhcf6g4ijr1vphfnvrchj2p1rfpj7zrvj8i3jzb6dakyw4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -72883,8 +73184,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "41309d8a64a992f532753093742c15d413c446b5"; - sha256 = "1fqaf4n236l4qzy4ac370laysb9jnj98769nri6qkirsfzk6hcgd"; + rev = "45dc6ba44fd5f2aece9da4a0e88effb947fe6c0e"; + sha256 = "1q3gva57r7g9iqvkfi90zih97dq37ds2vfbjisqxzh43vab8hsjv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -73005,12 +73306,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170905.1505"; + version = "20180214.824"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "d08fe8e01db6df151b38c3001fba239a9a22369a"; - sha256 = "1a93pd7c2fgdy4vhhwy0lm7plyrwfqa9177m2x5kfblz0q51n6y8"; + rev = "bf724ce7806a738d2043544061e5f9bbfc56e674"; + sha256 = "0pz26q5qfq4wiqcpfkq26f19q5gyiv8q71sq4k77hkss5a5b5fqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -73733,8 +74034,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "d6e873cafc40291f0fe27ac9fffb1051c0ab448d"; - sha256 = "05w76h4hlhr7i6z68s45w241hxg5gh49qh7ipbi53dr2sm8d7v54"; + rev = "262539ae26f5e0729d6ef59009e6339a1ec21e94"; + sha256 = "0f6m9nfvy7vgpnzra8xrb0bpgnhgi93iif4d1mswylwvj3805s6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -73981,12 +74282,12 @@ vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-fossil"; - version = "20171018.2216"; + version = "20180215.835"; src = fetchFromGitHub { owner = "venks1"; repo = "emacs-fossil"; - rev = "abdb5487831e641c291c0dcb3848f539ca11f400"; - sha256 = "024bf8cjf3srz0zrxk90c63yz9v525m83znb2fscwa1fwvnnpqkn"; + rev = "7c5af95181213db38f81f5f9586f3334301a3ea0"; + sha256 = "1c18ywvs0l5w7ip2igksjy48awzas8mph7plpvp1v8c67a3a3m2m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil"; @@ -74405,8 +74706,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "1469c953bc20d21d87ce5d92def767e551cda07c"; - sha256 = "0nywz6nk1qanx7z9sykf28h9c2qj7xzs9w4hya4vmhwigqqbhldl"; + rev = "c904cd3e8515e76fb836615305e174369211f6df"; + sha256 = "1kwd6f2qi3p41kryd8z01lkiw7ikpgywgpfy9zbjyb5x6z2hn35s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -74632,12 +74933,12 @@ vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vmd-mode"; - version = "20161106.125"; + version = "20180223.556"; src = fetchFromGitHub { owner = "blak3mill3r"; repo = "vmd-mode"; - rev = "e3b27f4f179002984643895292bb207c3e221a5c"; - sha256 = "0gpamwnsszhna9crhbg2zcvr9hrq7lackhgclq63lsvcm0z2ynfz"; + rev = "24e38a20951dfad6e3e985c7cc6286c1e271da5f"; + sha256 = "00anpbnf0h6iikhpqz4mss507j41xwvv27svw41kpgcwsnrmrqwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vmd-mode"; @@ -74779,12 +75080,12 @@ w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20180116.135"; + version = "20180221.2059"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "92be3a5bf5940826882bb6e17a85952a6b4eb537"; - sha256 = "1n3020y18brpi7d286s3qia8fp4nbws16224nqga18hcx00zzdna"; + rev = "4b9664bab3794379af42d549d9540735c16b5a25"; + sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; @@ -75156,12 +75457,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20180211.945"; + version = "20180224.733"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "d667edc2e35f5e4fe8cc4465e6359ee001a1516a"; - sha256 = "072x1kgzm9pp3bg1sq7zb1v95m19ksnnjdvf26ablwcldsgapncd"; + rev = "c6d5cab4fc30ff9ca8b55a2a37d3ae3f7f540859"; + sha256 = "03vb5aqyvqzxxw5zafp0hgc5vs7c74917p4r4ki9dp2qwvh82ziq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -75534,12 +75835,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20180131.606"; + version = "20180225.1951"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "fce520f8af727bd33861f8d0f7655c01ea84ad85"; - sha256 = "1sgaln0d6rslvln4bvznkp401sizngwp6ypscp4gn95ygq2aam39"; + rev = "0f80d0f95cbf133f52f64578d6a152e7e48ceb0e"; + sha256 = "0bljzvggx1dzjl904bryny9pdg7xcncnqqzmvymgc3i6j70c0v2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -75727,8 +76028,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "1b09b1b2848ab21c412f2fe7a259b1dcea2c733c"; - sha256 = "1g53id1wc6xfa3066m9c4f0f0chsnsv8mqqs5v6zx7yf4nv9v9ja"; + rev = "5922cf54533e1f8a3b1db5f57f07ececf9a20e1e"; + sha256 = "1qjs9xkqv3084hj67vk9cz4pnkw7hzl48fzps5kng8ip94yiazh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -75786,12 +76087,12 @@ wilt = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wilt"; - version = "20151105.518"; + version = "20180220.54"; src = fetchFromGitHub { owner = "sixty-north"; repo = "emacs-wilt"; - rev = "5febe367c6c3729848654358af4d17ee2987da8d"; - sha256 = "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd"; + rev = "04dbe37fa35d0b24c791421785d2c97a8cbfe2cc"; + sha256 = "197kqp22pyy1in2rq063mahvrf00vrfvgnfkqp0zy7hpkhiiqvim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eea4f2ca8b4f9ea93cc02151fdda6cfee5b68b70/recipes/wilt"; @@ -76142,12 +76443,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20180111.433"; + version = "20180217.548"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "04d59d68dab58a7cf3034c84d8ba0553b78ae30c"; - sha256 = "080f39m9nmi163arpmxw45xwadb7q7w7p385yi1jy62bzvqnk0pm"; + rev = "fcbccec6ec0f6639eab769d6ff8e97f25347a48e"; + sha256 = "079dy4b409i9016j3fkgwxggw8332hkvnnm86am46va3lqpd3jr9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -76646,12 +76947,12 @@ x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x509-mode"; - version = "20170909.632"; + version = "20180225.2330"; src = fetchFromGitHub { owner = "jobbflykt"; repo = "x509-mode"; - rev = "240b5045dcce18190bdabd91d74f48d3610a6fe2"; - sha256 = "0pi5hi0n6f2hif5hz1g04rk509rb4jlw6nrlhc8fg5k6x4n7ci3p"; + rev = "33cddc0fe18652ba707308e907b255ead60e2850"; + sha256 = "05b7ifmjiy5rw0ywyjknf46garsyfaxrrdzn4rjwrw1crf8f804r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode"; @@ -76688,12 +76989,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20180120.241"; + version = "20180219.2311"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "ee1c71cd2b3fc00a76e55789ad9a74eed4ae59c2"; - sha256 = "16wbdm2a5wdpfhxwd1wlqnj0h1ivrrq00nk8ddzp7qsdc8m1i4gn"; + rev = "cf452fd0f2e742812a4c69e41cb5403f22b0a16a"; + sha256 = "1wjj3sj90az5y4a7cy0pblwxi0xbj5gg72jdr9wbm95si582vk58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode"; @@ -76709,12 +77010,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170828.1"; + version = "20180225.1515"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "6e94446566df206911afa107d06aec50ac3a56fc"; - sha256 = "028y8dlb5b4vclg03imcipjp56l1m4klgj69f0n7ir0rr6xwl3f6"; + rev = "cf1cce0ddc3cba18ccd506b04d8278189fbd92c2"; + sha256 = "0wdfdjcq0yrj2g995879y5ymjb5z1pv38vxvniclifg478qym5yy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode"; @@ -76751,12 +77052,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20180211.1348"; + version = "20180221.1809"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "b88e84bafc93b109c53cee2be88b8fd6517187be"; - sha256 = "1394v3mgmx7hwxi3slszhlc82hds6c4p0pfglyd2bf33c56shk6h"; + rev = "c01ddd038e03051bcc8010629b7548838db2531b"; + sha256 = "132afibrgz6381nanjhalkgqmxwia6ykyprrasa19m9kbm96xwdl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -76814,12 +77115,12 @@ xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20170905.849"; + version = "20180216.1040"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "fcdfbed46ff81c8da84422611e0009c6b267e359"; - sha256 = "01s4fhnp4zqh2cmqbp2sh1sbdcyq4i5hy1r8manqa26m041xk2z0"; + rev = "16a441944da3fb3f844b93d0add1e042e1b5377a"; + sha256 = "1vr7dkibw5ibd1c3snxy2pw055yl620pi2vynxszsk82shz2xvbz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input"; @@ -77427,8 +77728,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "b028fc03a1526b166043e783add3be4f04b7a92e"; - sha256 = "0abl81q726jdhlirz77vl55xdbhpyfqrfqc2x6qdz9jmh04r912g"; + rev = "c2912e845d74a22436bdf720eb9bc543d0e0c45c"; + sha256 = "1swnr1nrlyd7ij4m05dvqwdfmpj41b3ibfqmb45qm073f27gvj65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -77465,12 +77766,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20180204.2333"; + version = "20180212.1556"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "7f4103736178fc6e3a9a9ba3b3d0516986ab8b71"; - sha256 = "0y153522yg5qmkdcbf7h87zcambgl9hf9bwk8dq22c0vgdc04v3i"; + rev = "3fc5a33760b0bbb6e67adbce48ab3dc4ae34b847"; + sha256 = "1ijq7ay5lx77nibzqc1kih64v4bg4790as1zg26igp7ivg66l1m6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -77549,12 +77850,12 @@ yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20180127.254"; + version = "20180220.1049"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "4b04dd134599b2e360c10d8be9110078aa1aca9d"; - sha256 = "031v4r5spgsl8i0vgfzrwvcp8s8vbdw0kf56wj7qz9732hmb14j7"; + rev = "de672dab9df4a0bffb44cdadaace93d00d9a8848"; + sha256 = "1w0lkn1prv9xd4pn81kqxk26s37ia1xk0kz8qahcvjg7z4igyy9n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -77696,12 +77997,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20180211.1442"; + version = "20180218.459"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "c9277d326e9c8b6052bbb35eb86467e43a7e9424"; - sha256 = "0hddvg7b3ba1irydhybr011d9dfxvnqj9km4km9l3xk9fx0kkqvw"; + rev = "3d7cafccf8d7ea9d62e0ccd63c30769de5b8cf01"; + sha256 = "0m5z46vdv5npwpkqc87jsf488k31mpqphsg1yayy4pjqz2bn68vb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -77717,12 +78018,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20180122.521"; + version = "20180222.440"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "b42c2b670bdd761b9c1c232998ebf4bbc5b914e8"; - sha256 = "0mzfck8jdcy6p18r37nc06w888zhvd3kamaaxzspbda4yws7y2wk"; + rev = "2373036c13d71c5fab2616d97498213f54688bd6"; + sha256 = "18sdc92qaacxp757yqdv71hx2pjhcy33vshkwjdi6mmmqa1d2zq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -77742,8 +78043,8 @@ src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "c1de31d2b16d98af197a4392b6481346ab4e8d57"; - sha256 = "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx"; + rev = "4ab835c5ee90a1dbc31c4275a563a9e741a78c6a"; + sha256 = "119i1p1rj329yh7d5a1wizrwhbvnildzzhl2bv50vkswg9nvg3na"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -77758,11 +78059,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20180122.1744"; + version = "20180223.2345"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex"; - rev = "b1896ef49747"; - sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b"; + rev = "af4601ee3c6a"; + sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; @@ -77824,8 +78125,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; - sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; + rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; + sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -78040,12 +78341,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20180123.59"; + version = "20180222.1757"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "4b3e541721f52dbfa307e2cab3cd682e25987fdd"; - sha256 = "0x3b3dbkgpf9py7z3bf9629q3vqi303xp2hy7vi2qdfrnqn0600q"; + rev = "3a9ae671d01d9828b3e2935c80e8796cd3c1d77b"; + sha256 = "1kfwnwnnax22dlkc42rlw7lrdlpjxmh70sjnrrljpvi238scn5b2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -78438,12 +78739,12 @@ zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "zotxt"; - version = "20170109.2040"; + version = "20180218.1053"; src = fetchFromGitLab { owner = "egh"; repo = "zotxt-emacs"; - rev = "1a010ea5db617269adc132e4cc028a44d9b629bd"; - sha256 = "10i5hq0mkb0b88n9lb40ad4d98fwv5inbdfiyxyrflvl4qj0q60r"; + rev = "5b3715bab55c9f17f134a8fada5b68c07aa66cad"; + sha256 = "1hz1m4190yi6knz3y088ql8wy3pmsl8lsznqby2vpnn9p74fvl37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; @@ -78480,11 +78781,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: melpaBuild { pname = "zpresent"; - version = "20180205.2109"; + version = "20180224.2212"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "53a247d2c21b"; - sha256 = "1a45l3i1gg0pyka13z6hra3wyp6x564cz66gbi10sqly2jlwgxda"; + rev = "e2e34c061ff5"; + sha256 = "00rj8lgp5b856csvlrin1vwas1109nmywbrnpny4qck4yghv6zqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; @@ -78500,12 +78801,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20180210.717"; + version = "20180215.1021"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "d078dafa74f4e2a001f1aeecf718c0716779d77e"; - sha256 = "1skhvq48f6pl1i53gaa1bplbwd1ik21a12vryby3gk3w5ccw3wng"; + rev = "67a1d90595353ab57fd424651c567df9851b9494"; + sha256 = "01qv400zp4bdfah62l3ixkc3kvkwrjj5ngc36m6w783q0zmr105r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; @@ -78567,8 +78868,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "8ddda49de3356d8fa0308d79b5d68272baf2c57b"; - sha256 = "17d8mmmgj2w4nm2nfg12g35i7zbp4bp47ix5ifqqm1zvwmbmzrqx"; + rev = "db8d9e660ad18a15159779efe34d7a98ef0df535"; + sha256 = "1wlzlhabq75iqrhg9p2xx8l7rnfzpcjjflxmgyhaxhq188bwrqk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 148099d1005d..294414f15ee1 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -125,27 +125,6 @@ license = lib.licenses.free; }; }) {}; - ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-anaconda"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "proofit404"; - repo = "ac-anaconda"; - rev = "d0dec5c026235f65f9fd6594540df8886ed1b6a8"; - sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda"; - sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf"; - name = "ac-anaconda"; - }; - packageRequires = [ anaconda-mode auto-complete dash ]; - meta = { - homepage = "https://melpa.org/#/ac-anaconda"; - license = lib.licenses.free; - }; - }) {}; ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-cake"; @@ -2023,15 +2002,36 @@ license = lib.licenses.free; }; }) {}; + aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "aurora-config-mode"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "bdd"; + repo = "aurora-config-mode.el"; + rev = "0a7ca7987c3a0824e25470389c7d25c337a81593"; + sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode"; + sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; + name = "aurora-config-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/aurora-config-mode"; + license = lib.licenses.free; + }; + }) {}; auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "5ca6a838489c1175de3df7af025751559eb13cb3"; - sha256 = "10y6grxwp8sw24fv8i9f50lc83qcdxnkw2bm1v983fw6di4i3a8w"; + rev = "6af0458a6b586cc5004fa652f23615433304924d"; + sha256 = "150cx8ida9bl0g84iq051rziy64ic2pxz6hn0blsys1qcp9lf8wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3247,22 +3247,22 @@ license = lib.licenses.free; }; }) {}; - buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: + buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; - version = "1.2"; + version = "2.0"; src = fetchFromGitHub { owner = "killdash9"; repo = "buffer-flip.el"; - rev = "386067141ca77848b266e068f8c6baf6b4c2ab5b"; - sha256 = "1bch4jk6d60aydvcc624026pwfby29fbcwm3zhrsksqc0d2qxdwq"; + rev = "868aa9e04438d57746e0b1f5a13bcb9b64061c05"; + sha256 = "0b069g89b34s76ds3axmpiwl924fjd1jh6z6fdw5x0h0lj20pa87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098"; name = "buffer-flip"; }; - packageRequires = [ key-chord ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/buffer-flip"; license = lib.licenses.free; @@ -3502,12 +3502,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "1.9"; + version = "1.11"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "18a887957b0e22d3cc8873796bd27f06b2493a03"; - sha256 = "0y0wg0yqmvqjyhjs4dx8yw44hl19k227krd9mds220w0dx8wmhay"; + rev = "8d27bb99463bc230a76dee96378dd337622988f5"; + sha256 = "0s5vfzcfsiqb6bc6jh95a2dyy23b4bvhdpzn2fcq8awldbpx51fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -3775,12 +3775,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.1pre2"; + version = "4.6.1"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "b057bd0758f63f41fd8853ee025c58368e33ed21"; - sha256 = "1s066clvar4ws0mingh68jrj87dak52grs8mnd2ibcf1kf21w08q"; + rev = "81dc8e8fcf923baa5e5208f9bc4228930c7c3d56"; + sha256 = "0pn25c3v8xnihnyzk1w297ci5ca05hcdv46m21522sgpcinbvkc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -3838,12 +3838,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "afdd191b97e76c8393f656336699419a2b39ca1a"; - sha256 = "10qiapg6kp890q8n2pamvnnpxwcgcldw20mp23pmwzh9nsvqrpbs"; + rev = "ccfe38ae133cc843865f87607d3f4f3960b76870"; + sha256 = "1bv0lganh5xhjp2r84js596p1sqndvxnhn3q6l7m7lcdxrjckcy8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -4772,12 +4772,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.10.2"; + version = "3.11.0pre1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "c1e087a9d3af74299d7681c9f9de59e5977a1539"; - sha256 = "08qw6kq3l7dv37s5mppqxb6ys22h733k0qh2llzk2430wv5y9crk"; + rev = "02edf08be2b9476f442b702c6c00447912425cc2"; + sha256 = "1ppq3g1525izfl4d8779rj6lq8jkgqh50wnbyb0cmj6bp7b7c9sz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5087,12 +5087,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56"; - sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa"; + rev = "4711695af3df93f1bbceee165c505fea5bfc49ac"; + sha256 = "0x8zwq88k85ikzr0klm6nfa6i1wbykzfa790cg9cmi7wrsywimm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -5399,22 +5399,22 @@ license = lib.licenses.free; }; }) {}; - company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: + company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "1.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "86fda23d29b732ba3987bf20901034da1515b077"; - sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y"; + rev = "4512d062c38922d8b8cf402ca6043c246e915694"; + sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l"; name = "company-lsp"; }; - packageRequires = [ company emacs lsp-mode s ]; + packageRequires = [ company dash emacs lsp-mode s ]; meta = { homepage = "https://melpa.org/#/company-lsp"; license = lib.licenses.free; @@ -6059,12 +6059,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "1.3.9"; + version = "1.4.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "2219bf8d9a4584abc905c7470455777553496056"; - sha256 = "0kcxcbf1rm7cm74s5z87pv0bflx42h4j2lnb8b3r0nznj94ywnj3"; + rev = "9d70490b551503aac22241c8089a46e55dd3deba"; + sha256 = "03yr0y3z0jgh8c1db43nq0888rr561f6ks5fmf254aibh63schff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -6728,22 +6728,22 @@ license = lib.licenses.free; }; }) {}; - dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dart-mode"; - version = "0.15"; + version = "1.0.3"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "e6635b390235cf16a8081763768cf925ca2d9133"; - sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx"; + rev = "f3a7c7b71fb12d02fa02700bc10426cb10010d01"; + sha256 = "1g0c37qfqki7v1a5rxf6sy7k07i529rw3f1wmjl7g1zhd9bwsml2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla"; name = "dart-mode"; }; - packageRequires = [ cl-lib dash flycheck ]; + packageRequires = [ cl-lib dash emacs flycheck s ]; meta = { homepage = "https://melpa.org/#/dart-mode"; license = lib.licenses.free; @@ -7571,12 +7571,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa"; - sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867"; + rev = "5b55dac12467689083ff995777f54a304ff47be1"; + sha256 = "0sjrnab8rx1bpnxim268b8jfpyh8h0iy3j38925r0jqjgjb19ksn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -7914,12 +7914,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "bc747b3b65baf737f99dc4ccf68558581958bbba"; - sha256 = "0j5aywwh8cw0bb55frrpmyfmbzg6d6jv29ys61p1xf49gvki870m"; + rev = "98120f9b362b53983e932f126cf92848297b745a"; + sha256 = "03pnnbqa09iqyypgbgwlkxr6w1j46rla6pivbq7fy366yk2x03x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -8103,12 +8103,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "a87d3d9cf8d4d8cb6f108004e425f9a557683b75"; - sha256 = "0dia1xc8mng9bg987cpnhr2lciw4qbqsvzs4ayakrqfl2g3ny2qn"; + rev = "3ea5136bde1240f93fbf3ce30fffc4f279a58d27"; + sha256 = "0lkc8y09lhlpg7vrn2459c5fxn0nvxbzqhwadmkgc046i3aapqpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -8522,12 +8522,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.11.6"; + version = "2.11.8"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6"; - sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20"; + rev = "fb43f9354f9f9c4c65091ae15732b1d941475186"; + sha256 = "16l6l2qpkq10wkd95vbch2f7qcsb0jw4rjdf0gck2q8si8i2xi9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -9160,12 +9160,12 @@ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elbank"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Elbank"; - rev = "245cbc218e94793909ecede2e0d360c7d86f3122"; - sha256 = "1qcxh8v5dj2wcxxs3qcdny00p906nj33wsxyswwa4jbhh2vfxz12"; + rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5"; + sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; @@ -9304,6 +9304,27 @@ license = lib.licenses.free; }; }) {}; + elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elisp-lint"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "elisp-lint"; + rev = "9d894e99377859171ee54cb7d2b2e7f2cc7c267c"; + sha256 = "11pvqskjhxxsyxmy8wllqwa0qg0j9280h0m5rzjghgsdcnlisyvq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint"; + sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63"; + name = "elisp-lint"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elisp-lint"; + license = lib.licenses.free; + }; + }) {}; elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; @@ -10465,12 +10486,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.2.2"; + version = "20.2.4"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "194513197e19cd592f3f5c2231510542f5193fe4"; - sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6"; + rev = "13c6a4bf01d39a5002e09ef1f82619cde9f2c90c"; + sha256 = "1j8fqzaw36j8naafrrq1s329jlvlb06ra1f03hl76xr0bbxm44ks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -11679,6 +11700,27 @@ license = lib.licenses.free; }; }) {}; + evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-swap-keys"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "evil-swap-keys"; + rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a"; + sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; + sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6"; + name = "evil-swap-keys"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/evil-swap-keys"; + license = lib.licenses.free; + }; + }) {}; evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-test-helpers"; @@ -12415,12 +12457,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.4.7"; + version = "5.5.2"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "7be14de3c737e70606d208d8d443b89e58cd646d"; - sha256 = "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr"; + rev = "aba912a73d1f3fcff0d184b49008a2fa1655ad7e"; + sha256 = "145n04lid9alrm8nl6gfnll75jz1ssli48pbsc9zyva00ryk83my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -12734,6 +12776,27 @@ license = lib.licenses.free; }; }) {}; + flower = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flower"; + version = "0.3.6"; + src = fetchFromGitHub { + owner = "PositiveTechnologies"; + repo = "flower"; + rev = "2c89a7b0bc9d7b2e95d98e159a059d41ae43933f"; + sha256 = "1ilj0wa53qs8863d7ri9k8m57jd4n2zm3ijs3s2i7fn8a3svmmhy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; + sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd"; + name = "flower"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/flower"; + license = lib.licenses.free; + }; + }) {}; flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flx"; @@ -14246,15 +14309,36 @@ license = lib.licenses.free; }; }) {}; + fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fortune-cookie"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "andschwa"; + repo = "fortune-cookie"; + rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6"; + sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie"; + sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78"; + name = "fortune-cookie"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fortune-cookie"; + license = lib.licenses.free; + }; + }) {}; fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "e2878da13e7b87a824ebd6c842e9f552369b220c"; - sha256 = "091c8scwdxfrg710d1rkqad6l2y8hiw8f5jg4ayvrjm7d0s29hsa"; + rev = "ee20f7a3bcb86b661a38480acf853c1da2db6d26"; + sha256 = "0y7ji7p3blgzbwsz434346g835hzjs896hd7jli1ig0b9b0l43my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -14467,12 +14551,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "81b858a79b29622a1db732f97225cad705c4acf5"; - sha256 = "04zxal7j58whcy384sscwc7npcqdjlq01jjjn0i35pf2v7r045xy"; + rev = "631c493b97b3e2f928892fb25fa29daca4927f83"; + sha256 = "1a6qr5r62q84m1jcs1xj36p7jr9c042gh38lb7cmfcxf2x693h68"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -14874,8 +14958,8 @@ sha256 = "194nf5kjkxgxqjmxlr9q6r4p9kxcsm9qx8pcagxbhvmfyh6km71h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; - sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; + sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps"; name = "ghub"; }; packageRequires = [ emacs ]; @@ -15556,27 +15640,6 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "glab"; - version = "1.1.1"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "glab"; - rev = "5ced0214622450930bcea105b9aac785c594609d"; - sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; - sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di"; - name = "glab"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/glab"; - license = lib.licenses.free; - }; - }) {}; gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }: melpaBuild { pname = "gmail-message-mode"; @@ -16536,12 +16599,12 @@ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122"; - sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka"; + rev = "374d14b99f4959fa039c0e1ce8e0e7991b726d98"; + sha256 = "135w5vwbk2468b82v6icc8nh50d9flpi7zd63xch8vpvsri0vpw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -17226,12 +17289,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.8.8"; + version = "2.9.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5b7237acc11ed0fbee10af9cf6345da7c3d9dd26"; - sha256 = "18ay4c5mvr5b5i8qfn1h75yy5znzm1l6h5rhhzhhaiidvb2arr69"; + rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69"; + sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -17541,12 +17604,12 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; repo = "helm-company"; - rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048"; - sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90"; + rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d"; + sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; @@ -17562,12 +17625,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.8.8"; + version = "2.9.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5b7237acc11ed0fbee10af9cf6345da7c3d9dd26"; - sha256 = "18ay4c5mvr5b5i8qfn1h75yy5znzm1l6h5rhhzhhaiidvb2arr69"; + rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69"; + sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -18654,12 +18717,12 @@ helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; - version = "1.7.2"; + version = "1.7.4"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-swoop"; - rev = "6d3fdcfb6dea06242efc8ff4cafff9917e558bfc"; - sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72"; + rev = "c66336b8245ddc51c4206f19c119f1081920985c"; + sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; @@ -20334,12 +20397,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "c15f5a2b4a48fd53b446e0fa291bdb8323b80c27"; - sha256 = "07fzsjmbbq4nx2w23pbb0z88iqmclm156yd87nxsdivndmzvsgw2"; + rev = "5ece767ea30a350dcdb1a4defaca174e85efedc5"; + sha256 = "1djkzjxv7idqg5pmbqf60lmvibp3ccvgdkdwb48wzn2yvnqr2vw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -21843,12 +21906,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "d730208cff185ee86a81f8a5a6feadfea78ab9cc"; - sha256 = "0xfb8zi6jvwdivklc3lk5dzf8nnx05pm4fip44s4al6ajns8hgya"; + rev = "8a229fcd1d73876920a063f0eba906a5080275a7"; + sha256 = "0w35862sjyizj7grb9ixjns8kpxq2wgdgn1n06jdhmnnaqdyq911"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -22575,6 +22638,27 @@ license = lib.licenses.free; }; }) {}; + line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "line-up-words"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "janestreet"; + repo = "line-up-words"; + rev = "54d2c51c1c3da7e06be47b829bf465bf467ab53f"; + sha256 = "0qda9i5yjjf2x5cpg6nxkzqwa8fzzjxk0yyc4295kbawwd83vglr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words"; + sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79"; + name = "line-up-words"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/line-up-words"; + license = lib.licenses.free; + }; + }) {}; lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lingr"; @@ -23025,12 +23109,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.8.2"; + version = "0.9"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f"; - sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63"; + rev = "9ec279d933923dab2d8d1f140adc43073dab6433"; + sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -23214,12 +23298,12 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "emacs-php"; repo = "magic-filetype.el"; - rev = "0dfe3d9e0e22c7b06e34c8338f110e337306e3fd"; - sha256 = "1yjn2w0ykczhlj4q3dnfw2z4q66201dn3jz31yw7hh8bxjlsvwfh"; + rev = "019494add5ff02dd36cb3f500142fc51125522cc"; + sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype"; @@ -24068,12 +24152,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde"; - sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q"; + rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0"; + sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -25620,12 +25704,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "749f48b510d0fd47dac67850f4089119fbff142a"; - sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25"; + rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099"; + sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -27076,12 +27160,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "0.0.9"; + version = "0.1.1"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "62791db188fa6a9a6b4e53c5c29fb4fa46582b98"; - sha256 = "1l1fyyyyyi8nj4vpkyhpvz1yyqa2vn7042kp9443kqcswdfc9660"; + rev = "0752659f7a19cead182584fabc9544464f69b83e"; + sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -27398,6 +27482,27 @@ license = lib.licenses.free; }; }) {}; + org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-rich-yank"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "unhammer"; + repo = "org-rich-yank"; + rev = "ffa90b29604e27a60ad341c06d0e43769af19715"; + sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank"; + sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y"; + name = "org-rich-yank"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-rich-yank"; + license = lib.licenses.free; + }; + }) {}; org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; @@ -27671,22 +27776,22 @@ license = lib.licenses.free; }; }) {}; - org-wild-notifier = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wild-notifier"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "akhramov"; repo = "org-wild-notifier.el"; - rev = "28f6af12a9efbcab53e310363c451f53ce8ea3f2"; - sha256 = "00v4f26np4i947xgqr03wylz4ichc168znlwxn4l6np1s85i3mzb"; + rev = "5da63fc00db20b60eb46a241cc8308547d85b3ad"; + sha256 = "1269az078d6d0x7ims2qa6wdv8ql2hn70fwigfqw116v9602ywjr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; name = "org-wild-notifier"; }; - packageRequires = [ alert dash org ]; + packageRequires = [ alert dash emacs ]; meta = { homepage = "https://melpa.org/#/org-wild-notifier"; license = lib.licenses.free; @@ -27788,12 +27893,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663"; - sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf"; + rev = "976f3c7d25ad92c57341b52dad9af89b49c37f0c"; + sha256 = "0m8mghh0iydbvlsrg0zd2xajfhdxgxk79dm4gwircrh6zv8194ax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -28250,12 +28355,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "940c991ccd0dab53bd7c120601b3db35669c5e73"; - sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp"; + rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00"; + sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -30979,6 +31084,34 @@ license = lib.licenses.free; }; }) {}; + python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: + melpaBuild { + pname = "python-pytest"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-python-pytest"; + rev = "0ed385f7e8edd1a7d0aee72f5112459ea9054cbe"; + sha256 = "1wpvgx8ldrnq0pjr8iq65f3m0kmh1c9hnv1lkrgrglqazs2c6hbm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; + sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4"; + name = "python-pytest"; + }; + packageRequires = [ + dash + dash-functional + emacs + magit-popup + projectile + s + ]; + meta = { + homepage = "https://melpa.org/#/python-pytest"; + license = lib.licenses.free; + }; + }) {}; python-x = callPackage ({ fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; @@ -31024,12 +31157,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "f925bcb46ea64b699f7cd06933c48e0d5db88b73"; - sha256 = "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63"; + rev = "71eec02c25006737444dec7dfd004285f6cff6a8"; + sha256 = "1j62qf4llrbmwwi7ynrhnzvh0g4razbc21vdlaa8jkjg6y5id95m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -32059,12 +32192,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "68984092d0e0725057e7b67ba32016903170f189"; - sha256 = "0qd3qh640339n1dn1isk23xhnkj0pds08yzfak4ijxyzlgl63bdq"; + rev = "562ac6fd6291f828ee6116db62982c77ddd52956"; + sha256 = "0r5pqjmjwn5qpm8kns1730a6cq3bqxjp8ha63w0n1hnrd4gb24sw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -32350,6 +32483,27 @@ license = lib.licenses.free; }; }) {}; + rubik = callPackage ({ calc, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rubik"; + version = "1.2"; + src = fetchFromGitHub { + owner = "Kurvivor19"; + repo = "rubik-mode"; + rev = "7ec955639865ca8e99a941843e19b12be5015a47"; + sha256 = "0fdjg6gpg45m5myq517vkprmvh50xw10dqa8vwr9hfz2z8dy18ja"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik"; + sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267"; + name = "rubik"; + }; + packageRequires = [ calc cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/rubik"; + license = lib.licenses.free; + }; + }) {}; rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; @@ -34868,22 +35022,22 @@ license = lib.licenses.free; }; }) {}; - ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "ab4b80e206163b09a021f7de157e8bd4ae66358b"; - sha256 = "1c8hk7xwwlgkdw5xjcznpmajv904v2vs8mrcnmlay99r2qj3p2yx"; + rev = "aef539bb4feefe927fa48d01736dfadb7b3d7930"; + sha256 = "0vra7y2icid9sdyp7iygwkp4xaas249nm1lcbcyfpaad250g2pn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm"; name = "ssh-deploy"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ssh-deploy"; license = lib.licenses.free; @@ -34973,6 +35127,27 @@ license = lib.licenses.free; }; }) {}; + stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stgit"; + version = "0.18"; + src = fetchFromGitHub { + owner = "ctmarinas"; + repo = "stgit"; + rev = "3df606d14f6673fede6cdf5fad921a664c03e108"; + sha256 = "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit"; + sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g"; + name = "stgit"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/stgit"; + license = lib.licenses.free; + }; + }) {}; string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-edit"; @@ -35161,6 +35336,48 @@ license = lib.licenses.free; }; }) {}; + sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sudden-death"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "yewton"; + repo = "sudden-death.el"; + rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb"; + sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death"; + sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh"; + name = "sudden-death"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sudden-death"; + license = lib.licenses.free; + }; + }) {}; + sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sudo-edit"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "nflath"; + repo = "sudo-edit"; + rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b"; + sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; + sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4"; + name = "sudo-edit"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/sudo-edit"; + license = lib.licenses.free; + }; + }) {}; suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; @@ -35266,27 +35483,6 @@ license = lib.licenses.free; }; }) {}; - swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "swbuff"; - version = "3.3"; - src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "swbuff"; - rev = "8d5b2bec12503509554f9dd83b97c198b259db2b"; - sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff"; - sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk"; - name = "swbuff"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/swbuff"; - license = lib.licenses.free; - }; - }) {}; sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; @@ -35311,12 +35507,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "7739e4954cc614ecd6b37e935f82ad057e256d56"; - sha256 = "09mvwfi3nv4hkdvh76d7737nl3zaxn4a5vpmv2645q9s4vcq8zj8"; + rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29"; + sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -36548,12 +36744,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.18"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475"; - sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -36569,12 +36765,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.18"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475"; - sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -36590,12 +36786,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.18"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475"; - sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -36776,22 +36972,22 @@ license = lib.licenses.free; }; }) {}; - turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "turing-machine"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "therockmandolinist"; repo = "turing-machine"; - rev = "41bfe79ecf8a44dcbaf308c33cbdf324f7c806ae"; - sha256 = "04j4nw526mxlm4fd2a28p0pa2ss4b4vznjvpk0f0wlf61ymvy884"; + rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047"; + sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine"; sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn"; name = "turing-machine"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/turing-machine"; license = lib.licenses.free; @@ -39285,8 +39481,8 @@ version = "1.80"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex"; - rev = "b1896ef49747"; - sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b"; + rev = "af4601ee3c6a"; + sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index a8815b4d3d87..f6349089be1e 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20180212"; + version = "20180226"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180212.tar"; - sha256 = "09wgmiavby009mkc5v2d0znrrs40fnmhzq252hni4zjy8kbgwfzk"; + url = "https://orgmode.org/elpa/org-20180226.tar"; + sha256 = "0jqvry6gah1bwnryha4asynj13jyds3qim0xcy7s01rxk99m2ziy"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180212"; + version = "20180226"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180212.tar"; - sha256 = "0wy9j2iagjzzjkqfsz1askxg4jmaxc0p0f42jbzx2ja7h4qkm9nj"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180226.tar"; + sha256 = "034wp70hcqnpidji5k1k80mj35iyyy098nbvc2sl7i2aca4m03zc"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index f87cc72f2f2b..ba243629cc3e 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,8 +4,8 @@ , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null -, withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null -, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib_networking ? null +, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null +, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] ++ lib.optional (withX && withGTK2) gtk2 - ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ] + ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib_networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 9288d293b916..23478758efe5 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "1.32"; + version = "1.33"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "8b7be10b95d0614eb07f845ba2280f7c026eacd5739d8fac4d5d26606f8c3c2d"; + sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 0e77094b819c..a02773f715c4 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -247,25 +247,25 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.2.3"; /* updated by script */ + version = "2017.3.5"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0yp5h8ps5hfi07gsz14pp61skibfx48klg8qmc4f6q6xzcfdqxsf"; /* updated by script */ + sha256 = "1hfy0mxdsvydjjklh8fwdz6f6qxajhngmcmyyzw0gdfhw6ldrv9c"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; - update-channel = "datagrip_2017_2"; + update-channel = "datagrip_2017_3"; }; goland = buildGoland rec { name = "goland-${version}"; - version = "2017.3.1"; /* updated by script */ + version = "2017.3.2"; /* 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 = "0cfjfv01ra67sr8n8ijqwd9zm2yzb1nm447kf0mr5cynr124ch0z"; /* updated by script */ + sha256 = "0bhvj1xqlpy58yq2s5nrhhaw53i913zpr135b1f6r5s22nvkigvm"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; @@ -338,15 +338,15 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2017.2.1"; /* updated by script */ + version = "2017.3.1"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1zviknxamp1y7lrlg5qfj3ijp96z0dqvcr42ca0fbx1xb887wzww"; /* updated by script */ + sha256 = "0k9yc00lmk826pylfs9jyxqnlczk9vhq7bs61b8nyfam1dqbgikv"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "rider_2017_2"; + update-channel = "rider_2017_3"; }; ruby-mine = buildRubyMine rec { diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 3d623d3f3bda..c24866671f9b 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx, +{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { openssl libxml2 gnome3.gtksourceview - at_spi2_core + at-spi2-core pcre epoxy boost diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 1a164ec08de9..41d1a6262ed5 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -3,7 +3,7 @@ , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons -, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info +, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info , libksysguard, konsole, llvmPackages, makeWrapper }: @@ -34,7 +34,7 @@ mkDerivation rec { kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons + kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons ]; postInstall = '' diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 74a83c1278af..c5f8278f649d 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem -, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index f4bdee830e19..d0367d7c3051 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mg-${version}"; - version = "20170828"; + version = "20171014"; src = fetchurl { url = "http://homepage.boetes.org/software/mg/${name}.tar.gz"; - sha256 = "139nc58l5ifj3d3478nhqls0lic52skmxfxggznzxaz9camqd20z"; + sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index bea1e18e0612..f1c1e3dcac70 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "micro-${version}"; - version = "1.3.4"; + version = "1.4.0"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "zyedidia"; repo = "micro"; rev = "v${version}"; - sha256 = "1giyp2xk2rb6vdyfnj5wa7qb9fwbcmmwm16wdlnmq7xnp7qamdkw"; + sha256 = "0w1rmh81h28n1jlb05k89i751h498i6p883hrsjr70hvrwq5zjpb"; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 53ea9741c03c..e8e529b63abc 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, fetchNuGet -, autoconf, automake, pkgconfig, shared_mime_info, intltool +, autoconf, automake, pkgconfig, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake shared_mime_info intltool + autoconf automake shared-mime-info intltool mono gtk-sharp-2_0 gnome-sharp unzip dotnetPackages.NUnit dotnetPackages.NUnitRunners diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 187474de5b6f..a27b5a41ac70 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -25,7 +25,7 @@ let name = "neovim-ruby-env"; gemdir = ./ruby_provider; postBuild = '' - ln -s ${ruby}/bin/* $out/bin + ln -sf ${ruby}/bin/* $out/bin ''; }; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index eef1746ff380..0db93f78781d 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vis-${version}"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk"; + sha256 = "1crsg3ssqv4xix9z16hwl0zyx7hxk686s52zmrp7yfak3m5igf9k"; repo = "vis"; owner = "martanne"; }; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index d689254f2c85..c2a09a507cc5 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.15"; + name = "qgis-2.18.16"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "1jpprkk91s2wwx0iiqlnsngxnn52zs32bad799fjai58nrsh8b7b"; + sha256 = "0d880m013kzi4qiyr27yjx6hzpb652slp66gyqgw9ziw03wy12c9"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index e9932b93fbe0..14659d796fc3 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libsoup, graphicsmagick, json_glib, wrapGAppsHook -, cairo, cmake, ninja, curl, perl, llvm, desktop_file_utils, exiv2, glib +{ stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook +, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32"; }; - nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop_file_utils wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt - libsoup graphicsmagick json_glib openjpeg lua pugixml + libsoup graphicsmagick json-glib openjpeg lua pugixml colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 478e9d2b4530..6d603f6940bb 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.23"; + version = "2.24"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "18922zv8ckm82r1ap1yn7plbk6djpj02za2ahng58sjj2fw3rpqn"; + sha256 = "148qbxkk5m7i3cxymnfwi7aikqjyfxr306dlqm9ndp6x932js5wq"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index afad1e6c3af0..09d1a86db8e3 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } : +{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } : let version = "2.2"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr"; }; - nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ]; + nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ]; buildInputs = [ gtk3 ]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 1e8f0e209c06..d034f5d64d93 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2 -, lcms, intltool, gettext, fbida +{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool +, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida }: stdenv.mkDerivation rec { name = "geeqie-${version}"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "http://geeqie.org/${name}.tar.xz"; - sha256 = "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb"; + sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; }; + # Do not build the changelog as this requires markdown. + patches = [ ./geeqie-no-changelog.patch ]; + preConfigure = "./autogen.sh"; - configureFlags = [ "--enable-gps" ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ]; buildInputs = [ - autoconf automake gtk2 libpng exiv2 lcms intltool gettext + gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida ]; postInstall = '' @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH' ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Lightweight GTK+ based image viewer"; @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://geeqie.sourceforge.net; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ jfrankenau pSub ]; platforms = platforms.gnu; }; } diff --git a/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch new file mode 100644 index 000000000000..1b8833b135f3 --- /dev/null +++ b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch @@ -0,0 +1,14 @@ +--- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500 ++++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500 +@@ -10,9 +10,9 @@ + readmedir = @readmedir@ + + if HAVE_MARKDOWN +-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html ++readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html + else +-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html ++readme_DATA = README.md COPYING TODO README.lirc AUTHORS + endif + + desktopdir = $(datadir)/applications diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index d01286e15a64..dea3fd4e3c61 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, - pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }: + pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }: stdenv.mkDerivation rec { name = "giv-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = "scons install"; nativeBuildInputs = [ scons pkgconfig vala perl gob2 ]; - buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ]; + buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ]; meta = with stdenv.lib; { description = "Cross platform image and hierarchical vector viewer based"; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 6dcf8223777a..c1f15904818f 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook -, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book +, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book , intltool, itstool, makeWrapper, pkgconfig, which }: @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; buildInputs = [ - barcode gtk3 gtk_doc gnome3.yelp_tools - gnome3.gnome_common gnome3.gsettings_desktop_schemas + barcode gtk3 gtk-doc gnome3.yelp-tools + gnome3.gnome-common gnome3.gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool ]; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 161e89151249..03489db933c1 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret, - libchamplain, librsvg, libwebp, json_glib, webkit, lcms2, bison, - flex, hicolor_icon_theme, wrapGAppsHook }: + libchamplain, librsvg, libwebp, json-glib, webkit, lcms2, bison, + flex, hicolor-icon-theme, wrapGAppsHook, shared-mime-info }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -17,12 +17,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = with gnome3; - [ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf + [ itstool libxml2 intltool glib gtk gsettings-desktop-schemas dconf exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain - librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme defaultIconTheme ]; + librsvg libwebp json-glib webkit lcms2 bison flex hicolor-icon-theme defaultIconTheme ]; enableParallelBuilding = true; + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + ''; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/gthumb; description = "Image browser and viewer for GNOME"; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 9acd8357cb71..50440ad8e42b 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "hugin-2017.0.0"; + name = "hugin-2018.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46"; + sha256 = "1jv5wpqbq49fhbl5g521g1qxhdm1rm7acxd18fr3n3n5d830vbyk"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 791cd7be2d09..1f7e779e88ab 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; meta = with lib; { - description = "A free an open source painting application"; + description = "A free and open source painting application"; homepage = https://krita.org/; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 4b5c4517deab..4dc1e89116ed 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -7,13 +7,13 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "17.07"; + version = "18.02"; src = fetchFromGitHub { owner = "leozide"; repo = "leocad"; rev = "v${version}"; - sha256 = "1j361pvxywi4nb2alhnnd4qpqrpg6503gbi17cadcdi434gbqbsd"; + sha256 = "0rb4kjyrr9ry85cfpbk52l19vvwn7lrh2kmj2lwq531smnygn5m3"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index ac0060ec7f8e..8c3a8bc894b3 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -4,7 +4,7 @@ , makeWrapper , pkgconfig , wrapGAppsHook -, gsettings_desktop_schemas +, gsettings-desktop-schemas , qtbase , qttools @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libraw libtiff quazip - gsettings_desktop_schemas]; + gsettings-desktop-schemas]; cmakeFlags = ["-DENABLE_OPENCV=ON" "-DENABLE_RAW=ON" diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 5743f0c1bcb6..9964bec67814 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook +, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook , lensfun }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun + lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun ]; cmakeFlags = [ diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index b23ddbf9d78b..437044ba2675 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite -, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json_glib -, gettext, desktop_file_utils, gdk_pixbuf, librsvg, wrapGAppsHook +, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib +, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook , itstool, libgdata }: # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig itstool gettext desktop_file_utils wrapGAppsHook + meson ninja pkgconfig itstool gettext desktop-file-utils wrapGAppsHook ]; buildInputs = [ gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee - libgudev gnome3.gexiv2 gnome3.gsettings_desktop_schemas - libraw json_glib glib gdk_pixbuf librsvg gnome3.rest + libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas + libraw json-glib glib gdk_pixbuf librsvg gnome3.rest gnome3.gcr gnome3.defaultIconTheme libgdata ]; diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index e951f3a7a937..c655cadef400 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms -, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}: +, intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}: stdenv.mkDerivation rec { name = "viewnior-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext - shared_mime_info glib gdk_pixbuf perl + shared-mime-info glib gdk_pixbuf perl ]; preFixup = '' diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index 38f63bdb3836..538931c1040e 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, hicolor_icon_theme, defaultIconTheme +, hicolor-icon-theme, defaultIconTheme # Test requirements , dbus, xvfb_run, xdotool @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ hicolor_icon_theme defaultIconTheme librsvg ]; + buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 52a17f5cbeb9..0ed958b4e770 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime }: @@ -10,7 +10,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index da7cd2e8d79d..cba0b1e59e3a 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,6 +1,6 @@ { mkDerivation, copyPathsToStore, lib, kdepimTeam, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, }: @@ -12,7 +12,7 @@ mkDerivation { maintainers = kdepimTeam; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n kiconthemes kio kwindowsystem qttools diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index b032de848794..89bc171d2953 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -1,5 +1,5 @@ { mkDerivation, lib -, extra-cmake-modules, kdoctools, makeWrapper, shared_mime_info +, extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info , qtwebkit , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , flac, lame, libmad, libmpcdec, libvorbis @@ -28,7 +28,7 @@ mkDerivation { # cd/dvd cdparanoia libdvdcss libdvdread # others - ffmpeg libmusicbrainz3 shared_mime_info + ffmpeg libmusicbrainz3 shared-mime-info ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 17d7da7b702c..b5eca47d6c0e 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -21,7 +21,7 @@ , kplotting , ktextwidgets , mlt -, shared_mime_info +, shared-mime-info , libv4l , kfilemetadata , ffmpeg @@ -62,7 +62,7 @@ mkDerivation { qtquickcontrols qtscript qtwebkit - shared_mime_info + shared-mime-info libv4l ffmpeg ]; diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index 3230efd82017..b3cfed91dd45 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - shared_mime_info, + shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, @@ -14,7 +14,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 8abb58b46b27..13585848317b 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info, + mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, @@ -12,7 +12,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix index 9f3d5e2ea019..f380315cce90 100644 --- a/pkgs/applications/kde/kmail-account-wizard.nix +++ b/pkgs/applications/kde/kmail-account-wizard.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, shared_mime_info, + extra-cmake-modules, kdoctools, shared-mime-info, akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo, pimcommon, qttools, @@ -12,7 +12,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 1217c29032b4..e0e80b05ebce 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -1,7 +1,7 @@ { mkDerivation, lib , extra-cmake-modules, kdoctools , qtscript, qtsvg, qtquickcontrols, qtwebkit -, krunner, shared_mime_info, kparts, knewstuff +, krunner, shared-mime-info, kparts, knewstuff , gpsd, perl }: @@ -10,7 +10,7 @@ mkDerivation { meta.license = with lib.licenses; [ lgpl21 gpl3 ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; propagatedBuildInputs = [ - qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts + qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts knewstuff gpsd ]; } diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index 422968be35a5..0ac8ddebc75d 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, qtscript, kconfig, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, - shared_mime_info + shared-mime-info }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { maintainers = with lib.maintainers; [ peterhoeg ]; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; - buildInputs = [ shared_mime_info ]; + buildInputs = [ shared-mime-info ]; propagatedBuildInputs = [ kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 karchive kcrash diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index cfd4d6b32de3..f69152820e43 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }: +{ stdenv, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation rec { name = "artha-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib gtk2 wordnet ]; + buildInputs = [ dbus-glib gtk2 wordnet ]; meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index b348f253b350..cfdc9077bb01 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -11,11 +11,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.79"; + name = "blender-2.79a"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9"; + sha256 = "1mw45mvfk9f0fhn12vp3g2vwqzinrp3by0m3w01wj87h9ri5zkwc"; }; buildInputs = diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index d9ea487a83bb..4477cbbcc06a 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor_icon_theme }: +{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "clipit-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ]; + buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ]; meta = with stdenv.lib; { description = "Lightweight GTK+ Clipboard Manager"; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index b9a160564a5d..edb10a0f6671 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { name = "cura-${version}"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "1x732bzxdxnz1av8jlv5kzs08jpmsg6bz9i88jr63kw32d901xsm"; + sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp"; }; buildInputs = [ qtbase qtquickcontrols ]; @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = "https://github.com/Ultimaker/Cura"; + homepage = https://github.com/Ultimaker/Cura; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 575889ad2c6f..c3a19e6551a2 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "3.0.3"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "0x1ss3hppw6062rmmxh0dpnm5cg6r2mp01k0nxyw5riiljj59ydy"; + sha256 = "1yqpp6qhixzni3ik11vbk5kcdrhlz2j4ylzmh8f6c86r4d73a0cp"; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; - homepage = "https://github.com/Ultimaker/CuraEngine"; + homepage = https://github.com/Ultimaker/CuraEngine; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index 12ceb0958f0d..8e64fa698058 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # For setup hook gobjectIntrospection ]; - buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ]; + buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ]; meta = with stdenv.lib; { description = "The default terminal emulation for Deepin"; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 4a7c4d7ec304..1ea45c3574a5 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "devilspie2-${version}"; - version = "0.42"; + version = "0.43"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; - sha256 = "119zb9x5i3y4cp30h4113psqxb5d7zxiyijpq02g8kds1wqvrx8i"; + sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; }; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix new file mode 100644 index 000000000000..fbd9d47633a1 --- /dev/null +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -0,0 +1,140 @@ +{ stdenv +, autoreconfHook +, curl +, fetchFromGitHub +, git +, libevent +, libtool +, libqrencode +, libudev +, libusb +, makeWrapper +, pkgconfig +, qtbase +, qttools +, qtwebsockets +, qtmultimedia +, udevRule51 ? '' +, SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402" +, '' +, udevRule52 ? '' +, KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbbf%n" +, '' +, writeText +}: + +# Enabling the digitalbitbox program +# +# programs.digitalbitbox.enable = true; +# +# will install the digitalbitbox package and enable the corresponding hardware +# module and is by far the easiest way to get started with the Digital Bitbox on +# NixOS. + +# In case you install the package only, please be aware that you may need to +# apply some udev rules to allow the application to identify and access your +# wallet. In a nixos-configuration, one may accomplish this by enabling the +# digitalbitbox hardware module +# +# hardware.digitalbitbox.enable = true; +# +# or by adding the digitalbitbox package to system.udev.packages +# +# system.udev.packages = [ pkgs.digitalbitbox ]; + +# See https://digitalbitbox.com/start_linux for more information. +let + copyUdevRuleToOutput = name: rule: + "cp ${writeText name rule} $out/etc/udev/rules.d/${name}"; +in stdenv.mkDerivation rec { + name = "digitalbitbox-${version}"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "digitalbitbox"; + repo = "dbb-app"; + rev = "v${version}"; + sha256 = "1r77fvqrlaryzij5dfbnigzhvg1d12g96qb2gp8dy3xph1j0k3s1"; + }; + + nativeBuildInputs = with stdenv.lib; [ + autoreconfHook + curl + git + makeWrapper + pkgconfig + qttools + ]; + + buildInputs = with stdenv.lib; [ + libevent + libtool + libudev + libusb + libqrencode + + qtbase + qtwebsockets + qtmultimedia + ]; + + LUPDATE="${qttools.dev}/bin/lupdate"; + LRELEASE="${qttools.dev}/bin/lrelease"; + MOC="${qtbase.dev}/bin/moc"; + QTDIR="${qtbase.dev}"; + RCC="${qtbase.dev}/bin/rcc"; + UIC="${qtbase.dev}/bin/uic"; + + configureFlags = [ + "--enable-libusb" + ]; + + hardeningDisable = [ + "format" + ]; + + postInstall = '' + mkdir -p "$out/lib" + cp src/libbtc/.libs/*.so* $out/lib + cp src/libbtc/src/secp256k1/.libs/*.so* $out/lib + cp src/hidapi/libusb/.libs/*.so* $out/lib + cp src/univalue/.libs/*.so* $out/lib + + # [RPATH][patchelf] Avoid forbidden reference error + rm -rf $PWD + + wrapProgram "$out/bin/dbb-cli" --prefix LD_LIBRARY_PATH : "$out/lib" + wrapProgram "$out/bin/dbb-app" --prefix LD_LIBRARY_PATH : "$out/lib" + + # Provide udev rules as documented in https://digitalbitbox.com/start_linux + mkdir -p "$out/etc/udev/rules.d" + ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51} + ${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52} + ''; + + meta = with stdenv.lib; { + description = "A QT based application for the Digital Bitbox hardware wallet"; + longDescription = '' + Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices. + + This package will only install the dbb-app and dbb-cli, however; in order for these applications to identify and access Digital Bitbox devices, one may want to enable the digitalbitbox hardware module by adding + + hardware.digitalbitbox.enable = true; + + to the configuration which is equivalent to adding this package to the udev.packages list. + + + The easiest way to use the digitalbitbox package in NixOS is by adding + + programs.digitalbitbox.enable = true; + + to the configuration which installs the package and enables the hardware module. + ''; + homepage = "https://digitalbitbox.com/"; + license = licenses.mit; + maintainers = with maintainers; [ + vidbina + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index ee16ba24ed46..93e5d297ffb3 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk_doc -, keybinder3, clutter_gtk, libnotify +, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc +, keybinder3, clutter-gtk, libnotify , libxkbcommon, xorg, udev , bashInteractive }: @@ -19,8 +19,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; buildInputs = [ - vala_0_26 gtk3 gnome3.gnome_common gnome3.libgee - gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify + vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee + gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon ] ++ optionals stdenv.isLinux [ udev ]; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 8c63c8565781..be853e4213bc 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, - pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool, + pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool, librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { file intltool vala_0_34 - gnome3.yelp_tools + gnome3.yelp-tools wrapGAppsHook # For setup hook gobjectIntrospection @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - json_glib + json-glib sqlite itstool librsvg diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 939b38ca29f7..f05514f3fc58 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gammu-${version}"; - version = "1.38.2"; + version = "1.39.0"; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; rev = version; - sha256 = "1rk3p3sjyy6n6mlqs4qgyxna4swrh1zm7b77npxv8j341wxj3khv"; + sha256 = "1hr053z2l5mjgip83fsxnd1rqsp5gwywzagzrgdg243apn1nz0gs"; }; patches = [ ./bashcomp-dir.patch ./systemd.patch ]; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 509a54881cce..d4f2a056a9f6 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, - intltool, libstartup_notification, gtk_doc, wrapGAppsHook + intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool gtk_doc wrapGAppsHook + pkgconfig intltool gtk-doc wrapGAppsHook ]; buildInputs = [ - gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring + gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index dfe61b57b43d..776a10b7e0c5 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 -, gsettings_desktop_schemas, wrapGAppsHook +, gsettings-desktop-schemas, wrapGAppsHook }: let version = "1.3.10"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ]; + buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 46278f42e7bb..77e7b592f647 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.11"; + name = "gphoto2-2.5.15"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r"; + sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf"; }; nativeBuildInputs = [ pkgconfig gettext libtool ]; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index a7485c4ee681..1810d6d5c476 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }: +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gpx-viewer-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig - shared_mime_info # For update-mime-database - desktop_file_utils # For update-desktop-database + shared-mime-info # For update-mime-database + desktop-file-utils # For update-desktop-database wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 8b66b23df01a..ace91bfafffd 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, + pango, gsettings-desktop-schemas, # Optional packages: enableOSM ? true, osm-gps-map }: diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 21a551bd6314..0a2a17fc8fa0 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -17,7 +17,7 @@ with lib; let inherit (python2Packages) python; - inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome_common ]; + inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ]; pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); in stdenv.mkDerivation rec { name = "guake-${version}"; diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix new file mode 100644 index 000000000000..7a04bd7194f2 --- /dev/null +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, rustPlatform, cmake, CoreServices, cf-private }: + +rustPlatform.buildRustPackage rec { + name = "gutenberg-${version}"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "Keats"; + repo = "gutenberg"; + rev = "v${version}"; + sha256 = "03zhbwxp4dbqydiydx0hpp3vpg769zzn5i95h2sl868mpfia8gyd"; + }; + + cargoSha256 = "0441lbmxx16aar6fn651ihk3psrx0lk3qdbbyih05xjlkkbk1qxs"; + + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; + + postInstall = '' + install -D -m 444 completions/gutenberg.bash \ + -t $out/share/bash-completion/completions + install -D -m 444 completions/_gutenberg \ + -t $out/share/zsh/site-functions + install -D -m 444 completions/gutenberg.fish \ + -t $out/share/fish/vendor_completions.d + ''; + + meta = with stdenv.lib; { + description = "An opinionated static site generator with everything built-in"; + homepage = https://www.getgutenberg.io; + license = licenses.mit; + maintainers = []; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 51a14fb20d0b..105f7beb98fe 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome_doc_utils -, intltool, dbus_glib, gnome_python, dbus -, hicolor_icon_theme +{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils +, intltool, dbus-glib, gnome_python, dbus +, hicolor-icon-theme }: # TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { }; buildInputs = [ - docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme + docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme ]; propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 972403a47544..d18546cb36f8 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -14,7 +14,7 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.5) - ffi (1.9.21) + ffi (1.9.23) forwardable-extended (2.6.0) gemoji (3.0.0) html-pipeline (2.7.1) @@ -23,7 +23,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.2) + jekyll (3.7.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 32e90b07a263..b5b21dec4382 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -53,10 +53,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8"; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; type = "gem"; }; - version = "1.9.21"; + version = "1.9.23"; }; forwardable-extended = { source = { @@ -104,10 +104,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05f61rqwz1isci7by34zyz38ah2rv5b8i5h618cxcl97hwqps8n2"; + sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff"; type = "gem"; }; - version = "3.7.2"; + version = "3.7.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 418b4ea466ea..ce3c318f6780 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -2,6 +2,8 @@ , withOptionalDependencies ? false }: +# Bundix: +# nix-shell -p bundix zlib bundlerEnv rec { name = pname + "-" + version; pname = "jekyll"; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile index 41f33c6e9ea7..aba5e06e3769 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile +++ b/pkgs/applications/misc/jekyll/full/Gemfile @@ -10,7 +10,7 @@ gem "jemoji" # Optional dependencies: gem "coderay", "~> 1.1.0" gem "jekyll-coffeescript" -gem "jekyll-docs" +#gem "jekyll-docs" gem "jekyll-feed", "~> 0.9" gem "jekyll-gist" gem "jekyll-paginate" diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index d070ad66f65c..190f1d66479d 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -25,7 +25,7 @@ GEM faraday (0.14.0) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) - ffi (1.9.21) + ffi (1.9.23) forwardable-extended (2.6.0) gemoji (3.0.0) html-pipeline (2.7.1) @@ -34,7 +34,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.2) + jekyll (3.7.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -52,8 +52,6 @@ GEM jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-docs (3.7.2) - jekyll (= 3.7.2) jekyll-feed (0.9.3) jekyll (~> 3.3) jekyll-gist (1.5.0) @@ -136,7 +134,6 @@ DEPENDENCIES jekyll jekyll-avatar jekyll-coffeescript - jekyll-docs jekyll-feed (~> 0.9) jekyll-gist jekyll-mentions diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index f41acb661910..3a115f8a4b0e 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -112,10 +112,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8"; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; type = "gem"; }; - version = "1.9.21"; + version = "1.9.23"; }; forwardable-extended = { source = { @@ -163,10 +163,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05f61rqwz1isci7by34zyz38ah2rv5b8i5h618cxcl97hwqps8n2"; + sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff"; type = "gem"; }; - version = "3.7.2"; + version = "3.7.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -186,15 +186,6 @@ }; version = "1.1.1"; }; - jekyll-docs = { - dependencies = ["jekyll"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dw8pvxr0q02rivc0n0v4w6151zi6s212xwl27iam6pjc8skbg9b"; - type = "gem"; - }; - version = "3.7.2"; - }; jekyll-feed = { dependencies = ["jekyll"]; source = { diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index b7b09816abd4..e87288d71287 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jgmenu-${version}"; - version = "0.8"; + version = "0.8.2"; src = fetchFromGitHub { owner = "johanmalm"; repo = "jgmenu"; rev = "v${version}"; - sha256 = "042nvix85a37aalc2rwg4yc2g3wyy6lym3c2ljj2xkl6c1b0c1r7"; + sha256 = "0nflj4fcpz7rcd1s0zlyi5ikxjykkmz3p5w4gzica1fdbyn2l7x3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index b908941d2bc9..b536dffb708c 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13265"; + version = "13478"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0mmpxmf17lw1j1m1gfz2jrm3qj2416zgbwgcy7xbvn6qcd8k7dr5"; + sha256 = "1mc1zdcnlm14ky820cj61sid6aiq9k11kj6vzlqskvgqazc60xj4"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/keepass-plugins/keefox/default.nix b/pkgs/applications/misc/keepass-plugins/keefox/default.nix deleted file mode 100644 index 0215c5a71c2f..000000000000 --- a/pkgs/applications/misc/keepass-plugins/keefox/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildEnv, fetchurl, mono, unzip }: - -let - version = "1.6.4"; - drv = stdenv.mkDerivation { - name = "keefox-${version}"; - src = fetchurl { - url = "https://github.com/luckyrat/KeeFox/releases/download/v${version}/${version}.xpi"; - sha256 = "0nj4l9ssyfwbl1pxgxvd2h9q0mqhx7i0yzm4a2xjqlqwam534d1w"; - }; - - meta = { - description = "Keepass plugin for keefox Firefox add-on"; - homepage = http://keefox.org; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.mjanczyk ]; - }; - - buildInputs = [ unzip ]; - - pluginFilename = "KeePassRPC.plgx"; - - unpackCmd = "unzip $src deps/$pluginFilename "; - sourceRoot = "deps"; - - installPhase = '' - mkdir -p $out/lib/dotnet/keepass/ - cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename - ''; - }; -in - # Mono is required to compile plugin at runtime, after loading. - buildEnv { name = drv.name; paths = [ mono drv ]; } diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix new file mode 100644 index 000000000000..b2980bcd8aea --- /dev/null +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildEnv, fetchurl, mono }: + +let + version = "1.7.3.1"; + drv = stdenv.mkDerivation { + name = "keepassrpc-${version}"; + src = fetchurl { + url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; + sha256 = "1y9b35qg27caj3pbaqqzrqpk61hbbd8617ziwdc9vl799i786m9k"; + }; + + meta = with stdenv.lib; { + description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords"; + homepage = https://github.com/kee-org/keepassrpc; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl2; + maintainers = with maintainers; [ mjanczyk svsdep ]; + }; + + pluginFilename = "KeePassRPC.plgx"; + + unpackCmd = '' + mkdir deps/ + cp -p $src deps/$pluginFilename + ''; + sourceRoot = "deps"; + + installPhase = '' + mkdir -p $out/lib/dotnet/keepass/ + cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename + ''; + }; +in + # Mono is required to compile plugin at runtime, after loading. + buildEnv { name = drv.name; paths = [ mono drv ]; } diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index bee86cb0ed39..5e492fc621fe 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,11 +1,6 @@ -{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, gtk2, plugins ? [] }: +{ stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, + unzip, icoutils, gtk2, xorg, xdotool, xsel, plugins ? [] }: -# KeePass looks for plugins in under directory in which KeePass.exe is -# located. It follows symlinks where looking for that directory, so -# buildEnv is not enough to bring KeePass and plugins together. -# -# This derivation patches KeePass to search for plugins in specified -# plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; version = "2.38"; @@ -19,6 +14,38 @@ with builtins; buildDotnetPackage rec { buildInputs = [ unzip makeWrapper icoutils ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + xsel = "${xsel}/bin/xsel"; + xprop = "${xorg.xprop}/bin/xprop"; + xdotool = "${xdotool}/bin/xdotool"; + }) + ]; + + # KeePass looks for plugins in under directory in which KeePass.exe is + # located. It follows symlinks where looking for that directory, so + # buildEnv is not enough to bring KeePass and plugins together. + # + # This derivation patches KeePass to search for plugins in specified + # plugin derivations in the Nix store and nowhere else. + pluginLoadPathsPatch = + let outputLc = toString (add 7 (length plugins)); + patchTemplate = readFile ./keepass-plugins.patch; + loadTemplate = readFile ./keepass-plugins-load.patch; + loads = + lib.concatStrings + (map + (p: replaceStrings ["$PATH$"] [ (unsafeDiscardStringContext (toString p)) ] loadTemplate) + plugins); + in replaceStrings ["$OUTPUT_LC$" "$DO_LOADS$"] [outputLc loads] patchTemplate; + + passAsFile = [ "pluginLoadPathsPatch" ]; + postPatch = '' + sed -i 's/\r*$//' KeePass/Forms/MainForm.cs + patch -p1 <$pluginLoadPathsPatchPath + ''; + preConfigure = '' rm -rvf Build/* find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \; diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/applications/misc/keepass/fix-paths.patch new file mode 100644 index 000000000000..318f8a358985 --- /dev/null +++ b/pkgs/applications/misc/keepass/fix-paths.patch @@ -0,0 +1,87 @@ +diff --git a/KeePass/Native/NativeMethods.Unix.cs b/KeePass/Native/NativeMethods.Unix.cs +index 7495a1c..4ef4727 100644 +--- a/KeePass/Native/NativeMethods.Unix.cs ++++ b/KeePass/Native/NativeMethods.Unix.cs +@@ -128,7 +128,7 @@ namespace KeePass.Native + try + { + Application.DoEvents(); // E.g. for clipboard updates +- string strOutput = NativeLib.RunConsoleApp("xdotool", strParams); ++ string strOutput = NativeLib.RunConsoleApp("@xdotool@", strParams); + Application.DoEvents(); // E.g. for clipboard updates + return (strOutput ?? string.Empty); + } +diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs +index e93a22a..3fd9a2b 100644 +--- a/KeePass/Util/ClipboardUtil.Unix.cs ++++ b/KeePass/Util/ClipboardUtil.Unix.cs +@@ -62,7 +62,7 @@ namespace KeePass.Util + // "-out -selection clipboard"); + // if(str != null) return str; + +- string str = NativeLib.RunConsoleApp("xsel", ++ string str = NativeLib.RunConsoleApp("@xsel@", + "--output --clipboard", null, XSelFlags); + if(str != null) return str; + +@@ -83,10 +83,10 @@ namespace KeePass.Util + if(string.IsNullOrEmpty(str)) + { + // xsel with an empty input can hang, thus use --clear +- if(NativeLib.RunConsoleApp("xsel", "--clear --primary", ++ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary", + null, XSelFlags) != null) + { +- NativeLib.RunConsoleApp("xsel", "--clear --clipboard", ++ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard", + null, XSelFlags); + return; + } +@@ -97,10 +97,10 @@ namespace KeePass.Util + } + + // xsel does not support --primary and --clipboard together +- if(NativeLib.RunConsoleApp("xsel", "--input --primary", ++ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary", + str, XSelFlags) != null) + { +- NativeLib.RunConsoleApp("xsel", "--input --clipboard", ++ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard", + str, XSelFlags); + return; + } +diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs +index ddd8f57..150eb82 100644 +--- a/KeePassLib/Native/ClipboardU.cs ++++ b/KeePassLib/Native/ClipboardU.cs +@@ -27,7 +27,7 @@ namespace KeePassLib.Native + { + internal static class ClipboardU + { +- private const string XSel = "xsel"; ++ private const string XSel = "@xsel@"; + private const string XSelV = "--version"; + private const string XSelR = "--output --clipboard"; + private const string XSelC = "--clear --clipboard"; +diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs +index 0da7019..f6a1022 100644 +--- a/KeePassLib/Utility/MonoWorkarounds.cs ++++ b/KeePassLib/Utility/MonoWorkarounds.cs +@@ -41,7 +41,7 @@ namespace KeePassLib.Utility + { + public static class MonoWorkarounds + { +- private const string AppXDoTool = "xdotool"; ++ private const string AppXDoTool = "@xdotool@"; + + private static Dictionary g_dForceReq = new Dictionary(); + private static Thread g_thFixClip = null; +@@ -303,7 +303,7 @@ namespace KeePassLib.Utility + // } + // else { Debug.Assert(false); } + +- string strWmClass = (NativeLib.RunConsoleApp("xprop", ++ string strWmClass = (NativeLib.RunConsoleApp("@xprop@", + "-id " + strHandle + " WM_CLASS") ?? string.Empty); + + if(strWmClass.IndexOf("\"" + PwDefs.ResClass + "\"", diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/applications/misc/keepass/keepass-plugins-load.patch new file mode 100644 index 000000000000..ca52e7ef191a --- /dev/null +++ b/pkgs/applications/misc/keepass/keepass-plugins-load.patch @@ -0,0 +1 @@ ++ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch new file mode 100644 index 000000000000..cde6e7252bc3 --- /dev/null +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -0,0 +1,13 @@ +diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs +index 3d5fca0..4c3f3d4 100644 +--- a/KeePass/Forms/MainForm.cs ++++ b/KeePass/Forms/MainForm.cs +@@ -406,7 +406,$OUTPUT_LC$ @@ namespace KeePass.Forms + m_pluginManager.Initialize(m_pluginDefaultHost); + + m_pluginManager.UnloadAllPlugins(); +- if(AppPolicy.Current.Plugins) m_pluginManager.LoadAllPlugins(); +$DO_LOADS$+ + + // Delete old files *after* loading plugins (when timestamps + // of loaded plugins have been updated already) diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 8479c4e16ace..699cb2fd0986 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc -, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib +, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , xapian, ctpp2, zimlib }: @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ - --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ + --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ --suffix PATH : ${aria2}/bin ''; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index e2290105c925..bb55fc2d4a8b 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -8,7 +8,7 @@ , dbus , libwnck3 , keybinder3 -, hicolor_icon_theme +, hicolor-icon-theme , wrapGAppsHook }: @@ -28,7 +28,7 @@ buildPythonApplication rec { # For setup hook gobjectIntrospection ]; - buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ]; + buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; configurePhase = '' diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 2695ac1ef7d5..5c21b404f348 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub , extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }: -let version = "0.7.1"; in +let version = "0.7.3"; in mkDerivation { name = "latte-dock-${version}"; @@ -10,7 +10,7 @@ mkDerivation { owner = "psifidotos"; repo = "Latte-Dock"; rev = "v${version}"; - sha256 = "0vdmsjj1qqlzz26mznb56znv5x7akbvw65ybbzakclp4q1xrsrm2"; + sha256 = "110bal0dairsvgj624n5k0zabh2qfy9dk560a4wy7icxv0cjh7hg"; }; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index a514b0ff63dd..0a2a051223ac 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte +{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte , libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs }: @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-man" + "--enable-gtk3" ]; nativeBuildInputs = [ @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs ]; - buildInputs = [ gtk2 vte ]; + buildInputs = [ gtk3 vte ]; patches = [ ./respect-xml-catalog-files-var.patch diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 0167132db789..8451c783aac6 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK -, desktop_file_utils, libSM, imagemagick }: +, desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "17.10"; + version = "17.12"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c"; + sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libzen libmediainfo wxGTK desktop_file_utils libSM + buildInputs = [ libzen libmediainfo wxGTK desktop-file-utils libSM imagemagick ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 1317c0357923..701e4b2e052d 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.8.0"; + version = "3.8.4"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "00dzx5rqsp73shgvn2jvgk85v3lirby06wxkqjcm1i1xwigidq3b"; + sha256 = "07ih7953pr1jr99rayjn57ba5a0cr3niqkmvy9n59lcc1qwcrwf9"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 75d8463cf7f8..5326f948d894 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -29,6 +29,16 @@ in stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306"; sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk"; }) + (fetchpatch { + name = "CVE-2018-6544.1.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d"; + sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i"; + }) + (fetchpatch { + name = "CVE-2018-6544.2.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7"; + sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627"; + }) ] # Use shared libraries to decrease size diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index e8c6c9f24300..76517f874642 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, glibc, gnome_keyring, gtk, gtkmm, pcre, swig, sudo +, glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo , mysql, libxml2, libctemplate, libmysqlconnectorcpp , vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs -, libXdmcp, libuuid, libzip, libgnome_keyring, file +, libXdmcp, libuuid, libzip, libgnome-keyring, file , pythonPackages, jre, autoconf, automake, libtool , boost, glibmm, libsigcxx, pangomm, libX11, openssl , proj, cairo, libglade @@ -21,9 +21,9 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo + buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file - libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf + libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl proj cairo cairo.dev makeWrapper libglade ] ; @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/mysql-workbench" \ --prefix LD_LIBRARY_PATH : "${python}/lib" \ --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ - --prefix PATH : "${gnome_keyring}/bin" \ + --prefix PATH : "${gnome-keyring}/bin" \ --prefix PATH : "${python}/bin" \ --set PYTHONPATH $PYTHONPATH \ --run ' diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix new file mode 100644 index 000000000000..971da8ba0483 --- /dev/null +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -0,0 +1,37 @@ +{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}: + +mkDerivation rec { + name = "nixnote2-${version}"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "baumgarr"; + repo = "nixnote2"; + rev = "v${version}"; + sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; + }; + + buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake ]; + + postPatch = '' + # Fix location of poppler-qt5.h + for f in threads/indexrunner.cpp html/noteformatter.cpp utilities/noteindexer.cpp gui/plugins/popplerviewer.h gui/plugins/pluginfactory.h gui/plugins/popplerviewer.cpp ; do + substituteInPlace $f \ + --replace '#include ' '#include ' + done + + substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' + ''; + + meta = with stdenv.lib; { + description = "An unofficial client of Evernote"; + homepage = http://www.nixnote.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ htr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index d651f9ef3b66..ae1c178e5716 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "1yl4k39wkh2ins7fz585kc4cg6fagiswgqkh5g36db1bka3v1kn0"; + sha256 = "03cgsdj4l19gla5fx9d1ydqirpsah9d7gx9jaik73x38zqsabr89"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 2aa04ce83e53..8e8126192dda 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus_glib, makeWrapper, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "notify-osd-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib libwnck3 libnotify dbus_glib makeWrapper - gnome3.gsettings_desktop_schemas + glib libwnck3 libnotify dbus-glib makeWrapper + gnome3.gsettings-desktop-schemas ]; configureFlags = "--libexecdir=$(out)/bin"; diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix index f1211851b4c6..69f74d66dd01 100644 --- a/pkgs/applications/misc/nrsc5/default.nix +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -10,14 +10,16 @@ let sha256 = "0pcw2x9rjgkf5g6irql1j4m5xjb4lxj6468z8v603921bnir71mf"; }; + version = "1.0"; + in stdenv.mkDerivation { - name = "nrsc5-20171129"; + name = "nrsc5-${version}"; src = fetchFromGitHub { owner = "theori-io"; repo = "nrsc5"; - rev = "f87beeed96f12ce6aa4789ac1d45761cec28d2db"; - sha256 = "03d5k59125qrjsm1naj9pd0nfzwi008l9n30p9q4g5abgqi5nc8v"; + rev = "v${version}"; + sha256 = "09zzh3h1zzf2lwrbz3i7rif2hw36d9ska8irvxaa9lz6xc1y68pg"; }; postUnpack = '' diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 499653b14359..9e460bf2611a 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ola-${version}"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "OpenLightingProject"; repo = "ola"; rev = version; - sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al"; + sha256 = "1qazhkcakvzkf1dvav0alk33aaklawf8vckgwpf6fvwf7g2kyh63"; }; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index a78b98a58cb3..d4847e4ce493 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -1,21 +1,21 @@ { fetchurl , stdenv , aspellWithDicts -, at_spi2_core ? null +, at-spi2-core ? null , atspiSupport ? true , bash , glib , glibcLocales , gnome3 , gobjectIntrospection -, gsettings_desktop_schemas +, gsettings-desktop-schemas , gtk3 , hunspell , hunspellDicts , hunspellWithDicts , intltool , isocodes -, libcanberra_gtk3 +, libcanberra-gtk3 , libudev , libxkbcommon , pkgconfig @@ -74,17 +74,17 @@ in python3.pkgs.buildPythonApplication rec { buildInputs = [ bash gnome3.dconf - gsettings_desktop_schemas + gsettings-desktop-schemas gtk3 hunspell isocodes - libcanberra_gtk3 + libcanberra-gtk3 libudev libxkbcommon wrapGAppsHook xorg.libXtst xorg.libxkbfile - ] ++ stdenv.lib.optional atspiSupport at_spi2_core; + ] ++ stdenv.lib.optional atspiSupport at-spi2-core; nativeBuildInputs = [ glibcLocales diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix new file mode 100644 index 000000000000..8a941a719f29 --- /dev/null +++ b/pkgs/applications/misc/opentx/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub +, cmake, gcc-arm-embedded, python +, qt5, SDL, gmock +, dfu-util, avrdude +}: + +let + + version = "2.2.1"; + +in stdenv.mkDerivation { + + name = "opentx-${version}"; + + src = fetchFromGitHub { + owner = "opentx"; + repo = "opentx"; + rev = version; + sha256 = "01lnnkrxach21aivnx1k1iqhih02nixh8c4nk6rpw408p13him9g"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = with qt5; [ + gcc-arm-embedded + python python.pkgs.pyqt4 + qtbase qtmultimedia qttranslations + SDL gmock + ]; + + postPatch = '' + sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' + sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|' + ''; + + cmakeFlags = [ + "-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations" + # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. + #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" + #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" + ]; + + meta = with stdenv.lib; { + description = "OpenTX Companion transmitter support software"; + longDescription = '' + OpenTX Companion is used for many different tasks like loading OpenTX + firmware to the radio, backing up model settings, editing settings and + running radio simulators. + ''; + homepage = https://open-tx.org/; + license = stdenv.lib.licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ elitak ]; + }; + +} diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index fc7fd95bbb95..0c0de526e601 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, pkgconfig, fetchurl, buildPythonApplication , autoreconfHook, wrapGAppsHook -, intltool, yelp_tools, itstool, libxmlxx3 +, intltool, yelp-tools, itstool, libxmlxx3 , python, pygobject3, gtk3, gnome3, substituteAll -, at_spi2_atk, at_spi2_core, pyatspi, dbus, dbus-python, pyxdg -, xkbcomp, gsettings_desktop_schemas, liblouis +, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg +, xkbcomp, gsettings-desktop-schemas, liblouis , speechd, brltty, setproctitle, gst_all_1, gst-python }: @@ -30,7 +30,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 - intltool yelp_tools itstool + intltool yelp-tools itstool ]; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ in buildPythonApplication rec { ]; buildInputs = [ - python gtk3 at_spi2_atk at_spi2_core dbus gsettings_desktop_schemas + python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 691f3188b08c..47be9dc8200e 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib +{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib , mono, gtk-sharp-2_0, gnome-sharp, hyena , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp + gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix index e01956e36119..e06f4407534b 100644 --- a/pkgs/applications/misc/pdfshuffler/default.nix +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn , wrapGAppsHook, makeWrapper, gettext , python3Packages, gtk3, poppler_gi -, gnome3, gsettings_desktop_schemas, shared_mime_info, +, gnome3, gsettings-desktop-schemas, shared-mime-info, }: python3Packages.buildPythonApplication rec { @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ]; buildInputs = [ - gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme + gtk3 gsettings-desktop-schemas poppler_gi gnome3.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; doCheck = false; # no tests diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 3b64cf4aa6c0..746a319c2e1e 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -1,5 +1,29 @@ -{ stdenv, lib, go_1_8, fetchzip, git }: +{ stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }: +# When perkeep is updated all deps in the let block should be removed +let + gopherjs = fetchFromGitHub { + owner = "gopherjs"; + repo = "gopherjs"; + # Rev matching https://github.com/perkeep/perkeep/commit/2e46fca5cc1179dbd90bec49fec3870e6eca6c45 + rev = "b40cd48c38f9a18eb3db20d163bad78de12cf0b7"; + sha256 = "0kniz8dg5bymb03qriizza1h3gpymf97vsgq9vd222282pdj0vyc"; + }; + + gotool = fetchFromGitHub { + owner = "kisielk"; + repo = "gotool"; + rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + + gcimporter15 = fetchgit { + url = "https://go.googlesource.com/tools"; + rev = "f8f2f88271bf2c23f28a09d288d26507a9503c97"; + sha256 = "1pchwizx1sdli59g8r0p4djfjkchcvh8msfpp3ibvz3xl250jh0n"; + }; + +in stdenv.mkDerivation rec { name = "perkeep-${version}"; version = "20170505"; @@ -9,7 +33,24 @@ stdenv.mkDerivation rec { sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa"; }; - buildInputs = [ git go_1_8 ]; + # When perkeep is updated postPatch should be removed + postPatch = '' + rm -r ./vendor/github.com/gopherjs/gopherjs/ + cp -a ${gopherjs} ./vendor/github.com/gopherjs/gopherjs + mkdir -p ./vendor/github.com/kisielk/ + cp -a ${gotool} ./vendor/github.com/kisielk/gotool + mkdir -p ./vendor/golang.org/x/tools/go + cp -a ${gcimporter15}/go/gcimporter15 ./vendor/golang.org/x/tools/go/gcimporter15 + + substituteInPlace vendor/github.com/gopherjs/gopherjs/build/build.go \ + --replace '"github.com/fsnotify/fsnotify"' 'fsnotify "camlistore.org/pkg/misc/fakefsnotify"' + + substituteInPlace ./make.go \ + --replace "goVersionMinor = '8'" "goVersionMinor = '9'" \ + --replace "gopherJSGoMinor = '8'" "gopherJSGoMinor = '9'" + ''; + + buildInputs = [ git go ]; goPackagePath = ""; buildPhase = '' diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index ecc4c341a686..5b4b043ef667 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -14,13 +14,13 @@ in python2Packages.buildPythonApplication rec { name = "pytrainer-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "pytrainer"; repo = "pytrainer"; rev = "v${version}"; - sha256 = "1x4f1ydjql0aisvxs5kyi9lx35b4q3768dx42fyzq1nxdwzaqyvy"; + sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581"; }; namePrefix = ""; @@ -35,8 +35,13 @@ python2Packages.buildPythonApplication rec { ./pytrainer-webkit.patch ]; + postPatch = '' + substituteInPlace ./setup.py \ + --replace "'mysqlclient'," "" + ''; + propagatedBuildInputs = with python2Packages; [ - dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate + dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy sqlalchemy_migrate psycopg2 ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ]; buildInputs = [ perl gpsbabel sqlite ]; diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch index 359e28c41c34..761064077a98 100644 --- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch +++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch @@ -1,7 +1,7 @@ -diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py ---- pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py 1980-01-02 00:00:00.000000000 +0100 -+++ pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py 2017-09-30 18:56:43.127016847 +0200 -@@ -69,7 +69,7 @@ class ActivityTest(unittest.TestCase): +diff -Nurp source.orig/pytrainer/test/core/test_activity.py source/pytrainer/test/core/test_activity.py +--- source.orig/pytrainer/test/core/test_activity.py 2018-02-27 22:15:32.078243354 +0100 ++++ source/pytrainer/test/core/test_activity.py 2018-02-27 22:16:33.936867052 +0100 +@@ -92,7 +92,7 @@ class ActivityTest(unittest.TestCase): self.assertEquals(self.activity.time, self.activity.duration) def test_activity_starttime(self): @@ -10,10 +10,10 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1 def test_activity_time_tuple(self): self.assertEquals(self.activity.time_tuple, (2, 3, 46)) -diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py ---- pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py 1980-01-02 00:00:00.000000000 +0100 -+++ pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py 2017-09-30 18:55:45.078128980 +0200 -@@ -23,7 +23,7 @@ class GarminTCXv2Test(unittest.TestCase) +diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrainer/test/imports/test_garmintcxv2.py +--- source.orig/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:15:32.079243364 +0100 ++++ source/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:17:10.778333751 +0100 +@@ -39,7 +39,7 @@ class GarminTCXv2Test(unittest.TestCase) self.fail() def test_workout_summary(self): @@ -22,9 +22,18 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrai try: current_path = os.path.dirname(os.path.abspath(__file__)) data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/" -diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py ---- pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py 1980-01-02 00:00:00.000000000 +0100 -+++ pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py 2017-09-30 18:56:23.448720166 +0200 +@@ -52,7 +52,7 @@ class GarminTCXv2Test(unittest.TestCase) + self.fail() + + def test_summary_in_database(self): +- summary = [(0, True, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')] ++ summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] + activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1') + self.ddbb.session.add(activity) + self.ddbb.session.commit() +diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py +--- source.orig/pytrainer/test/lib/test_date.py 2018-02-27 22:15:32.079243364 +0100 ++++ source/pytrainer/test/lib/test_date.py 2018-02-27 22:16:33.936867052 +0100 @@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase def test_getDateTime(self): utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 763435da564d..88628c63c9ce 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,7 +1,7 @@ { mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null , qtbase, qtwebengine, qtwebkit , cmake -, syncthing, syncthing-inotify ? null +, syncthing , preferQWebView ? false , preferNative ? true }: @@ -34,7 +34,6 @@ mkDerivation rec { ${lib.optionalString stdenv.isLinux '' substituteInPlace includes/platforms/linux/posixUtils.hpp \ --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \ - --replace '"/usr/local/bin/syncthing-inotify"' '"${syncthing-inotify}/bin/syncthing-inotify"' \ --replace '"pgrep -x' '"${procps}/bin/pgrep -x' ''} diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 6ac27f145a93..b13bc4cb7af2 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -7,13 +7,13 @@ assert imagePreviewSupport -> w3m != null; pythonPackages.buildPythonApplication rec { name = "ranger-${version}"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; rev = "v${version}"; - sha256= "0h3qz0sr21390xdshhlfisvscja33slv1plzcisg1wrdgwgyr5j6"; + sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj"; }; checkInputs = with pythonPackages; [ pytest ]; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index c0e481ae8788..b7ab092bbc04 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool , libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection -, gtk3, python, pygobject3, pyxdg, libdrm, libxcb }: +, gtk3, python, pygobject3, pyxdg, libdrm, libxcb, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "redshift-${version}"; @@ -36,15 +36,14 @@ stdenv.mkDerivation rec { libdrm libxcb python + hicolor-icon-theme ]; pythonPath = [ pygobject3 pyxdg ]; preConfigure = "./bootstrap"; - postFixup = '' - wrapPythonPrograms - rm "$out/share/icons/hicolor/icon-theme.cache" - ''; + + postFixup = "wrapPythonPrograms"; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix new file mode 100644 index 000000000000..c1b1cfb48a28 --- /dev/null +++ b/pkgs/applications/misc/regextester/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchFromGitHub +, gettext +, libxml2 +, pkgconfig +, gtk3 +, granite +, gnome3 +, cmake +, ninja +, vala +, elementary-cmake-modules +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "regextester-${version}"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "artemanufrij"; + repo = "regextester"; + rev = version; + sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n"; + }; + + XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ + "${granite}/share" + "${gnome3.libgee}/share" + ]; + + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + vala + cmake + ninja + gettext + libxml2 + elementary-cmake-modules + ]; + buildInputs = [ + gtk3 + granite + gnome3.libgee + ]; + + meta = with stdenv.lib; { + description = "A desktop application to test regular expressions interactively"; + homepage = https://github.com/artemanufrij/regextester; + maintainers = with maintainers; [ samdroid-apps ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index cbf602b75dab..1d0c7d28de6e 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext -, gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme +{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext +, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper , pkgconfig, python, pythonPackages, vte , wrapGAppsHook}: @@ -22,11 +22,11 @@ in stdenv.mkDerivation rec { buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib - gdk_pixbuf gsettings_desktop_schemas gtk3 - hicolor_icon_theme vte ]; + makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib + gdk_pixbuf gsettings-desktop-schemas gtk3 + hicolor-icon-theme vte ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" + NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; diff --git a/pkgs/applications/misc/rtl_433/default.nix b/pkgs/applications/misc/rtl_433/default.nix new file mode 100644 index 000000000000..819c6c9391a9 --- /dev/null +++ b/pkgs/applications/misc/rtl_433/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }: +stdenv.mkDerivation rec { + + version = "2018-02-23"; + name = "rtl_433-${version}"; + + src = fetchFromGitHub { + owner = "merbanan"; + repo = "rtl_433"; + rev = "51d275c"; + sha256 = "1j443wmws5xgc18s47bvw3pqljk747izypz52rmlrvs16v96cg2g"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libusb1 rtl-sdr ]; + + meta = with stdenv.lib; { + description = "Decode traffic from devices that broadcast on 433.9 MHz"; + homepage = https://github.com/merbanan/rtl_433; + license = licenses.gpl2; + maintainers = with maintainers; [ earldouglas ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 17798bb01e2d..7c74bb6cd459 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sakura-${version}"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1vj07xnkalb8q6ippf4bmv5cf4266p1j9m80sxb6hncx0h8paj04"; + sha256 = "0fhcn3540iw22l5zg3njh5z8cj0g2n9p6fvagjqa5zc323jfsc7b"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix new file mode 100644 index 000000000000..2c8753efcd74 --- /dev/null +++ b/pkgs/applications/misc/sequeler/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub +, cmake, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook +, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2 }: + + +let + version = "0.5.4"; + sqlGda = libgda.override { + mysqlSupport = true; + postgresSupport = true; + }; + +in stdenv.mkDerivation rec { + name = "sequeler-${version}"; + + src = fetchFromGitHub { + owner = "Alecaddd"; + repo = "sequeler"; + rev = "v${version}"; + sha256 = "05c7y6xdyq3h9bn90pbz03jhy9kabmgpxi4zz0i26q0qphljskbx"; + }; + + nativeBuildInputs = [ cmake ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook ]; + + buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 ]; + + meta = with stdenv.lib; { + description = "Friendly SQL Client"; + longDescription = '' + Sequeler is a native Linux SQL client built in Vala and Gtk. It allows you + to connect to your local and remote databases, write SQL in a handy text + editor with language recognition, and visualize SELECT results in a + Gtk.Grid Widget. + ''; + homepage = https://github.com/Alecaddd/sequeler; + license = licenses.gpl3; + maintainers = [ maintainers.etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7367c8207054..7fbf11573c49 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ buildCommand = let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 5fffa6681cb2..1e4e72c4e484 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,6 +1,6 @@ -{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop_file_utils -, shared_mime_info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer -, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }: +{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils +, shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer +, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2, hicolor-icon-theme, adwaita-icon-theme }: stdenv.mkDerivation rec { name = "spacefm-${version}"; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { postInstall = '' rm -f $out/etc/spacefm/spacefm.conf - ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf + ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 udev desktop_file_utils shared_mime_info intltool - wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks + gtk3 udev desktop-file-utils shared-mime-info intltool + wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 ] ++ (if ifuseSupport then [ ifuse ] else []); # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 009eb488d7b4..68a192d78b84 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }: +, gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }: let @@ -36,7 +36,7 @@ let patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' ant furniture textures help @@ -54,7 +54,7 @@ let cp "${sweethome3dItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 37623caa1d4e..6c4b32ca9aa6 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }: +, gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }: let @@ -26,7 +26,7 @@ let categories = "Application;Graphics;2DGraphics;3DGraphics;"; }; - buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ]; + buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; patchPhase = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml @@ -43,7 +43,7 @@ let cp ${module}-${version}.jar $out/share/java/. cp "${editorItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index cc267dceaf8b..a337b5eae996 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json_glib, zeitgeist, vala_0_38, hicolor_icon_theme, gobjectIntrospection +, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobjectIntrospection }: let @@ -18,8 +18,8 @@ in stdenv.mkDerivation rec { gobjectIntrospection ]; buildInputs = [ - glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist - hicolor_icon_theme + glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 7378950b189b..d5b927bb536c 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "tilda-${version}"; - version = "1.3.3"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; - sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki"; + sha256 = "0w2hry2bqcqrkik4l100b1a9jlsih6sq8zwhfpl8zzfq20i00lfs"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index f83ca1b25fef..dc723336a9e9 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus -, gsettings_desktop_schemas, libsecret, desktop_file_utils, gettext, gtkd +, gsettings-desktop-schemas, libsecret, desktop-file-utils, gettext, gtkd , perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook dmd desktop_file_utils perlPackages.Po4a pkgconfig xdg_utils + autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils wrapGAppsHook ]; - buildInputs = [ gnome3.dconf gettext gsettings_desktop_schemas gtkd dbus ]; + buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ]; preBuild = '' makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5") diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 05deac81af6f..838e26463cd0 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre , glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage , libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp -, libstartup_notification, hicolor_icon_theme, wrapGAppsHook +, libstartup_notification, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs - libXdmcp libstartup_notification hicolor_icon_theme ]; + libXdmcp libstartup_notification hicolor-icon-theme ]; postPatch = '' substituteInPlace CMakeLists.txt --replace /etc $out/etc diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index eebab6643a68..6cf1f27a104b 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.4.15"; + version = "1.4.17"; name = "tnef-${version}"; src = fetchFromGitHub { owner = "verdammelt"; repo = "tnef"; rev = version; - sha256 = "0wm5ylppkjg518ldb9kzlx58a9l8z66gpz9ljalmyq6a77khd7pj"; + sha256 = "0cq2xh5wd74qn6k2nnw5rayxgqhjl3jbzf4zlc4babcwxrv32ldh"; }; doCheck = true; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 853cc5171053..3810da40849b 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.4"; + version = "0.9.6.6"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v" + version; - sha256 = "166zhic3k4z37vc8p1fnhc4xx7i7q0j30nr324frmp1mrnwrdib8"; + sha256 = "0hbwvc554v6fi4ardidwsnn8hk7p68p155yjllvljjawkbq4qljq"; }; phases = [ "buildPhase" "installPhase" "postFixup" ]; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 9f94b0aa48e9..ea79e29ff020 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, asciidoc-full, gettext -, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg +, gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg , udisks2, wrapGAppsHook , buildPythonApplication , docopt @@ -21,7 +21,7 @@ buildPythonApplication rec { buildInputs = [ asciidoc-full # For building man page. - hicolor_icon_theme + hicolor-icon-theme wrapGAppsHook librsvg # required for loading svg icons (udiskie uses svg icons) ]; diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 78305675f17f..6aba4e751503 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "1.7.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "00l1zs3qw89z1hlylprzrpf6nf7h22h0nw43h97gv775vaqqgczv"; + sha256 = "02jq2jas6gm08z4l09azi6dcsydaaaqbxfv4mb7pnrc1w8m593zr"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 5af675a82acf..d090878f9768 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl -, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper +, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils + buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite ]; diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index 27b2a8f7134f..166811fb4ae3 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg -, dbus_glib, autoreconfHook, wrapGAppsHook }: +, dbus-glib, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { name = "volnoti-unstable-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ - dbus gdk_pixbuf glib libX11 gtk2 dbus_glib librsvg + dbus gdk_pixbuf glib libX11 gtk2 dbus-glib librsvg ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 0d38f1b93e73..968539336a9c 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.8.5"; + version = "3.15.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw"; + sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index fbf68f317dee..0394fa83d4a4 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, gettext, intltool, libtool, pkgconfig , libICE, libSM, libXScrnSaver, libXtst, cheetah , glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm -, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: +, dbus, dbus-glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: stdenv.mkDerivation rec { name = "workrave-${version}"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah glib glibmm gtkmm2 atk pango pangomm cairo cairomm - dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx + dbus dbus-glib GConf gconfmm gdome2 gstreamer libsigcxx ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index a895c9b4537b..bb7b22c40a26 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -3,11 +3,11 @@ , intltool , docbook2x, docbook_xml_dtd_412, libxslt , sword, clucene_core, biblesync -, gnome_doc_utils +, gnome-doc-utils , libgsf, gconf , gtkhtml, libglade, scrollkeeper , webkitgtk -, dbus_glib, enchant, isocodes, libuuid, icu +, dbus-glib, enchant, isocodes, libuuid, icu , wrapGAppsHook }: @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt - sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml - libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ]; + sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml + libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ]; prePatch = '' patchShebangs .; diff --git a/pkgs/applications/misc/xpdf/cmake_version.patch b/pkgs/applications/misc/xpdf/cmake_version.patch new file mode 100644 index 000000000000..59a51f7506d5 --- /dev/null +++ b/pkgs/applications/misc/xpdf/cmake_version.patch @@ -0,0 +1,15 @@ + +Fix "No known features for CXX compiler", see +https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at +https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + # + #======================================================================== + +-cmake_minimum_required(VERSION 2.8.8) ++cmake_minimum_required(VERSION 3.1.0) + + project(xpdf) + diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index ef031c4b9f4d..3b05c9be451f 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,9 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false , stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null -, cmake, qtbase ? null +, cmake, qtbase ? null, qtsvg ? null, makeWrapper }: -assert enableGUI -> qtbase != null && freetype != null; +assert enableGUI -> qtbase != null && qtsvg != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; @@ -17,7 +17,12 @@ stdenv.mkDerivation { sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz"; }; - nativeBuildInputs = [ cmake ]; + # Fix "No known features for CXX compiler", see + # https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at + # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html + patches = stdenv.lib.optional stdenv.isDarwin ./cmake_version.patch; + + nativeBuildInputs = [ cmake makeWrapper ]; cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"]; @@ -31,6 +36,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + wrapProgram $out/bin/xpdf \ + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix} + ''; + meta = { homepage = http://www.foolabs.com/xpdf/; description = "Viewer for Portable Document Format (PDF) files"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index bb5a7046dd49..f5ec42974c74 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, ninja, which, nodejs, fetchurl, gnutar +{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, gtk3, dbus_glib +, glib, gtk2, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage, cups , ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 @@ -25,7 +25,7 @@ , enableHotwording ? false , enableWideVine ? false , gnomeSupport ? false, gnome ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null @@ -44,10 +44,14 @@ let # source tree. extraAttrs = buildFun base; - gentooPatch = name: sha256: fetchurl { + gentooPatch = name: sha256: fetchpatch { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}"; inherit sha256; }; + githubPatch = commit: sha256: fetchpatch { + url = "https://github.com/chromium/chromium/commit/${commit}.patch"; + inherit sha256; + }; mkGnFlags = let @@ -125,10 +129,10 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 gtk3 dbus_glib + glib gtk2 gtk3 dbus-glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - ] ++ optional gnomeKeyringSupport libgnome_keyring3 + ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; @@ -147,6 +151,8 @@ let ] ++ optionals (versionRange "64" "65") [ (gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl") (gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc") + # missing ninja dep https://github.com/NixOS/nixpkgs/issues/35296#issuecomment-368666833 + (githubPatch "b1e3cfd4f9bfe43a1e08c5670b51c8c80d3e6372" "17vih86rpsy282r8ikrf2q5gfjdwqzvyn8859i75xzvl8agyhbaa") ] ++ optionals (versionRange "65" "66") [ #(gentooPatch "chromium-gcc-r0.patch" "127xdwabizn5gz8rf1qsw62i7m0b5bsfjqxv4kdbsnizmjanddf8") #(gentooPatch "chromium-memcpy-r0.patch" "1d3vra59wjg2lva7ddv55ff6l57mk9k50llsplr0b7vxk0lh0ps5") diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 426161475369..1f6eb7c178fb 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, stdenv, makeWrapper, makeDesktopItem, ed -, glib, gtk3, gnome3, gsettings_desktop_schemas +, glib, gtk3, gnome3, gsettings-desktop-schemas # package customization , channel ? "stable" @@ -75,7 +75,7 @@ in stdenv.mkDerivation { makeWrapper ed # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk3 + gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS gnome3.defaultIconTheme diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index bc9105acc77f..bca9e1c9a1c1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1ggj1a7v2n4v34kb8gx2hcswlayryr9g62zqlry26bwmvz6qzsx9"; - sha256bin64 = "1ah8088d8p674dj5bijk5maapmiq9iap1w2i81dl0hhpyqxx3h3i"; - version = "65.0.3325.73"; + sha256 = "1kdv6r3cmy7lqynnk4ylkn81x91wkv2k3hqh41sb50h65s7h9b3y"; + sha256bin64 = "18bralcc4frapglcfa5az3z8i74calrblf4zzavisvpkmnil7ypa"; + version = "65.0.3325.88"; }; dev = { - sha256 = "13klppyl6rbkd3ffp8y8d95l4mc72gmj45y34wynyfap6b4z1lmh"; - sha256bin64 = "0w1ipy858p9lbpcrjhs44kncgw7c5qv1929h0w65ybgsggjqh0gz"; - version = "66.0.3343.3"; + sha256 = "1ykg5c3bayv6pwz74dglxcmbsalz6p04c3r0y15xkw2iyv5jjcam"; + sha256bin64 = "1phw755ra3pckvhapm26amr6b3652k8f7sxanjyq118zkpga21w2"; + version = "66.0.3350.0"; }; stable = { - sha256 = "0mf4qjmrjnxs7mx9c5pymavmib7l2a2kxiy0kqk3mma1y90qnc7k"; - sha256bin64 = "0idij274g53lzvgz9h5xxi8l841vvvr78hp25ndbmpv4a2p1d83b"; - version = "64.0.3282.167"; + sha256 = "0q0q1whspmzyln04gxhgl3jd2vrgb4imh8r9qw6c06i3b63j3l2z"; + sha256bin64 = "1sq8mmdw32n00swm4q9q5q3vw6q5sp8yiaxag4rbzvxkfnr3vi4g"; + version = "64.0.3282.186"; }; } diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 137b463a1e1d..ec585e53fd23 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls -, json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }: +, json_c, m4, glib-networking, gsettings-desktop-schemas, dconf }: stdenv.mkDerivation { name = "dwb-2016-03-21"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gsettings_desktop_schemas libsoup + buildInputs = [ makeWrapper gsettings-desktop-schemas libsoup webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ]; # There are Xlib and gtk warnings therefore I have set Wno-error @@ -19,10 +19,10 @@ stdenv.mkDerivation { preFixup='' wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" wrapProgram "$out/bin/dwbem" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index e41783ddf5ba..d1741774d347 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook -, git, glib, glib_networking, gsettings_desktop_schemas, gst_all_1, gtk3 +, git, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3 , gtkspell3, libsecret, python36, python36Packages, webkitgtk }: stdenv.mkDerivation rec { @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ git # required to download ad blocking DB - glib_networking - gsettings_desktop_schemas + glib-networking + gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 680ffe8382a6..224af61bfa47 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b11"; + version = "59.0b13"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ach/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ach/firefox-59.0b13.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "5e8287db112a59ccdcf9460d66d170538a312583253f3ed98c251820f75ca1de4b4ee7efbc5a9d6b6cba167d2bc451f62801bfee8bf4022cfe640312f0b5c759"; + sha512 = "3385d1c5540bd0066c90fb63b2f18105085092e1d89ae1a0badc9e00f8392f4dc20b65ac6a04f22239332ca1ccef0995df433d656d6b105be03c0129063e7198"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/af/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/af/firefox-59.0b13.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "43bbad7b87c5b0043177d633bef8cf60136ab78e5f1f5c23b5d5c39dd08940f7603d997dfda84b94b5fd581d25a68f03ac71015c5fad500f6df7704c52b58520"; + sha512 = "1eaa00e379a4f3dbf162edb4a79b3642b8b16a882e6b106475ccbb962072e6148becde4c068f41cf3061741d30ad1cd72e5b04f587eb9ca9483e248e8366a522"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/an/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/an/firefox-59.0b13.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "80889c60222d86fe544456c54a2307033f70040edcdba8102f4e11d6be887b5e66c397b31c897f38402ef64565a6d122f7f8f894d8ea7f6180391680949d25a8"; + sha512 = "0cb52af20dcec4785865a479096d211213257ddf19b033a2d9b078727192be9b44eccbb548248e32f0f4a19348b5e8c5ebf27c8dc94f1872d5ebf3e369b74006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ar/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ar/firefox-59.0b13.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "bf85daa07fc424e522f9ad79a1dc849fda667342a4069cb0bb1669001cdeeb4f45811dd19f6c85dd5efcf375c66c5bc3941ff46ccfbbb5e8d1b5bfcdc99a368b"; + sha512 = "099945735a3fe0470eb67f50fe1e2c92f49d7d34b5ca7a1c35167eee05aadf705dc6a3f4fdbeb78ff609c8892ecadd2cb32cf3a11cea6879f734220895172982"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/as/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/as/firefox-59.0b13.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "aca2c69d98b9a92592b4e8076ca6778a39f2124ad38d541940ea903c7678e5bc5bd823a596d042891e790aa19fa2aa5f98859b9c7e0e08a8c87b3ebb62314bab"; + sha512 = "30efe149f3f941a19d47ed8ebf0eac53997397f550f56d79c548054df8e14cccd5b1b3d1728b5d9f347cb2e373eff2f2f9403c1741f70c43c958b7566d70a55a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ast/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ast/firefox-59.0b13.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "5c0dd82ee28fa52cd3935553923909f4b817677b455bd36d4efb93d4669b6cb08eec56c388c4c4fdc60cca26565dc2fcbf42fc2b4b80301dc128fa3483d359cf"; + sha512 = "c962aef0f068f3dcc3c9fe82f670b3a2de132ad761144fa009d052622f6578bb42875e39fc311265709e87aac58fcf62e60b0f0d5f98f05193f385be7296b35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/az/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/az/firefox-59.0b13.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9f2dca2a53bdd3f0ba26e7e26f4f7ce73704f023c0732c98b0c16399176af91c69bc6d6e05ed8adadc2caecbfa710bf5cd7dc638be9a7457c63e408a6da9a66d"; + sha512 = "994d995198817480b0f4d198f5a6289d4a380a183b2e350054e6efe1d77ca3dad5c48ce8aeccf5e4813047fca9d856bd392614d7adfe49fac52cd950e05e0bdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/be/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/be/firefox-59.0b13.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "2f4092f1a6fd5f0019307a6bff056f363aadccf4495718476094e8ac888b01df762d96b0b33fa48a37b8c4a85606ea1e1504a855587b8a531c405ccb0b011a23"; + sha512 = "48a60eb7e794fdb5f060f2bd0e359d22ee14ac5916819fada7bf939d07b31993dbfeaf58ce6906c40890c4b35e7edb47fa3f0b33f5d327d649ae5fe2417c5bcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/bg/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bg/firefox-59.0b13.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "c0a61c4ab8615b7315edcc70eee200f742c37dfe9287fd77f58a982cabac233b00ce6725e1bb6d66194db5f1e6a4f5351041e11825ed98573e75320713638e69"; + sha512 = "caa1de35213a8bc492bdec4b003b7b4b072f268f59ff0ccde04e69b64aefd18ee2ef3bc1fca698be4a38251fe76863f8b613279ac060644d3c84e3191977f2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/bn-BD/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bn-BD/firefox-59.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f6fc7d1f9a459654e2775782e0355385840ee6cf7f43d47084e5e60866d785dcff25f08a6de17d8bec8169b069566d599cd6780a3ba71458bcdfa2253b718231"; + sha512 = "466bf0e7394dffbac4f58736c51dcabfb1d9634baf73d28af3ccd270bc1267a51b5c31802d48fc225918f8b15fc4291eb5e959802804510f5967db298e6054ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/bn-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bn-IN/firefox-59.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "6dc654dc8c10070fcd0fbe57928a1c46bd2392fb4b85d91fc40d8537fb62fb30e67f34cd8c5f02965bad5aafef98c305693ee37858bdebced83793e819227d7c"; + sha512 = "034d37ac4aa1fb38b1aa6181e291e16447a270d5c21196469cbba33be773364614e2d2cae415674588c460a107a06f30a8d8ee663a0c797c621f0d4618c1588f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/br/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/br/firefox-59.0b13.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9dcb2f6eb272095ae7dbe61360187f558093147887a848e4cf1bc936d199942ee0c621e063e06ab5e73f265d59710eb162a2b86a8bbe676088fb641c69e1a50a"; + sha512 = "f38c6cc0fc8ab0d0c7504b427c88081b5d8d456510aa6c0a8e1a14b013d9a9502008c4397850fefe3dbfe28d0da57175b1d10824f6feabaacbd6c44a03ed283d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/bs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bs/firefox-59.0b13.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "eab54247b96ac8a9c51b6f40dd12548832c802169f2159ab5e6f77427b5677d21226a7eee541e4f9beb936c4d3078d39eaf6349fce85a0c668cae75e11d1256a"; + sha512 = "e93729b7e94cddc446d035fb35dbfe74a7582bb553095a62b4809c965453a172654aac5268c3238d398a9f46260daf206126782d393938b4863a1efab2a7f78b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ca/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ca/firefox-59.0b13.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "0f1a155975a6a8103ad02c8c1c32d2401812b23e2315321b0c54c34a1f96a0dcbc6c16376e1dae6dffc747c3c9bb2ada4c755ed2d8cfe3c2bf482044d4efeba2"; + sha512 = "fbe2aea772370a83f78bc831d4ad447ba2bfb48b462a085e01aa44aaa517f69002b905523a3ecaf72ad04b41bc0bf0158042ae9d492410e6260bd180e8345699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/cak/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cak/firefox-59.0b13.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "3b3fff95934ca14c93a0720d641f4f7320d013d9f739a82390420cc6da38c8039d25dfad4019dd01df6efdf68a1dcea3fb34683c8ed7f2194e0b949b983a49fe"; + sha512 = "f272b29b440ed9dd3f520539537b3822f79ea274c9dd887f0bd7b352fd25d54850f8c3d3de77ba23d7498d789c90659c16b68df139c325c48cb5bd23b9dc6fc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/cs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cs/firefox-59.0b13.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "96a711881213abf84592ea646ce4804d419cd879c8ed004b8497e90478e976c536523e9aa9bc000c9deb61a0bb5ed3fee3dd8d3befb6a6ecf85956b675f11c50"; + sha512 = "562a7feb664d7fbd1cf46a611cc47b275f730e35af4a5c6860aaec54a5ef3a9ea25b56152b7a6f8b0a239b6c30ba961d1f6584219659a1a35d3395aa9abeda7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/cy/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cy/firefox-59.0b13.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "1eefeeb063198b1475553d76874914e5afb1627c991fa355c8c2ef3b1ff0566fe9145515a66cca4369ede62f12fabc4f87a6e80d191c0e4196a6760b56baeec6"; + sha512 = "811773221c9df7778afe17d31bce17a322247ebab55461b34fe3f984afec96ba44cd941a781915433ae54f5eefbe14c9e6fbaff6b690c69db3504c5fe3c1f678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/da/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/da/firefox-59.0b13.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "e5d2c6e14230811ebe306c5f47667a8264b1cad26eddb44b44f9c3930bd31f58a9c942c5f095dec88b2df26e2bf21906f8d8564da383c19dbec117fb432219eb"; + sha512 = "6fc0b8a04ee1a03b8aa7647a409274d642827b284c9e19b11281369b6299b9f4e17cff942f297ffbdacf922cb47df35b5c572d1a33a6450d000d4c373ebc7c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/de/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/de/firefox-59.0b13.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5a154a843d7e4fc84b3c38dd7227e7cc7de3d663ba8dd66883c748db05b553e6c9f2b412911636432c2a0140376553b831a6a311b41cdbe11c7794b7719cebc5"; + sha512 = "080b44995281ca69a92c039c8734b16b5a57c28df8b7b076f770f2d360d6945b5b9ff1c30c0e226a84a70ef5c76085ddc5b3b2790131e7797508854e261efa4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/dsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/dsb/firefox-59.0b13.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "82fa8750374c5f0e85826515ff6ce9e0dac120b3ab84b855a18609ce747fb45924f26b905aebaffded693c6d822e817a521ed9bc3dfcbfdcdbfdb83047a2e7b3"; + sha512 = "0c37fc3850911499130612465980cb1642c4a7914cffd8d857c6b03e75737992f0e181646050057085a52d7d11654e57c0efacc195b3be377b7fbeadaacf77e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/el/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/el/firefox-59.0b13.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "52a6b477511d5a3d420cae94a7f3354019eb87687086429a7c3e37687af64eb5bca84f0990a5e033856a2c20a2b1e7ab9f66dfe5c8d19adcf989412086815cb5"; + sha512 = "e0e10ddd3f24686790d2d78b9509d1d4dd679588f6c0a9349b35c7d58aab0fc3f914cb139212faa993056997cf805ffb75ee334f8dad6a110b6912b199da3bef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/en-GB/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-GB/firefox-59.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "6163056518c7d9a24de67972e841e369459350af371427a52394827549de1861639395e69b12c011edd381224fbace0818723e638f5c2076634b39a86e0c2d17"; + sha512 = "989b1e7590520271a0e16c1fd02c4b0c85edd53d9d0f6c2dc6e2dcc71b24e53e5ddb58d081e41720bcb54dcdaa8c0b2f8183183adddd6e4da2257dfe71d978e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/en-US/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-US/firefox-59.0b13.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "a8424651320f18d16b4efb6efa4275bbad5bd35ad557cfa02e901025c442d65fffdda2c7bed0d0de7090c708797614fa6d5e3886e6d665ab8d0455c7e329ac91"; + sha512 = "f8bd79f3a6e6b7439103699111fba9e5c1534ba643227fcfb07106fc7e6aa5ce8004b7fcfc58a825e73dcde769e9d19dbb35ac1169c587b66bed6a6805390b52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/en-ZA/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-ZA/firefox-59.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "c590b69168717328765f6bccb70af8878358501b33ed4171b2b2458e426a67bf11c9aa6860139feecaf8b4028240ae9818056650924845bb28bb6609a5aac157"; + sha512 = "b1eb3804b3f25984afc72756388f538c822d0056d6b6955e92f4eddd975bcefb2dfba22fd343171f3ed33f779c86c5f154928a7f2764242d3ce86530e57b8ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/eo/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/eo/firefox-59.0b13.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "b1b2eaa555a0b2eefe5927f87cff7eee2548c81a8f2cefe60891520f68d3c7e2e6593e8944ce535f0018b303b7f93fed39f62fecfda56e6ae210261cbbcb1e51"; + sha512 = "1ea4e0fa24012532cbbcce89b22e5c3131248ef72544bce2de97afc1c104c254a630104d4f2117bf01d217072983296718663e1108e96e86101369d6a66619a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/es-AR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-AR/firefox-59.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "18e575ef4e0b31426c723ef57c2ad665ad6bbce8bfc12373bfaba0d73fcd5d389035488cd84fb2f0a550cfe3a9fd486d287c5d5319899a14e66f2a7c1dc43272"; + sha512 = "151be2980e61df7e96b47f0d48553da52b54007999734322814f4a0fee269d8bba3831411b5731caa23619033ba80a4265eba02acc228db78ef4c1705e1a7615"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/es-CL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-CL/firefox-59.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e01055ad3db6ea4795f4f87e0e4776db93db368a82eabfc4dac79e04ba19466070642adf5b72130f6f3f5ed6b85386f219125e3dbdd862abac6f57b7446c6f99"; + sha512 = "c7b46b7c7fd78cb9bdb5b2fc6e5b0ddb0bbc09bb6e28fbda12ca46b0a0fd8e35660c4d66aeb47fc3b70b725c39e6629f2a0f3a27a9d4991458e5952fc08e819c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/es-ES/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-ES/firefox-59.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b4424d6ba4425198555ab77180b11473b6e3c26f088ec690ae5d6b4e8722ad8fb7f4875077bb5242679d96223b69c610e98df75c26d18687c5d0fb4487e292fe"; + sha512 = "2d79c84179d27e2dbf08637d6302c357438790fd3b02805a0722adb978187cbdde53a4a600c224d2c9c207142550efbc4ef5773218580615af31e0bc42e5ae32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/es-MX/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-MX/firefox-59.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3d089a3372c65eefb747d14061907eb60f00fa5d27117107fb265e3f4e5f9404810d0d0fe5543cabc721eb93995dcaacf037eb76aa4d015fd251fbc4c2c833e9"; + sha512 = "38a64984e500e18cb21529e23e803fd33de9ef910b367f39ceb416cb284f61d5bb2717d86bdf0ed74e2320fade42dde89b7a8d4de024ea7e9b9ff95474208e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/et/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/et/firefox-59.0b13.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "8dd518c48e298cce2163d293627b4231ee858637cfac3b740019c8005a8d9e9c04647c6cb8cc3959cb363cf56ee6e4575d3a1d906090730ef196023298dabbd1"; + sha512 = "940c57ebf1384150a96bc31c9d7bf900f38f020e42cbb4c9a58d563a95a64005aa5244de17acb9834ffb1d2f39cc9acd4b08e976cfe8e48ea9b3584d2ded1db6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/eu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/eu/firefox-59.0b13.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "0422e886daf75a2486725b70b2b12a8a6646bd7db0bc7676a6b534cb93daabb9de502b05ef4bb4041be7a823f8a5fab7dbe0576061a6128fe41b2cfdf6a5831b"; + sha512 = "770dc127e21e350873ad17a966c438a10a1eab8637adc11a368bfb3397a61d0411f17452a984aa0b7c62012adc75b193d49936de7775e1c380ad0e1d315f479c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/fa/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fa/firefox-59.0b13.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "f084cfb1120973bfd0905dcf1e24fa2b719c36906531af4f67b5231db7ad59bba1e0a1fe89a30a58a81d17ca44d7035a916f472c6737c06daac308f6b4947706"; + sha512 = "483bbed985b9f1987393e288894e41760f2a69ac7f71c38807ee099928d478d7599d86795462d638f83003b4bc5869a32e13df4ab73ad85219228bf2326aab93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ff/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ff/firefox-59.0b13.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "17523d5781d7aaa0a8b31c07da9152c54995d376e5c4cc4b88a405784af54aa59744a948e8676e8670af2ad16bae8f2dd5b9c9f421df6db2c00bc2d3ea6a5c70"; + sha512 = "70e3d235569a976c3f82f10117e2060bc366382f630cb94fdda89f7f30e2dfb1075393dda29a67a6a3e224d8c2baae0d3727132d4391b261b39819eaad7b7a4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/fi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fi/firefox-59.0b13.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "1af9a35f7d617773d039807e8d02db50d715c30773e2b9577ddf93b92ac1851293260f96e3d6e185f20ffd40cdaff147e30854cd7c7ffb21c8f7cb938f3831d9"; + sha512 = "6e72b77d296a2f4b8d404ca1302ff96ea39c846bf3d38b741acd6e327afab6c6e010980f15502fe5f69ddb0bae06041a343d588aa813f24176c34022a5371551"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/fr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fr/firefox-59.0b13.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "4967cf0e9b639bbfda7668b02c94d19488c5416384362f3f2b308e034a975bc995c0cb74cab952f5b5963a35e7f01e2ed55883b10a3fd63763fa35459449b5c9"; + sha512 = "724271904d24b4d412e6246ce8ece8fed71c6fe3e272551d3040dea3e7326f00f2516d742cdff9751222a141a574624fad4d476bfdd942a572ebf590eea4b1d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/fy-NL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fy-NL/firefox-59.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "ce2317827a41016b1b08edd1d4f5119aedcf3e924064c8a07f207a41b62c83dcaca1d2d2b72be94e889be0997af597b535bdb707638b16fd4685a0aeb1e87efa"; + sha512 = "73ed1f28ad9c8b5c9a94ed746b48fe5756c323ecfbc35165b1af8f957331564a8a46403b72ad1e7d0c9e955f88bddd75628bd491a20916d769e410fc7d06671f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ga-IE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ga-IE/firefox-59.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "939870c715e8330abf71fbd6223e5d2314b43cdca7f84629205844b651990a840eefdd701e4eede711d3231da32fc0451eee5eaa4e6cd0f585c8c8887d7b8bfc"; + sha512 = "da86d4603f6456d62a2668f86d5eb3b5cfb9bc9454fbea11cce135fa0e215713a73976a71e630c93a6f6235880a08ae036bab6026f64e12847dde3996a4e767b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/gd/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gd/firefox-59.0b13.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "38136a88b6254bac3b21f5bf29997df2e256e603beed11c6d42de4f49d7f0a806eb1a65a624c3e2b3b53c8bf0be660039139aec29c3e4631f058f4ba6c38f505"; + sha512 = "34904ec1e30394e06a14d2f5492fb2d08b66af587ee0823d7ddf6dd0c89407e784342c438f9f2fee85e7bb21888f4003c33c90be51a395d3b4d29050290cfd67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/gl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gl/firefox-59.0b13.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "63a039bcfe1aaaa42da8c38cbb1d82a7e3128f9924df8cb9c703cf2d076fbdbb77ebe36a99b12384d929b104b92e5438c26eabb367b7e38f17d17c1adf93ee53"; + sha512 = "485c67a32819bebca340240a53767ded9a4af9b8e89a9ddd98913ee2702b799551cae47a1be8ffc13cb3c61121ccc25def8527db622eee4f1f762c88e1517f53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/gn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gn/firefox-59.0b13.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "5a8e13184bc491d7d64cd302765b2c13937aa172e2390e93395cbd7e000bc1e5478ef953f6b6a3fd37813a83d1f4661ce52c14890cf2ac9c79a53108556a41f6"; + sha512 = "b1e6704fee7cf35bf24e94db3dac411e4627b88eb5b954d017bd69cc03d598058a4f6a649522e8e56c648fd649c0315ca62fcb77304175753dc0e71ede3848ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/gu-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gu-IN/firefox-59.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "28723577b5df745f711a8a01834a040ac07d3d6468a2b69c3992e8f850a22c9e68495c647d717bfc841cc31121626bae2b5010cbbbbdabf08917042de4fa7363"; + sha512 = "fb2163796be2756d7c3cb6993e2ce295162e1d407e7673989365848c82017280b3da615dcec32ec6170fd39edd7cac87f9998d54e91b365c7fb88431201c7feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/he/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/he/firefox-59.0b13.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "37e9f8be66c57077ddb514ea43639b33796540c76db2f2e9bfb52852b6356952d0f4cd9c3ae8a2addca2ff4a4e586ad5aabdbdeef614af3e2cb647c5a0ffb095"; + sha512 = "f902b115d29654c34f98e1acc15aa173c5881838f42734b5ccbccb388eadbc32167ee35aa07173e62290cd69bab0ec985293e49bcd951b407e9b568e1a126b4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/hi-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hi-IN/firefox-59.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "4eea2f03baa7cbba4f7ebcbd58e580f3e4278926051757e8bd2e3653e2fdd60d2aaf9615cb9abe71a2039263fd76d8e5cb18431c8d68dc55605eedcc9a2950f7"; + sha512 = "5cc246d4807ea49700784c4d4f0995eccac7120c9e3f3c38efa4ddc0835db21f53682ac1921864270079c3dcc39d60ebb5cde7c58dcea9f91f04b81ba2fc41d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/hr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hr/firefox-59.0b13.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0de2795cfba7f8dac2ac0198dd5ea35610c803bfcccc444de0ba9a3c702e03de34f49f378331df7638a0a3cc6bc1a29749aca789ba58fb72549ab6875c5c98ca"; + sha512 = "3455463f7fad3c893a06b24df9a58a53ffa7f56845dca035b2eff9d98c67f1127ac74492dceb9277c01a47131d95f7b2dbfa23189420c6a3cbfc6c63e8fcd616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/hsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hsb/firefox-59.0b13.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "59747fe7f291b3ee889b2ecc8582cc24a4aff9d6db6f85049b7e0e29d47cb5cd73b67d3fd16022cc03f682a454f967bc4d68e5300770509132dc1d0c3cde9fa7"; + sha512 = "aba2ea135d6114c0615677193641c91e4b047840e9dfa5d2f9eb461cde5d539aeae34179f50038424f82104bad8d31ff6fc0f39e6ec7092ba8f3526781284a19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/hu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hu/firefox-59.0b13.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "6f97f366c038985e98ba269a80deeef883bbdc20347827f52cb8334f310fc9cd8f3b29cead4531e6dcf886473064a364efd5fe8c2ff2957cfc0552ba5e432ca1"; + sha512 = "05651119089ebe610586abde15515e9a6886fe546c7b2c1260d5c0c0b778448da5d7ffbe30e46d5f32d49ff0f050a97adddb608cbefdc6f2bdddd593b9e2ad28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/hy-AM/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hy-AM/firefox-59.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "382c39f92a3cf8856bbdc188e672bd75613c8ada0146b5a852f77714c106f649f009e80c58706397d247ffb39821f7c0ca18860362053dfd42dc323bfcf8eae8"; + sha512 = "6d3b6f30e9450352dedd933c310a8c8ee6858410a653a75f4851743cbaf5fa9a35e8f9d65eb110afa02f6a7025266127d10db3326443289e235be012e34495e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ia/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ia/firefox-59.0b13.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "fabbd2e9d30b78254e5ac07ef3f02c6800f3f6331680653ec65598d3733a07d239433ba5b45e9e4e101e094fe59650b527d0189c6f87c89b6251439906b76afe"; + sha512 = "f14f8f554d18adc261a26c55e0c78af833992fdcb1c8c8bb8e4dcd65d8f731b36a663cf02513d7d12d979751aec62d8484a06d8403001e26b5aea304c34c9a65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/id/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/id/firefox-59.0b13.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "db0156e7d76699e6d858360c805387f0b8cea468bfe04c73ac18c87c4b53596488c6d10c44e1a4d5951ae00d13f8c6c23d36edce05ea49ee5f90a578fafa715f"; + sha512 = "ca3f9e284afc1836a73d8b6afee674daaf4f930f9128ad2aea052a8f0050b4b741726af21a5843ee8579c03b4b456e57f2f6f983f223aae8e2b7ee69231a82cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/is/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/is/firefox-59.0b13.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "b369005d3f30b01ba743b57c8d6b22b68c7e2b408b5e67693b770980a9f71f8f0c5fdcad5a72332282be5af68c583a39b5fa498264dc6f85ff0ec4e84664cc5c"; + sha512 = "3356171a15ee94549cfb41eeb601b2f08e4cf286a0c3bdf02a55882df64b819e3159c2ded9601d2f23fc9b49b58cf4f4c53017c5344e9f246f53a5c3b1ed2799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/it/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/it/firefox-59.0b13.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "43363c9addab855c88a07c257ab6f380ec39fc94f28f88ba3aea88ca4a46772a1f7a0aeedca35402b0acc0712b132921ae8ff05e46611d0713dd7544064c5362"; + sha512 = "b1bc75a9f2a4ab2923127514c4b31b679fb5ee5e58223f02cf4b3aae820ebccdc4d41b1d0bbd45ba5bf1dbccbbb2452e95e651417889e8d9acca3bff065630e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ja/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ja/firefox-59.0b13.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "717f484edbf2aff96e6e6b0b8ddc55cc5095760fd4d46487dd766da0861d91572bb689ec9c408bd417a4e312e2a3c7961e46c0674d7578272057308475f26cbc"; + sha512 = "f8a8cd7a69367dbc5d19094c530cf3fa75dc996c2ddb6e91d82d788d778ae2d67e05a8e9371417dd618b62fbd1940ea1dd1231aa7e50e9fa0b633da41f9f9b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ka/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ka/firefox-59.0b13.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5806b59257be4cbc8bf983268f32cb14524fc6b28d317f44cded5af0750adae4d44686af280b015f2c04db8c158b6b943ab0f224077720f742620ed4c69bc1d2"; + sha512 = "6bab5af80f51494e6bb6d1813f05c7defe6170964513438781ea8d72afcc90af90792480c61cbec4cc87909867e47364fcaafcaab9b87f75c845d5022d1d8878"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/kab/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kab/firefox-59.0b13.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "9c3d5f864cbc9c031989a50ca89ccb7b6c57178eb9927e0d103612c6b00e68a18dcf40d9766b57b88c4be2c814d1dc72bd6ca1c8d2e84d797ba2bbb9be21c6b3"; + sha512 = "040e8a53f4f0d3ead182edf37afe9275b0e875c479fd2866f52945824d729c47e6af9162af8e67cc9d7540fed394c09c95b5003d61287a74736336a9a4632118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/kk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kk/firefox-59.0b13.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "30758f1b97f8ea7d80239f0ae0cec40f6689b00a5a6311b5bb77137b01d41e65fcac3f143bcf15ee3d46c28beda0e3a5642c72027f50621a2d96f0fe31025f54"; + sha512 = "3c34fc69be05029ac47810ccf2e64c358bea58abf5b8bde5e8af076fb87e7b36327fb4be565adea27b992e6c4bba14e678ddc3c71de127adfe0a048f11d33a70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/km/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/km/firefox-59.0b13.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "05a559aba77681303ffde44c8aef306ab01633ad045ef35c9c7249fe364e3d52d580a80945054ec99abbc75c5e04d3c271b8abb24714579d1ef3fdf6248ed161"; + sha512 = "2e6d71df99893d69c29352d9a69176d7d3f2d5f47e95d95e6d65826c7bcbb4ebe855878fcf0c1a33fe4e3e749868f081ba58dd9265f130712dcac86d87fa5a2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/kn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kn/firefox-59.0b13.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "3717b9d17b8a3ab0057b0fee943200b77586c65193c21edb06971a861b55f1a976ee25859c6ca57e0056ce6c2f499751dc849b8b6f49bef350b7a4715ff39696"; + sha512 = "b37754188e3f79a5968d5b2c64c6ec8ebe0afd3252260e33e1be639445377d4f36c3dd2bf3e278d14255bf5964def6a359aa17eb108e8402e35f47ebac460c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ko/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ko/firefox-59.0b13.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3ab2890869a1e5845822b7ad53638b908d9d300ae3ed26a545dbb45d991a80d45eeb04b80a277aec26ea0d1be0ec55ddcd896a80ba1af5e10b756136f653b5cf"; + sha512 = "1f069f59437cdc924e8eb34ce4af4c9de39e28733589f35f7ba7d1d40347164dc4bb8953160436bc5b2228f9c78d097d2c8c46a5e3295c10dd6585575939a133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/lij/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lij/firefox-59.0b13.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3f9e5a92862fc440a88d38cb2a520c14f76cce550b9d3ecdfb07d255d95d24b9ed073318093c2f6c9eaa14fbf26eb4be22f86190c3a8404209729c672cd026af"; + sha512 = "4d4890e1aac3a606eeaaa4379f983d556643201ed209f67e1cad1a5c9518a362630a79e74805b37af9e7adf59523ed267f45537b890752cd59d7f10e1b07e189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/lt/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lt/firefox-59.0b13.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ddad89fd08ae2f5b09ae9fd92c3bca701c50441786126ed4abd284f6096d0816c40d603bd8e5965a92399e6ed52bc303c133a4eaa1b993c81e43ca9859583d74"; + sha512 = "8212468dd5c7ecd531bf6bc1f2ec83fe41074b0706f73359cf628312d5959ff04dcd13814f5a54b0c74b050cbd02343099ab654ed8f24bf315036f5da36a6b65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/lv/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lv/firefox-59.0b13.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "30f2239338c0cf7671b46e9b872fa7bcaa960fdbd3dbd3300463c7a69f046f48ccf8ffd43a0409f276177612343be10f825d4ab3f2b64e479b715d5402d3f704"; + sha512 = "456002cac8a82802af2b9a7277f57094bfa69fe03a511b3ab8aae9e74a4e02c90dba69b64f8e0277ce9b78fe254a5fceef31c4684028384655b97651c123b9d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/mai/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mai/firefox-59.0b13.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "af099e3f62745ab8ff9af72c00ba00b1858fa482974ddef743b467f9b9a3b782aebf80b393bbf151a3725cb829326acb5a1de42e30b3c84707cc8bec78a94751"; + sha512 = "5307b74b03e68f95de62512edb1bbacd059b7906582bbca41bae83508ae6de12962ee2b27a7046b6eddd0b0521550ee04d77db07ee0d283e9c1f9fccda1ad1b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/mk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mk/firefox-59.0b13.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f7309c33a3d556ae9143cef3c0e2ca517aa47c12517fa5795971bd8c7366863383418d6be0270455582f495d45fba5573ddb33558896373f16e53f78040dd800"; + sha512 = "693c0665ee15d3136b3bc2e10404f1504237b3cae9eb7e3f3869de641bb6a1b15311e94da778396bcde8d91589260eb08cccf4cb59446b343e39c15506183ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ml/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ml/firefox-59.0b13.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "aa3e62b53ae32806dab1d529cf5a112527dafc95b356d81c6ed1a957f5dfda751daba07401e17510b619644ea2a51175c7b565a17883856681d6b8c209f35915"; + sha512 = "5b57c7756477983f153f650cc0611f9e5d07bd53fc741ef489a32434ee5ba716fc4b1162af2b603e7049b08f737eabb4e91c9f90a3058d83ad1c68608f4713ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/mr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mr/firefox-59.0b13.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "ed7a677fe3f14850f040f3a072b4b678c2c1905511cccc92fe591f279802d49f7a76a93149c2bd6bd1a515bdf05e1431d258a255a30ace51bf3108fd3fed9066"; + sha512 = "8c1d7c5434f8fd7321a2140a938b3505d929c1469d93a08c0deddd20578269c6f6d13a2ee42803f753d19873150587b75924c708918f340e7925b7457a68b39a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ms/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ms/firefox-59.0b13.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7357df06cafc75408d365587ff18a7a907f97116c04b45fa4ee17403914d81752fead616bc51514c238829849842c5cf61c4da4778754401886fe71a13b4d93c"; + sha512 = "cc35a754552dfe2e99004f0b72cdda5b82daebd8ec6eedbb00a9cf64a7f6c51d2c6f2b14b4777117d2cd4f8e585c7a3bb5d81b925c359a35f9873d3a9c5e4bd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/my/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/my/firefox-59.0b13.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bf295939f3dddada01678f2da983e03a3ef1091bae02ae85140c8ddc960919b96dd845e372cd9949be80ecf3778766ec855c533e38f4b7c7b20a9a307236eb2a"; + sha512 = "1772df0d4931024a9256e1a2ec465f193d3351019e397a2708a35317d7a08ffadc4516ff6bbd1cf4efc4b03a4230b628ba2e6b0956763bbedda6bb055a810249"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/nb-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nb-NO/firefox-59.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "bbc645329b20eba4bab5e8a9e959ca5dac19ca44ce0a0b4e590b30a31ac0731bb423496c30b908dfcd056a484a7f87a62e2e6b26cd61a0a0f00ae09c8b49e7c9"; + sha512 = "0f1c60c5e1db28d733093840c1823bc6509dd6bc18a6c514d977d59f03c82ad8a88e114f5ae18fc27d4071eebe3145b91e5a00885b666ee7ed8c1617493f0072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ne-NP/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ne-NP/firefox-59.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "36f2e47d2b7c8e01bc9ea8383238f4d513e7a40bef71c29302e41f994b26a33281fc315653105f3aa564db48556bd91c80f52c7be2a0385205ecca32ce82cdc6"; + sha512 = "17382dd82ed6bd5e4e948c98b494cbd937654bfbfa834c8c8dd8b33d3f7f85fe1d54f4b1e1eb166b4c3e9798063d25abaa89076379ab3283ef73873145db6db5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/nl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nl/firefox-59.0b13.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "19747468727ca8fb857b9b49bf21fc074691431bae03aac650b91a29d055a4e105142e7931fd8de5914552fdd26334655c5a42ee0bf83a1f1c316d9c9a47c5a9"; + sha512 = "45d50122bb98684d3542a3bd015ea906b4d5cd8998f7b1564548d93b567e947f899e554ab8b6bed72077247ca96c8a4df1bf4d85cbaa795a5bd84bed9b6b9af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/nn-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nn-NO/firefox-59.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b4082b5e9f71b50480c1cae8a62c0c5bec8f6c6405050651882137132109fde58bd57b6abd0fde5c6bcb55b0a275793458248c38c7c8c5ea83848259870f6a5d"; + sha512 = "99a97c7b3570e885003e2e93d641574fcb7aa3d9e96555eaf9baa6376bcb22b702d3bc100514c69cb0d9ef8d690d54afea9ad28f996dcb91cbe2a2f29807cf73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/or/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/or/firefox-59.0b13.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "fe48530b18e8c0d555fba6b0cb7bbc65b02bdbe79096445e47f2f66a0ad087420d2bd60eb5bb80e7444207a6a14f8e5de59cab84b467196242e3fc2f051628a8"; + sha512 = "088fc29280127267909b0900db695db6d6ac51a223755c588e2d88703a07ec4ad5cd9c61e9b7c6f2d5456b15859409045a0f7efc869781994aea010522bf96e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/pa-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pa-IN/firefox-59.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "c6c16d428e897cf5432c33677f3b64292d58769ebf162a7f4dc25a6c78ea8008f11ce85c62ff5d0f42995a3f9fb4ecba71a0e6b3d0c2c92a851fbbfd0eb8d7bf"; + sha512 = "6cbb3780012e9e89767bcad23291f9935836904946b71d3c238478ae30f9c72d12a94b68aaee25079118528c1bfb81f58439c72483f57f49174f43556f50cdd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/pl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pl/firefox-59.0b13.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "15882656083843e2cde539d5cdf839e0166ff51555dd5b4ab8ad28e93973b31d44713be494b24659bc819033027209eb8f95be8689d044e9a208d243128b4537"; + sha512 = "b02fd17e4432c75e10018a61c6d24e156658708bc127874c8f1a27a7b6cc3887feeacbba6047d723883f901666e6352127f8ce447651d78120ccba409470abce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/pt-BR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pt-BR/firefox-59.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "c3258178f904021968f09fd87b94eb0ad6424181527828720870694884707f0228648476b94ee60bf96bfb603bceadd95606aed9fb10fb736520f5c055133996"; + sha512 = "e65860c40c362c36732d25f2eac9126d9ba5186343f2de91f33bbfab11d907a7c3968dd5f25664d8c5865c7824b5b754717b9f7a03eb231ba0008151ac7c19f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/pt-PT/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pt-PT/firefox-59.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "318ce1d62ff293cf7c0aed22e9e75a865f888321c9251f32501cafbd960bb0860c802e78a1f7b31878f861e579a4fed6c6c61aa896552246c6333618f1a81889"; + sha512 = "847f71e52e133ca383cad419021657e5b17275f9c27468fe18dd34913665c770f4c9a059ea997684bf54dfb96a4ca6802f8e19b2c138410e55482b5762f3dd96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/rm/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/rm/firefox-59.0b13.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "11310f3c8c3c9445a33c8280b2a38841a831f508dabe30a08caa8f70150b72747a9525e10df17058ea5c12c8fcef823283235a449b4df4363daf772317c478d9"; + sha512 = "337005d811d838545cb6d978dc4cf20afd35aeead11e5adee65fbd0b792b11fd857abe9d49ed14d9efafb7e2e27cdf79110be0b61d6367294072378e27b778aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ro/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ro/firefox-59.0b13.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "bed06a8c8bf4a0df45399853b7819bf8245fbea050dde07f51409948026056e033adca3c1de27158376d5e6d2d3eb1b9f524580fe259bd628089ffc2388511f7"; + sha512 = "9c6dff63e8cb8892ca5ebf6050ae8a1fc639923442b7bfc52be3496667b6043598a85ea94f51af8dff27b5ebb59352b4a8c6898066de0b7f49ccd600eff967ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ru/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ru/firefox-59.0b13.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "7bf800406f71bf280742aa1cd627d58235487786c40dd94026c694b777cdebd04404dcf4ef36f0fd7f9a72c4a503f2a48d32715e27d95e7d3a96f968cbad0a22"; + sha512 = "6b2fbaa5c4219288ab02cf376bc48393c6514d26a7c3c4d108b483eec6286101ca01f7399dbc62575fbaf21a4750fbd6b851bdf5cb3af1d5144b99f52e04a0b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/si/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/si/firefox-59.0b13.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5541f53f62142e4f7d46682f9aefe32a4da41f15d746accf00c1cdf06296d40e951600b0d74e1f6e3fe6875d2d78d4fe79391b806954eb8f9c9e4efb59ec1d2e"; + sha512 = "a152768e04c2e7ee4a501a4a50dd72591f19c3d6b20ea1fb64090f61998ff1ef7d65cde0a39d60d4b594e120b8a65d4bde90c501b839c6a1b8fbd268f02750e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/sk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sk/firefox-59.0b13.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "316ea3f50801cea1deaded1a27690b43de6c04a2b29517da90b9365c4d9ed197617435723ecd17827487d4245b08af063f8b7b230c03f89e412cee63336962ad"; + sha512 = "36a185b703c18e393dc581d494e90f58ebfa1326b434ad0e9e4cb6d0e44e51687d37db219d6000c7777a76372ce5dfc1428d945546887630206f2929508151e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/sl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sl/firefox-59.0b13.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "29296ae0bd9e2e60e245b716ca5f4910017a9e673e7bcb5fdad45db2eda195b89d1dc9ec1574c6545a759d21a6fd4feb7e72cd66c729e9f58e47e08dd44b0bb6"; + sha512 = "1cb63ce3433f109eb9ffa795de2eb1b7c3dd52a66fb50b45e7e33f8150c034c06f928eb829dabdb7ffdf2d3e89f667e1d315aea566027ad51e288dc2d54046aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/son/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/son/firefox-59.0b13.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "cc8d29ac7421138d33207e182eba6211b732bd264a8085ffc46b4db303d8be1fbf3b59d1f438fde019ba585bb479f5a007a2faf2bd16686425148537b023c46e"; + sha512 = "3d18c86a14c46a09669c9db111292006de1dd8ca8f26fbf0733b6478a3e93212301ceb0ef5824a250ed68b45ddb0fdeb29a0459fedcb1f3145f95974a0c0d39c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/sq/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sq/firefox-59.0b13.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "be90f1b2ac1dac382362b408f60c3da942c28a4008da1fbbf532d4637bb64c395ba29c234e55f7cbdb7663ebd0bb1d4f9cc9056b6ededd07c2dec6d16a7ae3c5"; + sha512 = "05d945d5dcd2e8554ad8c8508f468c16cb9573dc3ae3bcb7a0ae01e11aee1bccc40686e96dc51ef64a380d94f391b6984cc1232ebb47f3f0aeb46913fed31446"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/sr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sr/firefox-59.0b13.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "24c7aa567c7e79a6c280ddf6da0e5127f5f170e7bb0da9613869bdc6f621ff980c6ab2d3b8f35056d1b5c32ac885bff9f50fa3e3b8e3b55ba6d492859d8f2ce4"; + sha512 = "c9e1ad67ff5e183c9b30f91110e52d8b546585f837dd5fc9c859fc589dee4e49e5da57e4ffa397c3152226217f83e0ab1375a4c36da88a4899b7ebfe99654fa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/sv-SE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sv-SE/firefox-59.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "34cb14dcff46a421dd52385f77ffd9146f3c6ae09ab1ac2e4cebafd02f101f9582b908ea91229343acd46dd4f1ac28093bb166e4872025877167ecfe45e4f0b1"; + sha512 = "8cce3afd623efc0926f75e77f4db3914047755957f7aae01f67215caa1764f047a5af6eab1316d3b6562ad584d152d5cbec32858f9dd2c5403b8069efa555866"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ta/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ta/firefox-59.0b13.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a63433395895a5cf17c06f5639839c1f3416e10b4247f0b1100e7ab81aa38c4a72e3607e3693e114e78fe54ae151d47da3a9396ad6b61fc178d3d51fc40ce8bd"; + sha512 = "0311bc2738f4e245f78e8e1abd15d7b480ebd6ada25e79c13e2110cee6c789f11326352eac41d0e1a32954045125888cabddfc811f29351e053d45787054442c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/te/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/te/firefox-59.0b13.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "505a5be2a0d0efafe1990dc2870cc20b8c73946d5a5c18c7f2d568f630b9aef08e99a69ae74505dda5544206cd9ce61b7414eea682a9dd1274bd58d291ef4f58"; + sha512 = "8e986b0741df57e59b5f211c7c3342d6cf7b2916b4591415afac7d747eb97c8dbfbdc3fc4b9fd0a834d16af97109476814919b3fbbd220d66db5e4ad01fa308b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/th/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/th/firefox-59.0b13.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "050917ad7bf99d5751ac952830337385f198962c4680806e868585a87d4eb30810d840c2815cd198b67c5c2a0d7d4bfd908eea5f205752f90231ec94dc0d0525"; + sha512 = "6524b7b5801bedec93d7cd7da2a7b05bbb3352b7d28399507fe21b72d1c2979389c6d1e51dc968bb7f28d1d0f7f723c93e2970fce90d84b6f9bbe4dfd258a94f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/tr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/tr/firefox-59.0b13.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "f133c13521a069551dbc68afa8de4bcd888589766645f0aaf069c6309a98a2b62614ee4033daa0f63cc5b78828210c4bf0aacdc646e357e488db83ebd4083023"; + sha512 = "fad0309059571ac100d92be735fbc307ee1359e1fdb9128166cbd2fddd4caa7543890f85875943d445b71b97d20de6845e7d17336839481ea7624064ef4bed2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/uk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/uk/firefox-59.0b13.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "5dfb898e9e4aa446746abd7261edb03e6f8685cbe1a3c0e35631e48abbed990cbded6be9b348b5b29a77c6907c3aa2d70765fa04e737426848c74428fba17c45"; + sha512 = "4769300bb43e9b88314e13a42d0ee760a86bac32fc5e3ada4dd03d33886a8f7c3b572c901a081f017ab0ce46d31f3bb97e8796d4699db0ef582ffc6a6e84fd9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ur/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ur/firefox-59.0b13.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "1c3130ecd3f359c3a090df07c816513d6f74bf2d8073d71c9ce9a56daa76d860f1ced9185e7858fc64ad7d1f80704a1ac8913dbfc9392fc1bcdf033ff3c05a69"; + sha512 = "ecbe4eadfd031f28cdcf75443d67f14906d497e18037ab2c78e3ec81fd6e0228495ee725c29bf57b1b5d0abcbceff94e72e765dbf38110fc5ad4ecb9ab1873f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/uz/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/uz/firefox-59.0b13.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e3fe6faba1c3063dd9e3be709f19ef547e05b87a31b0977eecaf4ef913c538a0c83f904753dcb01dadcc21e7d2787eccfde47a79225fe494b336b1167c9d43e5"; + sha512 = "ece335699ca00e0296445187a1a96ef6acf34985b8e8996ed0165f45e7648b9af62a4e242a78881e220d5ff1336833bf8025ae78fe6458fa90992a9a0bdb16ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/vi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/vi/firefox-59.0b13.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "65460c0d41d790835a7019327fc74c1deec4eb2f72e96f8bb72f714edf3ce6c905d05469aa4cf831fec1781abd575dc1e6304e19a9d6b056e0ebca2ecbe5b857"; + sha512 = "8fd030682e6d3eef3397d340814dae3d58dc0025b575dbc20c1d5d40ae97f48631ade63be12e03e9dfd8e84e5dc1585cc2cfa0d8a1cf958fee50006a7d1bf27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/xh/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/xh/firefox-59.0b13.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "f937ae6a3c9dc875f0d8d7715742e10cdfabb1ef0a2ef9dacb31c95f21883713c847668f8946fe5eae2f7fdbe1441dc0448fa5093dd36446fb3230c354bba83e"; + sha512 = "55ebe55c84883ece28fb6b7771eae6ed47b0dcd5b90974110a7018f39d1ad690302be44a67d0d034ef7b77f985d10cba26d3fad714579aa3d293bd6f36fd0880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/zh-CN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/zh-CN/firefox-59.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5c21c7b8c6457d6cb9956ef01a2ecaecec20b64e9be5e0899553718928de99da70fd5522db7e5fa5fc710489f787e55a40b4a28ba58a68ad37eb258709b8aa45"; + sha512 = "fb1176a2c711ec34297a5ddf95a797c4dd5823ee9e898e78c804daa44c16ab78fc84addccd9d83f4171af5dff60302f69236fa92cc584e3985770d6bbe369e57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/zh-TW/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/zh-TW/firefox-59.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0e99176fbdd3809fb7fd7810fe64bedfb2545ed9acdbea7f72a77ae6eb57fc3abb8a491c63d5af46ad1057de196d7538d1436aaf497a32ee8fc71ebb756cc69c"; + sha512 = "226d55ac9bb97fee285ef9fbbe54fee9746cb98a09d1e669761bda08ea6115f2cdd39e1eff0a087f8f46d94139e1906758a8bcdeb74c191c0f453f3705ceaeff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ach/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ach/firefox-59.0b13.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "b98ef8e28148db58bee66490f2dc9ea596746335ca13aeac7f3d632326248a1cd5fe6a7dc977a9457e7f67b1fdc8543d4ab28554dc9df7cf413d7cb751bb9a1c"; + sha512 = "9cf2e615fcc0014b5c40b4113c3be737f5ef7930515dd84a92b8a0d5d6cb90f29c7fe5cab3252cd895558ffb7a6735591ff6cfb8e8125a09455b2139d2d3cacf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/af/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/af/firefox-59.0b13.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "d4caedb1a904233af77cbd0d5e5a78e9b757a66ec94f77d2affdd78bd4796c3fefcffcf70f3eb216bf8969b246256c21524a24b6be5090a6b01f2895898d8142"; + sha512 = "eafd8c098c6092829104ffd870f9803338628cf38cc0525de6beea95d182a8b0a46c9ffc3180798ca06d35bc7822bc18b551b57166d02a53c786299a85c41fcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/an/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/an/firefox-59.0b13.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "d84dc052758b127cbaf7c2e4c3eb2213eb005dc7dd60ec4626face1b27322e0d1f64e26388aefdfb3a43d917ffcac7454574b475c275f46f46bdef3040d844af"; + sha512 = "7b82271ede38e63c86d0d805c486183c52f0ef12b181a8cc57315fce353111497896e884f7eac873f140c25695af4a810fe8b7a7a070d9015f8cae3eef0b3a3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ar/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ar/firefox-59.0b13.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d74200b02e5afd3d217c48308b4b09a27cad92feabd1bdaf9f1fdc7fd08df3cebc2b5f2b39de38aba13a2a34edede7c99e41c36eff88acbc4b62daf244197878"; + sha512 = "49749432076c90f63697b45fcc8714c6d98a6450ea8ee5d2f850c7a229f65277786784ba00e2ef14622c19a121805a7f07eab7e7dee02a213fd6d44cf10bc783"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/as/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/as/firefox-59.0b13.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "f8274da94a79078aae3d9ed1aaee007af76592e7fa267968d814f9964a20b99eea120c4aeedc6fa99a7483d7f8c8ac393ab26ae175802da81f80858c1ac324ec"; + sha512 = "b8c3d57dc6cc1c00d8edd37eb7c81eca0c2d8f5df318801b111630511968bcf5fd8afb0549cb3618577c95d121a181d4c8ab523a78857826141621ad5c7d26da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ast/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ast/firefox-59.0b13.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2a9958e4472f2f38d30a695307b8fbaedc68267dd9ce543cce8c986119cc873013d3928fc438027693384e7b2d72f2407451b3dfb0d3e1409c625f1da80bf63c"; + sha512 = "a0b482b610d3d569f1a17d166bd86bb37fe57c1f7d8bad6164c40d509811cf706d818be6add0c3277531f0cf5a18e14eb8ae4a652abe9a45207f62de6f4074a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/az/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/az/firefox-59.0b13.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a16bbce416f98e645063fd8ff10c724f8ea599155c2d9fd24c07e47900730d71e603139465e6d20ea565dc503377926e838de92cf202c79b207efadbcd5a012c"; + sha512 = "c1bc3350bdf7f9c16d9b3370d01661c369156e55bfdc7bce0a4a1c1d1b3e7764a691b257984696b021897d47b206f3b21dc692e4de9ab6aa3a47dc12ac2eb9d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/be/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/be/firefox-59.0b13.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "e16acf988b4089bff160011bfbb4729f7883a6f7646907afa44f99605b24faae5b264cd782fd4e7dbbbe9213dbcb6739b4f1d57fb403d2909ed044e8ab1ea50e"; + sha512 = "b228044ff1a1d581b00a25c3c33ae2059622f80900d0106af9da3a2b99722691e795bd83cdefd64f81ba17928fb74c3e9a79370871d7ea3c50c3747c1dd18046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/bg/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bg/firefox-59.0b13.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "24c8cc468f05de748f50e6d855079025206893d0ebeaa1d6ce95f3bd0623ce72e04233aeee27b375ab1ff7d42bec2e4223ea20f9e54f81821600e456f8d8e5b2"; + sha512 = "b60e554d7233d14b6513b815289a81c06a54d9da30dd57f1d595d0210b6229229ae59b3523dc4e3ff4f12693e519898c507c506db65f3f76b3bd475ce6e33d22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/bn-BD/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bn-BD/firefox-59.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "df83982e60936344ba5eff4b1266c9af7d3cdc8e1ea79ebcc69feec876712148f3945a05651c1517c71babb8839418ecdf277db78c1d52b9a9d0d6b5f6499881"; + sha512 = "8a0ee21d78875b5ec34a30140fbfbdc9fe9480cf792d73652fa2479c7446115aa501562c4cab873aa3f45f20802941272596ee4edc91c2927cdac22a887915da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/bn-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bn-IN/firefox-59.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "878a9e4f7871656c935ee226f78c55132ef403342a4419fe6d83db90abc74700f35332ac25e4d4286f3d12cb1215b3e72b948a7ff38668ec58b2938c9d2d760a"; + sha512 = "b38841e3b9d6b5ced6e8ab5dbc3510275f2cf0410fcb75ec86a99d31a06d9524c1b2420045bc71bac7b541ff60dc37a79dd5eccda2483a3e92697ce29594be98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/br/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/br/firefox-59.0b13.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "108a25a3233e0382477fe32a424ee333bbabdfd19b2226eedd42ec39192b76ea73105e6ec1940fc1fe791feba94681b942a8ced1da1c3050e9bdd9a3e9208007"; + sha512 = "df014a91481412ec3c950250d37f8ee006055f1504070e01573c479b5e3f157eaf84a6ab41ab5eef96c94b868e526dfe0f884f36263e36437a1e3269e8b33b43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/bs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bs/firefox-59.0b13.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "47dfe8708b8d61638289122bd37faa3e825a93cf2f3b1b8744ee6792688e2d881af5180c599131510a8fd01aee5cf4615002909b07120714921c8a0bda65c467"; + sha512 = "982567a667735df9fbe86a3c3dedc3103d6b63c81e8e54f70fe9b3d6ba751de1545c1dcf3b902189dbdbbf5bfd5b129186e8f3a09f417a64746c71bb30228c25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ca/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ca/firefox-59.0b13.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "19aa45a4f1cdad6e526365b5e73546400adf14126220edd1818f2d4b7057213f2b84bc171516438cb17ce12142e5601c107fc43da754a7026cbe3d2b14633fdd"; + sha512 = "c6fb02d7867bd2541d37ac52bc92da0357bad6439fac72fde1883b843a14b6c5bcfe3638bfda989e9169d8282624ea43735a167fe78633601545cd04636d2465"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/cak/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cak/firefox-59.0b13.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ea5f9c626cffa8c7f3da891add01f329df780fd39e3e6fa1debc152cad21105eec118a8b5c0a7aa695d9b9132c8817a0fe430b1f462280092c4cfa66ecca9c6d"; + sha512 = "9b6542199a9e02ac62c604543e2ba72e63847482662992a1a1717de78f3d992d7c70c5476559dce147a1756d25dbbe78720118e607668375757bedcfcb3b919f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/cs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cs/firefox-59.0b13.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e4f323128b30db5db79e3eec2d631e56e9978cd12920aedb29eb58d1a632a0a5a071cd70f0ca081d12a809d0e1eb2197f3337656b511ae0466f6ea1dfb9e47b9"; + sha512 = "912eac4e2b9ea7e48f3270138aedea1847ff7c2998489244beb52125286565423ee287b967d675556204e38cc90b224f88b0830caa03f13fc908649480f8b6a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/cy/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cy/firefox-59.0b13.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "89f06c767f249181e207e7de7d48bba09552f867952f4e93d2247f0061643fc4081db8358f06049c1939887278ff14d177ae36d2ffd96c9e0da8cc72570f1fed"; + sha512 = "9f9ad35c577fd5d8d387861ace87dbcaa46768a6b16b1351314c1eba98a23ab99de3a3670e54c0b6463be38fbbf347868a4915f2827ecef5fc722c19bde82082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/da/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/da/firefox-59.0b13.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "008c5c4bed5dbc5cd4e0d503a013ebe8cc365b36e987e8c58437fd4edd99e160eb0c565f1f46c8c0f049a199bd5eec6ccc54e9a4b0e6a7a3431bfc0e75ce16ef"; + sha512 = "53f724c516ebc8d1ac72c8a6f3e21975ccaaf2f7c12382c5483e9755568a1908ddf8448eae34e91c64a1b3d4f73ca7b4f71bd5f3ad36dc14468323599cea1745"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/de/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/de/firefox-59.0b13.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8b527ebc7f8b5905a97feeb955a8b9eaccce70967f40737b834bf6253024e784576c9e9c8e60cc346fcee2d13f33bba52b6079c6d9cdb2e34f1729b1a9e1652b"; + sha512 = "f4332be64f0a87f7afd98788307fedae93021ab3578c7c193e16e6e3a66c2b7468eef75e7bd8ffad4e23b05b47d04a95d56e0a51428ade99e956f97152b1b2c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/dsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/dsb/firefox-59.0b13.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2bffb16d886ae457b26fab9b1c75355928f67456cf643068a99bd51349d857b56215c9bb8458e45a5825e605436ef1b915a293b58863e55d3d512d285ea0478d"; + sha512 = "8e6bec92f696e49273b1ba9ef1ee367e7d67db409e2833dc3e76a7cf6de2437f23a7203865262e9e0b355ec8aa09d8ce6a8bccced367108039755fc8bbee5319"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/el/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/el/firefox-59.0b13.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "20e3e6154252650ef9fcd4203c940857d366f62407db14ba1c822de83501906af854d5062a0f0bef9e8c27c721cb71f72bb6ee19fcf28af319f2e0dae0b2a60d"; + sha512 = "fea0097f647d170f04e239668c4f6d3a31d0c0e0a7fabfef909fafe82cd2ae6cfc08166b6d8c55f2e778781bff98055ecb1393fbc21164b699feb3797131d426"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/en-GB/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-GB/firefox-59.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0dd26f7b3db2907cbdc1dc600c6a56c09b1fefcffd768eb8328a51c2e171e8655d9abf56fcdab312f8084d6903578d3fb8e27ec1334a0d03dae28f06ce0c5276"; + sha512 = "9664ff64be155b308c586b8e170f06004160809c7802674f5c14549a36ad18260e7736f40ce841013a5db9084be83a4e0f44b8c11b69c11f0a34be8bbe7ea11c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/en-US/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-US/firefox-59.0b13.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f3ee82714a6ba5bafca51d89fff03c4d0d97051ab7110b1164734dcea843bf557b2b6c3ea39f5d890044f24162a01cbeb6bef1ff9c630eb27b56ef8e97463f4a"; + sha512 = "ff65f20d9ef9911ac853dcd830b4fdd60790c9c860fcfa3f57791c3d2615624a8ea837342745c7646c1704c04e145c4c5b68c939d49a1fe05d5835e78d141132"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/en-ZA/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-ZA/firefox-59.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "cd001c3c6307d0b5087cc9324ec6b144d337445f591552a839c6641c1522f40a63aae96596ee6c3acafac0a9a53b5a5e480f02c4c9928ba6ab8650e7f8cdd05b"; + sha512 = "de76c940a1d3f5ded493455fc979582908368e10035d685fcb2c216dbbe55ca539a3feae8851b6ad97901be6d4a6fce34583ff35c5cc241765ea115ba45b6d8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/eo/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/eo/firefox-59.0b13.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a5e7b7a5f1363d1d2ba47ee573c55a15d4295532221e669d4b17ea0466d532a78e059ebfd358ffbfbc1c2ae72b28c99c3272f855e427576dbbddc0e2c887f701"; + sha512 = "4268e22b96f9195444bca4fbeffc1d47f1ed93c3001115f532f3bec1bbf788fb72c99d5d7f6ee427c19b103602e35e98354784aa13368f0df53b52fc9a8d9c5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/es-AR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-AR/firefox-59.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "79c26f3a3fae3da70c751cc54d99c79e960c2a0c69ce69ce0b732fe22148b40b3ef1df01da593d514ca47d5832e003fe960d73425f6a05fdef2269caa81c0263"; + sha512 = "143cbedbdb18aeed78a1805591011b2dcd2837ed950aa2579d34d4006aeaaa85a84ceaccefd8b14e1d4695469d0cd8088261927e80eb5bdc6df4ef1ee5e07350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/es-CL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-CL/firefox-59.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c0333ecfe5cc92b9facf6f87497b5f23ca18eb2819e12c950bef6c3b394c9e9f2f160af06abaf131a662322cf708b07a840d1aff8b8d8c4e3ba4143a920f4888"; + sha512 = "6fe0857c8615720b5f268297c1809148943a25b1549f294ac83db6bf3315f7984de7b9b9921fffd0505f2d956fcfcba6b90e0f14d0a25e7e1c52a89f13eb2079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/es-ES/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-ES/firefox-59.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6e050fd6bb081fc732e04928478a89646934283ab20c25f4484fdfc8d018da32c5b87f4916942ae4d8a649bac43063519a38f90f92ca0d28c077d5637847e381"; + sha512 = "93817b6399e451a99317b1981c033cb9ed46b673ce00fb6014e384be250ec64b5f32625d9e1b79e80e4c38a203a32f4f4716c76bbf2df130a3d7be1604a91106"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/es-MX/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-MX/firefox-59.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "6d7901d5e59ea8a8eff600005a0b49ec4a0d66363d85c25d8870faee70078aeb396fa7a83ac5d465919d0bc32409d6b37829edebdc0a06c44bd764fd3c26831a"; + sha512 = "c6ed809031bb31dfe29a5fa9af201b59eabd59b286d0b7d69063c98682f603a3b6995eed553ae1db2f433b3ccd85e1a9e0ee94e14ec63f2e428e317335137538"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/et/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/et/firefox-59.0b13.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3e912ebabd17061bce56b3899b47ee2510bdaf530d73f4350fe98c60dc21f76b46e2484e02581ebe48b4fe57c0ccd5683d9e7e7a5c75e1bed4e43856613c26f3"; + sha512 = "9e688803943cafff591e9f675a864447964cbb2f0441db212e9152e88edae83331d913094053c2af49db9caf0341c7e6194ff6f54c48ba6931e4b5ef4222399a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/eu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/eu/firefox-59.0b13.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ae776bf858dcb545ed000cd76b12650bc2753fd674f553e5231cb9699d00ae0a444ea04ae54a36abf05c4c8bb826098dfa516a0884b7626448727bb9fa01d20e"; + sha512 = "47cd9810a14f512857cd6b11cb839800f0335c17cbe6ecd29c22b765f475891bdf07f9756f5a9258233c16389543f4bd662f767636823bc578744323bc56eb37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/fa/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fa/firefox-59.0b13.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "53752951301ad68f85b05301041886b06970971c7fba90fffcd8bd1c988401d1fdf91bb3c254a148ef2f614cb48595572efe6c0c1a5888feaf8aebb38771ccc5"; + sha512 = "357c1be02050c9871f54b444c7cea4b56a3834779e239aebfacb00feac0960197cee9837ad127cd5e617423b44ab13ca1d1a4aa4d75d52ea59a4d8caec64cdeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ff/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ff/firefox-59.0b13.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "b1ea20edf1d179714fdd64395eae1252a51664ad407fddeace0e09d38f8a54f2180e5cdaae79d80dec8007a3a97b382da8a61843a615c853bb0e48c18c639122"; + sha512 = "5b35389950b1e5913c0a8177348f314235fab8560663abc59ab09c360ac02857e3387e77be119d2c126ef000ee52c9ba1b408d9b760158dab751e03a618863eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/fi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fi/firefox-59.0b13.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "e36087e3b026c3a83951969e562539898d3e12f8a4b996e9bda02c4a2cd934f92bbc7808b478cc431e47d9ff206270b484f34fd30a6a8264eac09fc81d10788f"; + sha512 = "d9a0cedad0e8715bb86031797639ffe28ba2b5846531b6712de5b1ad2dda60f1279ecb34570b172091e4e245f09e8cf3bcc62478f7cfb02a38043bbceb7b2d6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/fr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fr/firefox-59.0b13.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "4a4b653865bf2cef107a52eea796e58a39fd6565654d61b3658a3af9d91f6dd9351a8669b916fbea855c4661f9db5a2e7d003dd2fada9d6f3f76a6e4d1dfd431"; + sha512 = "b850891b14e1aeee6779687f558160d21f1618da6e6b8133b5701a2076a8b91a283af711c0107fb9862e4c76dab318c6be9f19c03fd4567c67530f573003bd0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/fy-NL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fy-NL/firefox-59.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7cf956dcb909f26827d1f97ef4f4165f4793bc0836ca40291f963571557f3d008c2704c0aa7d407563afd5dded2bc261d9ebc49026a76fff420fde3b19892422"; + sha512 = "cc37b6614980a31fcc11a5b964a08a900661ca1057ea8ae486ac7dd6ada72adde58ae1839dd9797e6aeda28e657d4d763c94a906f745fbedf8fa9423e3d83061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ga-IE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ga-IE/firefox-59.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "bf12342349050f63d0638cef84e81974ee2af5b1bcf7d0a86d9222d161a1affa45dbf99d9e6f17dac82a67c7f63688973569bf58ca70c625a552ee5f1ded5eb0"; + sha512 = "2d078d00cb4fda65ac14abc3ab5e4a4a0c203f12e64f726843751884b51bbb15bafb15cc1dc76cfc587428a7348a6886d3f41a125129235432bed16ea2b53f94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/gd/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gd/firefox-59.0b13.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "959828de66c70b15d1afc4dc224ab01ee370a9e935acf83b1cac2322005cb294a5b5d59356cc5f0ce3382534e440b8aec319b10af75ed5bcd76b2f1d0f2112ea"; + sha512 = "74fc1848fbfc826e18a60b34dfe61b056636561927aa96e2c789d26dd72b9adff32ed445c62fe62b877b28945ea5a0007224deabae1d264dbf3ad61c5b38493b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/gl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gl/firefox-59.0b13.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c20f84fc26ec76e55132639b299f2d41ad1e4b4e68e888395c2575b81004d0748a97b1f3e1f9b04c96f83f8ab0bfcfd601d806165549e26e71868c2522c92cc4"; + sha512 = "9ff0b453c118cd48cb3455690755cba41d39ab81cad52d2f6ae6ce26589f5d09ecc6506acda66b5a0b79e0c53ce51d9875eac646cf31b9643baacc8866dbf50d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/gn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gn/firefox-59.0b13.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "bd708bd6d56e3cc3e87b44b6c01a0fdf26b6bf32c57ab96d50a87a58c75e102ee956dc5e809e93130532f815b1d54ee09200e518a30e042a3ba409c3a02b3eba"; + sha512 = "6b4c85b78808d1c28869363a0760aa63bb6aef022734b5c4bd77035e68faaaacb8501d296ae32bdf70e4a0c8c001978be13bf596e6e87c6d209fe0766b40bf33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/gu-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gu-IN/firefox-59.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "968cad1094e728264f4f97efc5e0f26d014553632248841c67d8f704d3c5926dcab21d5bb748a67bf04caecf587b178bfd236af2db15b953ca5b2d5d1c7e5384"; + sha512 = "860423153134eb53a0ea7cc1e77f3e9ef03fe50ba59bff939b082e41ee015f464ea76ceb93400f91b8cdf2288fa64382f44b735a42ae4b805c3b7ea9d9dd4c40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/he/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/he/firefox-59.0b13.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "e209b137371be9a5a833c9821d80b938fc4213f78f4be3135f904aa58f3ca10f13510939a8c6271adb9d7aaa62dd0089bc05343b67c510678d57e14e850c8389"; + sha512 = "10eb3db2c96e3c9b157890abd5cc83ee852a530d4f3f11b043049e11458bf52f2d3dc3ea2e8f1a0352f9541177130e07293f1d008f6d89fef734a8bfe65c247c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/hi-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hi-IN/firefox-59.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f25073c665a37454c8ae34404c83409dc17b8f851b3555f0cb57866eb80924fcb8028d4c401b1ddbd548d15d9e4b40eae467dd28930ee19e89ae314cd6c4bf0f"; + sha512 = "e55dcd464c1c99613842a3b98d7ea2404f516be7ffa92765021e0fda65a4f961b470af53f672d61b0579d18618dc84d0f851158fa773800163ee8cbbb6cf73cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/hr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hr/firefox-59.0b13.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f8a4c2d533c7e9d0010058eeee1ffb9157334b2d9f6130bfb05ad2bda4a32db10a56627f44ced77bb00ab7ec71fa8817bf100b623250dd6e06d790497d71d5b0"; + sha512 = "ff166b9bd88bb607eb5e06ace5015a76fba9ff8c70967bb043efc52d6eedec8f1eb2fb720a85e19ef3994ce5a1de081b624fac37fea2ec7d88236aae829cdc8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/hsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hsb/firefox-59.0b13.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7349923767652d9d8a8d00b13428e8df29c284fcdeadeb59a8bf9df272575392f7620eff189c4ed2e07f8fa4b231a3fbd421373b5b2266faad62aca8fb45f1cc"; + sha512 = "679258efd864a674a471674ef4cdb241f1ebbd9713c7017c28fb528065b52ab658413269f346415ee14268664bd667f53db618290ad971fcc24d33e957605eba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/hu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hu/firefox-59.0b13.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "66d205670538c0e0e6986b661462263a62c4276be995fe51a802b9fbd57085a00b6ebd1afe956f464aa06fc7f2eb1228f1376e00580a1a958136e3b876f76f7d"; + sha512 = "51758c4e4c57495a6a44bafba54b1ee376139258f1451e51cfb68aacc5990253ed7fe1ebd0639d9f8c1fd7ca59c344c330333d5da6b2b992fe9da576fb251aa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/hy-AM/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hy-AM/firefox-59.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ebce2ddcccd5c8cb3da57676ff89270465734306e9132cfb8414b22d7a30451d8b45222944a59efef088979acd272f434a64f0bd1689b91333e3d0b8fb4257a7"; + sha512 = "419e445b1d97710047a80e74645fa1504766e4d89d5bd616f98cc4a50c936b60e4c1b32202b13f4703e4edafe13be13a2eef1fa22ae77ebb1432f12463a977b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ia/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ia/firefox-59.0b13.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e3ff0946659cf0fb6bdafd0d322c1aaf6ebaa17c46375dc27e06c014505ccc0f07b601ba5a13b831eeb6be11dff592f13600884c8cb30a94bf324f41526db3fc"; + sha512 = "59084fde1fc58ef1ed14db350281b6c4d3fc0abf08f349c69083e2185b4441dca760e288ec861ff97fb1f4a12942f65f16fd4fc6ad78a7e006def5000ac28cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/id/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/id/firefox-59.0b13.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b8032081d2bb40398a0689c620d0cb8159530718fc66241df3b4bf09976fc98fd54c6a4c82585f04f9d906e1a12858499dbf14f622ff7099ac3132a6c264e80e"; + sha512 = "a97dc85473478c00a35767dc725030fd55a285b707ba0627ec6413c51c64d5f24891b6a9fefb17aa54a4bfa42cc6625e77df8942af66e44de1fccaa7fb4aca9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/is/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/is/firefox-59.0b13.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1c6bbbca91ad5f3cae5f7bb990807470819be84a4d69276554e179d0edf2f752964e50c8dceda54bd8b32cbd4da10c860b8620bc5adfb693c5df5da0ad1173c5"; + sha512 = "1ebd9ce8b8285597ce3ec93e30ba3d8564f400c6c1716e8e7e043342cb2c69c391dfca71ffd62ccfb1c9a6719f107d869fb1f4caac18308b0d33a912139297c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/it/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/it/firefox-59.0b13.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "1325b6f7cdf02dd33dd7a83372d66417325a74d09fe523d894d2ae10c8484ef459cfd160e1ec93c638ac9929f48e363b9da3e05715644802857f1ecde6657d13"; + sha512 = "e96beacb71274940a491fe68c3b12e2c65672bc3a3fa45f3e8b1febd72acfd601856c109bf3a1027e9690803ef4112611fc571b7e7e51a01fef1b0a0f2a638fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ja/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ja/firefox-59.0b13.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "2fa743ccfd571bedca7b3798aa1fbeaf5bc44374a22c6926e0bb7079a41ea9829d62c84015caae6a6b4e0b39ab46fe8a68d1244f15effabfc74b1a9928209d7e"; + sha512 = "f1ba3a7c77da4f4d6ec8c48ce3353356eedb83dd16f342ffbc5df602922c098ad7ac48c6414ac9a0aa029d3d504412c7c614a63b85bc36f172663f2dc65ed66c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ka/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ka/firefox-59.0b13.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9e7afb40a0bed3c49a315c8fb886464b1d3c6703ec02ff33168e41b7d4320471221e428fd46e3a3d3831dd5bfddec6dbf0f86e3de466159a6c2202c3d2708402"; + sha512 = "5a63064d45cdead33f387c3f9f053abc659c02b957d3c7edc9b319defa0c6c5e36aa9134257ded94c102511d382c366cacc3c744280194e7a7c1d920966c692d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/kab/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kab/firefox-59.0b13.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "f9bb72163ffd63c705286dedcbb3fbe4c853cf6c863ba2a1df9e686a8e52fe877ddf55ee58fbb49667e43af3f1870b6bb67c3c8f45b85081c328a4c4a0717ed6"; + sha512 = "1c9d970798a8cd1e7fc302e479e1609d919bf098aacc4ac398e1287e598d33e396f37cdd521e65ac1ce828d1aa690765c1d5b407aff6835f53c725d4cdf29237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/kk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kk/firefox-59.0b13.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "ba7f103a5aab139950a1db8ec433ede6e8211d333276f30ee3870046ae9194ce291e291f408ce91c2e1379efd4c5010a2af4e1f39c83b80a6e6c3f414e3edada"; + sha512 = "e9aba1a5ac3a4aaee4623b62abc22e387539041c940b316cabfe89fb0320d30e1a063c72a0247fd364f8f32c5c02ca4431012c74795d4cbadfb96f2f7fd673ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/km/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/km/firefox-59.0b13.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "bc4c924bd0865a0c3ff8d28a9ab3e3cde2238a647257b2f4ebf4ae7980a53a89bfa5b70d6bf18ad4de4af3f17774393330ad15ab7862f2654688cf481a5344d7"; + sha512 = "92547aff76f0d0a124e82c9a6e6b91f66b1126d23f652423333513f618bc674d879cb777447963717663b91e23cabb687de730129fd5af9daca2055ee2dd78f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/kn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kn/firefox-59.0b13.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0d04a46a8b965edce1be1c3195c7a6839f1c5550e9f07b10379ea64bbefcd7248748262b1eb00bbf1a14c8aa40355c4577408cec689aec4f2238ab9f7dec88d5"; + sha512 = "d3bfcf0ff2b91b3023c30a7cdd0ff568f4b98f36012ec3368f52b4cfd3f6bb5e0295078f2b45f121b251f03c5b9072bd4c742fc5d225d21ce72026012f1abf77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ko/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ko/firefox-59.0b13.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "44141c817165c32f6f16b50f2592bf531a32c29075baa7575e41f3746467575b6df8e1535bee6cd72744a9a8e6b28b34f9c9cee381fb5a19434606c34f25fb7f"; + sha512 = "d651f789418fe39b1611f0e5a24be58d9602209f285d1d0db62d33b93bae34e542fb9b59d09c96b2c14891119bd0ed20500e0cbe0e24e86ed9801af4072bd7fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/lij/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lij/firefox-59.0b13.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "0781f6b5caa3b8f7c535f928d08450aebfb5edefb83e6660d188e6df90f53619d3703cb299e8fdec5bb97d2127a94f0e80d48e3f27ee32e7b3458403a0d402f5"; + sha512 = "fa9c21f3c81617a275c8fe15f142707bb4227ae6ccd5895262309e771c221c121d01bc57af39d2b45891e689bc6fd6a34c51ace106a35cbab176f98b60c5ef49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/lt/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lt/firefox-59.0b13.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "80a8d5b244a42493ede5331c6f5370e7966ec6fbcd964c32fdb9e20dbcf89f3c34d21195a45c5197650d4a3be6492af5b18e30de3b4bdda00c8dff627af6e5c6"; + sha512 = "f934a730d3e22c3b49f7bbd3d4ebec5efae8f637ca39f72276644b7e80d082f87620f58c76c86cf542b3123a88abb58a29fb781c40ae897902bc0854635e0fef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/lv/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lv/firefox-59.0b13.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "39cc0a4d68154f860c8a6bf2062584d94ea6491edfde4069c764eef4dabbdffcfe66773917c51ff33a633861a0ba29272471355ffce8256a28908cd8e0fa935d"; + sha512 = "afdd6675ba2bfc18eb4fec5c63f9ed394fbaaa3800097843925c2c8c76a29a4de10e3c7c4fbf4897067e73f551d549bbc93550fe8a7f8c78878a61d67c414764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/mai/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mai/firefox-59.0b13.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "92955f4b41fc65c3c6e926a5fdad99a0d9bca32bee5cfcbd1c326cf05e35d685f5d1d1c57a2040c926b831be9827db9222bedf2cb496f340f77f4f400081de2c"; + sha512 = "a52776efbcedf14f1e3878d3ef06e27eacd39c55ef7ca743c99429f7b8e24000def5535cf082226fe337deb2ebe1ac94f8f42a0b0d855c099b6fea4c4980d971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/mk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mk/firefox-59.0b13.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f57cac6c0214a958d1648fbd43a54a8580e6f7ad046b11470b5d3c9f8cfae34225534928bd2ad3aea9967277ce10f18c3f0301a9b9c38e3dad872b27ffb10a94"; + sha512 = "601500f68a5b9fa8297a0d7cb612f3bdc8f5910d3a76d2adbcdcc468c4f2beac24d7f85701ee20fe98a0d6a024c4ebb8dffde33ecf113da2f833e10d18395528"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ml/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ml/firefox-59.0b13.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "81cc17c6466db2ae0fc28be10826069091a1d06979363bf67ffa0459d6d6f5c93c48e98ca4faf6471d8502c3f455feff0e3e7335ca27a9d0ea3b81d1bd94e555"; + sha512 = "1163bf2a97011e86401dd429834ac0be699c9dfca2c8a90bcdd79c54537d5f56e6ff8c788e5dcb599a0d094a6405b84f6f0de6fcbeb9210c53fef98220399733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/mr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mr/firefox-59.0b13.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "b8d0c5061dd6a916d6b4415ac0dbfca7d9fb750892015095880356e1240bb6b8e72e544e6db98799a52a0107901a6b49ac19489e8ef6c5ed91864594dec190e2"; + sha512 = "76e48c4b910532d5b94d099994341bced12a9db673af6baabc75cb786b59ec033662873d532ebe7266f1af4cca799fb4d468150551ea875b5f3c78d0155eff60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ms/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ms/firefox-59.0b13.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3a084c3e2298a7181011b879afa07317bb4d7b963adfecb5b41afadd5c6c746c3dca0dd4135fcdaac84b3d8273e8b93f401ba7474da77aa4cae434d86cd47cf0"; + sha512 = "1e2d3e00b04fa231b5fd8d52e624dfe6d4bf22474896c68e6c54b61a9c363c72535853a93c5695ded4cd1c1ff56c7f690c5716f22aaf2a2b7f652c31084372ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/my/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/my/firefox-59.0b13.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "0de79e2d0e0bd3260d0903f69a3c86de2304b7f27c6c6d216d644f8c0a853f5dccb01839a7f5dfb9a27f507d43cf71bd243826c7ebb2705006deed35b738eb8d"; + sha512 = "7ee2c4581657472b0747ab4a0e188485ab67d4ce9a14b0a5ad27c45c7f5abc9e021723f4af8aa80ac698ced75cda9043e685cb568c3fc20f34c507cb1f375952"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/nb-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nb-NO/firefox-59.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5e8b71ac547cb914c668bf7eb2ebdebe6757f5dee906a5993866e761b500869e8af5da37403ea46986f44ff990d677ae132049099392981fc954ec60691aa14c"; + sha512 = "99d0718cd52cbd9483a8d19541dc6ca2d3c6546a08690a30c61d18f71cd9620aa7ec5080925c9115c5f96fde1887bbd1dae6e93e05f461da8c06ffb29841c753"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ne-NP/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ne-NP/firefox-59.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "d153e1302594b2244f5d603be66e2dbc1e531458191a550563ab28eb89898b317c6a06bfde92b50e6b01a9a8f3cb06a5c611fb8d99f6a82ce2e86c0024eba7a9"; + sha512 = "db9d211a189398ccadabd82d6a51f60e3c5d5c4e3d2581e172681e7313f8fc2783b7488486b0f4b4b3d32acf891ec2e99f32cd995584073a03891db95adcddbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/nl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nl/firefox-59.0b13.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7de66e82c057f7b1d1c89ead7641cb9d9a811742606c864d22142566b99420fcee57b2f54759daefd02429a037832e4f1a55606e2be9a90586f4b9053267024d"; + sha512 = "a3fc5b7f6209e348236449b3c66a7fef1b230421f66392c8c149d32d4c7d2d606ed9ecc972d58d132682ae1c415bafe410e218d2dbcf7ef183b658e2b5d54f01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/nn-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nn-NO/firefox-59.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "99ed4ae5a3cd291fde33fbf56d93afeb076da9759df985779e5378b39703c61fb0979c7ba32a134ad9657251a56aaeb5a170f03909d964d9a2ed5f19f30640ae"; + sha512 = "f701240e3c4c5f112ca9076aa83d3d399c0e65be600ea7baf6c4b2b232b90e1c8c56a358c10302986a945256dde3f1f9397a8c0aad3ff35f8582e0dd6972f3a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/or/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/or/firefox-59.0b13.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3969df7368dde47a62f9c1ff806afd5c101c2094580db904c857fc8d9fd6077fc9b3e60011d827e92bd87c7ff0ce5a7a21db1e728eb7bf953b604beb2fa3cb46"; + sha512 = "b912565bccfd31b9f32742a83353f7d97a3ff272e05cbfeb5153bfb4b26479404ef559b0e0b7c1636c5d41a81d409522c5726a38622f26f3719a076946cef076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/pa-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pa-IN/firefox-59.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "c98ffb3b939eeeefe9f6f2e9c8406427561ae3a9cf067e0e5ee8334f2901c527298079666a7f376604765c66381211d04c04284ea4a19c881f8e73cc94f1cf72"; + sha512 = "4fec18f06be41273f84c16213de8e4877dd4dc378ba051a761fbcdd8aebbaf937bed1d547c976b8da3a2b377d3878bfd00c8e3c2ec9fb40b1442e12dc395836a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/pl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pl/firefox-59.0b13.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "40631417b2e99ec4b546491be975012192ec4f69a4db349a22672d64484544c13874663cd19c2c19ba92b8dbddc02e898fe1cfbc3c18d4212a1027b740a26936"; + sha512 = "0fbd127500ceedc19c160764a2a61f3fb788e54b029c2728b50a7a35b1a51d430a67bec739ea623621c05cb64d1e35fc9044da6c5403054d51baf141baeb732c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/pt-BR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pt-BR/firefox-59.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "a2d5877bf5aec74c14975ba6bee84b12c88aa28644d3ff4bd27e1179c26f3f5b808244a3b20c536c678bdc982c3d73a8da2ea5266487f42134cbcfff8db733c5"; + sha512 = "5b960fe9614152e27da77c659cbc198b8b7eda777e3ae188a80c79f96f775330354f3a76f409b022408905dc4bdfb102acca42227cca1e0e20811644dcf14c34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/pt-PT/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pt-PT/firefox-59.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d69182e5591ba76ceec47b83095460df45364daf0d6e7cf21dcee3a1bff6942ea2abad7f13a0fd4544399cd037ffca89dadf90059da4a447386ffa86eee2420e"; + sha512 = "7bca9e76dce8eaa92e9c6836cb07614e0b7cd520ce085d245de8b64499c8972cfd9ef74e3b04744446e5ba5c34be7c1b39fbc1d6828f411ffc2b1a1133bdd993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/rm/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/rm/firefox-59.0b13.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "32b46a34d5b703c5b6edcb8e2503101ee064364a14ba856e5c48d5c8df51962b56100cc5b61c8437ab0ff2f1e900ee0e34571c4efc8253419c2523304623e0d3"; + sha512 = "9770c6ece4f52557bcb47dabc717b9e422f915feeb5bd4d02debf4b4e2bd9708dc4da81c1e918335b8a9813b567df229eff83cf8dc413e1287dfa6dd57c704db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ro/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ro/firefox-59.0b13.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "f86a41c5c1c7d85a6efe7fd47301e0a5f35be16b0d88491912bc20de8b77162d7ba00b1abe65fa84b7b72c6f85371994b654c6dfdc6056800fb07ddbd8a4b401"; + sha512 = "43df1f25801a0bdbf0d47327264b8c4ac6eb8c10e5e48ca5993b9aff92f3c6c97a2d289073cda0a52a81d72c384a62a8f233b7b155a424378f06fb7706eebc04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ru/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ru/firefox-59.0b13.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a13aa6b8f6daa1e235a450b0bf3b19c78a58d8eb9fb2c1d627e2de22ece41b82176430f8aee3d5a9b4aa291cafcf74183642bcc7ad48d4d97f093cd1f37c2295"; + sha512 = "9d0ac601df2827191c8ad44d88b5bb5b46dcdda85281ae73090ef735c9e9895e2eabb36aac1d095a0cedac525b315f588ea5f64163b5ec6328412ac29046c0a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/si/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/si/firefox-59.0b13.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "96d29e93d36edab9b3bf5674aa770d1ea5a4220d4dbb084e339d519a6ca459f12acbb188e118b162bc97dbe18e2ce0204b2256ec353991281808e189a436e570"; + sha512 = "f45e432475757cbfe66a5ef12071a95bf74c1ae6c357165f2caff119c677974a53c66ad92e7c951c4ebe41ca82b7ed25fdc308698b03a6c2aa686df0b173cae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/sk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sk/firefox-59.0b13.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "6e6a82d1993d880fb2bbd557307b71880cdd4e7065447755fdf1d1bd0a87a82e1a5026a3da0ee7b403bd6c263d963a0d10faa6bc935cd90fb22f7a6f13c3e6f8"; + sha512 = "a4e0e3db886326d6ce74a2a47d8e9d7b80e2090a425cc7dd3a386835ee4c5ae525c597ec8aae603ca638f4a742f517559b821a58b5396799742481f7f859cdf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/sl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sl/firefox-59.0b13.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "a65e9815f2ce6994a7562598016755a228ec3cf50048b97a9b7c553fb04c09fdca6bbe99f83a2a32e39a2ffe89dfd8e43aa92e405e50bb641d54778df2de1f0c"; + sha512 = "3e83fd71a7620c4d58dca6437fddaffec172405bc10ca7e7df2a7c1f34ca5f3f3dcf139112fa5ca608c911d08b30d08cb55854d2edb84b9f59d14e459d9bdc84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/son/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/son/firefox-59.0b13.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a5748561851a9b06e41411723216132b5d92b8153a7559b0e16de7dc7170c12f9714ad0a27e7c37c2bc6dc8a82b1887cfb87591d92ad1437f782314d9a0187a9"; + sha512 = "eadcba6770e85c50394ce85def8915c7d819521e2ae8025a79a1888280278c23c0a41846705a3450dfe3548b1154a84fd17a1c971478e4746143b2d4d3925749"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/sq/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sq/firefox-59.0b13.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "e88dd7eed9882e47905d2e2a10b3d12572644eaa9d7b3ed91e6973cfcbef3a42a7ab3c4683ced33fdb89a8c5257bafbd09728c43f61a665eecb61e908cb56c5f"; + sha512 = "861148e9080b230884b8cbb415e116da836d367b7c6b8e3edbe55e2275f03697dd0219d2c30d01375abe023e99e0547abb7d47e7bc29dc68af7ea05a2849dc92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/sr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sr/firefox-59.0b13.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ec3d240e6ad2f1052aab917c840da3afced7762e49aab68b4a131765934aeac6edeffa7dbc381890736260bda4ea5c8d189913661b2fa8b529b49c9c8611a6f8"; + sha512 = "242794c64aeb0f350d83a22e12225e723822b70f79e629c41715d3e47c7c482ac9b089c71d08e9d1674da0eb0f4c122257d4570989c59d5d2d3877385fa95268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/sv-SE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sv-SE/firefox-59.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "d39abc95ebf6c35abe223302c77b2ccc31f82dd111388d813344686eaa156c402df1ba7b6f80d8c4c69d4738a6159326c96d7eaf4d73740bd84dd4801bfbdb2f"; + sha512 = "ece418ecc310406da2e8bd583468435d0e6cd4eade1f0334b867c71806ccccd2781c22482caca04c8924978907b2fb654660944df4bbd31be8eb13b0bfaa42a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ta/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ta/firefox-59.0b13.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "2ceed73689f05c535698f768c3ddd99046ac82117ac15010b60cb1575335c48708607ec8d173ad35096b0a04bc74bde33d1edc1d1b29e5a0a1877e2caee73c48"; + sha512 = "8bcb70380c63c5b6363e4b13caf4462031f990455f9e2d2f47b4621ac9cada5f05de4d1e5d1e2c65437aae2533867bb81399768577f9d68c58e300712c96c91d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/te/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/te/firefox-59.0b13.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "7321023b94a3cb251cca32d492e3583a50bd6ca117851848ae075b2e5f0f9d345aa5e9d26c6e1c97d06f04b663f1cea25a501d3d643eb8783aeec52dfeef857c"; + sha512 = "40aeec3c324bbde19bf6566532d995706fb9c603222265713133d967735ace95a80af0dbb8401f8589a78332958e0c02745ae5e99030cb5b8e990d87ff441241"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/th/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/th/firefox-59.0b13.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6641339942984ee1e8bfbd9b5f2e70f4b1cc94520967432271e6c750081df673b06fac1012915601499074c5f8361da6eb843bc996a01b7ed85834d47db3758e"; + sha512 = "1368b907c43cc93387ddf74d86c2e04e1c2e0e867217de11595662921a48abf9660030f54bdc7961df90b50729e9ea0d0d2e634d9f4b9773d9b8da75517b961e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/tr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/tr/firefox-59.0b13.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3448b624d980caf109daef94dc037a3256c804aa2014d2d4ddd6ff4d6d2bc1588aebb0f1c7524a9572ca247ee37e835ca34df70b124142d627ba5c23db06ed47"; + sha512 = "a9019b3bc55a87bc20cc06907f2fc24eb7ccbdb397ad39bdbc5bea4bb3a3eeb23cfeba68dec1bfed66fdfa42ab281c41447b2ce848b38410b84f53be7a8ff9b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/uk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/uk/firefox-59.0b13.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7e12823066607c5cd53e1a310fa9952760b5213a7baf0c375e107441532612a39d114b528c3d341745b45c19a808d85e21d9a326b855bc6639395f46d1833a0f"; + sha512 = "a09122c768e3c90a4a5278f800c1e41ee566792e5c3a29d8f2d37cd1b647fa5160376564b0f3fee08d93627b8fd5b084fb66ecf34500a73f9a0a726a353758f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ur/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ur/firefox-59.0b13.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9cf39d4a2fe34a55fb3a445d2fab33e2d56710696c55f6d92e7b61e58143d6895fc43bee2271fa0631ee18e22a3d0a601ee60f4d595e26429e6cf82eeab2881f"; + sha512 = "8e4d3bad6652afa436f690ea934cdf5feddf2dea13dad1637b4ce244256d3823afb6e23a511b38e8a467c324539c8cfa0113a3897cec00a475072ba0325c7403"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/uz/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/uz/firefox-59.0b13.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2be0c1b0c205a43bb018bf7a8e6a0b015183b8c28086f2f7475078da57d7a63b53989702b05833a32cebe3e69145510e51a2091e6529bbea13e04de017f68529"; + sha512 = "1e532a744f4969b1d6df7f5d9d958cced92ae996a123aca3de97c35ec5b3d597db62c3da2191bc5b3bea172c6c5d1f1bea93ee2127fa417a43e4550cdb1c3b82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/vi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/vi/firefox-59.0b13.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "1e7edd38f3a7f4a31d02bb2c3f2672ed505890c7909353cee82956bfa2651a66b2b4c564748a6f6da228fb2c015e3ad4da70cb40c6e680e2d7df8d9ccdbda51e"; + sha512 = "5f9980b4d1fbb7b620021fe1aa80d2aed5cefc4c5be8716ece73697428cb157c79c052aee7a9ebe505a811da5c9a01fd789b27ae1fa8b11292d5a44ec28adb5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/xh/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/xh/firefox-59.0b13.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "59a5948b986d699e1eecabf3fa413fa3a1f8ef026c2546ff67ead161d577e2f66919239a002f25d21a8ee2e407b7d31b4a1c7e9e5cf63436c8e079885978c804"; + sha512 = "e8a9cbc9df298c53b54b6c3ed1b75b87f668ae7feb11a911c4e90b3d925b4e818f7a5f8c50e22cf5ca399324e41aafc436abbe787fc68d0b41fbbd9c0fd99502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/zh-CN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/zh-CN/firefox-59.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "66bfd09feadfb609106301690276acce840779dcddbf230992654a8b542c7287448c7e03f32779ad2d3368ab346945b6c5bcb8ca521a11716ed2ccee7411e221"; + sha512 = "e7d0c0a7f8bfcb63a2d3d1164917ee8ecb2a0fe74871437723edf381cd2bb5888c86bc9708ddbf94383569ff5b6703f3dadbc0cbb5afe56e70130dd4df4340c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/zh-TW/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/zh-TW/firefox-59.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "120811946f1070f710ea761c1d73afab2eb8c8147c73e062982f3bff6a7898170e7b2b47c8599ee00c745e0bfb9e48c5e6b544482d38807b7047129d4c185e11"; + sha512 = "09bacdd45bbe517dfd7c30b20307e1fe50ffd97be349fa778cc977af64a976326f4bbae30baefab714ccbe8160e5ebc375b7f409d8c8e2d18a7615481abee811"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 347ceba9ab4a..c1a440009b8f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -4,7 +4,7 @@ , cairo , curl , cups -, dbus_glib +, dbus-glib , dbus_libs , fontconfig , freetype @@ -27,7 +27,7 @@ , libXinerama , libXrender , libXt -, libcanberra_gtk2 +, libcanberra-gtk2 , libgnome , libgnomeui , defaultIconTheme @@ -92,7 +92,7 @@ stdenv.mkDerivation { cairo curl cups - dbus_glib + dbus-glib dbus_libs fontconfig freetype @@ -115,7 +115,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra_gtk2 + libcanberra-gtk2 libgnome libgnomeui mesa diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index c2b867beb3e9..1bb7ffd1b092 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b11"; + version = "59.0b13"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ach/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ach/firefox-59.0b13.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "81368baaad6be4496f71572a72eaab3f4feb9e6b75912acd8088b9532e08c90129e03ac6358fe932cda97ed709befeb961ddfb6e5e200a5cdd16f99f99c464e7"; + sha512 = "b94b5d17bb2bcdf0997e8e0b8d58cb07a7be671fba4c9a6e42c4954fab5bac2c2243b9f57cb2513db319f0a257561aebd837531f134344b1c51486f66f96ce3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/af/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/af/firefox-59.0b13.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "bf8aad24962923522db88384ac84777b7ca50e25043c3e12cb6ef68ce526450d0a95306db42fdd3c08dcb2b9bfb48729150080616d2839e16acdd0ae548bf152"; + sha512 = "10b1db6c1abdfcd1cdfa5465447b70413b411cbee9fb33161bac21c3f47a9222243be4267849008d1bd20486c3d6dc752a57cb9003c2bef4566ff4210f37e388"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/an/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/an/firefox-59.0b13.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ecab3ee9d4df2beaa6dfa1f9519b3e5dddb2a573a6fb8084db5b285987ecc88b543c006064798cfb10b66a64d44e64e388f783e590ba98ed666973e5eaef7cc9"; + sha512 = "8d94ad871580dc295783c5f3b7f22c88db3f16f0fe3511a505569571082775dec3edd95c472b17fce9353cd07737450df8a9a44a78f4541c26c9dbbb24f1ebfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ar/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ar/firefox-59.0b13.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "10225de3404ccd60bcae5e283960551c16274aaaaea9695d5efa03f9e0b8eb0f52b4dd245cb6db99d11c9a3c4c614d8382a8e65348dc09fe4c2c33e02b144264"; + sha512 = "9f2cf9ae453fb79dec52c29371af50830b129bd82e190cf93d846042579484adb389ba33690bc5dc5e3a652af3924b70878fc0109d5a6da679d97a48fb3de567"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/as/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/as/firefox-59.0b13.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "324df2949c740aba66fb5afe7b461c3d8efdd3f35b4dd9cffb5abed40ef9a7eb3eddf396fa3b48bf70958b6ba19e63caab1dbb5245b2c48598afca471dd635bb"; + sha512 = "b97ca2803feb8b9afb1b006ac375111a59a26f67ed54ec0bf285452f2b59999f4c99e40b2cc066314ba761de465a7a893de671b50b575464d6f9f5bfa631368f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ast/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ast/firefox-59.0b13.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "79a49e07b3deaddb575d9a00262a0d21d316fda95ce6d0968b074a18689635271eb00d43a3a9dccfc969a5fcf4a9908c4d821f2d9af972ca378b995baf75027d"; + sha512 = "1f92d7ad29a89ac7e27181cb67cc956811ec512f48a9b9bb5e35247e4b03bac680dcc900719d1975d476c8ea7f51ad3d21d01aa9fed8f0f4b9ec81a443354575"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/az/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/az/firefox-59.0b13.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "48b513d827ca582f137b5b12b7926cefff53313cb51961a7f256c90c8b532a81118567f7bd98f30fbe0ffe23006a2a9b5ede14d9f5ac5b1033f52f4b64c1daaf"; + sha512 = "43a54e6e62e02f792ce7aaae7fdfb4198320baa34c7e1ae76213e10bfe118f6c49a2d8c85536910e5eee7ea2d48b0e15087a906ef01d100a2978f885d0a04515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/be/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/be/firefox-59.0b13.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "3c4494c96c798b5e4a1e5f2f07b325b006e16d7139993b8d7ba40d251d43a194adfd1a6d8378107fb5d4c5a43a5c21b6af618872cb0216f0b5bda3fa1dceb358"; + sha512 = "9baeb1245ffca545d6b0ac79b4bed8398406f411cb4a6b7c2f703d32435709521894ffbcba5d31e063dbd0a1c2ed1639656454ba5f69ef5a53c1c3622b5cff21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/bg/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bg/firefox-59.0b13.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a25da34be9a79dca9d2ad85ca6accf48b59f7f1bd9395f222fd39c679387c91f8a985af8fa421e0d5612998ed58c25389869102a3dd8370bafb3aa5c5f26b5c3"; + sha512 = "57e9db4705224381034f2c11434bf750fa8addc16773a8aa6e761c2a3bc5e583568531acdab844337948bd5ee2e39101a99a32074862f36738ff9c700087227f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/bn-BD/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bn-BD/firefox-59.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "9e8bef3f9b8a108bbcd2f3b0312670482dc368e78c1c0616af937b13a29808a50b8f5a64bdc1bc3a7e8140790e6913220d2e4539b7a41a47582710dd077c262b"; + sha512 = "f42d8d243a88bf713b82f3fd284e1dbd3a320db37b43d14a11aa6ec98dd5db4e50ac5b014f00495c11204c4732461c9c24f3d3410aec9f33f9cfda6e97d867f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/bn-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bn-IN/firefox-59.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "709a91b866e14f9567c54ce7de579426997e44510cf3f98766355bd97a1cfd4fa5cda2e1e74c56c44c8eb4defdbc3a6212d047e04940c88a81fb3e240d262f5a"; + sha512 = "ddcb486b0909bce3c8e917ec504e0f99c366a83385c36f18ddbc0a0456cad295e689ebc7715bfa82aa62b679387b31334000c92c4c7f7223ffdd9390f039ceb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/br/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/br/firefox-59.0b13.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "439330193ec220e1f34bf878d51869eb6889e8fd917080e387e308d4adac20fb3827c42afd5aa85c59408f779132c8ae1bcb9b7d50563fa53f0fea1e60c40abf"; + sha512 = "a271350d8d0f87461479fe4bb5b998535ce5ac673e0c8657b820fc50f805cf282141269bd1cb467b0df3c1139362b33b15b4dda5eccaa297894bb400b0e7c6fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/bs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bs/firefox-59.0b13.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b578820c0429dde366e0f6435b0a91acccf63efc83aad89f2eb9be6a767c03d14f4daebf43fbeff1d684d3bbdcf0cd262c3fd7ec96e50dd2450bec846267c56a"; + sha512 = "a897577f7c233a4e6d905a9e03dd817cf26636dab68deb8c4db13b0101f7317bc55de40a7570d835de3256803901acbdc10041e8cfd0aa21ced140a80bf7c845"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ca/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ca/firefox-59.0b13.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "800c292841be780805bc4f5650a7fe1603218f3be9c109956e297641de3d178ae6772f5c643db77c556e4a7e8362c587624cbee1f510fd19f8b853f18d937b2e"; + sha512 = "d032ca82efbaf4207759f8e048c5018400dda9e80078fe13c2cfaec542b1d16bea8ba68bf885a6255793b3724c3f1d1b0a79be8028651ffff6ffb85bfb1856e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/cak/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cak/firefox-59.0b13.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "8bec0ae474b0e9ffed58d278ec4b632eba4d746254a94d3ab9a542337ea26e44a1664d994c38dbd91c9859a64dded35b55fcf6f0fe3e69b9c969313306650171"; + sha512 = "d3c6c7fc0b505f0ec8f670b314627061b3f829ee04fbdca6301956cd6ba244de194295aa989badf0cf3a015668945a8311f12ac37b39e1caec653380a719238f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/cs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cs/firefox-59.0b13.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "3e0252397d8eb3012f967f8816920fa00d1e4803906a1f455b9ab86f1ac50ba7814f1818947edbf4b647977e75827094e65097a60de8a08e3950a63ed2702ed0"; + sha512 = "e636cb9df591f73f0d9b8d596e997893b92fd6db9692be44e6aaf83b7eda66ecd8e4ebcf8a4c3d451358f3ebc510e51c6ba1a79cdb76dacb21bc1a9904e425b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/cy/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cy/firefox-59.0b13.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f7f5f41bc94523dd496e40668194a8298f925e59fcf89c7a0a1935ad0d873cfa18efc9b85cb05df9e1477ae319a7ab864a69f3aeff79826454bb0d842f721dd7"; + sha512 = "8b4252664548625e4b9e007b88fb6dadfbf2ac5592b6721e37f44a86e11e1b429534b321b8582b5b82b17e3819fd94c45e9d03e5f8faa1eb5e318de22a2e6ee8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/da/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/da/firefox-59.0b13.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "dea984a55e2d9e017c63977172f3a443af33cce4e5e2565d9beca715dd3b1bb0a7649103d3d7401277b3b0d696fe337450d864918195db59ba6aaac6f7f7d557"; + sha512 = "5d2d668d74064dabe2f0a074ee6a101706ac76e0e21129a68d201a6eb627948b911dac86746cface983dc077ac44f68519f81b62e8fa07f097c3b5bfecd88739"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/de/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/de/firefox-59.0b13.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ae4b5122f9f2b04dc224080b506086ddf67e00074315f9d0795d22b7e12cf8b4bc727b3ad44f75dade74578c835b532833afe420860db5836d5db0b15ccc916d"; + sha512 = "8730f4173165b961badf184c7a8e25659e0844eea51c26a7f7bb958ccb43a0b1cb079ce8916a8a58853f7a1489c0464330a8467822c70f6c6b2df510db1460ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/dsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/dsb/firefox-59.0b13.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "76bdc3d9abc14f5b4358b63853bcc526774a38a3b4b9ddb589b5876ea6c224a8e7a122bf488438b8923f1d3140620ef5f81cb3c7d30ea0814b520bc0ae1a680b"; + sha512 = "522459633b1a8638efe961e33c8779eea0c83e51eff1372731389d32c1826ee019c6fbd7e5592a632fb7c07fd85adb3c7ef08200dc087b95568d75d86033dabe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/el/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/el/firefox-59.0b13.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "a5016bed5e22749b42e6b680541b9c91ac455660acb2f857eaacd1280cd6025bf247ec016bac9d6204c7632d23f95697013dc6e0037c0c48090e0e79cb1ea3e4"; + sha512 = "46ec66ca8cf5a2b299ed1eb21db01b115ca54044adfc74851ac5436ec0d8fdb227fbd9033b14745dcafedea722f63fca3ad1a860efaf9802d717b6f91bb51174"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/en-GB/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-GB/firefox-59.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "25c0923e552583b9469079d0d2fc2172aa6603389452c680482afab4c796340b9761473d34caacb67d10bff537c299f2b05fa91a1c14a79804e0a44755d44171"; + sha512 = "ac52ba67083f9d411e9e14afe88bb4bfe9850f7509d5ff70812c30ddedd4563e758852dd457fc7c50b285abe0e8423a5b72d8b39dcd9c501e3c692cce3591cca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/en-US/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-US/firefox-59.0b13.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d0a5c41a1fafa0c853f6abd5118c76a7c83a344e5024cd0a418d52418ade49293fd268cd35b3cfe60aa0d9646841026fcceb76040c588921d38940f5a49bd6d0"; + sha512 = "c911e4a8b16272d4bc7839b5f13dd4892d68290ed778d72cde95ce110cba5d78df1572868f50222d9adb81df367a564d542c8afb4b1f7ced23e3b9a8a759e4b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/en-ZA/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-ZA/firefox-59.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "cd4a4777830ac0273405a9f78a5aaeaa15f657ae673fb1b1e326909a53b280b7a84729ab75425737187a4a8b1a1ba6383f5064a460df27e63477e9115bec7d16"; + sha512 = "67baa5b7bbb55b3732dba842fe6c063a0bac2cefb55f201e6aaab2d11105c50cbba4850cf80c7d99b2e83b32535ad4cb3a95432bb26563592d48ee961cc1ac0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/eo/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/eo/firefox-59.0b13.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "1720cd5551675a3b43c3b1a9d54272b0b04ec70b883831f54cfc1530a7852ea7c8a298670f3ca1f63641f3bb53fb9170d31470e960bc5197941253a67423f403"; + sha512 = "3d952efdefd0f8b7886506cbea3359f747854f73d53efe58474a8d31beb396b568849151951c6d0750d116570a8f894c5d6e586b0487e3696cfaf451450ecd3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/es-AR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-AR/firefox-59.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "970eae87a941b42fc4b23d8c2cd882a60da643a106bfa1be056a8790b788d4da18a668f18a92d39d25e22d8b12548d849c7da04b751980502eeca67eb3776e5a"; + sha512 = "26ea9b1ddff5518975d49cd851df6951af376d3086b88483e7da9253fc4b427241d77019a8cfc22ba4ffa279af83fbae3c4deca8e43ec085fa366abf44629ba5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/es-CL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-CL/firefox-59.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "a9b861009f5c6f72d2c7a6714422690a665c4b7d527fbafba0cd6951ecca11cc4cc0d5b68eec6afdd652cd2c3fe751a86eec82a32ea93ad29231dd7eaa9dd36b"; + sha512 = "85d260e0dc02a4d3f94c43b4c3425c0ed0c6c9569577faf80f8f7719f368d0c353d59deaad519ccecf9da081b3063721746cdefbef18127ae2eb6d7c9863470a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/es-ES/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-ES/firefox-59.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c0a3a2474dacde01c4fadd41c4ae196e80a531fd20fa17d129d22dba69f0910c50250711c3c6f95da5825f30273d839c6a2746c81a171d08f9e6572de8640bf9"; + sha512 = "0efb25a3539fce60d2788513ca26f2a2ea48330894fe9468d54e5eac1bce411e72d937eb5997c18f60fc64c9d15ba247664998199655c73f3e9488a84810e4b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/es-MX/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-MX/firefox-59.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "7a72edbca19cc9199abcd7ef18e3e3cdecede5704e3a375d7d94d88971ae39a4814510d2afd3a5d0c18223dc40ae6c78576b58064406c639fbde3ad289d3f53c"; + sha512 = "64c1d3945d866649891da16dd16d7d3261d0434e275d44c179d98fabee7eeb35e7fffb6e20b9b6630d60de52559f62d01ab59a5e460a389a17f5d5513296fd5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/et/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/et/firefox-59.0b13.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "a19677eb4307e70e2c533adcfded110cefb0ceea32e8674c77b58d8888bd8544b21ded902228d1124e64a9312004619539ad06f017d252c30ff8e5aa2e2cdd78"; + sha512 = "6b63a9fe3f12f4c270dcebe46d9b13082efdc32e94c8d1937e1e5248eaa84e8e0966092e408475bf20014d116509ee773bc91b06be9cd14fd97e64b8269072e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/eu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/eu/firefox-59.0b13.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a8f6d4296d75f40ccb147901277be4e639806dd0ce38dab9eedfab8ad4fe95ec95ebb98512ec034fd3dbf7bc2540ed4cecf08d9ad25fca586f35a55f1cfba214"; + sha512 = "221f867cf7384f2d5f79906ac68c53b87ac6d11034698a7f390def2008f1acdb944db748b8019a726ad9eb89debf72b4939034057e48ab0a2642d041e3fa2b14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/fa/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fa/firefox-59.0b13.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "a10951a2c9327e5323ca3bb19ddc7ff217fae4e6fdad08b6c7957d99bc2827bfde50bfb056fe823b9d469c2f03a12b5ef211c3bc2743429f5d87e0daf6419589"; + sha512 = "e513f3f871c444c6dfe4af027b31830e78d0d90ee6f199f26b3dc8fac1dbd3293c1ae74f4df735e15cfb4338330665f94c6d1dc4221e9f30250c7aac33ddddfb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ff/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ff/firefox-59.0b13.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "7aaab75d2a70792b15b6644f5974803aeaa4d5738e64ebde26f53568764451d28aa8f53495bebb9f495a9b8f00ec8037bb289d3c4f4b925e6f432549fcea4ed3"; + sha512 = "074cb42f7b6cb93ff5583834c8ba1f16d92330d241a166983b26c3311c3254a323ab52badc16e9fd3d13e71a783d5aea55674c04c7ff5bb68f60a5deae446954"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/fi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fi/firefox-59.0b13.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "146aa988c6b1aec4bd80d8494691274dcf914bae0cc16739eacae15a4e92f90846e5e0e3d505be724db20480919f1f1f804ab3864b2bdc6df0baad33ba968d91"; + sha512 = "901bbb71c4293a6cd7c79210a64349d65fa91c2c2f0bc00da5ceba0a7906c0cdfe00c72d316cfb39604129070d48dc1a30416ae4d6ea2fbf9c3be3511b1a3a39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/fr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fr/firefox-59.0b13.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "13919827f884274949f2aa1f59f6dbb7cc5b0b68f3f9c7a7c0c48ba57d1122f47b5860756d9be539b390536a016c68da5326aae72c8013ff3eb5fc7b7169f4d2"; + sha512 = "b70919cdb4f6798253acee401efc6fe22acdce8e12249c59c618b9d2858ccffd398a51c0c77c82ffa4c5a68dc0ac6a9066466f8bb3cb7bbed621ddbe426072ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/fy-NL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fy-NL/firefox-59.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "00a22dba34622ac793b926b5e36427dd08e12d5cc620e36761fd0beee42b44b5f975395946d2633fd856b4a658917422e95667a1dfeda4548c42dbf81c0dca48"; + sha512 = "b3ce427644dd2997d8f21eb60fa1b94c03ab091e79e5c8c908d938ff73871fec81b288d70cd754e03ff9a3758289bd9886077c01b5e3db0458bb7c6f04b11ea1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ga-IE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ga-IE/firefox-59.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "0ea311ba94bfe3208789c3bf4bb82f0f01ea6022564b7f8e1f5b147bbf6fe56f05eeb5072d9aff6d1fd1db3b28b1c0aa203f62ab295d5b3be94fd26c789e0a25"; + sha512 = "6bc8201b78d85d5e5e2dc226628ce03814cea2c9084e5c4bb332b21d50418fcbb5ba656ca3a592e5304bf9fa10b64b32493daf17f6f3363c154b59ff3aaea828"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/gd/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gd/firefox-59.0b13.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "811c9979b05a6846dd13406a169c044f31f20cd79aca2373bd00079bf77f5472a44872d51e3dfada0d06ca620e1625d6646a8a49279cb5231acf1849b3fe5bc1"; + sha512 = "8167a0e36c2ff85a85c9155a47f5530c581fcec9bea1b535b60b8c9e2bc4a370d002f942c9542787a34c76117356e513822cccdf8c02962d0091acec16724001"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/gl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gl/firefox-59.0b13.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "c94ceab554f41def1d561207fa6135a02520c3e99579eec3e89cec9cb6f3b1823cbb85bd2654e14799d3112c4268d686a5291e8abca614ba758090f3da7aed74"; + sha512 = "b1d8de0f315199bbcae9ae693a04e038dcd24c73b8795f031a595e70fbbb4c79b9fb93ccb1761319010e99a915e3f71a075b2e368731bc530ba59b48873b5b48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/gn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gn/firefox-59.0b13.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "3e61e5c8aa3b1243cc2d2a067af204657c0ce1220b38be4aa29769c6bafaae27c361981c70b7036abf2222e1db9fd668bf4df8ec84078332fcb3ed6bf57376af"; + sha512 = "2c64c3db99edca9ae722953a48e4df9f106dd485357ec0bd35bfeaf5d35ca72437f38991e2af7fd46fc3653a9907a2f67f6cd931f8d8cd2f55cc56f9bc3a9b99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/gu-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gu-IN/firefox-59.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "3c75d4ddcd8d6acd86bf1b47e818fed59f2a640d7f7f865d2221c1a00072b55fd59b9f043f4cefd1214b2d857a6385116840f29de13c5a6737ddfa15cd4f8a33"; + sha512 = "29bead26899e8cc33cf47e7e9248493d80a5ddd82fc35e94836f26b627d7343768d427a7ce4e7ebfc70465fba9a5c81bdb56ca7e0e06c788d179c500ee42b44e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/he/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/he/firefox-59.0b13.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "0f3f399e6223819243a06e7a4db56391b46e791afee6e4efeaaaa37923fabbfa7fbdde9d3ae5899b7f6aa23cb0e868be03fa0526109bf4f5f05f481584875efd"; + sha512 = "e3899e1a3fb97df70a29c0a0b314bc871a9625e736249eb9bc056cf0c56a81d1a2a3364ab964078733f5f3f4cb20229a5fb65a4a481e74b1afe2f1282e41894a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/hi-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hi-IN/firefox-59.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "342af0d1f435b814f52b93895e519858f6963567c2b35fada1ac530143a741249a7d55a0726709f116de18852911ba8d04e29caae11d5e286080fe731b603c81"; + sha512 = "ca96796c00ea4f028d833c7b9720de0ce2d77e72b9de85dc6e77fcf83379992abad22ace9201de0d4e45c4c89f8a77bf997228b9667accbeb774d3035276d1f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/hr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hr/firefox-59.0b13.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "07d2b74ef1a1f8da9e4e43034743104a9b97e0e6349587bc695f6592b940bd5bd355311be22e376e675d1061c19e1b00248b0149b5d7fc2c6ddbc002cff67bf2"; + sha512 = "7ebbf4ee67c475d8abc48212b6be0cac569000f386c54d893c863e329b0459e59d2af70c1a9ec5d5d123edef738c84249bd41538eb876e010776cd8920744997"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/hsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hsb/firefox-59.0b13.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "89a19fa159aa03cf56af3002a2991fe2ae33f491a8549cf54e41ff168427f5116c31e990c9d1377b0afc4e6a51bc16301778de0c231ad460c41e438f5c12ff3e"; + sha512 = "b1ed1fa049df575cdf5e7ec1e0e5e0d70f3fd235ecb969490e4e6ed694db677fb9d561b6d78e798e684df1a918d1660aa5460494639a525e71c5689d7a0d312a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/hu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hu/firefox-59.0b13.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3248c07d0ab3631569afa6c975025b7b59f04bff103a9c4bd26b1b0f60013f188d67ac9f7b177152f6800a56d594fcca75afe32c1a94522c89a8daad9d9e47a9"; + sha512 = "7f2420f9da6b68a461cd7345755b8968b55e7cccf2d89ee1e5133a11486f35fbe20284e1a083c108806f49f61070550222fd82898d8229baa64d2097f448fbf4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/hy-AM/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hy-AM/firefox-59.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "d4b25189be36d036cd681d2261e6792c67b2f81fe29b4d66ccd117455a6426c451be2af1fed80c1a6a9f62f1dbd1210a3a4997d98f8ec3c1ee8b67632dd85163"; + sha512 = "15394abfe0ff50a85714a601b250530ac8983bd456e6eab5f1cd6551ac19b283433ca68bed8f05874785eceea4e7eaa3eb442193ccd31c9e611cac43a20655e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ia/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ia/firefox-59.0b13.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "4862ce32644bf06333f753016c3910ec10e41676669c5061dab9b4a9d7de269a934b9316efd472d80bd6f0e8077e1ee79435e39b3ec5e64ba90d07ea54dc218e"; + sha512 = "80281f638231443c959e0f8ba8c40a74bd96dc9d5b95a3d15d6a62b04fd308b9f3c4613685098da85d45d6e1f5b0f813b8e9b7d2b6f3fd655dfec5481d184106"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/id/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/id/firefox-59.0b13.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f0e4e6d7ba40c614cf690ce9f7ddb00dd1e783370363930b19aa909a50a1d7253bf6c806a5d85d3bebcfac4d02dae0a07818bd89870e2803502de62e9de9d7bd"; + sha512 = "1ebfd95939088082786a667284a30426fa98d490eb0fbb0cab1546b46f8f22d2e2f4e58b862c2f11b1c2f2f12efc76348f435230fbbaad8451bf7896f2fecdab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/is/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/is/firefox-59.0b13.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "dfe293c56597538890451f64f75bc21db53e0639c9a3e07df3ca488860e1937817091dac051c611e1aa659d664741d92e73a07d468873d0fd1b533bfc55c6fa2"; + sha512 = "2bb326166ed2f5ed8cc8c67607b817f9acdc760ff94b7cb5078ce45068ba7bf10aed568b1b6bbd68a5882103f490fa0c6aae1f9d66efe46bdcb606cbf4af6f6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/it/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/it/firefox-59.0b13.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a37a584dfcbb4607ce77185175a90c5806ded234c0a7f4eb4855b09dd7c03cd87f9beb8b029db63f64b3879382d3ca0956bee4a4d8cec8af3316a5e510947246"; + sha512 = "f73757b9dd8fbe5b079db6399513a01867e3d910ddc35bfe2f7046bdfcde7687c4e90da67ed9fbe829d4007edd6e9745886a458d81da07ca244eb1cde67d9f8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ja/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ja/firefox-59.0b13.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ce01130f06a6c2513fd15a91a18166f4ec7573898cd38f3af49297e91813ce40610e3a24d62a885c2952d4d9d729201d902db6fbbb2e10a14b2467cab9218810"; + sha512 = "60308c41f841ea80554ec084fcfabe002922aa86d67ffd9bd9ed654bfe94b3a5e216ecf2c05e7b409a21d7b86ef07da72738ee94e7b54a1fcc15c056b156d396"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ka/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ka/firefox-59.0b13.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "d4f6c60eb72b2854c0b7edae05c6fab01042f019c56ae9cb9aed277f99cfa8fb9b27a9815094fb59edc2245b3ba5f5406dbd9d3ef032718080c1cd059141af13"; + sha512 = "f18aedeb49d25f3d5e87a1121fd3ff42e70473666c7d6d4ef6006d0f7303c9b64568de36435d4cea9196e92523b5d808a4ebcc7bea94f68d90abcb19bf2d6f2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/kab/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kab/firefox-59.0b13.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f9c5f81391e330b642fcf18ca31e647bb08c97941b6a7229dda8df536c893220a65ae268a37ce7f8bddbbed23ad0042cd33f0f641bddf54353ae0de930151c21"; + sha512 = "40db6321b4793a823b37214d08f4db718f84d4bd4737cd03351100b417e48cddb36ff550a26d7462cc793ce2aeeadaa0b72391701215873707946384e122e6a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/kk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kk/firefox-59.0b13.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d9a2b2bc582c614cbd9ba633029b6c0109538dbfdf974489be41a0582bf31d419e6ef30130859a45ea87c9caa10428cd5778b092a618e9ebc2dbc801890fb83f"; + sha512 = "3511fe6537af25878518394f460a946e6013ba1ca56042070a2de96c637d9726a7e6b9ce2db8bab7972bd434037db76abff03fbd2380c893f5cb60b2a68c1640"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/km/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/km/firefox-59.0b13.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "b83844f56c20b51b9c64891c4283c70ace54c7da65dbf8d73d4b78941b2022907b60cbcde7b35943c16957b4b021e2f0b19c93ce082161beb35ae35bcbdc7756"; + sha512 = "8884ea6d19ebe1091768629698fb7d11e34c9d011f9270a603b4530a0be5e8479abd87c2aca0cb6fbb33e944b22a69d3267b69c665fbb9b41b0e54e4f9a25c19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/kn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kn/firefox-59.0b13.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "23f281b9fb24134a6a431bb1001686123042afc21b7b9f714a4875f4001d6dc5ab95584cb18f455ff30010024fe379a6cb525ae24b6910e28693c65dcf5ea46c"; + sha512 = "6ec80a671c71d5995812417c17e6a65dc9188238abaf2fcd15d9494b9c98ca3495c4b9be35e16175dc88d93a32d51ef2ab5c8d58683ba564e063a0931d63c25b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ko/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ko/firefox-59.0b13.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "6319c23d33f5203cf6889e3521c58bfab6aff1fa5ab96b76b4cddf7657709a48c3d57cf646a77064e2ed680a43b543f588f033f6a3577b5fc905a882b4058c12"; + sha512 = "3c4ee32ef52f915e0a64a28fdbbc1bb19e80405b63a1d574eaf503431165761d8917c972cf5757b1c104c2cfa9f080ee3c4ba550511b51458f9f9f8894cd4abf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/lij/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lij/firefox-59.0b13.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d24882005211ec9aa8efcfa22d0940ca82c8d5574ec499f2d7956db42b37fdf8dbe7abf0414d64f3344b79c77b0daaf7ab537a4d675f06373ddf65cdaf9eb30c"; + sha512 = "f5af79d0aa476e21a93a077f94e8408b28f4a1835596aa34caef4176ab37e201e3cff3c13e96e67687146eb2c6b3443744e43e99bb1766d5b49b789980a6545d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/lt/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lt/firefox-59.0b13.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "b0652f42e36f101b1a8c6c82bff3a9dad00703fe75e702ef595cadbd3f2b2f4e6e139e7e8e8a54b15e7db612adf443782bdd138e77a6e85ab9089cc3aaae23ab"; + sha512 = "ddb0cf56afae0de194528dfbedc96714e221d43486907cbce6014731650d8a9bfe8bfc639e27aabd5eeef9824004c140511178b89f8ab46550822950e33608e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/lv/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lv/firefox-59.0b13.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f2a39cf0c6c4a536711731ce46f943f875d2f02bb482152c81eb974e66303bf6968175a32a7bcf7bf3a281d551ae7f4d9d6bd1ab17249106835ba98a53102b1a"; + sha512 = "d2489d3e6f46695ef8e3aa12d01528a289fd687c5840e65d2cd4aa01c122b52ffacc139bff635bbb959c80e686dd8ffa1d0cbe585981048ef7b78ab490a53c8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/mai/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mai/firefox-59.0b13.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "38db02caaa1e380f9a9c29ceffbaf466ff4bc5e2cb7191fb3e7c745fc23e56f1f12a78a54893ccdee307f7b52ca2bcb12241d8162665cf6abf1b5fd04b2fa7e6"; + sha512 = "e5dabfeeaaec8bca3e8265b395b35ab2f4edab143f14461b9bf63fb9e0261c899e7d87ee194e2da0d4695863c9332b6dee6b8f3334af64832664fafb4c6daac4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/mk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mk/firefox-59.0b13.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "1c7d555e17b69af7274bde550353db2501ecc5896592f391ec235350da77445b73969ec61a49eaf8da4276056039c846f8db82fcea6eecbdc99d38f8421ed222"; + sha512 = "309d35b7611336dd11933d7cacc78d1c94813ac6343dc522110bd153d6dffc29eb803601958735789233c0f0163a983d6ddf2072d730a2858a8de808db00e3c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ml/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ml/firefox-59.0b13.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "838065437947ecabbbaee0892b38dcd06efe9fc3e07af01e4409051aed9dc91b79afdc6a8519d726e0997a6c8d52c6b764f5f82aa6389da003b5514af6781948"; + sha512 = "de02f9cbb6f47c3fe16e081aba67c45290fef2c420c29399bb4f0e32c3366957d381190b918723660a7bf9425e02bb290841062b4104498af4ebc35bc3bd3323"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/mr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mr/firefox-59.0b13.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "878938e50ab54b4008f292e6423e936ade2be23f2a9eaae6ab9630b2a655e7bca5392a95d040ad8145b1899e43dcb21d52ec8b8d3d1e9b8c01090af1bbac93cc"; + sha512 = "079a38be805c8527e1f17e64598e90eb9e464594656785e125f9daab0d3355268d8d18f28c2fe9ab3e8cfa526c2f9010d0a3b8a673e041ad60a8f5b2b6dc3796"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ms/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ms/firefox-59.0b13.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "da1730d9dbfd180dd9179bfbbc9d5e3e8b1ccb40660f2f12559743844033de5a0c50141417eec876e8a990c022b9c08c64ef3ca084184d974e65e7e204da9223"; + sha512 = "05a087a15ce680f8330070e5717cb32bd42fd7530b48917eb0f47f3608a1d08eb6e99834d20a7b51e4382c16e397ce46db166c49650e3d38112676e3d79b83cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/my/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/my/firefox-59.0b13.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1e017679a203e499a2cef3ac232a2af0184801eb6842982f8558d4d59fd45ccad5c7d439b1ffdde13789ef5fade73726d74f39cb010bdf221487a99fa7a7407c"; + sha512 = "2ab117abe127794aed26e5c50f65b7d32dc2fb8b46ca4766259df8190a33a7cb0630315b5a9d19a36a902f8caa2d33730a4500585ffb3deabffb65ad53ed7bd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/nb-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nb-NO/firefox-59.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "879733aea82fbe7a11d43510ab08d16bf7b9ef65f9cb128f273e607f226389765ac02c536cd8d7b2445ad5011c1abcd0a89310a143c028fa2d53718ab73a35ca"; + sha512 = "136b17bf57805f1c5523b8a170b6c0cf70b58760d8c3485d5c2d0bf6480acecf98ecb10de0b97cae79d8d5595b43b4289bbca851edf07844121dcc2e74c1e68a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ne-NP/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ne-NP/firefox-59.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "2509b8848fc3a462cae70c596ce95517e46a9e829981aafc5935c6031fa5aac5efcafde2f60981f8060e169182a9355d9e039be66f46a99dc1618147b3f6f6b4"; + sha512 = "4fc566997dc0a55caacd5a2b3a1a8a4d4f691e593da07e19cfc1e47fc6477e32101a5de1d5bfe34741885589eff724c6f2886d18fe208e8e7f6eff5a65fab0eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/nl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nl/firefox-59.0b13.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a47d869d65256e49ee1e51ae6a659c4a645ba6e4ae716c3771c15f043d0417ea5000aac11eed105dae0786f426b9c2e424d8199c55b5c656aac93ce8e76c881d"; + sha512 = "a5bf66f2f9180763534c7d5cfa51fa9d7c9f6b00e01c98245bbc836597f81bf0b07a11baa7ae4e3b5c49864f71f60caea673883d7c93ef3a5b3286b084c00b57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/nn-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nn-NO/firefox-59.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b5d0637e4039dc1cd7eca596ebb835263a781baf2e411550cd078e1e851ef2c795ed848be48d51edf9f83aeeb2ed95726f2759d59656161ac6b67a44690274d4"; + sha512 = "900f3975c993fcce0a043989b9dd92d09daca5a0e16f601069ce56183407380685fc3c4106ba38733ad545e4d79487a945ddf192ace54db7c7d97305e7f1f96a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/or/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/or/firefox-59.0b13.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "917bae041919402d4fcf6396e0e94d89666044b975ec7e8d9f7408bec232e4988764aca83b98374eccd53b11512548023f235a4a1e40bda3d51a2b78170bca60"; + sha512 = "09214aaa9c182013dd12f38b17db33e6b4872dcdb3105db8405bbd068163bb65546620692b5539ccf7bf477929619ddcb438593bd41929489b8842011307cae8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/pa-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pa-IN/firefox-59.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "31986cea24479949f4f4c432fd8d1a8974734325c30c915ba78c9a8687e1f6723368fb6f8337ad8ffcd3a41e3ae94405ee5fa33ca43cb7eb46ff07fd4c6584be"; + sha512 = "0e09950b757f8af342329c933414a8c8bb26e8759ff47281208f3cf4aebbe6ef8f230e2fae80070649897b52daabc695b4e47a87e4682d3570cd0b12fb4371b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/pl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pl/firefox-59.0b13.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "4c17870a4246ee20f23f5a3c899180df124c418be0c6f4690cbc0806d81c947f5ca6f60749282c9e2c67216c71aed7993a8fa66e2711f2e36cf2130276454dbf"; + sha512 = "dceeee73fdb4810363feb949792c9fed1e58cd99d64585a8259fd0e0709981de85c174b95317e9fc77667e73bd86faccbcb491cb77b14405553d271092b99989"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/pt-BR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pt-BR/firefox-59.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "4b86a1d9468be66f6fb4b58667e026a92be58feac5b760353c05411b6ace0224ae0326542a6b6b00492b72b1faec2119e1111a410dcca633fa253db7c07708c7"; + sha512 = "111d579b63758bb24995b74e5fac69a299db6caebab05eea1af3b2e86ed12db1a7e7ca4fd3d55e2ee18b7640a316bcd1964df18f8da8753f2b7f089f88bf213d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/pt-PT/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pt-PT/firefox-59.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e8adf87f5cad3e871c0b81332db5393e5aad70372fb8bddcfbf922be80cf0f1bd40ccfa49ec972aa95966d972a48400c8c2820f3fe1e67204bafd1272e8b42ae"; + sha512 = "d62693d19e7463639d0c06a9d07bfc34622f5748b01bf94398fe7195f5d9639344587d81ada0f17ae43f45fa8371f6558b9b468fdddf6677a6ac919e439ac569"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/rm/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/rm/firefox-59.0b13.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "e2785922eb50092f125df5d6082b58964b11a14a19f139e9fddd687f552f67f7d559c6b9031ecf74592fdcaa3218110a60bc0459c9a5341a493e6f607d77ea77"; + sha512 = "ae41b07013bc8908282b6683f5f161dc1e7d90c7373f9b31897c25d7b33da2b7136dc6ff94f9e0b9112de334c3c79c3176dbdedf39f09f0eae1af7809d23b224"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ro/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ro/firefox-59.0b13.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "4362555d79853b643ede451b77a8ff58ab4e1dfc29a2a0bdf55f0f11eba387dfbba4d0009340be1d8d6344f423b89a26ea6cab5c738b0eed5f9076d2f591b396"; + sha512 = "91b1776539108dc7cf75c6aae2c07153f61ddbaa0a46755dd70e418d0540ff752d6baa29e54cde95aa7bc4c3fc4ad05ac391bb63cd13b8ae8ff54cc4a09e9a2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ru/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ru/firefox-59.0b13.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "1aa522488a072e62e8014fdcd1c717fad2e5ff6e8cc42bb63edb876a552fc9b98cc5361d345213bdff3a2854c833b8afee93154ecc21fc4ef27680dd2943c2e4"; + sha512 = "41b9995ea1002ceff23a785e5e15b8978071554ce65358e68337bd00fb32be101fbf6feab1734f78b665b6f3eb1b25b4fd187a328fbdfe4e70824ee5f8b4800e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/si/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/si/firefox-59.0b13.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "6419386bd2f5c731f2b500b59bf6ad54ef09240fd5bb65b7aeec1a9d977d70a3ca036591f51c107a4e14546d60588dac5cc3add15f6178850e8dd0b73cecff59"; + sha512 = "e3ef0842002689f2430b8a70e2de709b18690aa8e691494e51c032126302e0c661ac4fdeca11a9249aa6dc94edbeb4276be49c1c30707566d3f5b33737677f3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/sk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sk/firefox-59.0b13.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "697de5ceeeda98191afa564587a926936717304523147d171f53ad5e6da94f5c132f21582c8e86eb079fbd20b3d15d302182490147e527cbfcb9d8d6f69aaada"; + sha512 = "92a3ca10270763cc17bbffb9d27286c029a1bbdd02b341748c098161a270b645e07b5939c6cea06d1d9e8c70553e3df887fbc6937f01b336e1676d35e2f15e8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/sl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sl/firefox-59.0b13.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "57323cd3ac194f90e31f5a4c830432f20522892d2d5adee73ab434df540177d5766099a004a939f6cce22b53d341470fcfc79f07269ddeaed1923d6cc10a8d9f"; + sha512 = "462c88a1112a75404782c189817f52925c11d3e0e46f193b9c3a9446bc01a7675d222881c563a1217971a1d5c7b5f4780b756e6913e2ec96034a0fcfcaf53634"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/son/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/son/firefox-59.0b13.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "50f4e1d7645b992c8fe0b8354684c6b5ee1db6ad4981a4b5b9709c75d65e8f09a2c7a633ca1bed322e150991c709cf1b012afe2b7faf3c9cb35deb392390fe98"; + sha512 = "7d0c93e02f1b71ba5625749c0fa39e3f09349cc2daaf8161248baacdc41794955fef74d5144730972abf0e20d8610795feeb9d47d1419d397a739bf52f3d794c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/sq/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sq/firefox-59.0b13.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3ce204bd28a1bf181f1b3f7b4e906e05412f412fe345670f235684791f737c05bdf6f9a9b2c9bf4066f5419300a2bab77c2ef34ff0efd3db543a0ea8125e8547"; + sha512 = "dc4271095f23a32c20e1ef7b9356fa5d28feebf6347b31d137744bbb565433b8e0fd6b811a2d0ef024405235f2747875f0457e9d5fbe35467ced4e79852d2087"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/sr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sr/firefox-59.0b13.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b0c498b589523faa34d54e6e1b5db6e3a1a06e0fbf2333ea22fe7118efbea2d4c9e852c48c0c073921ac602bd2586068da1f142b6ead6f83119066411b8d6044"; + sha512 = "7e4045f5daca691b38268c721249fd03c43492f1b523465fb5fa9b4652c7d2681f908c71e204916a016683df2423f2f567e8f9f34b836494eeea97e412bae465"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/sv-SE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sv-SE/firefox-59.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "56a03c0c8d129c18f8331168afbc96951e70fc9bceeed41b059d376ed0760130eb43b5ca53d288f55ef4ec7da0693015d3dfea85bc7e973961064b7c2ca5561d"; + sha512 = "cb2c3763f087f8478abdc8c40e272737e4e3f4bd5a4c9aa39de8a54f950d970479824d32afb21f3d78dd345fe8023045a974d5aa5e4b5169c885da7ce57f668d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ta/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ta/firefox-59.0b13.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c314a9ef07a32b4e01d6ced306cfd3b10e23387dbbac155b6ca2d8649b76009c8caebf666e92b7dfb90e9c52233fb1f552a46c983dd79f765b99f28be2c67fe9"; + sha512 = "34290d4dd472fbd0488882cddc9fc107833a9124d68ae3be554187bc1418c4614d6a3fd0afaeab70d70f29ca588cd6ee3393ec1750590fffbeb1171d110da373"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/te/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/te/firefox-59.0b13.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "cbf9e62c2a6c746a442150d84637e8c02db89417f725a261b343d2d87acd046df364d892131f5adab384bc5dee51378ffbd6d8d9ffc43d10ac2f5ab5dd394f60"; + sha512 = "866b566de668a28e7975e9aabb0122afc58e7fe8ae8b2200af9f1118bd279d03819ab8f8e02ff3182b741e50adac994de33edbe7f611eaa80b81c471ffa0fc75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/th/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/th/firefox-59.0b13.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "6584a4103b466ee21d887861adbacab9429e7f68e4432fee3a5a32ec59809990e50dd20df7275f3c8af00bab9fdef25a7dfeb23beffcf58f3cd0326d17544c5b"; + sha512 = "8dbdd85fdf77c1e8bda711e4400048b42341b34d21b68221e658d03c119f05e78f870121a5f60c354163b797c5fa4213b208a63b73944fbde35eee2728d04a3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/tr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/tr/firefox-59.0b13.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "0e4e8dfa5dae13b7b2763329c41cf8783f4e4dad844ae990c9ba36ce846afb9849aeafb10f0d6ac95bb79235876979c327d6ce3bb337a5b4dfa92e0a0acb1994"; + sha512 = "e537f0d5843b26f0e16f8c0d2b7930b604a6a2d208ca87cc76bd8b11bb18d38cc8a247c6601c0ce607df0434534e898ca1cb73e062b8b7c4a1cb02c8f41b1ecd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/uk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/uk/firefox-59.0b13.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "719ffe6b28a3b23afa238cfdd6d6b97642f2ca0a7c73e9e7f4558b2d37a7e7e7b62da1e85a669446e24a34ad54d2d495e3439d7672af1a3e95bf2035e453cbc6"; + sha512 = "8169a900880914dbf76027f3e7a8b7f30a00d729d8178e30c99a108944029640ff9ddfd81a88dc3627c704cfdf2a97daf5cafb6434ff8dd342d27eb72c3d8c1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ur/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ur/firefox-59.0b13.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "1bdf8f56cfeaf566bee011d325cad698ee99d1cef77da7fe8a90e29ed2a69ab56b0643c975d2a1ffe2caa90bcc8e32a08502071e40ebd6aff2c61512d052f16e"; + sha512 = "8fd7b1f7cc80978f6d0658d265883bc7a4f38462ccebbef8ccd537114b40bd5eacf3195fb193059cd9e1f4a5c926eac5d94bdd611afc1e5a738688461b714ce2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/uz/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/uz/firefox-59.0b13.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "3c212e672725c170e45f88dc422d1aad81115a7c428e794f99464b49b819a6e5cb353a1d17b795a5f7b0146a06d7ec92e44e8e897c9897ff5a44f058c3317747"; + sha512 = "b2a4c15f3b2304ebfb809c3eb654f53c13837feb9ca895c1c8e24a823ba646971df1726ea7c49510a8745f34fc6fbd004fa83b00752bef18cc7ba4f928e34a7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/vi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/vi/firefox-59.0b13.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "55c56e451b8bfe66f6a2808408013787c7ad0dcda3ea96ce8e5d7948a73104f1d3c803750e8fc256420daedda6a2f239c62e877affa94cfb0265b68d2d7b6164"; + sha512 = "dd8cd6dc52ff521b70daa4a2b4a67a500fc6149d23da635b453b3f49e79343a64f2cc9206e0ce58fdb2598b3240e36e5180a1ec1f21be5b47251b07eead7b363"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/xh/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/xh/firefox-59.0b13.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "0af098c785b7df94a59f0ada2c1c5fd2c005f01cd7668624dd3e5532953ac417f0d27295adac551a1695ff9300bae1684fb879454117d8149d412e8c53016afe"; + sha512 = "c9c78d72670e5e707bab9d53c38b542e0eeacc9ee4e883f9096881ccccfea339e24aca35ff71c1b2f0bec63396309ad55d65ba42fcd0fbb4f1a3876001412354"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/zh-CN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/zh-CN/firefox-59.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b560b43afdaddbe218e8e557d8b15b78295823cb1c80db7d55f7243b4d79a8fb1d03e2ae9fa8a825f817d599131cd121aa682ed2d784251bea4fab56389a04fe"; + sha512 = "1427b96d989c898d70c4d8419742a6e647c952951843aaba95668d8e4a02f7972d7e2f1940417a6c605a53f23ce08c52338c1f4ad605256baf4908694281b47a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/zh-TW/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/zh-TW/firefox-59.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2fe3b14b7d1e58cfa9bef71b2105d28be2871c527e1a551c5902f5368c7ab4f67b330b46716c83917e8cb7d8b494fe2770e535d528f96e6cd469b53c9998e883"; + sha512 = "0a78c8076b21ce6ee385aaf85dec8ca6249eae73e66209003765edea31660f3707cf3ceaea55d75db08746a6a4636ea8bd18ac3a0c0b2265013c501c71166af6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ach/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ach/firefox-59.0b13.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "c1e6e7e1a6490ec4a177a122048d3f405182c22039026d325b9600e8b12e1b1a670c1ea4f9c41fa3d0ebe5d95889db4078f1b96029c78266c00d346931a4eff6"; + sha512 = "963cdae76d22bc167d5d24f6c6c12705dd095f837cfbac6729cb357bd3a2e348d1841102d969e1446c93b56099087ac26af9454e72126c6d37eae2b1af9d437e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/af/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/af/firefox-59.0b13.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "45ba70b3952e5faa8643b75587c08076fa31a97f650e8950e6adf3a4ece770dd19641cc368623030e0766ccb1a30af585547c410f7a77714c408761e0e86572c"; + sha512 = "5feb546e412702ce7dd12b3d81bf1099499ee8461c4d3ef8d0857b9516b6733902e4c554f43c19bfe36425c55dc98463a2e4f576c5ed692ff23dde051a24f82f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/an/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/an/firefox-59.0b13.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "1e692c5a39a19913599382ec25ef3ecf7ba36db94784b7d33a7d2db9db29d87eb1a5b5499ae4d266c608b0e638cfa06db1228ee6072c113a435440be5286a96b"; + sha512 = "55208a195cb846401e1dd6746157d6dd6fea37fa179be33c73af28f4ee2e2a4ae3649ab022dc20c0f678c0741f33cce6cff24bc6383689b804c5c770e648626a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ar/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ar/firefox-59.0b13.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "561ba5eb55cae1d9d6ac59b223a07b9aa7420b3643487010adc6516db3fffe7fd0db363f0b098262cc9d94324620d381db9bfd2e590c56c85a4adb7cf2d8ef68"; + sha512 = "c4e185972857b5e47d6199e89dde4e554c2b636b67cee70be78efd7bd06d6d0efca50309000258f7c499a3dbd5e38f1356c362f3602ee2604d9fa7bdb45e8fad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/as/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/as/firefox-59.0b13.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "7de5a42a995e927a8deaeffd7aff5b752f7156613bd6d8722904dbad87317eb4a43d649d0ff2f86feaabeecdc67cb95be0dfe015464ef2b2edf9200a7b7ef65b"; + sha512 = "8e2c8a07665b989389a443539c26017e81f0f88ded862d6293f801989556fcafcc7453d9d6a9d379eaefd7987b7ca3ca365ac26feb672a1bbd1717970b6f9e5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ast/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ast/firefox-59.0b13.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "080df53eec28de87ab1a8058419da1c829dddf54aa15804498fb8819e35a2f892ad69af0e5c3c3c5b385b4892988a9171ebbdd10fdbeae31bd621c88c2b60c7b"; + sha512 = "65fe275638d5b0b4c9d597ea024665ee75570c302296e1b8a4f5b3088ad6f23cc094f9099085ace25814663787bc973339327c1c3ef9b887338f81bafcaebd4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/az/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/az/firefox-59.0b13.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "68b1c5c1bc5f5064ecf5baa9f8f420ab460f0781b2c6f838bd86bf88d248d3384df0b1c5a88e5c1cfc8363212dd9708ef229822418400392ed16d7bd9afba63c"; + sha512 = "e822f84cecb6b783e6cb3d5bbde521c03d73ac9597533217173f84a62d4fdebe1cddad7ca537b7982498842d333f9e03a41bbcfaee21a7b6d1a4025518fc47df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/be/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/be/firefox-59.0b13.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "de1910ca4024e4b449735532969b30039fb52d9eb4fd2fd103169ae99456a90f9cd629e153931f5812e44659151055bba42fe438675fc1d2d6626230c8916c2d"; + sha512 = "3f682a589e8701c4247aba7d79b2606ed94627f55ba2d39c4d12b97c2bfea9279844797fc79130da59ec04c9e05a722ac3a3345acc65db0a638329e136812053"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/bg/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bg/firefox-59.0b13.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "1e2c044b76102498307594bb13872244dec23ae09c9a730e37700febf22a6925ecbb03014b0d1122c4d5258b0a9a277561170a57394e920d620c42b3de609c2d"; + sha512 = "8e9dd34afe39d623e8015eb63d6f78f20aa22cb9c1cf97ce0279260325c86f1999fadac0b4e622a55bef1e994ffc6c3e347a91ec1401105b65e0dcc968c578f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/bn-BD/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bn-BD/firefox-59.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0d9b027eb0f539256514e851e0e5bdf98f171901ea5d7783262b5f7bd6f7a568ee4352ed4dbe3a30e5b364e4bcc6f3883fd9998b84223fbd30827650e28a3d56"; + sha512 = "eb0cbec48a71db923ca6054ec3fe908a9c60f7a21f74e6e18e85a4d7390f5a48c56c08ebb36f57b36bd517446d62a3ccc7556fb33c9203dff0f90dfa020b79d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/bn-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bn-IN/firefox-59.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "3277c2130fa526e9f38853a379d8418915832292ad958cfbc0d1d26d752fba6a9c153c3816a3e398803e5c6365a9ef81e522de7166424d54dc15eec067e10e97"; + sha512 = "bf4300ef92802f8c635aa543156a2310379d8cc8bd1a1821921e4152ba1134b9c72cefd82597499ff3dee3b19cdb6ed7e264628499161ad07497a3e3912603e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/br/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/br/firefox-59.0b13.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "f502069507f54da1d691f35cca3581d5d26a8699f73f421d927251a1061b7add5f21453823bc36c4a18e697e154697fd9127f4e1bb09137cd00ebff136ffa420"; + sha512 = "aca08a08d8c9c77da57d5aa0f9313c0bc9dd5dd766381c189c361ef4b311e49e462f70b6350dcd9dddd292d0a3dd295f0180444d607a9d33eb402242e34c9ddf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/bs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bs/firefox-59.0b13.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "76468f8aac7402b00abb4977d6b9cd76c5ae4eab3ae9ffa0940a4d6a9899c4987074aae45295e6fabf5c53b000475db1ee151838c43f7d4a42b9d02049e8ea76"; + sha512 = "56334e40e7175a49b77dc44bc2d915ef1836c1a67d71b2449f75073a113c6f87361e176defd412bce60f8d687aa07b527e5588d164e1177fb139a077527241f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ca/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ca/firefox-59.0b13.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "84d691e63fb9239aa857a2a94c0fb4bdbe445b4d463a4ef4da396c4ea521a17f99592f80b603e7aaa0997459daef5f7e9f843d864459307e73b468a346e868fd"; + sha512 = "dadfd68b729ec9d8fceb68dc1ee65fd0f00bd2135e8163c993cee34094110be3cdaf856f48c16a0156da395842503bf52a5438795c56caf9d6ea5f4b36961e1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/cak/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cak/firefox-59.0b13.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "4eb8f38bca6e8925d20e870b6caafe8659fc429f4a748471273ef3feb1df3855b0b8e20ccacb2e19a8ac5153eae7f046069a5c5512cb35bb83691d1efbcad56f"; + sha512 = "bde96a0f22c762f7d7a877ecefcf876b6161326052110b3f8efb61a67954b93d456acc854901a9af9857005c622ae9d557a647a10fe4e8df6399ee4bd889bcda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/cs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cs/firefox-59.0b13.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "6a0cd1776280940bc06d55985ef56eca1892fe9f846a2b442c4f8444207ebcef87113994624588c05e3667afc306430e0ccd1f29d8b0e8e1315eeae7fbee42f8"; + sha512 = "1174c231b511292e4528f59458f26f4ad601b2b4815c30322dd5e151e2d24e1f2fc244cd512e2bd43a46436180f83b25db61f3e8ca38164de130e76fa3415429"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/cy/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cy/firefox-59.0b13.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "b6d87a46bed0b1af3b632ec6af1422f916364e27775bceb61b23ca101711748a8233795c7e5ecc1a41b422a49149a48c94a8b183eb3b7348f3c849d635e5cbe6"; + sha512 = "02eb16c001278e637df52a28c5ffa9fd2565ec71b163cddc1cf0e01bc82895226d746474cea36317a43cb2dda7f0bb1e7ea74c1101602220db850bc8b238576c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/da/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/da/firefox-59.0b13.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "164dc380f91042fe0d9d476f202d2ce1a437bb0aebe266bee8f47bee9ea85428493f250deeb74d4e4555e8ab6aff0c7b804088b3d6e93f53e0c5b08bbdf65b1e"; + sha512 = "58738db35718350a5eb1ff0ebc1fa6a7c49a4d8604fd60bd5dca6fd4718f49ab4817abcdeb30d99d8a5a0eca5374b17dca28134d554eb608c030eb0d2be59cf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/de/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/de/firefox-59.0b13.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6c934a5e40ae25be9653775d80a913a933000f1a78cfa6150d2d0f2cd1056d728f73f67facc3a1be57ffa3034d32c4265f66da92e040ea656e254442063604a5"; + sha512 = "3b2e2f745b61a182a6a1c4b1a236e6e3639cacf0c3034dc5ac510e0595cb636b728e8c6f39d5e183a181f54788a64f19c7f3e8288cd73929e4a7b96e760a714d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/dsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/dsb/firefox-59.0b13.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "905200cd7d4901fae4004ff17241eb1a207ca74ed20e3586c639231cc6c2f23505511f336028d5807da1756bbed8114de318b43c392ab741350fee472324ca12"; + sha512 = "f05b7d0c56278b2d4644ceb542efe21ca4a548725ba5162f82b13ba9a122f6dbeb71db227a413c37fd05590868a41fd3e77831824753b140a763514c16aee76f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/el/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/el/firefox-59.0b13.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "12efe2362343b63f312dfe22cc23feb2bc449ee1737da7dbf85a123294d3ac9d4fad60684e35f520bfd09028ddac67e0998c1b7b722fe1851056f13e079f2afb"; + sha512 = "af7f98c5461b365724b81b99daf054b5308933debc99cf20eb8f4a0862b27b4024934682f780c09810333799ab297750cf59b4f4a709e0387f8f98ef4fb9947b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/en-GB/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-GB/firefox-59.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "90d231e74c761a0f312dcc8a63a5a1a065bfac62c7ae60decc2e3b79df0165f68b12a2280c976752a80494a8c0e9b04fc758974fdd779b7c8767f94facd45c13"; + sha512 = "d8339bfff4843038367a6043eac811138a9d0084dd6d0ba92d0cf23575a6d9780e071bccd281440a496d3d8e0f8dc0b25eca685a3012032dba1bb122d4212ad9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/en-US/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-US/firefox-59.0b13.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "bc8505de96553aafb61b5c1fd0fe3fd4114fa6ccb7e3596a5b9ba40030aa0ce4bbbb2f7d4c7e68b77e42e1f88aa55672b9e784d6e71bee1d1aeb555f6ee74921"; + sha512 = "3b6be53409502fbc88498e14129c0ba9d68fed4bdd68833a01fba16d75d61471eabe344a3be487834e6b36205df0584cd09724c650cd2510075a54ea786a4cab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/en-ZA/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-ZA/firefox-59.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "b87f829afb774a45b780341a8d0ca52b2a433ab2b166a75751fce03350a68bd2bb28870f35f37c2b7277a9cbbe6b7c4ba97ad3c80f2c35ff7a341b6afa39601f"; + sha512 = "d3fdae13673f4f6c2d6d0e675f2dabbc9880805ffebd03c531fdadd0ccbf7767d434ad8f8cf5c50e385998cfcd0f16433e40fee9b280784eea815ee14c846f70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/eo/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/eo/firefox-59.0b13.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "08e9ae1e5d8dc26b4ba408955574990f3da7a8e5ef08c6b0630102e79829ba983081b03465dafce3e7efc3f6ab7f3be6fba4df63076c3b5fa158badcf1efff3f"; + sha512 = "e9d2468d817a93e73a5d547442ca5bd12ee0e7e030b6b63d4d889a8baafa566db6c5a5f8bd2aa4411bda49bf0f8eb0af6f6845ca7297cc0b2b6f5dd25326021c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/es-AR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-AR/firefox-59.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "f1fc2a5c2f7de0c24ec1d9471c13589735a6e2b1e83111bf44f9f23317c69ba6e9c8bd7eae9e6bec5b9022808bdfebb9e203bb33fe3cd1564e0a864abea9c287"; + sha512 = "173de5049863b8e291fbbfb4cf1d7c04c15bf3b48f9eca1ce3759e1117f6fc64be3e37cd0548e4ad4dc8cf2be8ef6341b7745423a5e39c0d882d040ae9f94623"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/es-CL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-CL/firefox-59.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "90c608eccf19e1034d77e9852194bf6858665d29cc4649a538bf07e536bf3d32ab6149c702f71cdc809dc2df706811f386a4af0491a6e3fb6fe5830688ccaf1d"; + sha512 = "bee968fbc414f05b467528c398d8884c0ffe9390fb44c2c9a5d7e9807f63bc58bcd11078ca7db4e98dff470280b066ebbe605f5600d8e43782166b23bfd2a0e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/es-ES/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-ES/firefox-59.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "a42837bb0fc2aef78f6489d4126df2ad33a7464bfa7496e879d97112b5afab730bf1d0728dd08294d594241176ed9200979fce2eb135c5f2ec532885e0400646"; + sha512 = "dde6f0790c19fb619dc408eb3a6a9abe8cfb749110fbbc8f408460c3181755d408a7fefe79c8041187891ed45ce374727a54232510ebbae3e9620d207f406b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/es-MX/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-MX/firefox-59.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "5697ff24400196cfbb27dbbb7f21d893ecc9f5ae536d94833dcc4f46ef65f838cd17266f52b97b296edc854aea776da39a7a880cf06698842e24f6df87a91811"; + sha512 = "7794d4152d2fdc6d28d6c4607841364fdd5211eb7df56cc0c386a581140d16fb94b5fa26035f9c1b45fbeb3dc02d6fdfcdb51576599717c551416a961ae8e244"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/et/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/et/firefox-59.0b13.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "255b1a89aab21713279434cae424ed0d22da8e2f93ac0cfdad9fa641ce9c807ee5e3a4240b0be8b3c436315a883343a68a4b01080b2fe5049985561cb2e01cc6"; + sha512 = "3984aeac5f5d27d0a2e3797b91dfa3b23766fe742fd30b8872bf88010e8852a2bd7390c6180ddceb4685ea3f763ec7acc402eaf11930769c28c8069147fb01c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/eu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/eu/firefox-59.0b13.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "418472bd40f5bb7c2b0a6cb4da00e030b04de42b687deda303a61f9e463403271747111a53fd3ab6514f700c84c441c591736c777dcae89980764958f05b1a34"; + sha512 = "f4c38298ec6bf715011b631151ae599e94546112e50888d98229818be9551f9c8dbbb4664e99b00d17640406b86ea9496d59fa620fd13be850ca77994d50d9cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/fa/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fa/firefox-59.0b13.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8f3344d643f81acaab0d6309840c6f7e66b5bea8dcbc1c62964ff991efc4cbb701bdd18042638122ada090869cbd2ad6e24f3a57088d5fcc81652e69b0e20389"; + sha512 = "49e5fd356f031bf60952152e4e7fcd0cba651a20178d220d9927089639f783d2b866f79184015074c77606209a1c0a455554a6c9b454c21b46e3a9f083c83777"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ff/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ff/firefox-59.0b13.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "88e9e20d3672dc99c510995db6b0734a7186ce49cb04a6ae0de1f88945814d094f38200253d517cf676a95cb2a3925e92f44ff0459bb3b1ce1e68936d838aff6"; + sha512 = "29c96f619912254b644b479e60a38f1532b140cfb14b83c09e9b1adabbc95ba0b11b6f67b12668f194164d933e1bc4fa4410ceb33ff2511096765d2b447eb434"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/fi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fi/firefox-59.0b13.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "2a478fdb12790ace99f2b7691b3b70b5702f2620f3cb44d2b2d12f5b6bf7f4643b403985001b109e6e5f84ee57561f0a24c2080b4639ea03e8eb37e9eed30916"; + sha512 = "80929d60bf83d81e732f2dc0348cee41f43568c8652d16a96a46ae10107f155fdefbd7755c149b1522083e54b96c1fffa84e21007f27f8164663360d662b0c5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/fr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fr/firefox-59.0b13.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "79e39dfa2bd8b7bb0b9d953f1dea8061cb808756c07432f6132d18b83064588b97b2c25efd5aca6513ee8f0ef6454f1b978aa5168f55af7455ea2e5addd4d429"; + sha512 = "313722edf4b082eae40b4eeb2c5b382606095c84e0e112024d07552e1d9ce3a4ca0fa39679f574b8f41074e7e850a94db034b452624caacd98aa3d837662b409"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/fy-NL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fy-NL/firefox-59.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "6e64f606d17646365e08d7f908c339472fbde35a8337fa4333b49aa28f99c47bc07ea8eca4097c9f7139fd46117262f59a79553c97c108d5492cbcc40b783f14"; + sha512 = "2b819cb5bf8e1fb80604a98d134a94de735782b8539a89ec4a542b7bb5b795cfad173b26c66c77c9f518ca1edcd3b3946225a7475253bd948f44939453d20d26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ga-IE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ga-IE/firefox-59.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c2e1c5fba29f1ffd85195815305b2f134d0b354df1d2f78539a53d196f0fb2d58b6ffce9242f63718e2062472a44c38efeee4fc845425d6d8a0f6eb4fb5e0c5a"; + sha512 = "dacde472539682785a79ae2fc01918ffdcd23e630857bf0dffb13eb53651217dc081b8103eccafe62db7b5aaa36c33268e8378bef51a01111249718251b4215e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/gd/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gd/firefox-59.0b13.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "0158aa15c1047f07d4d2db65ce352313254025b9133ebc0b01dbb136cf4cbf4cdf568cf30a2f3c7f9161659ac56ef0231f4dec28a4f3a982c339d576dfcd124a"; + sha512 = "8ce645014642c907d309b965aec5d568bbaae65805a8331ed4726a9d404a1e8a243763c7a92bb85295a541767305560a2e1b5bea93ba6b2f96341e3587105a29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/gl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gl/firefox-59.0b13.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "986da4b58288b2c24784ef44ba94a5748bf1bdecb36779d9f8489fe466fcd7f530e7fca31bc7394085a1bbc3d4bded92a68d7b6596bb9f3534cd5452486089c4"; + sha512 = "729da9849d664ed6e2cbaeeb89f8b81d1de29b5f28d599d26e0d14e9d1a2daf1b37c8de769435c2dd7a88d8807f76ce7233fe629b0728ee063b02828edf8b984"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/gn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gn/firefox-59.0b13.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "f76b6bbd7f1fd244998cfe07b6533143def56d57bbfab6228f471ed62ac5ca3b9edfa90ebe7209b51d09cbd3d83e8112abdf80df4bfe5e21862e202a5c5718ce"; + sha512 = "f4af9658e7e0074ffcbd38ed9c2a8a131e279bc67c86da47f3322d30c5051c4b41cee8d7b61bb7faf9993d8ba41ad151681621525f92b50b88e4680246eaf2ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/gu-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gu-IN/firefox-59.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "68683b0841a3d5a5a5df49576b47ddd5dbce872607da12e3c14924038f2c81d4f85607455f11bf35ec9acc909084558b9eb227871e2cd1d0201a1ead86114601"; + sha512 = "30218d1a8b550130520018af0079e9abdb4e78642fceeee25806f739ec079f88a5df0740c44828678d865a7ab242e6805a7d632c41fbc2c3b84f44fd58fd9cfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/he/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/he/firefox-59.0b13.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "7b61eb2350f501943882fca5355813c4f5081520fa9b8c20879177b6f175e6512637f8265040c327fd1241c108c85c7e2b996c05266cadef27f29d0b1539b88a"; + sha512 = "809baa75d75c1cbea94e9934ed9e445d60f3f0cb37b9ecbae851c342f0477731de0fd5f6170c43863035f5e2633ab8cff960729a9f8594c684b23d5819192ee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/hi-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hi-IN/firefox-59.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "c2b33af66ed682f306b29a4d729bae59663fd5e9f956d458f7218166020e1a63e3563ba9ac3a91a3e9ecbd206f238536dfac611c71581ee144ce7797bdd804ad"; + sha512 = "440638f35d07edbc4f854924f60f22cb4115634d55e2847867c11391a950c3c792afaf2e35b3090764acd8512117a1a04e77d060ca2d9aec12638d00c2032245"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/hr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hr/firefox-59.0b13.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b0e9824f7d8c1635ad995c9bd1e4a18ae93bd0d2683a137b71a3871f3843ba7b594b633ff36e98cb56fb21d6d6d3dab80852b3e5168ce90cae7fe686ae91ed22"; + sha512 = "df6b3ab4c53799b6100722fad4f20403d1a1e659b17d66d21f65e98e3b335b0c7ae8a9a099c44bc8952359dee184f9acff836bfecab6cc09c686a7bb3d9d6599"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/hsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hsb/firefox-59.0b13.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "47e6cc57cbe8710f3a2afae02a91c33f502886a61b4dac45cb98e88baec7f9c3132244a66ccec173441bd986aa4c2270a42d6f6244785ed1a683b67f24acf619"; + sha512 = "c3ffb3eaf9d86a42ce281f97cdfc942081d14bc671e28543603e135bdbbb527a004af13df9e7cfdb1846c9cb42d4f2162b8ab63129eb447433ee5f47baad3ed7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/hu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hu/firefox-59.0b13.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "8560321cb3f64ecd5aaefab112dcbcb93cb50f30fbe8885e8239e569e1cef24abadbed6d0c90967fed1a5249ee4ed109807b967bf0879c83644d37e0a9c88e56"; + sha512 = "7b1f231f3add4b70b9f1f2d2801237dcaca17e4d0b0e0ce5934a617dd73550db4b36386b1997f835bd4712313fb9ce1752a3a972d77dd0fe8f1fe51364048ca1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/hy-AM/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hy-AM/firefox-59.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "bec109b912cd15708ade7b9aeb8f6ab159e3e2d1834d161f1bbb000d4f7c9bdd31555618f445f79cf5fafefcafdd446a5d83ada0ae6845c805bcb6d437a23eca"; + sha512 = "2d8d1b61a9609d5e69b031e51428cecfea166b8bad1e2c928cde2aeff0a5a105547954235628f3d67031ee6b150d800a2dd09235e69af8e61a5046a80d74cc38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ia/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ia/firefox-59.0b13.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "faadf2bfe1dd2724914803427caa58d320214e916fb12b0880ad0ed44d76b3a584390ff2c2cedab7d1d38f9243c82ec797b12af64f81b23cdebf0e033cc2f27c"; + sha512 = "a8045c13e33f28c136923abcd2131deef56fce717eb0be77ce750f80d1f0617b6b86cb3b123eb2da58bdf543209cc6b6c803cb3dc9a53b3cc6e23c98ce6b678b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/id/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/id/firefox-59.0b13.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "dad006e8f0f5c67a955f24eacdeb7a7cb5788fce9a09df2fed0f22010be88270ed50fecb82133be896966370e78e107b6209c3600f042b2266134e4ee94c0f78"; + sha512 = "4e89147ebe166243ef1a551f7943e3fca44d5005f8b8386728c3d9d82352cbdea004467ba7ccdeea5a4710bb34605217ee2577e1f1c534713fb52fe55aa0bbcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/is/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/is/firefox-59.0b13.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "3112783656ada68ee9bcd365527c6b5ed764522f960c295f767fbc01fc19cc6ab4d3c5ea7288219f97ce662721ca514c7204ca18ba0bc518bdbc113df145181c"; + sha512 = "5a94e9fb47ff68a2f5a07100acf573d974222446bbea110e11729286b64e59d1a1a9df91b93848b47fa9a8e3e3471d5d4973872ec1c6314b3a76b852459574a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/it/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/it/firefox-59.0b13.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "9821dfbe30bbccd6bc4f3e0d642668eab1792d322763bbad81e0306f03f3f20303697c96ade084da0f708251d33160b60fb9246f6ce77408be288a8d11c39bb8"; + sha512 = "c11b004d02096e950c59f77ada04ba557ac37e9d95994a105b0bd76e8a9193a0e66f0a3efbf724fcebe96e77a5940704c284f79d48f8865ca1907fc2bc7adc1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ja/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ja/firefox-59.0b13.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "131000fdca4ef12d0ea6c398131cf1cb5ab437673375607ef75fa8e462c38873e9a7ac072732c7ce9901cee7b1d33dfb048c21e77ef621d257df5bfe69d64d4c"; + sha512 = "9d98fb24d1c705246d2535a1bcb5ee38d84930ee609d15d350e3eb8bc905d1103e7e1f1cb48642ea6e6b99531e74929497790549e9ee9ef9c597bc8f16a827a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ka/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ka/firefox-59.0b13.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f00ea919a614149aeb76e08af31f302de80b51be5e0b5060f650f4e9310fb6a1126c95cb13dd60b5ce651c61c1e6b247af4e37546642c6db7755fd2af5f78d42"; + sha512 = "767d109b2e7bfe89a01b923c859d6f3d3f1050922cc84df9aef775cba990a2808bb839ab1b2431b3c6603b41d0e757dbb64b1c766ee150aeb221900bc9e0fedb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/kab/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kab/firefox-59.0b13.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "e0c86a1dc446b0bbb158ad98590ad538ccd157ee3376c65f22d4b36a415f1e68656bcfc3ea88525102093e742c2ed960e372cbe37975528cbee47cf78ad69301"; + sha512 = "3dc103b9a807abf43816db6ee9bcfdeef31dc21b969762a7b1e9f4fa06d5ff6a57cff134382b6d1d578c80d4b902232a7cc79642a68b2e26680887ee172ed11b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/kk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kk/firefox-59.0b13.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "eeebd7dac03df501a469d59c912d8d0a111036d812b7281c6491ce2344ead0c4bb81f34354f73457908e5ba612e7a09e489403bac546bd4049fae67ae0e4346d"; + sha512 = "e7cf35aae82156bdb4dd023e5a7530fa431f41c0e4f270aab89a64a0aa02dda228c92dfc7aa4ff289ccd256c543bfd74622c6d44ccd5b48ceeec880b394d38ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/km/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/km/firefox-59.0b13.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "50563d2898ca832f8b4a6ef2cce321ee0539489720233b077962768526705dcbe7817cde2e6e9d87c0be14f9496332b1ab07fc4faeae0cd65f502258a155198b"; + sha512 = "03afeff083f483b274a8526a4418dda8ce7c3773a60354aea26498c7f006445bd6631357213944ecd6996a5a4508b96797d44f16eadc5f1017b7fbc18d0bf3ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/kn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kn/firefox-59.0b13.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "ae0a8ef75d58676b5a106945a9f9901950ac22e311dd1375589523fc2015a059d8aa5b2d534875be16272da77a0f992326a4155e92d82cd3d9d07169686798f9"; + sha512 = "a8d2609029d28f8d2b59815bd8149a2473e06227fe710c77e2e72044663ef90e65105a32a7ada47a6d889d6aa761dbbd903b61ce8dff8100b052b54f35f86b28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ko/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ko/firefox-59.0b13.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "dbc1aa84fc5d9829b4a7058593b8751233cfc688afd88397b6019cfa3a9666473e766fcc33b2321f8dbc33705aec4abb4f18048d7931ea6b1cd382f4977b4c2f"; + sha512 = "1d073bff96a15bccf6a59e11a28eb0231983a0392069cc785ba8760827ade0e52f511040941b8e142c6de91621bd928e218ef4832a95439102644670b9be3a9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/lij/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lij/firefox-59.0b13.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "e96310c0dd8a670ae1a0d4751fd9bd79f2974afb66ca16903b021abf5bfc44475772ef54752d1c2949979ca157c936fc6a3519b4e90c5f841eaf0da935c7ceff"; + sha512 = "a69b4ff3b9a452a56e4ecc07c09d6276b26356bf35090cbefe9be419ce4d1a1fd772b7013a13fbe4f39fea495c5191575971db5786d3c1edf1b4ac9acac33323"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/lt/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lt/firefox-59.0b13.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "76c4ea7eb3f4ead3df02e4f8c7280d86b03beaf96797556ef430c2966933201bbe7b7b8ae8ab3a97baf3102252641746eeee770bf4653e56af054d850d1dbc13"; + sha512 = "987863606a8f68fdafc8c61f206db6bd8bc358157f28631fea598872acb5ae0ab6e56259134ef3ea46f5d74d908e49981eb6e8bd80e32a9cf1de77b6086e1ffb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/lv/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lv/firefox-59.0b13.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "a2a85562351352d8b72776bb66f0d89d3f7af12ac59b1ccc86e78316fd59e841f7c4e0947326bbfed09f82ea23b179c5647e2444eeecfacb2e3caa12834e35d8"; + sha512 = "3466e0bb5ebc426bddc9fa70f4c84b6c07e997119c707a3638b726c335ec8cd58fa9ad038528de4366ac0866b4e535b2a6ba307c0bd42a3590f55ffaf6fe7032"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/mai/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mai/firefox-59.0b13.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "dd993da327eff1f53bb2d13ac04527e3e55016e45a77157d88155b4a741fd25a842914d772f313d73b03bb97974b9803a86c281d5b25b9716226d16adb4d3b7d"; + sha512 = "427060dbefd340c2e5e0006b88c40de5a63786afa7dc7449b11493faf66acaa4c17dadccbbe8c44ba4651a4a44d65932a9eb17eb79280e4cbf2d10696077bd0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/mk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mk/firefox-59.0b13.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "91be59e096455bedebbe9b279ac56b247ca507d42cd6bb1584744552b3e3ec4e16654e73ec53276dd5fe63ded1e2614ab47f276aa40caee780a249663abb88ea"; + sha512 = "d4ad81fa8aa8ab44b63421d16d7cea36d900bf4d374e4c5a167c46e3480b459554672815cc9e54f02aa3a53f1becadf675e730799d57bb4bec4e245a78718aee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ml/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ml/firefox-59.0b13.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "54fb3b09607b84f6b8fd1f43749e5a0a194921af2b56e41aa6d649847267e59c41d7480c3f885d84170bee42da3265ba1c31b07d5355937afaab0af59ac385bd"; + sha512 = "c933f92ef6e972c2ede1f67852dcdd47e7f59928a3569c7fb935b538f8145185e2b460242feb6ec58f064c6581e44c046d568ceb1e96b5617821aa1a5cdec7c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/mr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mr/firefox-59.0b13.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "52973f72b89455232d72cb557f375a7f95ee783c7677e1465f952a551a5308a258a71069471e6893c5e048596116d5380739ee726559339bc1f615eadfb2c605"; + sha512 = "49318119e82876c99741b7829946d124db7bcd4833e014996842399bb8cfbd4f2f3374d4910ff208cca558da027dd6a6041c2d66e4026c6f1df4be199e4b9d9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ms/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ms/firefox-59.0b13.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "7b171a04eefa609844ef6bbf75751d1b506e2a337cc01c9c77a17cf5620453ec8ef8938553f89e9c7feb114088bd0def039d0310667adcf672d62aed598b3002"; + sha512 = "2e5e74999bb921e1a78c491f9794ab04efe4f069d2403757797e4aa408c41e6ff3bcaf9d94f786a407fdcd085ce57654a1e7aeb7560192827d6bc01786fde7ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/my/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/my/firefox-59.0b13.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f8af8c0cb3eb7776f0f1b1b1b8a0e66c38bbdf897a7e755f8bf714ecdb4f0117f5a52c49228fe51ecc1c34fe8075189b13563bbe625c45e304c0f88830e79989"; + sha512 = "a50843752c15dd9ddaa30f51188a4992bf9624f290f3179a95a93ad09c3b5c0080ecde02005264c7364de1d072a73a40159f3fd3b77c481f5f301604d1042db9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/nb-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nb-NO/firefox-59.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c6bfe140b38a5f0a7b826ab6a99aa4acd8b7b163c67e33f43e13f6fc662df5bc40b376430e5d0386a854af11d23570b7196d4d5faf188c521e36d7969b0c5874"; + sha512 = "9e03fcbd2e10345eac1483934eddecf6b0469cad4772787b8e01733283bc7655faffe504a424031e3dcd6fd27cf40148dd0ad82a9c06861f64b38fadc9e189c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ne-NP/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ne-NP/firefox-59.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "643ad4aa1759da139b63fdce91266fa11b1390d32a4a508708aeebcb309a828563ba3387335f09f28b9eab7b87973e0f852789fa26f8d734968373ee1b16d987"; + sha512 = "6c969e22d53d6fb723f5d722e1ac2b3fd6d3970b42a2971eae647a1c1d38a8b5f5456298751ae06e02a17ae619f613459da114ea8d335a29d068aadae30446f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/nl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nl/firefox-59.0b13.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9d68a99f0299f914d18685fe7cd651e7498b5b68c53c4dfd72756fc7d21f35a672b479792943e240195d9bc7d5ecab0a83eb5f2cc611b5d619bc7a884bc83d1e"; + sha512 = "009a49a7cb71bf7876d7c0d52ec1145d0989592a16a560fa76c4223e5d71c3f0523a39202928f00f7499689d030afde1e21808e504291d70ba7cc7e5bc117c91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/nn-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nn-NO/firefox-59.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e5c15c53747b6284bb95dd0e1b701311e89bddde2bf491969595d3e5299cdc5d2c3a8370b9b153bd9eb44bcda60a28cc918c6ac0b6616c49aa484cf4076eda98"; + sha512 = "da95a2bf55806687d77b52cd16d2a03e75d573318eb3a4f8b19720914e13cfcc965975528d21439da87b71bc1ef6aa7506c12afd641100fbd7ab1b58017301c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/or/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/or/firefox-59.0b13.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "0b3c9695476c42aae8b10f8f5437bdced049900f928a682aae378a45f049d615a7932df7c09a4f09d28f971d6a649758e5438b9f5001f4424709d3e49844beb4"; + sha512 = "b969bdd2d27eb9f5ef28de7537c09d7939534dd6cec2b5a95a32406e6b3c6687f84498f990ad2a353b5e4db38ad7a170649467688dd3fc51cbefbce3253f7a2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/pa-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pa-IN/firefox-59.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "663e6dc3bba8ba42428a6328ee74bdc9ea7be9a1703c4d4ba894a507f47c361b7967101e7861805c3d8487e9ffea28a5ade3db5603a41cffd6aa07a8e48df0e1"; + sha512 = "7c020da300a1dbe494180fc8299d42432f32b6f473ce4bf47b30105db39789f2ab07c2a883c1443202f39c4dd47eea8221b0484deacff6a90f4eb6cd4b8f164b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/pl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pl/firefox-59.0b13.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f7c9085bd201f574c63360911896c515a2b690eafbf6c7d4410923c89889ffcf640701ee088e8a479ae26b0d991d295a7e4dd35df3a306008aca634d1155982b"; + sha512 = "ad50c7a6539ee8b2f36f6420b524055f20880bd01cb118d6bef124ea9f1acb83148078972118fd6628394ee0d22215c26a1f9cb5cfec5713d5265229e0bdf681"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/pt-BR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pt-BR/firefox-59.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6554fb1629bfd38f9e55adaadcc1568a512e7852a52cd53543fd0b308ce13785a5916361990351346d1921138ffc87755800547c92b0988cf3fe13dd345b79eb"; + sha512 = "4f915c651bcba9581db961e0b5e66c15db0cb72298c5389183f0442e0ed18c84593235fcaba2274ee62ee7ca7998043ef9fba650a476a4017a8e066825cabde9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/pt-PT/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pt-PT/firefox-59.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "be22ec464e340a18776c7643a88da2c301954cb1ef7c386e8fcf536932f3541c38474d4c3ac8909bbac1c7f4721d7fefbe277ef4bdb8b78c73c6727b5867bb49"; + sha512 = "a5d9f49caa6e20afb8410f7668d0c6a71f06f5dd413e004183b82022db92406f752609ba6be05b27d70a8d68e4071e3a42ba5bebb8bf32e3cc074df4ce083bee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/rm/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/rm/firefox-59.0b13.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "7fcdb0dfc6829cc238f83323a509f783342abf56c80d52ed255837be02ce767972dd05c74ea1e77d9fa1cb94e6920ff32b5d2c67e9075a9a1cdb4bcb1a69eda8"; + sha512 = "50ef735ca5b2987200978e2df10df33ba9fec6be80cbfba63bdc4a6409c6180080740e5e716cfaf4c536c0dc84727431e16c08d91be93abefb214a4887653492"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ro/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ro/firefox-59.0b13.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9a0f07b7c6e579fb28b5fcd98a7f6a8f6766e5bfd6a0cb239cc48dbc0217ce8c5c82aab1e3fae70e5d9c343bdd8aa87ce19e4ce16b0d2c3b0cb49f92bf6b413f"; + sha512 = "9b38d3798a880ea76f6f378c0458cd2aeb7887fa53ec89b9f23c6d5ee98ec2b4aed0f3708b1a4fb17b2a818424479643a3706a812cba3291ba7b584392648d8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ru/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ru/firefox-59.0b13.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e19dc9b21f7b29bea0ba0ef3eb5fc35eb1a9f901359fe214c41ef9c39a111d35fe715cd499ddb125dddfaba10f3b2244563fbb58604cedc4c6bf6357c06e0eac"; + sha512 = "b772760cfddb791eb57c23ebeb05611b311b30041de8f286f639beceedb6482be36ecc183acfac4aa9f280904c2275c123f3e71302aa3b139f863ea01c7c4966"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/si/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/si/firefox-59.0b13.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "6cddbc30cff60818077669e37bbfa9570a6111c9621a0a3ecd9d6c2724b2f7f4e2f1a656193e44d4b411af6d607d74db8eddc192e06d13e80fc14c30d53632b6"; + sha512 = "1934317eef2a5af831d7bb9fa493584956a32e28f7e22b7186ef8258abff504adfd936f473c9f2e2b414a880a2d9b6b2b09c9a77b3fd7060ae8e5254083a3a3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/sk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sk/firefox-59.0b13.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "2379543aea8a76edd1fdf37fac7b214de6efbd38bac775177d4f43777df2aa35bb70cace7102cc82f5014b5121e85de0ad548845e4ac47774032f486c5f40e61"; + sha512 = "fb4c68917e17b472a592474e1370719c102072fb70a97ebd18a5f02e5295a1392afea4936c5f79aec041ee6f9ae0056a74233b660f55162b2d84562ef86e5265"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/sl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sl/firefox-59.0b13.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "ebe4ef7bfb6a2539a9b02b3d2acaa919136ae5d3101ff8d3f6209db2492cd79b1df6ed6bfd98ac1ecce711ce006f04e260585d184e7e066372f42986941c86d5"; + sha512 = "0255e54036f6ca78213414c63d40ca1907d597ac4da1a6f7bddd6bf307d536e710bb9cbb8caefb8f08def99f1fe27f28d22e076f1c7e62fae4ef1cb6d093c51f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/son/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/son/firefox-59.0b13.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "066deb32e0a8884c3d10ec2a2966224e5fcd62c352bb4d33a1be0256eddd4d73f097462cab7606e3a2713bb65f0e0329d538174656676db7370f68bd8597bbc2"; + sha512 = "43dd5f557382d9ab69f8a087dbe4d06e71ce68416f7a88a84978d1a6a9144938e12e4b9a50c3c42ff77131be16aee474a4a99f092a95671dbcb76e367f95d280"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/sq/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sq/firefox-59.0b13.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6ffb6dd81cbaf86585ad4db5978dc115f7ce0cf150faf2e468df0d637e5ceb17454825f3fdb29b4114d24ed1fb65e6f6688c73185b5e4a733c9a1018aed7f4bb"; + sha512 = "55ad59358e6e84204ea33f7a98436283ea7c843de6ecfe7f9feed24e719fb8fadb5f4de4d236a8f0490e56588f2574d3904093b6b3e9c58b2500fa04f302cc3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/sr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sr/firefox-59.0b13.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "aa92c2bf8c5dbb9b4779677fbf841ffb2a0bf83e4505d74a6e7d8b92864eac2157bd5ab3b237fce6a1038d04590c72d371551d493ae8776b7b43415f18b74a2a"; + sha512 = "871214235400256f86321f95ed1a5d2cfc80bfd892eada49987d6e1330901126922439a55ad03be84a97bc92544ab145892eecc3ac54e350876b7a2e7d2773ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/sv-SE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sv-SE/firefox-59.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "accb3f5e95a869f62c80c4f36a8e522c26b35280ed053defea42c89fc0284ec42c7f25b23d7179359f9b77dd009a40189040149c3bb68d844af9f4aa90034159"; + sha512 = "fd98c7c2c7347f36ddfbf3adf1e3b5059cabbce588785bbb522cc0c43ab061f0d776757633ad801efc53b769374f3f71bb810d07648aba98843ddd2b6bd97322"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ta/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ta/firefox-59.0b13.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "323660ec8e3e783127f81faa86381c6a38946deb090dbb94d1c27df8a2056a04d73bb95c915d67c7331bd5a72eaaf7b1deaf7885f181946dc560e2106e38dba5"; + sha512 = "4346ffc1367a8892c49a42717056d2ac46b5ad6e577a6b018fc08d673dd570a7ef2de6c6db493ab7f6cda899ac9a90b902c7d79a2ad8d5fc9dbffd8bbd5be32c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/te/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/te/firefox-59.0b13.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "bcb8887e396ad68fe8543a90a83cbac88c5e73b450e134a658ae29b52eb4c930af0a25682535367a08bfe29b942cd57a7f1c1a3cb1eced97c7c1f148c991555c"; + sha512 = "7c361450f296ac828068a97d9d936219bfb588d5dfdd79e8ce05839ea2f9a530736386ce4945d1b740f5582abe1a4c61ba0185632a0ced948d110c867e819d6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/th/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/th/firefox-59.0b13.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "aedb446c60aabef0851ce249178ca43a1e7e908660d1c2391d9565346c7dbbe9f2bc7b15a1f0c1bcd3bba35dcab1872035121143af9593748c5ece81eaf9671d"; + sha512 = "7cf88ac5b3f8d3e32d337fed29ee88bfdab1df2c733f8f959c5957dd4c3b9b866792fb56e776915398008f1f804544e0b0d1fdb0cf5fbaa8a81fbbf12f386b7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/tr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/tr/firefox-59.0b13.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "ad62e59b5aa4278df0e5127da5bcdac63d68032e0a77e666973c01c936057756b888b04916eeaa5be3aef2d953d0e5ff84f17dde3bd8521e68451e5bb9f05c05"; + sha512 = "f4816172c5979b7b3bc4bf33084f319bf964876356b08a32d2337e7e5c599596f41f4e4efeb5996a53b462635f4d2ac51bd95978fb0f00fd74596f9203f1d94c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/uk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/uk/firefox-59.0b13.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bd07b0d5813452b98e9d1c5985b628ada4a2904703b9a2239a89a0f277a7f7d9e2e4db66ab32a988dd7f95f56be3bf09db68964f57c1e8a0a24e8eae44b7359e"; + sha512 = "143e683fcf134dd6062ab87569798d34de1f3bf53ff2d50a73b35e2cc95d83d02654a047c7530cc5c1e34ddc791ce9d455ffba9f1f93d8b782e0968ef41621b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ur/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ur/firefox-59.0b13.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ef7e8108b27e106073b838ec09b4d0abebcabdeb288a62855be0d076cc481278006f7cfe3ff79ac38ef125157eb06645f44d56fec200d4b1b0ae238da4c16312"; + sha512 = "bb82ed997dd8d2b15f3881325b4f879b8eb49cbbd661da99994a54be21ceaedfa3901fa56214936c5ac05430035e41e9a0ac407afe73db289dc656f70a2199de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/uz/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/uz/firefox-59.0b13.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "73f23a0b9d0bbdbff8fe2d8461442b83d0f8d36e95c46b65b6dac257d2a62ade8aad71401d3bdca3c65b59f794ea9a918205c4b5887e7e1e63756d5133464337"; + sha512 = "d2db8f09274c73d63729fc32fa8dbe3a51f6421e16a741ea39e6cab1bc3d0e833fedd26678e68ac92aeb2caf01cdc7a02bfa518391ce20f9a0855a498297a001"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/vi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/vi/firefox-59.0b13.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "48e8c0f5d28f527b2a3f979dfdeebc39efcde646d146e4ca6cc3b35a827019b16c31a841582594179dfadec7a933ff0da0e4d35e2b8f2c50dee0c5260228b723"; + sha512 = "5b964331ae4567f12e3241eaf30a6d7d13b4da1bc4cd300a86d8a3a4102c6e8d71af5e6cdebe8a6399a2525345fcba06683c06216779aa2a6f375a56b0c71e53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/xh/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/xh/firefox-59.0b13.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "5da170e2a95e38c20fd5d130eaf097d19a166c6f66c90d770460dd520dce89a62b368a818202fff3ba35b7740ce75b775eb5a792de529c81ff4bd08edb75bed2"; + sha512 = "56556a238bc874e931e56f00879953bee1903ad1f1e67e2ae6dcabb8f65c97a74feda0f98d27f3e0a28b2a813d66d956696f001e08b809901e3bffec246f8f66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/zh-CN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/zh-CN/firefox-59.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7a07ce7713d66358852cda20fb6ccca921e7255bd35c9ee8383de6fbc70b978042916b7ec86b44fdb93908ff5e01df581fb0ba68d5e7999f31968966fd901922"; + sha512 = "cdf97069df00610f1f964de5aff4dc7134e7cb27768b15177c03b96c486b5856816b685a6acd5308c0e334672d39ed094f35a2bbe8046465f8ce6c9ed803baea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/zh-TW/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/zh-TW/firefox-59.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "1ac549170fa1cb76b5dc2924577b1ec1af482d47822ec1451d3bdcefaa345381f7637b77989fad1d369c2218c01ae0294c1a105c637f327d378725e19273d771"; + sha512 = "ad5266e66e06bf5d0dd674e57bb368e66917beda800cf58eeef9b5dafffb2f6272ebfa67e03a3a0ffd2a6d9d273fb3f93e6feee011e8971e760d8af04ec91330"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 69e935d78762..0abf3753dc6d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -3,7 +3,7 @@ , isTorBrowserLike ? false }: { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg +, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx @@ -73,7 +73,7 @@ stdenv.mkDerivation (rec { buildInputs = [ gtk2 perl zip libIDL libjpeg zlib bzip2 - dbus dbus_glib pango freetype fontconfig xorg.libXi + dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file nspr libnotify xorg.pixman yasm mesa xorg.libXScrnSaver xorg.scrnsaverproto diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 12ea714fb234..8d08eceb1692 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,10 +2,10 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 +, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader -, google_talk_plugin, fribid, gnome3/*.gnome_shell*/ +, google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , vlc_npapi , browserpass, chrome-gnome-shell @@ -52,7 +52,7 @@ let ++ lib.optional icedtea icedtea_web ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid - ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell + ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader @@ -73,7 +73,7 @@ let ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; - gtk_modules = [ libcanberra_gtk2 ]; + gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { inherit name; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 17c285d9bdf7..eaa05726f1c0 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk +, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk , kerberos # command line arguments which are always set e.g "--disable-gpu" @@ -33,7 +33,7 @@ # Only needed for getting information about upstream binaries , chromium -, gsettings_desktop_schemas +, gsettings-desktop-schemas , gnome2, gnome3 }: @@ -57,7 +57,7 @@ let libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd - bzip2 libcap at_spi2_atk + bzip2 libcap at-spi2-atk kerberos ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { patchelf # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk + gsettings-desktop-schemas glib gtk # needed for XDG_ICON_DIRS gnome.defaultIconTheme diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index e013f54a39ea..26a7e883c60c 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper -, gsettings_desktop_schemas }: +{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib-networking, makeWrapper +, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "jumanji-${version}"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ girara gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; + buildInputs = [ girara gtk webkitgtk makeWrapper gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup='' wrapProgram "$out/bin/jumanji" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index cea6d5dbeea4..f7d4f1a69417 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook , gtk3, webkitgtk, librsvg, libnotify, sqlite -, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3 -, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core +, glib-networking, gsettings-desktop-schemas, libsoup, pcre, gnome3 +, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core , zeitgeistSupport ? false, zeitgeist ? null }: @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr - libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core + gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr + libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core (libsoup.override {gnomeSupport = true; valaSupport = true;}) ] ++ stdenv.lib.optionals zeitgeistSupport [ zeitgeist @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS="-lX11"; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules") ''; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 461db272b12e..e56066e156f5 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, rpm, cpio, mesa_noglu, xorg, cairo , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl -, dbus_glib, alsaLib, libpulseaudio, systemd, pango +, dbus-glib, alsaLib, libpulseaudio, systemd, pango }: with stdenv.lib; @@ -36,7 +36,7 @@ let stdenv.cc.cc alsaLib libpulseaudio - dbus_glib + dbus-glib systemd curl pango diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index cd4f95097889..c17e16f0d695 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus_glib, file, fontconfig, freetype +, dbus, dbus-glib, file, fontconfig, freetype , gstreamer, gst-plugins-base, gst_all_1 , gtk2, hunspell, icu, libevent, libjpeg, libnotify , libstartup_notification, libvpx, makeWrapper, mesa @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype + alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 hunspell icu libevent libjpeg libnotify libstartup_notification libvpx makeWrapper mesa nspr nss pango perl pkgconfig python diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 9142ecde8598..2f9170eff87b 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchzip, python3Packages -, makeWrapper, wrapGAppsHook, qtbase, glib_networking +, makeWrapper, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true @@ -43,7 +43,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ qtbase - glib_networking + glib-networking ] ++ lib.optionals withMediaPlayback (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 1aa9bf044b05..88680414d1c6 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, wrapGAppsHook -, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk +, glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , patches ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ]; + buildInputs = [ glib glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; inherit patches; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index d64c7a20cb99..299ec43a8b90 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -9,7 +9,7 @@ , atk , cairo , dbus -, dbus_glib +, dbus-glib , fontconfig , freetype , gdk_pixbuf @@ -42,8 +42,8 @@ # Wrapper runtime , coreutils , glibcLocales -, hicolor_icon_theme -, shared_mime_info +, hicolor-icon-theme +, shared-mime-info # Whether to disable multiprocess support to work around crashing tabs # TODO: fix the underlying problem instead of this terrible work-around @@ -62,7 +62,7 @@ let atk cairo dbus - dbus_glib + dbus-glib fontconfig freetype gdk_pixbuf @@ -261,8 +261,8 @@ stdenv.mkDerivation rec { EOF WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - hicolor_icon_theme - shared_mime_info + hicolor-icon-theme + shared-mime-info ]} # Generate wrapper diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 508ab6ec432e..65ebaa3f80c5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -8,8 +8,8 @@ # Wrapper runtime , coreutils -, hicolor_icon_theme -, shared_mime_info +, hicolor-icon-theme +, shared-mime-info , noto-fonts , noto-fonts-emoji @@ -197,8 +197,8 @@ stdenv.mkDerivation rec { # Generate a suitable wrapper wrapper_PATH=${makeBinPath [ coreutils ]} wrapper_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - hicolor_icon_theme - shared_mime_info + hicolor-icon-theme + shared-mime-info ]} ${optionalString audioSupport '' diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 6ac8d9f1f6e7..8c9f23996ede 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python3, makeWrapper -, webkit, glib_networking, gsettings_desktop_schemas, python2Packages +, webkit, glib-networking, gsettings-desktop-schemas, python2Packages }: # This package needs python3 during buildtime, # but Python 2 + packages during runtime. @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preFixup = '' for f in $out/bin/*; do wrapProgram $f \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" done @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 makeWrapper ]; - buildInputs = [ gsettings_desktop_schemas webkit ]; + buildInputs = [ gsettings-desktop-schemas webkit ]; propagatedBuildInputs = with python2Packages; [ pygtk six ]; } diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 5b10932e73b3..251315619cfd 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib_networking -, gsettings_desktop_schemas, makeWrapper +{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib-networking +, gsettings-desktop-schemas, makeWrapper }: stdenv.mkDerivation rec { @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup = '' wrapProgram "$out/bin/vimb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index e6275b2f9592..54abc7dedff4 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk2, libsoup, libX11, perl, - pkgconfig, webkit, gsettings_desktop_schemas }: +{ stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl, + pkgconfig, webkit, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "1.4.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings-desktop-schemas ]; hardeningDisable = [ "format" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/vimprobable2" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2612df3efcff..6bd9614e08de 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 -, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at_spi2_atk, gnome3 +, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3 , nss, nspr , patchelf, makeWrapper , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at_spi2_atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd + atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 542bcbc41b0d..11aa0ce706d6 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch -, dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss +, dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss , pciutils, pkgconfig, python2, xdg_utils }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; nativeBuildInputs = [ - dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig + dbus-glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig python2 xdg_utils ]; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index b2c97d1ea396..ff0f664154aa 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kompose-${version}"; - version = "1.5.0"; + version = "1.9.0"; goPackagePath = "github.com/kubernetes/kompose"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "kubernetes"; repo = "kompose"; - sha256 = "1r5f8jbr2c1xxb5fpfgy23w4m30zahhmrw23jlk1hpx2w1pi1iyh"; + sha256 = "00yvih5gn67sw9v30a0rpaj1zag7k02i4biw1p37agxih0aphc86"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 41099192176c..ddb8951740cb 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.8.0"; + version = "1.8.1"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "0vaa18vhwk132fv7i896513isp66wnz9gn0b5613n3x28q0gvkmg"; + sha256 = "12nyr0iw1xwp60apli3nlq2vyn4jk3qjrb404m2syx2mqbnn47my"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e2f431e2a5e5..090fc98566de 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync , iptables, coreutils , components ? [ "cmd/kubeadm" @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { outputs = ["out" "man" "pause"]; + patches = [ + # patch is from https://github.com/kubernetes/kubernetes/pull/58207 + (fetchpatch { + url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch"; + sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w"; + }) + ]; + postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index affcbcc4b3c0..6a71afcaf60a 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32 +{ stdenv, fetchFromGitHub, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_32 , automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook -, glib_networking }: +, glib-networking }: stdenv.mkDerivation rec { - version = "1.7.3"; + version = "1.7.4"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "1xay22v5j239ppl6ydbj842zpm5v2mg5mcgpy5cjrhhmnbg79fgk"; + sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n"; }; preConfigure = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; buildInputs = [ - gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib_networking + gtk3 json-glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib-networking ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]); meta = { diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 0a89ec6023be..297703cde696 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -3,25 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "rssguard"; - version = "3.5.5"; + version = "3.5.6"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "0swjh664y1yqr1rn3ym2kicyx7r97ypr4qf7qrjl4a5q1spzsv48"; + sha256 = "1pdas7hg3nzykm3qi951fk25c9s6gjb7my82b9xzjn2yd7ks71by"; }; buildInputs = [ qtwebengine qttools ]; nativeBuildInputs = [ qmake wrapGAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; - # FIXME: This shouldn't be needed after 3.5.5. - # See: https://github.com/martinrotter/rssguard/issues/175 - preConfigure = '' - lrelease rssguard.pro - ''; - meta = with stdenv.lib; { description = "Simple RSS/Atom feed reader with online synchronization"; longDescription = '' diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index ddfa4fd607d1..49ac1d26dda6 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.30.0"; in +let version = "3.31.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1w0zqkccbsbmnjc9pfd1i3ywzwrdp0pprryvdk4sfn5ms9nnf2wi"; + sha256 = "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l"; }; configureFlags = [ diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 7ae3e8c73611..577252bc69e0 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -2,11 +2,11 @@ , geoip, gperftools, python, swig }: stdenv.mkDerivation rec { - name = "bro-2.5.2"; + name = "bro-2.5.3"; src = fetchurl { url = "http://www.bro.org/downloads/${name}.tar.gz"; - sha256 = "0w5rynw278nl6pdl5s7gsmxjwkl6z1g5pcm6byg930k26yyb35db"; + sha256 = "09b227j1c0ggihbhbyphd7lnh26mpz07z1s0h148dg6fwqagm13k"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 5261bd451e0b..8f4b54cec86a 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { - name = "daq-2.0.6"; + name = "daq-2.2.2"; src = fetchurl { name = "${name}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; - sha256 = "1jz7gc9n6sr677ssv61qvcxybdrmsll4z7g6hsmax2p0fc91s3ml"; + sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w"; }; buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 434ae803f0ac..e3a917a12eb3 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}: stdenv.mkDerivation rec { - version = "2.9.8.2"; + version = "2.9.11.1"; name = "snort-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; - sha256 = "0cwk02jan0vw6r3jl3vrf31vfp7i4c1r4yhb42h4gyhd6lnh2xa0"; + sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz"; }; buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ]; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 94490d9f0341..9793fd234a18 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json_glib }: +{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - buildInputs = [ bitlbee glib json_glib ]; + buildInputs = [ bitlbee glib json-glib ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 35cb2100254b..810422dcd3f3 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext -, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking +, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup , libgcrypt , epoxy -, at_spi2_core +, at-spi2-core , sqlite , dbus , gpgme @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ gobjectIntrospection - glib_networking + glib-networking glib gnome3.libgee gnome3.defaultIconTheme @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libXdmcp libxkbcommon epoxy - at_spi2_core + at-spi2-core dbus gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 283d38ef5c74..003ffbfc7d1e 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,7 +1,7 @@ { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool -, perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook -, libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret -, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme +, perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook +, libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret +, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool - perl perlXMLParser evolution_data_server gnome_doc_utils avahi - libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite + perl perlXMLParser evolution-data-server gnome-doc-utils avahi + libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite gnome3.libsoup glib gnome3.defaultIconTheme boost autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret libXrandr randrproto which libxslt libtasn1 diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index c4cb25dfe987..1d03c2f47c89 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ khumba ndowens ]; + maintainers = with maintainers; [ ndowens ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index fbfd36a59282..457e76d0a82c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } : +{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json-glib, nss, nspr, libgnome-keyring } : stdenv.mkDerivation rec { name = "pidgin-opensteamworks-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/ ''; - buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ]; + buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ]; meta = with stdenv.lib; { homepage = https://github.com/EionRobb/pidgin-opensteamworks; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 7ab9b1947915..6e589febe6d9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { name = "pidgin-skypeweb-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib ]; + buildInputs = [ pidgin json-glib ]; makeFlags = [ "PLUGIN_DIR_PURPLE=/lib/pidgin/" diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index c69de60c6cf5..f482e12a4bc9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pidgin } : let - version = "0.7"; + version = "0.8"; in stdenv.mkDerivation rec { name = "pidgin-xmpp-receipts-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "noonien-d"; repo = "pidgin-xmpp-receipts"; rev = "release_${version}"; - sha256 = "1ackqwsqgy1nfggl9na4jicv7hd542aazkg629y2jmbyj1dl3kjm"; + sha256 = "13kwaymzkymjsdv8q95byd173i4vanj211vgx9cm0y8ag2r3cjsb"; }; buildInputs = [ pidgin ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index 632f2543f57c..37b490304c4f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json_glib, mercurial, autoreconfHook } : +{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, mercurial, autoreconfHook } : let @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [pidgin glib json_glib mercurial]; + buildInputs = [pidgin glib json-glib mercurial]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 07cf66e572a7..460143e35494 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, pidgin, glib, json_glib, protobuf, protobufc }: +{ stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: stdenv.mkDerivation rec { name = "purple-hangouts-hg-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1"; }; - buildInputs = [ pidgin glib json_glib protobuf protobufc ]; + buildInputs = [ pidgin glib json-glib protobuf protobufc ]; installPhase = '' install -Dm755 -t $out/lib/pidgin/ libhangouts.so diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 2bf67f44c948..a6d893fd95a4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, pidgin, json_glib, glib, http-parser } : +{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } : let version = "2016-07-11"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib glib http-parser ]; + buildInputs = [ pidgin json-glib glib http-parser ]; installPhase = '' install -Dm755 -t $out/lib/pidgin/ libmatrix.so diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index d02c437945e0..ddb9217d5e22 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus -, dbus_glib }: +, dbus-glib }: stdenv.mkDerivation rec { name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus_glib ]; + buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus-glib ]; meta = { homepage = https://github.com/novas0x2a/skype4pidgin; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index bd3fc82f7cba..3ec45702b175 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell , gst_all_1, startupnotification, gettext , perl, perlXMLParser, libxml2, nss, nspr, farstream -, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn +, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn , lib, python, libICE, libXext, libSM , cyrus_sasl ? null , openssl ? null @@ -33,7 +33,7 @@ let unwrapped = stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr farstream libXScrnSaver ncurses python - avahi dbus dbus_glib intltool libidn + avahi dbus dbus-glib intltool libidn libICE libXext libSM cyrus_sasl ] ++ (lib.optional (openssl != null) openssl) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 9e7377699bd7..87b2ee223815 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -27,7 +27,7 @@ let gnome2.gtk gnome2.pango - gnome2.gnome_keyring + gnome2.gnome-keyring libnotify libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 34f0d16a7b43..67b116274a2d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchgit, fetchpatch , pkgconfig, gyp, cmake, makeWrapper -, qtbase, qtimageformats, gtk3, libappindicator-gtk3 +, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -31,6 +31,11 @@ mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' + substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp --replace '"notify"' '"${libnotify}/lib/libnotify.so"' + ''; + nativeBuildInputs = [ pkgconfig gyp cmake makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 77645371359b..1b9ccb98d0fa 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls telepathy_glib.python ] + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ] ++ stdenv.lib.optional doCheck dbus_daemon; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 4e4a2a9b6a96..a1669183bb3b 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }: +{ stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; - buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ]; + buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ]; nativeBuildInputs = [ pkgconfig libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index b4fd71b01d44..7894554eee4f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus_glib, telepathy_glib, libxslt, makeWrapper }: +{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 9206aea5c542..111970ab7112 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig +{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig , gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: stdenv.mkDerivation rec { @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { makeWrapper pkgconfig intltool libxslt gobjectIntrospection ]; buildInputs = [ - dbus_glib libxml2 sqlite telepathy_glib - dbus_libs telepathy_glib.python + dbus-glib libxml2 sqlite telepathy-glib + dbus_libs telepathy-glib.python ]; configureFlags = "--enable-call"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 82485de58fc1..18b3bb06e98f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, gnome3, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { name = "${pname}-5.16.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"; }; - buildInputs = [ telepathy_glib telepathy_glib.python ]; # ToDo: optional stuff missing + buildInputs = [ telepathy-glib telepathy-glib.python ]; # ToDo: optional stuff missing nativeBuildInputs = [ pkgconfig libxslt makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index cbae6af97b85..e060eaabf281 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup +{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup , libuuid, openssl, pcre, sqlite, pkgconfigUpstream }: stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { }; # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 - buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl - sqlite pcre telepathy_glib.python ]; + buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl + sqlite pcre telepathy-glib.python ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ]; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 700fab061164..06bcd7a0400e 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; platforms = platforms.unix; - broken = true; }; } diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 93efdb74c083..cf3725c35e3d 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "insync-${version}"; - version = "1.3.17.36167"; + version = "1.3.22.36179"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; - sha256 = "0mvg22psiy4x9g7k1fm9pigz2a70jmin7zg2nfzapfnqjlnrbw3n"; + sha256 = "0jmycpbmfvvpilcycyg6zgpjz6449bs17d2w4jx7m1rvzmpkk140"; } else throw "${name} is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index baa0b10fd756..b9860fa42273 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 -, libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy +, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy , libsexy, enchant, libnotify, openssl, intltool -, desktop_file_utils, hicolor_icon_theme +, desktop-file-utils, hicolor-icon-theme , autoconf, automake, autoconf-archive }: @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 lua perl python2 pciutils dbus_glib libcanberra_gtk2 libproxy - libsexy libnotify openssl desktop_file_utils hicolor_icon_theme + gtk2 lua perl python2 pciutils dbus-glib libcanberra-gtk2 libproxy + libsexy libnotify openssl desktop-file-utils hicolor-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 5e65c0dfeaf8..15f9def1151a 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ii-1.7"; + name = "ii-1.8"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "176cqwnn6h7w4kbfd66hzqa243l26pqp2b06bii0nmnm0rkaqwis"; + sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; }; installPhase = '' diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index a89898c37392..ec67321400dc 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -1,22 +1,50 @@ -{ fetchurl, stdenv, jre }: +{ fetchurl, stdenv, jre, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "jmeter-3.3"; + name = "jmeter-${version}"; + version = "4.0"; src = fetchurl { url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; - sha256 = "190k6yrh5casadphkv4azp4nvf4wf2q85mrfysw67r9d96nb9kk5"; + sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4"; }; - buildInputs = [ jre ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - substituteInPlace ./bin/jmeter.sh --replace "java $ARGS" "${jre}/bin/java $ARGS" - substituteInPlace ./bin/jmeter --replace "java $ARGS" "${jre}/bin/java $ARGS" mkdir $out - cp ./* $out/ -R + + rm bin/*.bat bin/*.cmd + + cp -R * $out/ + + substituteInPlace $out/bin/create-rmi-keystore.sh --replace \ + "keytool -genkey" \ + "${jre}/lib/openjdk/jre/bin/keytool -genkey" + + # Prefix some scripts with jmeter to avoid clobbering the namespace + for i in heapdump.sh mirror-server mirror-server.sh shutdown.sh stoptest.sh create-rmi-keystore.sh; do + mv $out/bin/$i $out/bin/jmeter-$i + wrapProgram $out/bin/jmeter-$i \ + --prefix PATH : "${jre}/bin" + done + + wrapProgram $out/bin/jmeter --set JAVA_HOME "${jre}" + wrapProgram $out/bin/jmeter.sh --set JAVA_HOME "${jre}" ''; - meta = { + doInstallCheck = true; + + checkInputs = [ coreutils ]; + + installCheckPhase = '' + $out/bin/jmeter --version 2>&1 | grep -q "${version}" + $out/bin/jmeter-heapdump.sh > /dev/null + $out/bin/jmeter-shutdown.sh > /dev/null + $out/bin/jmeter-stoptest.sh > /dev/null + timeout --kill=1s 1s $out/bin/jmeter-mirror-server.sh || test "$?" = "124" + ''; + + meta = with stdenv.lib; { description = "A 100% pure Java desktop application designed to load test functional behavior and measure performance"; longDescription = '' The Apache JMeter desktop application is open source software, a 100% @@ -24,9 +52,9 @@ stdenv.mkDerivation rec { measure performance. It was originally designed for testing Web Applications but has since expanded to other test functions. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.garbas ]; + license = licenses.asl20; + maintainers = [ maintainers.garbas ]; priority = 1; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 0324012b278b..610b16dab5bc 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings_desktop_schemas ]; + notmuch boost gnome3.gsettings-desktop-schemas ]; buildPhase = "scons --propagate-environment --prefix=$out build"; installPhase = "scons --propagate-environment --prefix=$out install"; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index aee4d8ca04e6..10daeeab8e13 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, wrapGAppsHook -, curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme -, libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk24x-gtk2 -, glib_networking, gsettings_desktop_schemas, libSM, libytnef +, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme +, libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager +, openldap , perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 +, glib-networking, gsettings-desktop-schemas, libSM, libytnef # Build options # TODO: A flag to build the manual. @@ -45,19 +45,19 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/procmime.c \ - --subst-var-by MIMEROOTDIR ${shared_mime_info}/share + --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = - [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme - libetpan perl python glib_networking libSM libytnef + [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas hicolor-icon-theme + libetpan perl python glib-networking libSM libytnef ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra_gtk2 + ++ optional enablePluginNotificationSounds libcanberra-gtk2 ++ optional enablePluginNotificationDialogs libnotify ++ optional enablePluginFancy libsoup ++ optional enablePluginRssyl libxml2 @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; postInstall = '' @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { homepage = http://www.claws-mail.org/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ khumba fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index ef66f69f979a..a71db1cf7151 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.0"; + version = "1.0.2"; 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 = "01384fi5vrfqpznk9389nf3bwpi2zjbnkg84g6z1css8f3gp5i1c"; + sha256 = "0nqgsqxsjnj46wsfb60p7fr631yx3fx7dfa4fpj6x2ml4i42kxid"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index b1ca80fc7e47..75f34952394e 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 -, libgnome_keyring3, networkmanager +, libgnome-keyring3, networkmanager , wrapGAppsHook, gnome3 # otherwise passwords are stored unencrypted , withGnomeKeyring ? true @@ -22,7 +22,7 @@ in pythonPackages.buildPythonApplication rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gnome3.defaultIconTheme - ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3; + ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; nativeBuildInputs = [ wrapGAppsHook diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 6413c1407dc1..ea7e7ee282d1 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript -, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl +, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }: let @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20171215"; + version = "20180223"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1c7vjl5cl0k41vrxp6l1sj72idz70r2rgaxa2m1yir6zb6qsrsd8"; + sha256 = "1q0zwm8p2mk85icrbq42z4235mpqfra38pigd064kharx54k36sb"; }; buildInputs = [ @@ -32,12 +32,15 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - docbook_xsl docbook_xml_dtd_42 gettext libxslt.bin makeWrapper tcl which + docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which ]; enableParallelBuilding = true; postPatch = '' + substituteInPlace contrib/smime_keys \ + --replace /usr/bin/openssl ${openssl}/bin/openssl + for f in doc/*.{xml,xsl}* ; do substituteInPlace $f \ --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl \ @@ -48,6 +51,12 @@ in stdenv.mkDerivation rec { # and use a far more comprehensive list than the one shipped with neomutt substituteInPlace sendlib.c \ --replace /etc/mime.types ${mime-types}/etc/mime.types + + # The string conversion tests all fail with the first version of neomutt + # that has tests (20180223) so we disable them for now. + # I don't know if that is related to the tests or our build environment. + # Try again with a later release. + sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c ''; configureFlags = [ @@ -73,6 +82,10 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt" ''; + doCheck = true; + + checkTarget = "test"; + meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.neomutt.org; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c23c264559f8..a3de728ce415 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -54,6 +54,10 @@ stdenv.mkDerivation rec { done ''; + # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and + # friends + setOutputFlags = false; + enableParallelBuilding = true; makeFlags = "V=1"; preFixup = optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index 76231dc7abf2..766aab39ce30 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -5,7 +5,7 @@ , coreutils , cups , dbus -, desktop_file_utils +, desktop-file-utils , expat , fontconfig , freetype @@ -14,7 +14,7 @@ , glib , gnome2 , libgcrypt -, libgnome_keyring +, libgnome-keyring , libnotify , makeWrapper , nodejs @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { coreutils cups dbus - desktop_file_utils + desktop-file-utils expat fontconfig freetype @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { glib gnome2.GConf gnome2.gtk - libgnome_keyring + libgnome-keyring libnotify nodejs nspr @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gnome2.gnome_keyring ]; + buildInputs = [ gnome2.gnome-keyring ]; nativeBuildInputs = [ makeWrapper ]; @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ $out/share/nylas-mail/nylas - wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome_keyring}/lib"; + wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome-keyring}/lib"; # Fix path to bash so apm can install plugins. substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 4f714cabf79b..69a63bbb0549 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, config, makeWrapper , gconf , alsaLib -, at_spi2_atk +, at-spi2-atk , atk , cairo , cups , curl -, dbus_glib +, dbus-glib , dbus_libs , fontconfig , freetype @@ -27,7 +27,7 @@ , libXinerama , libXrender , libXt -, libcanberra_gtk2 +, libcanberra-gtk2 , libgnome , libgnomeui , defaultIconTheme @@ -82,12 +82,12 @@ stdenv.mkDerivation { [ stdenv.cc.cc gconf alsaLib - at_spi2_atk + at-spi2-atk atk cairo cups curl - dbus_glib + dbus-glib dbus_libs fontconfig freetype @@ -108,7 +108,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra_gtk2 + libcanberra-gtk2 libgnome libgnomeui mesa diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index bfbd97001973..6368f1991e91 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg +, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, mesa, sqlite, unzip , hunspell, libevent, libstartup_notification @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { # from firefox, but without sound libraries buildInputs = [ gtk2 zip libIDL libjpeg zlib bzip2 - dbus dbus_glib pango freetype fontconfig xorg.libXi + dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file nspr nss libnotify xorg.pixman yasm mesa xorg.libXScrnSaver xorg.scrnsaverproto diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index ed6fe17cc7e8..965a8ec58dc8 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook -, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1 -, libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg -, gobjectIntrospection, glib_networking +, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1 +, libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg +, gobjectIntrospection, glib-networking }: let @@ -18,9 +18,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; buildInputs = [ - glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas - libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection - librsvg glib_networking libnotify + glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas + libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection + librsvg glib-networking libnotify ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 63d7f29d7de6..ad35c49c0146 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,6 +1,6 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null -, perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify +, perl, pcre, gmime, gettext, intltool, dbus-glib, libnotify }: assert spellChecking -> gtkspell2 != null; @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 perl gmime gettext intltool dbus_glib libnotify ] + buildInputs = [ gtk2 perl gmime gettext intltool dbus-glib libnotify ] ++ stdenv.lib.optional spellChecking gtkspell2; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 3cbc03e8d73c..f61b887cd873 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite -, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }: +, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome-keyring }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchgit { url = "git://github.com/nextcloud/client_theming.git"; - rev = "1ee750d1aeaaefc899629e85c311594603e9ac1b"; - sha256 = "0dxyng8a7cg78z8yngiqypsb44lf5c6vkabvkfch0cl0cqmarc1a"; + rev = "ab40efe1e1475efddd636c09251d8917627261da"; + sha256 = "19a1kqydgx47sa1a917j46zlbc5g9nynsanasyad9c8sqi0qvyip"; fetchSubmodules = true; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { $out/share/applications/nextcloud.desktop '' + stdenv.lib.optionalString (withGnomeKeyring) '' wrapProgram "$out/bin/nextcloud" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome-keyring ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index f2b7a4a4e999..b3a1c1a23b37 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ostinato-${version}"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; rev = "v${version}"; - sha256 = "1b5a5gypcy9i03mj6md3lkrq05rqmdyhfykrr1z0sv8n3q48xca3"; + sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx"; }; ostinatoIcon = fetchurl { diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 0d7a41735ea4..950187ed9c60 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools + speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index d37f5293ef80..688f908c798c 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, zlib, dbus, dbus_glib, gtk2, gdk_pixbuf, cairo, pango }: +{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk_pixbuf, cairo, pango }: stdenv.mkDerivation rec { name = "tixati-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus_glib gtk2 gdk_pixbuf cairo pango ]} \ + --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk_pixbuf cairo pango ]} \ tixati install -D tixati $out/bin/tixati install -D tixati.desktop $out/share/applications/tixati.desktop diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 20c3540b7f45..eb88d1c24c20 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,6 +1,6 @@ { stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig -, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib -, hicolor_icon_theme }: +, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib +, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pkgconfig intltool autoconf-archive appstream-glib ]; - buildInputs = [ gtk3 json_glib curl glib hicolor_icon_theme ]; + buildInputs = [ gtk3 json-glib curl glib hicolor-icon-theme ]; meta = with stdenv.lib; { description = "GTK remote control for the Transmission BitTorrent client"; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 3c5fb499a8bd..cf825b724962 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -6,18 +6,15 @@ , enableCli ? true }: -let - version = "2.92"; -in - let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "transmission-" + optionalString enableGTK3 "gtk-" + version; + version = "2.93"; src = fetchurl { - url = "https://transmission.cachefly.net/transmission-${version}.tar.xz"; - sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"; + url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.93.tar.xz"; + sha256 = "8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b"; }; nativeBuildInputs = [ pkgconfig ] @@ -27,16 +24,6 @@ stdenv.mkDerivation rec { ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.isLinux [ inotify-tools ]; - patches = [ - (fetchpatch { - # See https://github.com/transmission/transmission/pull/468 - # Patch from: https://github.com/transmission/transmission/pull/468#issuecomment-357098126 - name = "transmission-fix-dns-rebinding-vuln.patch"; - url = https://github.com/transmission/transmission/files/1624507/transmission-fix-dns-rebinding-vuln.patch.txt; - sha256 = "1p9m20kp4kdyp5jjr3yp5px627n8cfa29mg5n3wzsdfv0qzk9gy4"; - }) - ]; - postPatch = '' substituteInPlace ./configure \ --replace "libsystemd-daemon" "libsystemd" \ diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index d8e0c76dc490..f6828fe6f317 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tribler"; name = "${pname}-${version}"; - version = "7.0.0-rc3"; + version = "7.0.1"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0f1f8mzbk1ygkh8lv9y1s9mvslv12d94mxvmp3b4s2vm8w4syza7"; + sha256 = "0cqg6319x2lid5la5vdlj6lwja8g712196j39jzv5yiaq8d0zym4"; }; buildInputs = [ diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index b43287230278..2a4991b9318f 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pjsip-${version}"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; + sha256 = "0wiph6g51wanzwjjrpwsz63amgvly8g08jz033gnwqmppa584b4w"; }; buildInputs = [ openssl libsamplerate alsaLib ]; diff --git a/pkgs/development/python-modules/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix similarity index 85% rename from pkgs/development/python-modules/protocol/default.nix rename to pkgs/applications/networking/protocol/default.nix index f8ff177437c3..305aceec62b5 100644 --- a/pkgs/development/python-modules/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: +{ stdenv, buildPythonApplication, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonApplication rec { pname = "protocol"; version = "20171226"; diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 6f87e55e8ea3..00332754c264 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -169,7 +169,7 @@ let ./${prefixWithBitness}/hinst # Run the installer... - ./${prefixWithBitness}/hinst CDROM "`pwd`" + bash ./${prefixWithBitness}/hinst CDROM "`pwd`" echo "Deleting broken links..." for link in `find $ICAInstDir -type l ` @@ -202,7 +202,7 @@ let makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ --add-flags "-icaroot $ICAInstDir" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 959608b04f5c..6d32036def55 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook -, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11 +, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core -, openssl, gsettings_desktop_schemas +, libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core +, openssl, gsettings-desktop-schemas # The themes here are soft dependencies; only icons are missing without them. -, hicolor_icon_theme, adwaita-icon-theme +, hicolor-icon-theme, adwaita-icon-theme }: let @@ -33,13 +33,13 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake wrapGAppsHook gsettings_desktop_schemas - glib gtk3 gettext libxkbfile libgnome_keyring libX11 + buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas + glib gtk3 gettext libxkbfile libgnome-keyring libX11 freerdp libssh libgcrypt gnutls pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret spice_protocol spice_gtk epoxy at_spi2_core - openssl hicolor_icon_theme adwaita-icon-theme ]; + libsecret spice-protocol spice-gtk epoxy at-spi2-core + openssl hicolor-icon-theme adwaita-icon-theme ]; cmakeFlags = [ "-DWITH_VTE=OFF" diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 74f5ecb6b75f..e47a6ba6be3d 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, writeScript, pkgconfig, cmake, qtbase, qttools +{ stdenv, fetchFromGitHub, writeScript, pkgconfig, cmake, qtbase, qttools , seafile-shared, ccnet, makeWrapper , withShibboleth ? true, qtwebengine }: with stdenv.lib; stdenv.mkDerivation rec { - version = "6.1.0"; + version = "6.1.5"; name = "seafile-client-${version}"; - src = fetchurl { - url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; - sha256 = "16rn6b9ayaccgwx8hs3yh1wb395pp8ffh8may8a8bpcc4gdry7bd"; + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seafile-client"; + rev = "v${version}"; + sha256 = "1ahz55cw2p3s78x5f77drz4h2jhknfzpkk83qd0ggma31q1pnpl9"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 84e10fb18bca..682b7d311d71 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib , libssh, zlib, cmake, extra-cmake-modules, fetchpatch -, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null +, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation { gettext pcre perl libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls geoip c-ares python glib zlib ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) - ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ] + ++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ] ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index a7cf26ea7aea..e4bdec668a02 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lsyncd-${version}"; - version = "2.1.6"; + version = "2.2.2"; src = fetchFromGitHub { owner = "axkibe"; repo = "lsyncd"; rev = "release-${version}"; - sha256 = "1cab96h4qfyapk7lb682j1d8k0hpv7h9pl41vdgc0vr4bq4c3ij2"; + sha256 = "1q2ixp52r96ckghgmxdbms6xrq8dbziimp8gmgzqfq4lk1v1w80y"; }; patchPhase = '' diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 5e4f9738d445..5e48f85852df 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { gtk3 (librsvg.override { enableIntrospection = true; }) libnotify # Schemas with proxy configuration - gnome3.gsettings_desktop_schemas + gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix deleted file mode 100644 index e5e554db67b8..000000000000 --- a/pkgs/applications/networking/syncthing/inotify-deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/syncthing/syncthing"; - fetch = { - type = "git"; - url = "https://github.com/syncthing/syncthing"; - rev = "d0061c172caecd3baf61f3ff720f56fdb805186e"; - sha256 = "08cn0ym4arjppbnfn2b37crarwmiqbj4yjr7kinhdxx9gqm5wkj1"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a"; - sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj"; - }; - } -] diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix deleted file mode 100644 index e33501a17158..000000000000 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "syncthing-inotify-${version}"; - version = "0.8.6"; - - goPackagePath = "github.com/syncthing/syncthing-inotify"; - - src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing-inotify"; - rev = "v${version}"; - sha256 = "0z1zpb7av4q5nj2d4yda9jcbjdz4yj3823c29y73yf0gfp26lppl"; - }; - - goDeps = ./inotify-deps.nix; - - postInstall = '' - mkdir -p $bin/lib/systemd/{system,user} - - substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \ - $bin/lib/systemd/system/syncthing-inotify@.service \ - --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify - - substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ - $bin/lib/systemd/user/syncthing-inotify.service \ - --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/syncthing/syncthing-inotify; - description = "File watcher intended for use with Syncthing"; - license = licenses.mpl20; - maintainers = with maintainers; [ joko peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix index 79bc32dfa40d..8a056e21692b 100644 --- a/pkgs/applications/networking/tcpkali/default.nix +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -1,6 +1,6 @@ {stdenv, autoreconfHook, fetchFromGitHub, bison}: -let version = "0.9"; in +let version = "1.1.1"; in stdenv.mkDerivation rec { name = "tcpkali-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "machinezone"; repo = "tcpkali"; rev = "v${version}"; - sha256 = "03cbmnc60wkd7f4bapn5cbm3c4zas2l0znsbpci2mn8ms8agif82"; + sha256 = "09ky3cccaphcqc6nhfs00pps99lasmzc2pf5vk0gi8hlqbbhilxf"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bison]; diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 50ebee4a0ce5..8ac2f7b0a3b6 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgs }: let - version = "2.9.5-1"; + version = "2.9.5-2"; pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "0hz6g685jwl0c0jrdca746425xpwiwc8lnlc2gigga5hkcq8qzl9"; + sha256 = "0nrzb2lhjq0s4dabyq8nldjijsld9gq4cxm8ys1cw5jyz1875g2w"; }; nativeBuildInputs = with pkgs; [ diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 1537dd9b03ff..8449cdf05def 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper, - boost, qtwebkit, qtx11extras, shared_mime_info, + boost, qtwebkit, qtx11extras, shared-mime-info, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross, @@ -36,7 +36,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ - boost qtwebkit qtx11extras shared_mime_info + boost qtwebkit qtx11extras shared-mime-info kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 14c954c0c831..c768f4c7fa34 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -1,7 +1,7 @@ { fetchurl, fetchpatch, stdenv, intltool, pkgconfig, file, makeWrapper , libxml2, libxslt, perl, perlPackages, gconf, guile , glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice -, webkit, glibcLocales, gsettings_desktop_schemas, dconf +, webkit, glibcLocales, gsettings-desktop-schemas, dconf , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers , pango, gdk_pixbuf }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # glib, gtk... glib gtk2 goffice webkit # gnome... - dconf gconf libgnomecanvas gsettings_desktop_schemas + dconf gconf libgnomecanvas gsettings-desktop-schemas # financial libofx aqbanking gwenhywfar # perl diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 29c30204ddbe..62dcf5dd8a88 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook -, hicolor_icon_theme, libsoup, gnome3 }: +, hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { name = "grisbi-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup + buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 3d63b4195a27..f4e59d1ca049 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook -, hicolor_icon_theme, libsoup, gnome3 }: +, hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { name = "homebank-5.1.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup + buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 59249d1a6eb0..4f1bce4a2d24 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -2,7 +2,7 @@ , mesa, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }: let - version = "0.11.1"; + version = "0.12.0"; pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]); in stdenv.mkDerivation { # This project was formerly known as KeyJNote. @@ -12,7 +12,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "0b3rmy6acp2vmf5nill3aknxvr9a5aawk1vnphkah61anxp62gsr"; + sha256 = "0zaqq3yvd296mfr5bxpj2hqlk7vrb0rsbgd4dc1l5ag46giqvivx"; }; buildInputs = [ makeWrapper pythonEnv ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index e7b821834546..5dfd03570121 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings_desktop_schemas }: +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.8.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { exec = "jabref"; }; - buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ]; unpackPhase = "#"; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index cc3329bdcc9d..f8742253c519 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -1,17 +1,17 @@ { fetchurl }: rec { - major = "5"; - minor = "4"; - patch = "1"; - tweak = "2"; + major = "6"; + minor = "0"; + patch = "2"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0c17193vcf4nj8l5k9q87byv27px74kzp0hvgr1dfz5700cv086k"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "0qga01lhh09jf2gx3czk66i5c854gzzjxgkrmj5d7m4ci2zaxfsd"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c8948d13cf7f..dc3b14dabe1d 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip +{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis -, openssl, gperf, cppunit, GConf, ORBit2, poppler +, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven +, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook @@ -29,27 +29,27 @@ let langsSpaces = lib.concatStringsSep " " langs; fetchSrc = {name, sha256}: fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; inherit sha256; }; srcs = { third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { - url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; + url = "https://dev-www.libreoffice.org/extern/${md5}-${name}"; sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs.nix)); translations = fetchSrc { name = "translations"; - sha256 = "1ir1f5jgjhpnxsw6izsryp4wg52ifzmcqyc0gdp9zh03rjf5i4cg"; + sha256 = "1fx9xkf1ppap77b8zdr8qawbikgp607z5w9b7jk3rilcqs7xbkwl"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1apgc57a8q6lsjfq2f7pzdn7wanqm8zkkrkbq2nd4hidp6avgm6f"; + sha256 = "0zphmhl4a8pd5l7ma4bzhrwgbv037j8p5m1ilvb1blgbqv53v38a"; }; }; @@ -106,6 +106,11 @@ in stdenv.mkDerivation rec { # BLFS patch for Glibc 2.23 renaming isnan sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx + + # This is required as some cppunittests require fontconfig configured + cp "${fontsConf}" fonts.conf + sed -e '/include/i${carlito}/etc/fonts/conf.d' -i fonts.conf + export FONTCONFIG_FILE="$PWD/fonts.conf" ''; # fetch_Download_item tries to interpret the name as a variable name @@ -115,11 +120,13 @@ in stdenv.mkDerivation rec { sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile # unit test sd_tiledrendering seems to be fragile - # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # this I actually hate, this should be a data consistency test! + sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # rendering-dependent test sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME @@ -138,6 +145,8 @@ in stdenv.mkDerivation rec { sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx + sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx + sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; @@ -147,9 +156,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildPhase = '' - # This is required as some cppunittests require fontconfig configured - export FONTCONFIG_FILE=${fontsConf} - # This to avoid using /lib:/usr/lib at linking sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk @@ -229,8 +235,10 @@ in stdenv.mkDerivation rec { "--without-system-liblangtag" "--without-system-libmspub" "--without-system-libpagemaker" - "--without-system-libgltf" "--without-system-libstaroffice" + "--without-system-libepubgen" + "--without-system-libqxp" + "--without-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" ]; @@ -242,7 +250,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 @@ -252,9 +260,9 @@ in stdenv.mkDerivation rec { neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool - libxshmfence libatomic_ops graphite2 harfbuzz gpgme + libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme + libodfgen CoinMP librdf_rasqal defaultIconTheme gettext gdb ] ++ lib.optional kdeIntegration kdelibs4; @@ -268,7 +276,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; - homepage = http://libreoffice.org/; + homepage = https://libreoffice.org/; license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py index dcda0ff782dc..636f36cb383b 100755 --- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py +++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py @@ -256,7 +256,7 @@ def interpret(x): Output: One of 1. Dict with keys 'name' and 'attrs' 2. 'unrecognized' (if interpretation failed) """ - for f in [interpret_md5, interpret_sha256, interpret_tarball_with_md5, interpret_tarball]: + for f in [interpret_md5, interpret_sha256, interpret_tarball_with_md5, interpret_tarball, interpret_jar]: result = f(x) if result is not None: return result @@ -296,6 +296,13 @@ def interpret_tarball(x): return {'name': match.group(1), 'attrs': {'tarball': x['value'], 'brief': True}} +def interpret_jar(x): + match = re.match('^(.*)_JAR$', x['key']) + + if match: + return {'name': match.group(1), + 'attrs': {'tarball': x['value'], 'brief': True}} + def interpret_tarball_with_md5(x): """ diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index 478c6c4d9062..e82fa241c00c 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -3,43 +3,43 @@ name = "libabw-0.1.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; - md5 = "7a3815b506d064313ba309617b6f5a0b"; - md5name = "7a3815b506d064313ba309617b6f5a0b-libabw-0.1.1.tar.bz2"; + md5 = ""; + md5name = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199-libabw-0.1.1.tar.bz2"; } { name = "commons-logging-1.2-src.tar.gz"; url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; - md5 = "ce977548f1cbf46918e93cd38ac35163"; - md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz"; + md5 = ""; + md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; - md5 = "98492e965963f852ab29f9e61b2ad700"; - md5name = "98492e965963f852ab29f9e61b2ad700-apr-1.5.2.tar.gz"; + md5 = ""; + md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; - md5 = "866825c04da827c6e5f53daff5569f42"; - md5name = "866825c04da827c6e5f53daff5569f42-apr-util-1.5.4.tar.gz"; + md5 = ""; + md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_60_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2"; - sha256 = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b"; - md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe"; - md5name = "65a840e1a0b13a558ff19eeb2c4f0cbe-boost_1_60_0.tar.bz2"; + name = "boost_1_63_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2"; + sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"; + md5 = ""; + md5name = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0-boost_1_63_0.tar.bz2"; } { name = "breakpad.zip"; url = "http://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; - md5 = "415ce291aa6f2ee1d5db7b62bf62ade8"; - md5name = "415ce291aa6f2ee1d5db7b62bf62ade8-breakpad.zip"; + md5 = ""; + md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.14.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz"; - sha256 = "613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252"; - md5 = "23a0b2f0235431d35238df1d3a517fdb"; - md5name = "23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz"; + name = "cairo-1.14.8.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz"; + sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20"; + md5 = ""; + md5name = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20-cairo-1.14.8.tar.xz"; } { name = "libcdr-0.1.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2"; sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d"; - md5 = "e369f30b5b861ee0fc4f9e6cbad701fe"; - md5name = "e369f30b5b861ee0fc4f9e6cbad701fe-libcdr-0.1.3.tar.bz2"; + md5 = ""; + md5name = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d-libcdr-0.1.3.tar.bz2"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -80,15 +80,15 @@ name = "libcmis-0.5.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; - md5 = "3270154f0f40d86fce849b161f914101"; - md5name = "3270154f0f40d86fce849b161f914101-libcmis-0.5.1.tar.gz"; + md5 = ""; + md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz"; } { name = "CoinMP-1.7.6.tgz"; url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; - md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; - md5name = "1cce53bf4b40ae29790d2c5c9f8b1129-CoinMP-1.7.6.tgz"; + md5 = ""; + md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { name = "collada2gltf-master-cb1d97788a.tar.bz2"; @@ -98,11 +98,11 @@ md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; } { - name = "cppunit-1.13.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz"; - sha256 = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f"; - md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; - md5name = "d1c6bdd5a76c66d2c38331e2d287bc01-cppunit-1.13.2.tar.gz"; + name = "cppunit-1.14.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; + sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; + md5 = ""; + md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; @@ -115,15 +115,22 @@ name = "curl-7.52.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz"; sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae"; - md5 = "4e1ef056e117b4d25f4ec42ac609c0d4"; - md5name = "4e1ef056e117b4d25f4ec42ac609c0d4-curl-7.52.1.tar.gz"; + md5 = ""; + md5name = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae-curl-7.52.1.tar.gz"; } { name = "libe-book-0.1.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; - md5 = "6b48eda57914e6343efebc9381027b78"; - md5name = "6b48eda57914e6343efebc9381027b78-libe-book-0.1.2.tar.bz2"; + md5 = ""; + md5name = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850-libe-book-0.1.2.tar.bz2"; + } + { + name = "libepoxy-1.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2"; + sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64"; + md5 = ""; + md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2"; } { name = "epm-3.7.tar.gz"; @@ -136,29 +143,29 @@ name = "libetonyek-0.1.6.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; - md5 = "77ff46936dcc83670557274e7dd2aa33"; - md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2"; + md5 = ""; + md5name = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78-libetonyek-0.1.6.tar.bz2"; } { name = "expat-2.2.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2"; sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f"; - md5 = "f053af63ef5f39bd9b78d01fbc203334"; - md5name = "f053af63ef5f39bd9b78d01fbc203334-expat-2.2.3.tar.bz2"; + md5 = ""; + md5name = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f-expat-2.2.3.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; - md5 = "821260b61dafc22899d1464d4e91ee6a"; - md5name = "821260b61dafc22899d1464d4e91ee6a-Firebird-3.0.0.32483-0.tar.bz2"; + md5 = ""; + md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.8.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; - sha256 = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"; - md5 = "77e15a92006ddc2adbb06f840d591c0e"; - md5name = "77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + name = "fontconfig-2.12.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2"; + sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3"; + md5 = ""; + md5name = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3-fontconfig-2.12.1.tar.bz2"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -241,29 +248,22 @@ name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; - md5 = "919389b307ee8696288ea3b8210ab974"; - md5name = "919389b307ee8696288ea3b8210ab974-EmojiOneColor-SVGinOT-1.3.tar.gz"; + md5 = ""; + md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; } { name = "libfreehand-0.1.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; - md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; - md5name = "8cf70c5dc4d24d2dc4a107f509d2d6d7-libfreehand-0.1.1.tar.bz2"; + md5 = ""; + md5name = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877-libfreehand-0.1.1.tar.bz2"; } { - name = "freetype-2.4.8.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; - sha256 = "a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71"; - md5 = "dbf2caca1d3afd410a29217a9809d397"; - md5name = "dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; - } - { - name = "glew-1.12.0.zip"; - url = "http://dev-www.libreoffice.org/src/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; - sha256 = "6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4"; - md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; - md5name = "3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + name = "freetype-2.7.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2"; + sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88"; + md5 = ""; + md5name = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88-freetype-2.7.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -272,19 +272,26 @@ md5 = "bae83fa5dc7f081768daace6e199adc3"; md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; } + { + name = "gpgme-1.8.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2"; + sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33"; + md5 = ""; + md5name = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33-gpgme-1.8.0.tar.bz2"; + } { name = "graphite2-minimal-1.3.10.tgz"; url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; - md5 = "9c499b8ec9f1b81fd0bb6a3b986f4b0f"; - md5name = "9c499b8ec9f1b81fd0bb6a3b986f4b0f-graphite2-minimal-1.3.10.tgz"; + md5 = ""; + md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.3.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2"; - sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027"; - md5 = "5986e1bfcd983d1f6caa53ef64c4abc5"; - md5name = "5986e1bfcd983d1f6caa53ef64c4abc5-harfbuzz-1.3.2.tar.bz2"; + name = "harfbuzz-1.4.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.4.8.tar.bz2"; + sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131"; + md5 = ""; + md5name = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131-harfbuzz-1.4.8.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -392,25 +399,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "jpegsrc.v9a.tar.gz"; - url = "http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz"; - sha256 = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"; - md5 = "3353992aecaee1805ef4109aadd433e7"; - md5name = "3353992aecaee1805ef4109aadd433e7-jpegsrc.v9a.tar.gz"; + name = "libjpeg-turbo-1.5.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz"; + sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c"; + md5 = ""; + md5name = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c-libjpeg-turbo-1.5.1.tar.gz"; } { - name = "libjpeg-turbo-1.4.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.4.2.tar.gz"; - sha256 = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e"; - md5 = "86b0d5f7507c2e6c21c00219162c3c44"; - md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz"; - } - { - name = "language-subtag-registry-2017-04-19.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2"; - sha256 = "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a"; - md5 = "59a3595c1052c5b51f996f44fe9994b9"; - md5name = "59a3595c1052c5b51f996f44fe9994b9-language-subtag-registry-2017-04-19.tar.bz2"; + name = "language-subtag-registry-2017-12-14.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; + sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; + md5 = ""; + md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -420,25 +420,32 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz"; - sha256 = "5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"; - md5 = "f4c08d38ceade4a664ebff7228910a33"; - md5name = "f4c08d38ceade4a664ebff7228910a33-lcms2-2.6.tar.gz"; + name = "lcms2-2.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; + sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; + md5 = ""; + md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; + } + { + name = "libassuan-2.4.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2"; + sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71"; + md5 = ""; + md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2"; } { name = "libatomic_ops-7_2d.zip"; url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; - md5 = "c0b86562d5aa40761a87134f83e6adcf"; - md5name = "c0b86562d5aa40761a87134f83e6adcf-libatomic_ops-7_2d.zip"; + md5 = ""; + md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip"; } { name = "libeot-0.01.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; - md5 = "aa24f5dd2a2992f4a116aa72af817548"; - md5name = "aa24f5dd2a2992f4a116aa72af817548-libeot-0.01.tar.bz2"; + md5 = ""; + md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { name = "libexttextcat-3.4.4.tar.bz2"; @@ -448,32 +455,39 @@ md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; } { - name = "libgltf-0.0.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2"; - sha256 = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b"; - md5 = "d63a9f47ab048f5009d90693d6aa6424"; - md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2"; + name = "libgltf-0.1.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz"; + sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da"; + md5 = ""; + md5name = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da-libgltf-0.1.0.tar.gz"; + } + { + name = "libgpg-error-1.26.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2"; + sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69"; + md5 = ""; + md5name = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69-libgpg-error-1.26.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; - md5 = "284f120247323a35122ab32b4b359c45"; - md5name = "284f120247323a35122ab32b4b359c45-liblangtag-0.6.2.tar.bz2"; + md5 = ""; + md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { name = "ltm-1.0.zip"; url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; - md5 = "da283d2e3e72137d0c600ac36b991c9d"; - md5name = "da283d2e3e72137d0c600ac36b991c9d-ltm-1.0.zip"; + md5 = ""; + md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.23.tar.gz"; - url = "http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz"; - sha256 = "41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f"; - md5 = "86b1daaa438f5a7bea9a52d7b9799ac0"; - md5name = "86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz"; + name = "xmlsec1-1.2.24.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz"; + sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc"; + md5 = ""; + md5name = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc-xmlsec1-1.2.24.tar.gz"; } { name = "libxml2-2.9.4.tar.gz"; @@ -507,29 +521,29 @@ name = "mdds-1.2.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2"; sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d"; - md5 = "8855cf852a6088cfdc792c6f7ceb0243"; - md5name = "8855cf852a6088cfdc792c6f7ceb0243-mdds-1.2.2.tar.bz2"; + md5 = ""; + md5name = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d-mdds-1.2.2.tar.bz2"; } { name = "mDNSResponder-576.30.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; - md5 = "940057ac8b513b00e8e9ca12ef796762"; - md5name = "940057ac8b513b00e8e9ca12ef796762-mDNSResponder-576.30.4.tar.gz"; + md5 = ""; + md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; } { name = "libmspub-0.1.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; - md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; - md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2"; + md5 = ""; + md5name = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a-libmspub-0.1.2.tar.bz2"; } { - name = "libmwaw-0.3.9.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2"; - sha256 = "11a1f318431a052e1d623385351c8e659377d36db3e71e188af55da87ce9461f"; - md5 = "d8532ad5630d3f3b2189a7ec5639151b"; - md5name = "d8532ad5630d3f3b2189a7ec5639151b-libmwaw-0.3.9.tar.bz2"; + name = "libmwaw-0.3.11.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz"; + sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a"; + md5 = ""; + md5name = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a-libmwaw-0.3.11.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -556,15 +570,15 @@ name = "nss-3.29.5-with-nspr-4.13.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz"; sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4"; - md5 = "e55ee06b22687df68fafc6a30c0554b2"; - md5name = "e55ee06b22687df68fafc6a30c0554b2-nss-3.29.5-with-nspr-4.13.1.tar.gz"; + md5 = ""; + md5name = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4-nss-3.29.5-with-nspr-4.13.1.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; - md5 = "32572ea48d9021bbd6fa317ddb697abc"; - md5name = "32572ea48d9021bbd6fa317ddb697abc-libodfgen-0.1.6.tar.bz2"; + md5 = ""; + md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; @@ -584,43 +598,50 @@ name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; - md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; - md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2"; + md5 = ""; + md5name = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4-OpenCOLLADA-master-6509aa13af.tar.bz2"; } { name = "openldap-2.4.44.tgz"; url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz"; sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400"; - md5 = "693ac26de86231f8dcae2b4e9d768e51"; - md5name = "693ac26de86231f8dcae2b4e9d768e51-openldap-2.4.44.tgz"; + md5 = ""; + md5name = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400-openldap-2.4.44.tgz"; } { - name = "openssl-1.0.2h.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz"; - sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; - md5 = "9392e65072ce4b614c1392eefc1f23d0"; - md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz"; + name = "openssl-1.0.2k.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz"; + sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"; + md5 = ""; + md5name = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0-openssl-1.0.2k.tar.gz"; } { name = "liborcus-0.12.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz"; sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908"; - md5 = "d0ad3a2fcf7008e5b33604bab33df3ad"; - md5name = "d0ad3a2fcf7008e5b33604bab33df3ad-liborcus-0.12.1.tar.gz"; + md5 = ""; + md5name = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908-liborcus-0.12.1.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; - md5 = "593f0aa47bf2efc0efda2d28fae063b2"; - md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + md5 = ""; + md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { name = "libpagemaker-0.0.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2"; sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33"; - md5 = "5c4985a68be0b79d3f809da5e12b143c"; - md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2"; + md5 = ""; + md5name = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33-libpagemaker-0.0.3.tar.bz2"; + } + { + name = "pdfium-3064.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2"; + sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883"; + md5 = ""; + md5name = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883-pdfium-3064.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -633,15 +654,15 @@ name = "libpng-1.6.28.tar.gz"; url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz"; sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2"; - md5 = "897ccec1ebfb0922e83c2bfaa1be8748"; - md5name = "897ccec1ebfb0922e83c2bfaa1be8748-libpng-1.6.28.tar.gz"; + md5 = ""; + md5name = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2-libpng-1.6.28.tar.gz"; } { - name = "poppler-0.49.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.49.0.tar.xz"; - sha256 = "14485f0e1e43dcddf49cfc02c2ccb92910ba3e0e91e06f4bd2642ec00cb3a79f"; - md5 = "9e057ed8eee1f9979fa75d8f044783b8"; - md5name = "9e057ed8eee1f9979fa75d8f044783b8-poppler-0.49.0.tar.xz"; + name = "poppler-0.56.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz"; + sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173"; + md5 = ""; + md5name = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173-poppler-0.56.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -650,19 +671,12 @@ md5 = "c0b4799ea9850eae3ead14f0a60e9418"; md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; } - { - name = "Python-3.3.5.tgz"; - url = "http://dev-www.libreoffice.org/src/Python-3.3.5.tgz"; - sha256 = "916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168"; - md5 = "803a75927f8f241ca78633890c798021"; - md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz"; - } { name = "Python-3.5.4.tgz"; url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz"; sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44"; - md5 = "2ed4802b7a2a7e40d2e797272bf388ec"; - md5name = "2ed4802b7a2a7e40d2e797272bf388ec-Python-3.5.4.tgz"; + md5 = ""; + md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz"; } { name = "raptor2-2.0.15.tar.gz"; @@ -689,8 +703,8 @@ name = "librevenge-0.0.4.tar.bz2"; url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; - md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; - md5name = "5b9ac52ec77d4d19157cf5962ebc0aea-librevenge-0.0.4.tar.bz2"; + md5 = ""; + md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; @@ -703,15 +717,15 @@ name = "serf-1.2.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; - md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; - md5name = "4f8e76c9c6567aee1d66aba49f76a58b-serf-1.2.1.tar.bz2"; + md5 = ""; + md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2"; - sha256 = "f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899"; - md5 = "4012950240c2bf768c9b29ad376123d7"; - md5name = "4012950240c2bf768c9b29ad376123d7-libstaroffice-0.0.2.tar.bz2"; + name = "libstaroffice-0.0.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz"; + sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6"; + md5 = ""; + md5name = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6-libstaroffice-0.0.3.tar.xz"; } { name = "swingExSrc.zip"; @@ -731,29 +745,29 @@ name = "libvisio-0.1.5.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; - md5 = "cbee198a78b842b2087f32d33c522818"; - md5name = "cbee198a78b842b2087f32d33c522818-libvisio-0.1.5.tar.bz2"; + md5 = ""; + md5name = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e-libvisio-0.1.5.tar.bz2"; } { name = "libwpd-0.10.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; - md5 = "79b56bcc349264d686a67994506ad199"; - md5name = "79b56bcc349264d686a67994506ad199-libwpd-0.10.1.tar.bz2"; + md5 = ""; + md5name = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d-libwpd-0.10.1.tar.bz2"; } { name = "libwpg-0.3.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; - md5 = "dfd066658ec9d2fb2262417039a8a1c3"; - md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2"; + md5 = ""; + md5name = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59-libwpg-0.3.1.tar.bz2"; } { - name = "libwps-0.4.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.4.tar.bz2"; - sha256 = "387c46d9543bb566381fddb8991e2838599fc500ee132fef9631a704c5cbed73"; - md5 = "dcfd1d18bfa9818cf3ab21663ba857a3"; - md5name = "dcfd1d18bfa9818cf3ab21663ba857a3-libwps-0.4.4.tar.bz2"; + name = "libwps-0.4.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz"; + sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0"; + md5 = ""; + md5name = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0-libwps-0.4.6.tar.xz"; } { name = "xsltml_2.1.2.zip"; @@ -763,17 +777,17 @@ md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { - name = "zlib-1.2.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz"; - sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d"; - md5 = "44d667c142d7cda120332623eab69f40"; - md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz"; + name = "zlib-1.2.11.tar.xz"; + url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; + sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; + md5 = ""; + md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { name = "libzmf-0.0.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2"; sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b"; - md5 = "c611df8664240de0276ab95670f413d8"; - md5name = "c611df8664240de0276ab95670f413d8-libzmf-0.0.1.tar.bz2"; + md5 = ""; + md5name = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b-libzmf-0.0.1.tar.bz2"; } ] diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index d20ec2d0cc80..28c06b65869f 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -1,45 +1,45 @@ [ { - name = "libabw-0.1.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; - sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; + name = "libabw-0.1.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; + sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; md5 = ""; - md5name = "-libabw-0.1.1.tar.bz2"; + md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; md5 = ""; - md5name = "-commons-logging-1.2-src.tar.gz"; + md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; md5 = ""; - md5name = "-apr-1.5.2.tar.gz"; + md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; md5 = ""; - md5name = "-apr-util-1.5.4.tar.gz"; + md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_63_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2"; - sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"; + name = "boost_1_65_1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2"; + sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; md5 = ""; - md5name = "-boost_1_63_0.tar.bz2"; + md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2"; } { name = "breakpad.zip"; url = "http://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; md5 = ""; - md5name = "-breakpad.zip"; + md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.14.8.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz"; - sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20"; + name = "cairo-1.14.10.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz"; + sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09"; md5 = ""; - md5name = "-cairo-1.14.8.tar.xz"; + md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz"; } { - name = "libcdr-0.1.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2"; - sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d"; + name = "libcdr-0.1.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz"; + sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d"; md5 = ""; - md5name = "-libcdr-0.1.3.tar.bz2"; + md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -81,28 +81,21 @@ url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; md5 = ""; - md5name = "-libcmis-0.5.1.tar.gz"; + md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz"; } { name = "CoinMP-1.7.6.tgz"; url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; md5 = ""; - md5name = "-CoinMP-1.7.6.tgz"; - } - { - name = "collada2gltf-master-cb1d97788a.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; - sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb"; - md5 = "4b87018f7fff1d054939d19920b751a0"; - md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { name = "cppunit-1.14.0.tar.gz"; url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; md5 = ""; - md5name = "-cppunit-1.14.0.tar.gz"; + md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; @@ -112,25 +105,25 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.52.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz"; - sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae"; + name = "curl-7.58.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz"; + sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115"; md5 = ""; - md5name = "-curl-7.52.1.tar.gz"; + md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz"; } { - name = "libe-book-0.1.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; - sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; + name = "libe-book-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; + sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"; md5 = ""; - md5name = "-libe-book-0.1.2.tar.bz2"; + md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { name = "libepoxy-1.3.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2"; sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64"; md5 = ""; - md5name = "-libepoxy-1.3.1.tar.bz2"; + md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2"; } { name = "epm-3.7.tar.gz"; @@ -140,32 +133,39 @@ md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { - name = "libetonyek-0.1.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; - sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; + name = "libepubgen-0.1.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2"; + sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633"; md5 = ""; - md5name = "-libetonyek-0.1.6.tar.bz2"; + md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2"; } { - name = "expat-2.2.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2"; - sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f"; + name = "libetonyek-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz"; + sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac"; md5 = ""; - md5name = "-expat-2.2.3.tar.bz2"; + md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz"; + } + { + name = "expat-2.2.5.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; + sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + md5 = ""; + md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; md5 = ""; - md5name = "-Firebird-3.0.0.32483-0.tar.bz2"; + md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.12.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2"; - sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3"; + name = "fontconfig-2.12.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2"; + sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017"; md5 = ""; - md5name = "-fontconfig-2.12.1.tar.bz2"; + md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -216,20 +216,6 @@ md5 = "e7a384790b13c29113e22e596ade9687"; md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } - { - name = "open-sans-font-ttf-1.10.tar.gz"; - url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; - sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8"; - md5 = "7a15edea7d415ac5150ea403e27401fd"; - md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; - } - { - name = "pt-serif-font-1.0000W.tar.gz"; - url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; - sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa"; - md5 = "c3c1a8ba7452950636e871d25020ce0d"; - md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; - } { name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; @@ -249,21 +235,77 @@ url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; md5 = ""; - md5name = "-EmojiOneColor-SVGinOT-1.3.tar.gz"; + md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; } { - name = "libfreehand-0.1.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; - sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; + name = "noto-fonts-20171024.tar.gz"; + url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; + sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; md5 = ""; - md5name = "-libfreehand-0.1.1.tar.bz2"; + md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { - name = "freetype-2.7.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2"; - sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88"; + name = "culmus-0.131.tar.gz"; + url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; + sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; md5 = ""; - md5name = "-freetype-2.7.1.tar.bz2"; + md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; + } + { + name = "libre-hebrew-1.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; + sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a"; + md5 = ""; + md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz"; + } + { + name = "alef-1.001.tar.gz"; + url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; + sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52"; + md5 = ""; + md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; + } + { + name = "amiri-0.109.zip"; + url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip"; + sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6"; + md5 = ""; + md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip"; + } + { + name = "ttf-kacst_2.01+mry.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; + sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; + md5 = ""; + md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; + } + { + name = "ReemKufi-0.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz"; + sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b"; + md5 = ""; + md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz"; + } + { + name = "Scheherazade-2.100.zip"; + url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; + sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"; + md5 = ""; + md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; + } + { + name = "libfreehand-0.1.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; + sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"; + md5 = ""; + md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; + } + { + name = "freetype-2.8.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; + sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; + md5 = ""; + md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -273,25 +315,25 @@ md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; } { - name = "gpgme-1.8.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2"; - sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33"; + name = "gpgme-1.9.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; + sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; md5 = ""; - md5name = "-gpgme-1.8.0.tar.bz2"; + md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { name = "graphite2-minimal-1.3.10.tgz"; url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; md5 = ""; - md5name = "-graphite2-minimal-1.3.10.tgz"; + md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.3.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2"; - sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027"; + name = "harfbuzz-1.7.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2"; + sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029"; md5 = ""; - md5name = "-harfbuzz-1.3.2.tar.bz2"; + md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -301,11 +343,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.6.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz"; - sha256 = "512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2"; - md5 = "047c3feb121261b76dc16cdb62f54483"; - md5name = "047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz"; + name = "hunspell-1.6.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz"; + sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4"; + md5 = ""; + md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -315,11 +357,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-58_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz"; - sha256 = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309"; - md5 = "1901302aaff1c1633ef81862663d2917"; - md5name = "1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz"; + name = "icu4c-60_2-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz"; + sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418"; + md5 = ""; + md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz"; + } + { + name = "icu4c-60_2-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip"; + sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9"; + md5 = ""; + md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -399,18 +448,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-1.5.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz"; - sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c"; + name = "libjpeg-turbo-1.5.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz"; + sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528"; md5 = ""; - md5name = "-libjpeg-turbo-1.5.1.tar.gz"; + md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - name = "language-subtag-registry-2017-04-19.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2"; - sha256 = "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a"; + name = "language-subtag-registry-2017-12-14.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; + sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; md5 = ""; - md5name = "-language-subtag-registry-2017-04-19.tar.bz2"; + md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -424,84 +473,77 @@ url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; md5 = ""; - md5name = "-lcms2-2.8.tar.gz"; + md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; } { name = "libassuan-2.4.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2"; sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71"; md5 = ""; - md5name = "-libassuan-2.4.3.tar.bz2"; + md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2"; } { name = "libatomic_ops-7_2d.zip"; url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; md5 = ""; - md5name = "-libatomic_ops-7_2d.zip"; + md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip"; } { name = "libeot-0.01.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; md5 = ""; - md5name = "-libeot-0.01.tar.bz2"; + md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { - name = "libexttextcat-3.4.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; - sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163"; - md5 = "10d61fbaa6a06348823651b1bd7940fe"; - md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; - } - { - name = "libgltf-0.1.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz"; - sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da"; + name = "libexttextcat-3.4.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; + sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; md5 = ""; - md5name = "-libgltf-0.1.0.tar.gz"; + md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { - name = "libgpg-error-1.26.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2"; - sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69"; + name = "libgpg-error-1.27.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; + sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; md5 = ""; - md5name = "-libgpg-error-1.26.tar.bz2"; + md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; md5 = ""; - md5name = "-liblangtag-0.6.2.tar.bz2"; + md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { name = "ltm-1.0.zip"; url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; md5 = ""; - md5name = "-ltm-1.0.zip"; + md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.24.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz"; - sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc"; + name = "xmlsec1-1.2.25.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz"; + sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2"; md5 = ""; - md5name = "-xmlsec1-1.2.24.tar.gz"; + md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; } { - name = "libxml2-2.9.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; - sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c"; - md5 = "ae249165c173b1ff386ee8ad676815f5"; - md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + name = "libxml2-2.9.7.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.7.tar.gz"; + sha256 = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c"; + md5 = ""; + md5name = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c-libxml2-2.9.7.tar.gz"; } { - name = "libxslt-1.1.29.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; - sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"; - md5 = "a129d3c44c022de3b9dcf6d6f288d72e"; - md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; + name = "libxslt-1.1.32.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz"; + sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"; + md5 = ""; + md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -518,32 +560,32 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.2.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2"; - sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d"; + name = "mdds-1.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2"; + sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1"; md5 = ""; - md5name = "-mdds-1.2.2.tar.bz2"; + md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2"; } { name = "mDNSResponder-576.30.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; md5 = ""; - md5name = "-mDNSResponder-576.30.4.tar.gz"; + md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; } { - name = "libmspub-0.1.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; - sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; + name = "libmspub-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz"; + sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97"; md5 = ""; - md5name = "-libmspub-0.1.2.tar.bz2"; + md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz"; } { - name = "libmwaw-0.3.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz"; - sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a"; + name = "libmwaw-0.3.13.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz"; + sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea"; md5 = ""; - md5name = "-libmwaw-0.3.11.tar.xz"; + md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -560,32 +602,32 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.30.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; - sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd"; - md5 = "231adebe5c2f78fded3e3df6e958878e"; - md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + name = "neon-0.30.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; + sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; + md5 = ""; + md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.29.5-with-nspr-4.13.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz"; - sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4"; + name = "nss-3.33-with-nspr-4.17.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz"; + sha256 = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4"; md5 = ""; - md5name = "-nss-3.29.5-with-nspr-4.13.1.tar.gz"; + md5name = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4-nss-3.33-with-nspr-4.17.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; md5 = ""; - md5name = "-libodfgen-0.1.6.tar.bz2"; + md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34"; - md5 = "a084cd548b586552cb7d3ee51f1af969"; - md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf"; + md5 = ""; + md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; } { name = "officeotron-0.7.4-master.jar"; @@ -595,53 +637,46 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; - sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; + name = "openldap-2.4.45.tgz"; + url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; + sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; md5 = ""; - md5name = "-OpenCOLLADA-master-6509aa13af.tar.bz2"; + md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openldap-2.4.44.tgz"; - url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz"; - sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400"; + name = "openssl-1.0.2m.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz"; + sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f"; md5 = ""; - md5name = "-openldap-2.4.44.tgz"; + md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz"; } { - name = "openssl-1.0.2k.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz"; - sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"; + name = "liborcus-0.13.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz"; + sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937"; md5 = ""; - md5name = "-openssl-1.0.2k.tar.gz"; - } - { - name = "liborcus-0.12.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz"; - sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908"; - md5 = ""; - md5name = "-liborcus-0.12.1.tar.gz"; + md5name = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937-liborcus-0.13.1.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; md5 = ""; - md5name = "-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { - name = "libpagemaker-0.0.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2"; - sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33"; + name = "libpagemaker-0.0.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; + sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; md5 = ""; - md5name = "-libpagemaker-0.0.3.tar.bz2"; + md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3064.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2"; - sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883"; + name = "pdfium-3235.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2"; + sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f"; md5 = ""; - md5name = "-pdfium-3064.tar.bz2"; + md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -651,18 +686,18 @@ md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { - name = "libpng-1.6.28.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz"; - sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2"; + name = "libpng-1.6.34.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz"; + sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"; md5 = ""; - md5name = "-libpng-1.6.28.tar.gz"; + md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; } { - name = "poppler-0.56.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz"; - sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173"; + name = "poppler-0.59.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz"; + sha256 = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641"; md5 = ""; - md5name = "-poppler-0.56.0.tar.xz"; + md5name = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641-poppler-0.59.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -676,7 +711,14 @@ url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz"; sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44"; md5 = ""; - md5name = "-Python-3.5.4.tgz"; + md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz"; + } + { + name = "libqxp-0.0.1.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz"; + sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73"; + md5 = ""; + md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; @@ -704,7 +746,7 @@ url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; md5 = ""; - md5name = "-librevenge-0.0.4.tar.bz2"; + md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; @@ -718,14 +760,14 @@ url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; md5 = ""; - md5name = "-serf-1.2.1.tar.bz2"; + md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz"; - sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6"; + name = "libstaroffice-0.0.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz"; + sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982"; md5 = ""; - md5name = "-libstaroffice-0.0.3.tar.xz"; + md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz"; } { name = "swingExSrc.zip"; @@ -742,32 +784,32 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; - sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; + name = "libvisio-0.1.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; + sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; md5 = ""; - md5name = "-libvisio-0.1.5.tar.bz2"; + md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; } { - name = "libwpd-0.10.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; - sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; + name = "libwpd-0.10.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz"; + sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610"; md5 = ""; - md5name = "-libwpd-0.10.1.tar.bz2"; + md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz"; } { - name = "libwpg-0.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; - sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; + name = "libwpg-0.3.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz"; + sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33"; md5 = ""; - md5name = "-libwpg-0.3.1.tar.bz2"; + md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz"; } { - name = "libwps-0.4.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz"; - sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0"; + name = "libwps-0.4.8.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz"; + sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e"; md5 = ""; - md5name = "-libwps-0.4.6.tar.xz"; + md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz"; } { name = "xsltml_2.1.2.zip"; @@ -781,13 +823,13 @@ url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; md5 = ""; - md5name = "-zlib-1.2.11.tar.xz"; + md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { - name = "libzmf-0.0.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2"; - sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b"; + name = "libzmf-0.0.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; + sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22"; md5 = ""; - md5name = "-libzmf-0.0.1.tar.bz2"; + md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } ] diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 82133cdf6813..32abab8abf8e 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -2,8 +2,8 @@ rec { major = "5"; - minor = "3"; - patch = "6"; + minor = "4"; + patch = "5"; tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -11,7 +11,7 @@ rec { version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "023a7hr7v5cf0ipga4ijhyl58ncgbjrp500qq5fwf65j8g2c3apz"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "167bh6jgyhfcvn3g7xghkg4nb99h91diypdlry5df21xs8bis5gb"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 5070de5262e5..57dd30280e84 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -4,17 +4,18 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler -, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf +, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven -, libatomic_ops, graphite2, harfbuzz, libodfgen +, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses +, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ] , withHelp ? true +, kdeIntegration ? false }: let @@ -28,27 +29,27 @@ let langsSpaces = lib.concatStringsSep " " langs; fetchSrc = {name, sha256}: fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; inherit sha256; }; srcs = { third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { - url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; + url = "https://dev-www.libreoffice.org/extern/${md5}-${name}"; sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs-still.nix)); translations = fetchSrc { name = "translations"; - sha256 = "0mvfc33pkyrdd7h4kyi6lnzydaka8b5vw0ns50rw08kg9iirig4i"; + sha256 = "0max423hdlr4j6y6ymng15awilh2aq8gly1hsf16lnk1pxihgr54"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0yflll24yd4nxqxisb6mx1qgqk4awkwwi41wxmdaiq8las59sk95"; + sha256 = "14ziy02qq092x8h29f9dlwvvk2scd5v385zhln4848lf3q5cnifl"; }; }; @@ -64,16 +65,15 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; + # And LO refers to gpgme++ by no-path name + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. configureScript = "./autogen.sh"; dontUseCmakeConfigure = true; - patches = [ - ./xdg-open.patch - ]; + patches = [ ./xdg-open-brief.patch ]; postUnpack = '' mkdir -v $sourceRoot/src @@ -83,6 +83,10 @@ in stdenv.mkDerivation rec { ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} ''; + postPatch = '' + sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx + ''; + QT4DIR = qt4; # Fix boost 1.59 compat @@ -111,7 +115,7 @@ in stdenv.mkDerivation rec { sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile # unit test sd_tiledrendering seems to be fragile - # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk # one more fragile test? @@ -119,11 +123,11 @@ in stdenv.mkDerivation rec { # rendering-dependent test sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME - sed -e 's@rtl::OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx # rendering-dependent: on my computer the test table actually doesn't fit… # interesting fact: test disabled on macOS by upstream sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx - # Segfault on DB access + # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx @@ -133,6 +137,7 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; @@ -186,6 +191,8 @@ in stdenv.mkDerivation rec { "--disable-report-builder" "--enable-python=system" "--enable-dbus" + "--enable-release-build" + (lib.enableFeature kdeIntegration "kde4") "--with-package-format=installed" "--enable-epm" "--with-jdk-home=${jdk.home}" @@ -235,7 +242,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 @@ -244,11 +251,13 @@ in stdenv.mkDerivation rec { gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib - mdds bluez5 glibc libcmis libwps libabw libzmf - libxshmfence libatomic_ops graphite2 harfbuzz - librevenge libe-book libmwaw glm glew ncurses + mdds bluez5 glibc libcmis libwps libabw libzmf libtool + libxshmfence libatomic_ops graphite2 harfbuzz gpgme + librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme - ]; + gdb + ] + ++ lib.optional kdeIntegration kdelibs4; nativeBuildInputs = [ wrapGAppsHook ]; passthru = { @@ -259,7 +268,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; - homepage = http://libreoffice.org/; + homepage = https://libreoffice.org/; license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 6a741e0ab9eb..fbadd442ce7b 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, dpkg, which , makeWrapper , alsaLib -, desktop_file_utils +, desktop-file-utils , dbus , libcap , fontconfig @@ -129,7 +129,7 @@ stdenv.mkDerivation { # Patch up link handler script wrapProgram $out/bin/install-mendeley-link-handler.sh \ - --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop_file_utils ] } + --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop-file-utils ] } ''; dontStrip = true; diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 953499c21b91..14cde8415fd7 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -1,6 +1,6 @@ { lib, python3Packages, fetchFromGitHub, gtk3, cairo , aspellDicts, buildEnv -, gnome3, hicolor_icon_theme, librsvg +, gnome3, hicolor-icon-theme, librsvg , xvfb_run, dbus, libnotify }: @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ xvfb_run dbus.daemon ]; buildInputs = [ - gnome3.defaultIconTheme hicolor_icon_theme libnotify librsvg + gnome3.defaultIconTheme hicolor-icon-theme libnotify librsvg ]; # A few parts of chkdeps need to have a display and a dbus session, so we not diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index b59d55d3ea08..680b3fd40d72 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst -, gdk_pixbuf, cairo, clutter_gtk }: +, gdk_pixbuf, cairo, clutter-gtk }: stdenv.mkDerivation rec { name = "pinpoint-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake clutter clutter-gst gdk_pixbuf - cairo clutter_gtk ]; + cairo clutter-gtk ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 6a43f6ea24e7..b82531ea0348 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -28,8 +28,8 @@ in stdenv.mkDerivation { autoconf libtool - gnome_common - gtk_doc + gnome-common + gtk-doc GConf gtk diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 436644ef247f..de9bfe64e5cc 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -2,20 +2,20 @@ cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive, - kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared_mime_info + kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared-mime-info }: mkDerivation rec { name = "skrooge-${version}"; - version = "2.10.5"; + version = "2.11.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "1c1yihypb6qgbzfcrw4ylqr9zivyba10xzvibrmfkrilxi6i582n"; + sha256 = "11ns0j3ss09aqd8snfzd52xf0cgsjjcgzalb031p7v17rn14yqaq"; }; nativeBuildInputs = [ - cmake extra-cmake-modules kdoctools shared_mime_info + cmake extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index ddbc880690e7..e26471de5761 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -6,7 +6,7 @@ , gtk3 , granite , gnome3 -, json_glib +, json-glib , cmake , ninja , libgudev @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { gtk3 granite gnome3.libgee - json_glib + json-glib libgudev libevdev - gnome3.gnome_themes_standard + gnome3.gnome-themes-standard ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock index 5f451ca02b13..f71f4eaa4085 100644 --- a/pkgs/applications/office/timetrap/Gemfile.lock +++ b/pkgs/applications/office/timetrap/Gemfile.lock @@ -2,11 +2,11 @@ GEM remote: https://rubygems.org/ specs: chronic (0.10.2) - sequel (4.0.0) - sqlite3 (1.3.11) - timetrap (1.10.0) + sequel (4.43.0) + sqlite3 (1.3.13) + timetrap (1.15.1) chronic (~> 0.10.2) - sequel (~> 4.0.0) + sequel (~> 4.43.0) sqlite3 (~> 1.3.3) PLATFORMS diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index e68c753750f5..3564454a6741 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,14 +1,17 @@ { stdenv, lib, bundlerEnv, ruby }: -bundlerEnv { - name = "timetrap-1.10.0"; +bundlerEnv rec { + name = "timetrap-${version}"; + version = (import gemset).timetrap.version; inherit ruby; gemdir = ./.; + gemset = ./gemset.nix; - meta = { + meta = with lib; { description = "A simple command line time tracker written in ruby"; homepage = https://github.com/samg/timetrap; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = [ maintainers.jerith666 ]; }; } diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix index cbf90f8018ce..5764016573fc 100644 --- a/pkgs/applications/office/timetrap/gemset.nix +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -10,25 +10,26 @@ sequel = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17kqm0vd15p9qxbgcysvmg6a046fd7zvxl3xzpsh00pg6v454svm"; + sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0"; type = "gem"; }; - version = "4.0.0"; + version = "4.43.0"; }; sqlite3 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny"; + sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; type = "gem"; }; - version = "1.3.11"; + version = "1.3.13"; }; timetrap = { + dependencies = ["chronic" "sequel" "sqlite3"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rdaa27zvdgmbsbwa59g3dvfwb95nz7x1wycmviby94j5lywyzfc"; + sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd"; type = "gem"; }; - version = "1.10.0"; + version = "1.15.1"; }; } \ No newline at end of file diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 31774b6b55c1..51d5b083e6bd 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -4,10 +4,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "tryton-${version}"; - version = "4.2.1"; + version = "4.6.2"; src = fetchurl { url = "mirror://pypi/t/tryton/${name}.tar.gz"; - sha256 = "1ry3kvbk769m8rwqa90pplfvmmgsv4jj9w1aqhv892smia8f0ybm"; + sha256 = "0bamr040np02gfjk8c734rw3mbgg75irfgpdcl2npgkdzyw1ksf9"; }; propagatedBuildInputs = with python2Packages; [ chardet diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index e77287faae25..efa7f2a410d7 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -5,10 +5,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "trytond-${version}"; - version = "4.2.1"; + version = "4.6.2"; src = fetchurl { url = "mirror://pypi/t/trytond/${name}.tar.gz"; - sha256 = "1ijjpbsf3s0s7ksbi7xgzss4jgr14q5hqsyf6d68l8hwardrwpj7"; + sha256 = "0asc3pd37h8ky8j66iqxr0fv0k6mpjcwxwm0xgm5hrdi32l5cdda"; }; # Tells the tests which database to use diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index a957cd6eee68..dea3ea9731b0 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tudu-${version}"; - version = "0.10"; + version = "0.10.2"; src = fetchurl { url = "https://code.meskio.net/tudu/${name}.tar.gz"; - sha256 = "0571wh5hn0hgadyx34zq1zi35pzd7vpwkavm7kzb9hwgn07443x4"; + sha256 = "1xsncvd1c6v8y0dzc5mspy9rrwc89pabhz6r2lihsirk83h2rqym"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b259623bf91e..8e2f6bce0b14 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings_desktop_schemas, gtk3, gnome3 }: +{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }: let version = "5.0.25"; @@ -18,7 +18,7 @@ zoteroSrc = stdenv.mkDerivation rec { sha256 = "1y3q5582xp4inpz137x0r9iscs1g0cjlqcfjpzl3klsq3yas688k"; }; - buildInputs= [ wrapGAppsHook gsettings_desktop_schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; + buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; phases = [ "unpackPhase" "installPhase" "fixupPhase"]; installPhase = '' @@ -32,7 +32,7 @@ zoteroSrc = stdenv.mkDerivation rec { fhsEnv = buildFHSUserEnv { name = "zotero-fhs-env"; targetPkgs = pkgs: with pkgs; with xlibs; [ - gtk3 dbus_glib + gtk3 dbus-glib libXt nss ]; }; diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 148963d64c08..96e8e0d2d250 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, pkgconfig -, gtk2-x11, glib, curl, goocanvas, intltool +{ stdenv, fetchurl, pkgconfig, intltool +, gtk3, glib, curl, goocanvas2, gpsd }: let - version = "1.3"; -in -stdenv.mkDerivation { + version = "2.2.1"; +in stdenv.mkDerivation { name = "gpredict-${version}"; src = fetchurl { - url = "https://sourceforge.net/projects/gpredict/files/Gpredict/${version}/gpredict-${version}.tar.gz"; - sha256 = "18ym71r2f5mwpnjcnrpwrk3py2f6jlqmj8hzp89wbcm1ipnvxxmh"; + url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2"; + sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; - buildInputs = [ curl glib gtk2-x11 goocanvas ]; nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ curl glib gtk3 goocanvas2 gpsd ]; meta = with stdenv.lib; { description = "Real time satellite tracking and orbit prediction"; @@ -27,7 +26,7 @@ stdenv.mkDerivation { ''; license = licenses.gpl2; platforms = platforms.linux; - homepage = "https://sourceforge.net/projects/gpredict/"; + homepage = http://gpredict.oz9aec.net/; maintainers = [ maintainers.markuskowa ]; }; } diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index db12fc00c87c..5e899568a7df 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "10prgmf09a13mk18840938ijqgfc9y92hfc7sa2gcv07ddri0c19"; + sha256 = "1l82sgw86l1626b7kxv3h0696lbj7317bb48rvqb1zqd3gcn6kyx"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index f04b81ea9795..829672d64cc2 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.3.4"; + version = "2.3.4.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "15k86ln1xgqkyk8ms09cgdhagz49jpvr6ij6mha1f9ga5fxnnp1m"; + sha256 = "07cvcy6483araayj41arjzpxjmf4fmn4iqyl6gp6zmrbzw72wwzj"; }; buildInputs = [ zlib tbb ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 13cb407391c0..7825da0100ad 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.4.6"; + version = "2.4.8"; src = fetchurl { url = "http://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "00p9xhfn6snzm31q9l3dxccsj7rhlci8n3pgpy3k67q91mi2hkna"; + sha256 = "1ca4lsb5j00066sd1gy8jr8jhzpd9142fhj4khb8nc45010wib0q"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 5578a41f4441..a065fdf4489a 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.4"; + version = "2.17.10"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "00ffi8kkrlh72vjjkjpgi8zys3r9hkdk4xi82kcahch8pix4qzf2"; + sha256 = "0lf9appcs66mxmirzbys09xhq38kpa4ldxwwzrr9y2cklnxjn4hg"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 6b792310e8b4..b540df816eef 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg }: stdenv.mkDerivation rec { name = "pcb-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; + buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared-mime-info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index e34383865576..dade8296e996 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "3.900"; + version = "3.920"; src = fetchurl { url = "http://www.veripool.org/ftp/${name}.tgz"; - sha256 = "0yvbibcysdiw6mphda0lfs56wz6v450px2420x0hbd3rc7k53s2b"; + sha256 = "1zs3d6h5sbz455fwpgg89h81hkfn92ary8bmhjinc1rd8fm3hp1b"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 47077c2e255b..3257977f5b5a 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cryptoverif-${version}"; - version = "1.22"; + version = "1.28"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "17fbmv0askgfnhs5a0ilhizvrr93jkmq82ybm3cgyxhh2zrk0rq1"; + sha256 = "0vssz751g1nn8wclkiwgghpm475jl00xkivc164vgbr9acxsr7n7"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix new file mode 100644 index 000000000000..b1eb171b20b1 --- /dev/null +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, jdk, jre, ant +}: + +stdenv.mkDerivation rec { + name = "tlaplus-${version}"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "tlaplus"; + repo = "tlaplus"; + rev = "refs/tags/v${version}"; + sha256 = "0966mvgxamknj4hsp980qbxwda886w1dv309kn7isxn0420lfv4f"; + }; + + buildInputs = [ makeWrapper jdk ant ]; + + buildPhase = "ant -f tlatools/customBuild.xml compile dist"; + installPhase = '' + mkdir -p $out/share/java $out/bin + cp tlatools/dist/*.jar $out/share/java + + makeWrapper ${jre}/bin/java $out/bin/tlc2 \ + --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC" + makeWrapper ${jre}/bin/java $out/bin/tla2sany \ + --add-flags "-cp $out/share/java/tla2tools.jar tla2sany.SANY" + makeWrapper ${jre}/bin/java $out/bin/pcal \ + --add-flags "-cp $out/share/java/tla2tools.jar pcal.trans" + makeWrapper ${jre}/bin/java $out/bin/tla2tex \ + --add-flags "-cp $out/share/java/tla2tools.jar tla2tex.TLA" + ''; + + meta = { + description = "An algorithm specification language with model checking tools"; + homepage = http://lamport.azurewebsites.net/tla/tla.html; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 8dc3e3ce43dc..d7357c5048d5 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -7,17 +7,19 @@ , hdf5-cpp , leveldb , lmdb -, opencv +, opencv3 , protobuf , snappy -, atlas , doxygen +, openblas , cudaSupport ? true, cudatoolkit , cudnnSupport ? false, cudnn ? null +, ncclSupport ? false, nccl ? null , pythonSupport ? false, python ? null, numpy ? null }: assert cudnnSupport -> cudaSupport; +assert ncclSupport -> cudaSupport; assert pythonSupport -> (python != null && numpy != null); stdenv.mkDerivation rec { @@ -35,14 +37,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen ]; - cmakeFlags = [ - "-DCUDA_ARCH_NAME=All" - (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") - ] ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON"; + cmakeFlags = + [ (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") + "-DBLAS=open" + ] ++ (if cudaSupport then [ + "-DCUDA_ARCH_NAME=All" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ] else [ "-DCPU_ONLY=ON" ]) + ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; - buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ] + buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv3 openblas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn + ++ lib.optional ncclSupport nccl ++ lib.optionals pythonSupport [ python numpy ]; propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf; diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 7643c912db4b..6de77d81be6f 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2 }: stdenv.mkDerivation { - name = "cbc-2.9.5"; + name = "cbc-2.9.9"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.5.tgz"; - sha256 = "0kmsg9qpajh5jhnql04m6akpdjzlppxfz99q320vw5bkzgl3i18w"; + url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz"; + sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a"; }; configureFlags = "-C"; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index bef695fc650a..07740f4c8aea 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -12,28 +12,22 @@ let cub = fetchFromGitHub { owner = "NVlabs"; repo = "cub"; - rev = "1.4.1"; - sha256 = "1lcdwblz03c0yq1lxndg566kg14b5qm14x5qixjbmz6wq85kgmqc"; + rev = "1.7.4"; + sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66"; }; in stdenv.mkDerivation rec { name = "CNTK-${version}"; - version = "2.2"; + version = "2.4"; # Submodules src = fetchgit { url = "https://github.com/Microsoft/CNTK"; rev = "v${version}"; - sha256 = "0q4knrwiyphb2fbqf9jzqvkz2jzj6jmbmang3lavdvsh7z0n8zz9"; + sha256 = "0m28wb0ljixcpi14g3gcfiraimh487yxqhd9yrglgyvjb69x597y"; }; - patches = [ - # Fix "'exp' was not declared" - (fetchpatch { - url = "https://github.com/imriss/CNTK/commit/ef1cca6df95cc507deb8471df2c0dd8cbfeef23b.patch"; - sha256 = "0z7xyrxwric0c4h7rfs05f544mcq6d10wgs0vvfcyd2pcf410hy7"; - }) - ]; + patches = [ ./fix_std_bind.patch ]; nativeBuildInputs = [ cmake ]; @@ -48,8 +42,10 @@ in stdenv.mkDerivation rec { "--with-boost=${boost.dev}" "--with-protobuf=${protobuf}" "--with-mpi=${openmpi}" + "--cuda=${if cudaSupport then "yes" else "no"}" + # FIXME + "--asgd=no" ] ++ lib.optionals cudaSupport [ - "--cuda=yes" "--with-cuda=${cudatoolkit}" "--with-gdk-include=${cudatoolkit}/include" "--with-gdk-nvml-lib=${nvidia_x11}/lib" @@ -85,16 +81,12 @@ in stdenv.mkDerivation rec { cp bin/cntk $out/bin ''; - hardeningDisable = [ "format" ]; - - # on 2.2: fatal error: tensorboard/tensorboard.pb.h: No such file or directory - enableParallelBuilding = false; + enableParallelBuilding = true; meta = with lib; { - homepage = "https://github.com/Microsoft/CNTK"; + homepage = https://github.com/Microsoft/CNTK; description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; maintainers = with maintainers; [ abbradar ]; - broken = true; # Never succeeded to build. }; } diff --git a/pkgs/applications/science/math/cntk/fix_std_bind.patch b/pkgs/applications/science/math/cntk/fix_std_bind.patch new file mode 100644 index 000000000000..df97a0c66669 --- /dev/null +++ b/pkgs/applications/science/math/cntk/fix_std_bind.patch @@ -0,0 +1,11 @@ +diff -ru3 CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h +--- CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 1970-01-01 03:00:01.000000000 +0300 ++++ CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 2018-02-25 18:16:16.330269647 +0300 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + #include "CNTKLibrary.h" + #include "CNTKLibraryC.h" diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index ccdd666e90bd..7e5233180cc6 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: let - version = "1.3.1"; + version = "1.3.2"; name = "fricas-" + version; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://sourceforge.net/projects/fricas/files/fricas/${version}/${name}-full.tar.bz2"; - sha256 = "0c2wgj1c3mh5f8msx1ckxpnhm0dyq7dqf1wk6aiyysh8xn57cjkx"; + sha256 = "17a3vfvsn2idydqslf5r6z3sk6a5bdgj6z1n3dmnwmpkc4z152vr"; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index efa0c1751d4c..0cf834c8cdea 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "lp_solve-${version}"; - version = "5.5.2.0"; + version = "5.5.2.5"; src = fetchurl { url = "mirror://sourceforge/project/lpsolve/lpsolve/${version}/lp_solve_${version}_source.tar.gz"; - sha256 = "176c7f023mb6b8bfmv4rfqnrlw88lsg422ca74zjh19i2h5s69sq"; + sha256 = "12pj1idjz31r7c2mb5w03vy1cmvycvbkx9z29s40qdmkp1i7q6i0"; }; patches = [ ./isnan.patch ]; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index d2f3d0c5f337..ce9c214b3f0c 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -8,7 +8,7 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { name = "mxnet-${version}"; - version = "0.11.0"; + version = "1.1.0"; # Submodules needed src = fetchgit { @@ -23,9 +23,12 @@ stdenv.mkDerivation rec { ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; - cmakeFlags = [ - (if cudaSupport then "-DCUDA_ARCH_NAME=All" else "-DUSE_CUDA=OFF") - ] ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; + cmakeFlags = + (if cudaSupport then [ + "-DCUDA_ARCH_NAME=All" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ] else [ "-DUSE_CUDA=OFF" ]) + ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; installPhase = '' install -Dm755 libmxnet.so $out/lib/libmxnet.so @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; - homepage = "https://mxnet.incubator.apache.org/"; + homepage = https://mxnet.incubator.apache.org/; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 0bae80782059..a1ddbd9ab17d 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "pari-${version}"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7"; + sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g"; }; buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ]; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 278194d57fa4..b02a65532577 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz"; - sha256 = "14q89l6laa7v7d9qx7v71a0r2m65saxqgr9r871fasm400a9x8pw"; + sha256 = "0sf4ywz8hsszaf0yr0ncdlp7mwjk6b276bwl0j9vf1j925c89pbn"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index ee646fee2c25..007cb68177e5 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -21,7 +21,7 @@ , bash , fetchurl , perl -, gfortran +, gfortran6 , python , autoreconfHook , gettext @@ -94,13 +94,13 @@ stdenv.mkDerivation rec { bash # needed for the build perl # needed for the build python # needed for the build - gfortran # needed to build giac, openblas + gfortran6 # needed to build giac, openblas autoreconfHook # needed to configure sage with prefix gettext # needed to build the singular spkg - hevea # needed to build the docs of the giac spkg which # needed in configure of mpir - # needed to build the docs of the giac spkg texinfo # needed to build maxima + ] ++ stdenv.lib.optionals(buildDocs) [ + hevea # needed to build the docs of the giac spkg (texlive.combine { inherit (texlive) scheme-basic collection-pstricks # needed by giac @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ gfortran perl which ]; + nativeBuildInputs = [ gfortran6 perl which ]; patches = [ # fix usages of /bin/rm @@ -153,13 +153,13 @@ stdenv.mkDerivation rec { cd .. mv "$dir" "$out/sage-root" + export SAGE_SPKG_INSTALL_DOCS='no' cd "$out/sage-root" # build in target dir, since `make` is also `make install` '' + stdenv.lib.optionalString (buildDocs) '' mkdir -p "$doc" export SAGE_DOC="$doc" export SAGE_DOCBUILD_OPTS="--no-pdf-links -k" - export SAGE_SPKG_INSTALL_DOCS='no' ''; buildFlags = if (buildDocs) then "doc" else "build"; @@ -191,6 +191,13 @@ stdenv.mkDerivation rec { rm -f "$out/sage-root/config.status" rm -f "$out/sage-root/build/make/Makefile-auto" rm -f "$out/sage-home/.sage/gap/libgap-workspace-"* + # Make sure unnessessary packages don't end up in the build closure + find "$out" \ + -iname 'config.log' \ + -delete \ + -or -iname 'Makefile' \ + -delete + rm -f "$out/lib/R/etc/Renviron" # Make sure all shebangs are properly patched bash $patchSageShebangs $out ''; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index c7f74071c24f..67cdaa4055ac 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "wxmaxima-${version}"; - version = "17.10.1"; + version = "18.02.0"; src = fetchFromGitHub { owner = "andrejv"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "088h8dlc9chkppwl4ck9i0fgf2d1dcpi5kq8qbpr5w75vhwsb6qm"; + sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa"; }; buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 676395d03d53..2899bee636eb 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.10.08"; + version = "6.12.06"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "12mddl6pqwwc9nr4jqzp6h1jm4zycazd3v88dz306m1nmk97dlic"; + sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 9b8035fcefe7..af58aaafc9c9 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 , cmake, makeWrapper, libjpeg, python }: -let version = "4.9.0"; in +let version = "5.1.0"; in stdenv.mkDerivation rec { name = "tulip-${version}"; src = fetchurl { url = "mirror://sourceforge/auber/${name}_src.tar.gz"; - sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3"; + sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h"; }; buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ]; diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index c355b193dfd1..79af80ea75f5 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, file, which, intltool, gobjectIntrospection, - findutils, xdg_utils, gnome3, pythonPackages, hicolor_icon_theme, + findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme, wrapGAppsHook }: @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { pythonPackages.pyxdg pythonPackages.ptyprocess pythonPackages.pycairo - hicolor_icon_theme + hicolor-icon-theme ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 01669f3fd409..ade8af254496 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -7,45 +7,54 @@ assert stdenv.system != "powerpc-linux"; stdenv.mkDerivation rec { - ver = "1.23.5"; + ver = "1.23.7"; name = "recoll-${ver}"; src = fetchurl { url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz"; - sha256 = "0ps7ckrv63ydviqkqxs57hn04z53s2jnjnp94n1prs63xx0njswv"; + sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn"; }; - configureFlags = [ "--with-inotify" ]; + configureFlags = [ "--enable-recollq" ] ++ + (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); - buildInputs = [ qt4 xapian file python bison]; + buildInputs = [ qt4 xapian file python bison ]; + + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am + sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.in + ''; # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with # the absolute path to the filtering command. postInstall = '' for f in $out/share/recoll/filters/* ; do - substituteInPlace $f --replace antiword ${lib.getBin antiword}/bin/antiword - substituteInPlace $f --replace awk ${lib.getBin gawk}/bin/awk - substituteInPlace $f --replace catppt ${lib.getBin catdoc}/bin/catppt - substituteInPlace $f --replace djvused ${lib.getBin djvulibre}/bin/djvused - substituteInPlace $f --replace djvutxt ${lib.getBin djvulibre}/bin/djvutxt - substituteInPlace $f --replace egrep ${lib.getBin gnugrep}/bin/egrep - substituteInPlace $f --replace groff ${lib.getBin groff}/bin/groff - substituteInPlace $f --replace gunzip ${lib.getBin gzip}/bin/gunzip - substituteInPlace $f --replace iconv ${lib.getBin libiconv}/bin/iconv - substituteInPlace $f --replace lyx ${lib.getBin lyx}/bin/lyx - substituteInPlace $f --replace pdftotext ${lib.getBin poppler_utils}/bin/pdftotext - substituteInPlace $f --replace pstotext ${lib.getBin ghostscript}/bin/ps2ascii - substituteInPlace $f --replace sed ${lib.getBin gnused}/bin/sed - substituteInPlace $f --replace tar ${lib.getBin gnutar}/bin/tar - substituteInPlace $f --replace unzip ${lib.getBin unzip}/bin/unzip - substituteInPlace $f --replace xls2csv ${lib.getBin catdoc}/bin/xls2csv - substituteInPlace $f --replace xsltproc ${lib.getBin libxslt}/bin/xsltproc - substituteInPlace $f --replace unrtf ${lib.getBin unrtf}/bin/unrtf - substituteInPlace $f --replace untex ${lib.getBin untex}/bin/untex - substituteInPlace $f --replace wpd2html ${lib.getBin libwpd}/bin/wpd2html - substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl + if [[ ! "$f" =~ \.zip$ ]]; then + substituteInPlace $f --replace '"antiword"' '"${lib.getBin antiword}/bin/antiword"' + substituteInPlace $f --replace '"awk"' '"${lib.getBin gawk}/bin/awk"' + substituteInPlace $f --replace '"catppt"' '"${lib.getBin catdoc}/bin/catppt"' + substituteInPlace $f --replace '"djvused"' '"${lib.getBin djvulibre}/bin/djvused"' + substituteInPlace $f --replace '"djvutxt"' '"${lib.getBin djvulibre}/bin/djvutxt"' + substituteInPlace $f --replace '"egrep"' '"${lib.getBin gnugrep}/bin/egrep"' + substituteInPlace $f --replace '"groff"' '"${lib.getBin groff}/bin/groff"' + substituteInPlace $f --replace '"gunzip"' '"${lib.getBin gzip}/bin/gunzip"' + substituteInPlace $f --replace '"iconv"' '"${lib.getBin libiconv}/bin/iconv"' + substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"' + substituteInPlace $f --replace '"pstotext"' '"${lib.getBin ghostscript}/bin/ps2ascii"' + substituteInPlace $f --replace '"sed"' '"${lib.getBin gnused}/bin/sed"' + substituteInPlace $f --replace '"tar"' '"${lib.getBin gnutar}/bin/tar"' + substituteInPlace $f --replace '"unzip"' '"${lib.getBin unzip}/bin/unzip"' + substituteInPlace $f --replace '"xls2csv"' '"${lib.getBin catdoc}/bin/xls2csv"' + substituteInPlace $f --replace '"xsltproc"' '"${lib.getBin libxslt}/bin/xsltproc"' + substituteInPlace $f --replace '"unrtf"' '"${lib.getBin unrtf}/bin/unrtf"' + substituteInPlace $f --replace '"untex"' '"${lib.getBin untex}/bin/untex"' + substituteInPlace $f --replace '"wpd2html"' '"${lib.getBin libwpd}/bin/wpd2html"' + substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl + fi done + '' + stdenv.lib.optionalString stdenv.isLinux '' + substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' ''; enableParallelBuilding = true; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 80c4401f1708..cadc72f0f87b 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "fossil-${version}"; - version = "2.3"; + version = "2.5"; src = fetchurl { urls = @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${name}.tar.gz"; - sha256 = "0paalvb4rdyr79v6rwspaha5n4dqb92df9irijha13m3apsanwzh"; + sha256 = "1lxawkhr1ki9fqw8076fxib2b1w673449yzb6vxjshqzh5h77c7r"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index d613e97d550c..d00fdd0c29e0 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, ruby, makeWrapper, git }: let - version = "2.3.2"; + version = "2.4.0"; in stdenv.mkDerivation { name = "svn2git-${version}"; src = fetchurl { url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz"; - sha256 = "1484mpcabqf9kr6xdpdgb1npkqav1bcah3w5lxj2djjx4bjf2g3y"; + sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41"; }; buildInputs = [ ruby makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 07ea2be7ad34..597429c0cc7a 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.3.2"; + version = "2.3.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "14cdlrdxbl8vzqw86fm3wyaixh607z47shc4dwd6rd9vj05w0m97"; + sha256 = "1gw5ia6cl5b0q91kv4vfg35my2p49np23aikxqf5gn00zhqrkfap"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 6238cf9c9754..d04f0d5792b2 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "transcrypt-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; - sha256 = "05q0rgcsphrkavmcsm3qghsl1pkgshvhdf6zpwkn1qcj288h8gkc"; + sha256 = "1hvg4ipsxm27n5yn5jpk43qyvvx5gx3z3cczw1z3r6hrs4n8d5rz"; }; buildInputs = [ git makeWrapper openssl ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c7f7a4b02e4d..93b96dd87460 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib +{ stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig , libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libXrender gtk2 gnome2.GConf - libgnome_keyring + libgnome-keyring ]; nativeBuildInputs = [ makeWrapper ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken" wrapProgram $out/opt/gitkraken/gitkraken \ --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \ - --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0" + --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome-keyring ]}/libgnome-keyring.so.0" mkdir "$out/bin" ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken" ''; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index d5bd24cf9382..18e986e437f6 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -17,7 +17,7 @@ in buildPythonApplication rec { buildInputs = [ intltool wrapGAppsHook itstool libxml2 - gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo + gnome3.gtksourceview gnome3.gsettings-desktop-schemas pycairo cairo gnome3.defaultIconTheme gnome3.dconf file ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 541bc8799a83..68750bb9e6e7 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.3.2"; + version = "4.5"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "0j6djq584rcj9ghz59ddqzrfq49lykg3wqwap5fnzp9apa4gcnqg"; + sha256 = "0rgjy42zdlbzgp4qq49amzplfcvycyijf4kdhc5wk3fqz7cki4sd"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 01369b9685dc..3ac52a5c4403 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "peru-${version}"; - version = "1.1.0"; + version = "1.1.3"; src = fetchFromGitHub { owner = "buildinspace"; repo = "peru"; rev = "${version}"; - sha256 = "0hvp6pvpsz0f98az4f1wl93gqlz6wj24pjnc5zs1har9rqlpq8y8"; + sha256 = "02kr3ib3ppbmcsjy8i8z41vp9gw9gdivy2l5aps12lmaa3rc6727"; }; propagatedBuildInputs = with python3Packages; [ pyyaml docopt ]; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 2d77a9c32656..d3b027fada68 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: python2Packages.buildPythonApplication rec { name = "rabbitvcs-${version}"; - version = "0.16"; + version = "0.17.1"; namePrefix = ""; src = fetchFromGitHub { owner = "rabbitvcs"; repo = "rabbitvcs"; rev = "v${version}"; - sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly"; + sha256 = "01cr16zf3gzsci1hhfli79m34fcx5m1pvswl16rkxxn212yc9fhy"; }; pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 5a4fdbe9316c..5c6e65915da5 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "sit-it"; repo = "sit"; rev = "v${version}"; - sha256 = "0fvxv9x971s5qvhw6gpbw9ggsxynkwfy1fn5rln50gn9yrjf7612"; + sha256 = "1ysy1lhb7fxy02a3c9xk2awa49svnfa8bqcz2aj4x56r2f8vhj0h"; }; cargoSha256 = "1y8a8a9jn9f374sy5fs1snmpiqyckqc0aw7idwnpfr912c1zzrxw"; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index f06a0c90db14..437062f7f5e1 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,18 +2,18 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.3.1"; + version = "4.5"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n"; + sha256 = "11m2hir2y1hblg9sqmansv16rcp560j2d3nhqzfhkim46a59fxvk"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; - doCheck = true; + doCheck = false; # tests fail with "thg: cannot connect to X server" dontStrip = true; buildPhase = ""; installPhase = '' diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index ebc1249dc11d..341ae5fd2737 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { # but they are linked against GPL'd softwares # - so the resulting program will be GPL maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/avidemux/bootstrap_logging.patch b/pkgs/applications/video/avidemux/bootstrap_logging.patch new file mode 100644 index 000000000000..8f45251d26c2 --- /dev/null +++ b/pkgs/applications/video/avidemux/bootstrap_logging.patch @@ -0,0 +1,26 @@ +diff --git a/bootStrap.bash b/bootStrap.bash +index 646a5e048..6429199ba 100644 +--- a/bootStrap.bash ++++ b/bootStrap.bash +@@ -4,6 +4,7 @@ + # + # By default we use qt5 now + # ++set -e # hard fail if something fails + packages_ext="" + rebuild=0 + do_core=1 +@@ -66,10 +67,10 @@ Process() + fi + cd $BUILDDIR + cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $BUILD_QUIRKS $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ +- make $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR" +- if [ "x$PKG" != "x" ] ; then ++ make $PARAL ++ if [ "x$PKG" != "x" ] ; then + $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package +- fi ++ fi + # we need the make install so that other packcges can be built against this one + make install DESTDIR=$FAKEROOT_DIR + } diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 76b42acef3e1..62b819c600cc 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite -, yasm, freetype, fontconfig, fribidi, gtk3, qt4 +, yasm, freetype, fontconfig, fribidi +, makeWrapper, libXext, mesa_glu, qttools, qtbase , alsaLib , withX265 ? true, x265 , withX264 ? true, x264 @@ -12,9 +13,18 @@ , withFAAD ? true, faad2 , withOpus ? true, libopus , withVPX ? true, libvpx +, withQT ? true +, withCLI ? true +, default ? "qt5" +, withPlugins ? true }: -let +assert withQT -> qttools != null && qtbase != null; +assert default != "qt5" -> default == "cli"; +assert !withQT -> default != "qt5"; + +stdenv.mkDerivation rec { + name = "avidemux-${version}"; version = "2.7.0"; src = fetchurl { @@ -22,112 +32,54 @@ let sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy"; }; - common = { - inherit version src; + patches = [ ./dynamic_install_dir.patch ./bootstrap_logging.patch ]; - patches = [ ./dynamic_install_dir.patch ]; + nativeBuildInputs = [ yasm cmake pkgconfig ]; + buildInputs = [ + zlib gettext libvdpau libva libXv sqlite fribidi fontconfig + freetype alsaLib libXext mesa_glu makeWrapper + ] ++ lib.optional withX264 x264 + ++ lib.optional withX265 x265 + ++ lib.optional withXvid xvidcore + ++ lib.optional withLAME lame + ++ lib.optional withFAAC faac + ++ lib.optional withVorbis libvorbis + ++ lib.optional withPulse libpulseaudio + ++ lib.optional withFAAD faad2 + ++ lib.optional withOpus libopus + ++ lib.optionals withQT [ qttools qtbase ] + ++ lib.optional withVPX libvpx; - enableParallelBuilding = false; + buildCommand = '' + unpackPhase + cd "$sourceRoot" + patchPhase - nativeBuildInputs = [ cmake pkgconfig yasm ]; - buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype alsaLib ] - ++ lib.optional withX264 x264 - ++ lib.optional withX265 x265 - ++ lib.optional withXvid xvidcore - ++ lib.optional withLAME lame - ++ lib.optional withFAAC faac - ++ lib.optional withVorbis libvorbis - ++ lib.optional withPulse libpulseaudio - ++ lib.optional withFAAD faad2 - ++ lib.optional withOpus libopus - ++ lib.optional withVPX libvpx - ; + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXext}/lib" + ${stdenv.shell} bootStrap.bash \ + --with-core \ + ${if withQT then "--with-qt" else "--without-qt"} \ + ${if withCLI then "--with-cli" else "--without-cli"} \ + ${if withPlugins then "--with-plugins" else "--without-plugins"} - meta = { - homepage = http://fixounet.free.fr/avidemux/; - description = "Free video editor designed for simple video editing tasks"; - maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - }; - }; + mkdir $out + cp -R install/usr/* $out - core = stdenv.mkDerivation (common // { - name = "avidemux-${version}"; + for i in $out/bin/*; do + wrapProgram $i \ + --set ADM_ROOT_DIR $out \ + --prefix LD_LIBRARY_PATH ":" "${libXext}/lib" + done + ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux" - preConfigure = '' - cd avidemux_core - ''; - }); + fixupPhase + ''; - buildPlugin = args: stdenv.mkDerivation (common // { - name = "avidemux-${args.pluginName}-${version}"; - - buildInputs = (args.buildInputs or []) ++ common.buildInputs ++ [ lndir ]; - - cmakeFlags = [ "-DPLUGIN_UI=${args.pluginUi}" ]; - - passthru.isUi = args.isUi or false; - - buildCommand = '' - unpackPhase - cd "$sourceRoot" - patchPhase - - mkdir $out - lndir ${core} $out - - export cmakeFlags="$cmakeFlags -DAVIDEMUX_SOURCE_DIR=$(pwd)" - - for i in ${toString (args.buildDirs or [])} avidemux_plugins; do - ( cd "$i" - cmakeConfigurePhase - buildPhase - installPhase - ) - done - - fixupPhase - ''; - - meta = common.meta // args.meta or {}; - }); - -in { - avidemux_core = core; - - avidemux_cli = buildPlugin { - pluginName = "cli"; - pluginUi = "CLI"; - isUi = true; - buildDirs = [ "avidemux/cli" ]; - }; - - avidemux_qt4 = buildPlugin { - pluginName = "qt4"; - buildInputs = [ qt4 ]; - pluginUi = "QT4"; - isUi = true; - buildDirs = [ "avidemux/qt4" ]; - }; - - avidemux_gtk = buildPlugin { - pluginName = "gtk"; - buildInputs = [ gtk3 ]; - pluginUi = "GTK"; - isUi = true; - buildDirs = [ "avidemux/gtk" ]; - # Code seems unmaintained. - meta.broken = true; - }; - - avidemux_common = buildPlugin { - pluginName = "common"; - pluginUi = "COMMON"; - }; - - avidemux_settings = buildPlugin { - pluginName = "settings"; - pluginUi = "SETTINGS"; + meta = with stdenv.lib; { + homepage = http://fixounet.free.fr/avidemux/; + description = "Free video editor designed for simple video editing tasks"; + maintainers = with maintainers; [ viric abbradar ma27 ]; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/video/avidemux/wrapper.nix b/pkgs/applications/video/avidemux/wrapper.nix deleted file mode 100644 index 7f05b81baec7..000000000000 --- a/pkgs/applications/video/avidemux/wrapper.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ symlinkJoin, avidemux_unwrapped, makeWrapper -# GTK version is broken upstream, see https://bugzilla.redhat.com/show_bug.cgi?id=1244340 -, withUi ? "qt4" -}: - -let ui = builtins.getAttr "avidemux_${withUi}" avidemux_unwrapped; in - -assert ui.isUi; - -symlinkJoin { - name = "avidemux-${withUi}-${ui.version}"; - - paths = [ ui avidemux_unwrapped.avidemux_common avidemux_unwrapped.avidemux_settings ]; - - buildInputs = [ makeWrapper ]; - - postBuild = '' - for i in $out/bin/*; do - wrapProgram $i --set ADM_ROOT_DIR $out - done - ''; - - meta = ui.meta; -} diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index b00aae61d36d..ea8cb5aa3ffa 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which gnome3.gnome_common glib intltool libtool cairo gtk3 xorg.xwininfo ] + buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with stdenv.lib; { diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index e59469c704cb..f89aa04e0146 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { name = "dvdstyler-${version}"; srcName = "DVDStyler-${version}"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2"; - sha256 = "1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q"; + sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi"; }; nativeBuildInputs = diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 9f98d46d53bd..fd8cc8d86306 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,4 +1,4 @@ -{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus_glib +{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib , libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; - buildInputs = [ glib gtk3 gmtk dbus dbus_glib libnotify libpulseaudio ]; + buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; patches = [ (substituteAll { diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix index 0b4bd5851341..1bb77ffc4a80 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja -, gettext, pkgconfig, desktop_file_utils, wrapGAppsHook +, gettext, pkgconfig, desktop-file-utils, wrapGAppsHook , appstream-glib, epoxy, glib, gtk3, mpv }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4"; }; - nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop_file_utils wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ]; buildInputs = [ epoxy glib gtk3 mpv ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 7d0cfb455306..3e796275907c 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -16,9 +16,9 @@ libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, lame, ffmpeg, libdvdread, libdvdnav, libbluray, mp4v2, mpeg2dec, x264, x265, libmkv, - fontconfig, freetype, hicolor_icon_theme, + fontconfig, freetype, hicolor-icon-theme, glib, gtk3, intltool, libnotify, - gst_all_1, dbus_glib, udev, libgudev, libvpx, + gst_all_1, dbus-glib, udev, libgudev, libvpx, useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx ] ++ (lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify - gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev + gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev ]); diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 8653305f908a..862032572dcf 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection -, gtk3, libwnck3, keybinder, intltool, libcanberra_gtk2 }: +, gtk3, libwnck3, keybinder, intltool, libcanberra-gtk2 }: python3Packages.buildPythonApplication rec { @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./datadir.patch ./bug_1190693.patch ]; prePatch = '' rm setup.cfg - substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra_gtk2}/bin/canberra-gtk-play" + substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra-gtk2}/bin/canberra-gtk-play" ''; # no tests diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 28577a429bd2..4eb4bb095eaf 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -18,7 +18,7 @@ , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp -, libplist, p11_kit, zlib +, libplist, p11-kit, zlib , dbusSupport ? true, dbus_libs ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -78,7 +78,7 @@ let preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . ''; - buildInputs = [ gnutls libidn libtasn1 p11_kit zlib libva ] + buildInputs = [ gnutls libidn libtasn1 p11-kit zlib libva ] ++ lib.optional vdpauSupport libvdpau; nativeBuildInputs = [ cmake nasm pkgconfig ]; }; @@ -118,7 +118,7 @@ in stdenv.mkDerivation rec { src = kodi_src; buildInputs = [ - gnutls libidn libtasn1 nasm p11_kit + gnutls libidn libtasn1 nasm p11-kit libxml2 yasm python2 boost libmicrohttpd gettext pcre-cpp yajl fribidi libva diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 3a297abb15c4..b3cfe21b7d69 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk24x-gtk2, libsoup , taglib, sqlite -, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas +, libtorrentRasterbar, glib-networking, gsettings-desktop-schemas , gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg , enableBonjour ? false, avahi ? null }: @@ -65,13 +65,13 @@ in buildPythonApplication rec { mv "$out/bin/miro.real" "$out/bin/miro" wrapProgram "$out/bin/miro" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [ pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk24x-gtk2 libsoup - taglib gsettings_desktop_schemas sqlite + taglib gsettings-desktop-schemas sqlite ]; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix index 2c5d3d365c12..2d5d2d3b102c 100644 --- a/pkgs/applications/video/mkcast/default.nix +++ b/pkgs/applications/video/mkcast/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' for f in $out/bin/*; do #*/ - wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin" + wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome-terminal ]}:$out/bin" done rm -r screenkey/.bzr diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 9324b08efd72..7afc3b502ad5 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,32 +1,36 @@ { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv -, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost +, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost , libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark , withGUI ? true + , qtbase ? null + , qtmultimedia ? null }: -assert withGUI -> qt5 != null; +assert withGUI -> qtbase != null && qtmultimedia != null; with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "20.0.0"; + version = "21.0.0"; src = fetchFromGitLab { - owner = "mbunkus"; - repo = "mkvtoolnix"; - rev = "release-${version}"; - sha256 = "0qrjvvp0pvw9i91rh0zrxpclq7xap2dpjip0s5bm4gv14gh4l4mc"; + owner = "mbunkus"; + repo = "mkvtoolnix"; + rev = "release-${version}"; + sha256 = "06nixp0qqa6g2fv40f7l0i0sqbc7qswpgq4534l98nan08wjbk2r"; }; - nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; + nativeBuildInputs = [ + pkgconfig autoconf automake gettext + drake ruby docbook_xsl libxslt + ]; buildInputs = [ - expat file xdg_utils boost libebml zlib libmatroska libogg - libvorbis flac cmark - ] - ++ optional stdenv.isDarwin libiconv - ++ optionals withGUI [qt5.qtbase qt5.qtmultimedia]; + expat file xdg_utils boost libebml zlib + libmatroska libogg libvorbis flac cmark + ] ++ optional stdenv.isDarwin libiconv + ++ optionals withGUI [ qtbase qtmultimedia ]; preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "drake -j $NIX_BUILD_CORES"; diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix new file mode 100644 index 000000000000..80ca213c06c1 --- /dev/null +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }: + +stdenv.mkDerivation rec { + name = "mpc-qt-${version}"; + version = "17.11"; + + src = fetchFromGitHub { + owner = "cmdrkotori"; + repo = "mpc-qt"; + rev = "v${version}"; + sha256 = "1vi4zsmbzxj6ms8wls9zv15vrskdrhgnj6l41m1fk4scs4jzvbkm"; + }; + + nativeBuildInputs = [ pkgconfig qmake qttools ]; + + buildInputs = [ mpv qtx11extras ]; + + qmakeFlags = [ "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" ]; + + meta = with stdenv.lib; { + description = "Media Player Classic Qute Theater"; + homepage = https://github.com/cmdrkotori/mpc-qt; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 403fc7e4ee11..1616665b75d5 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs -, lua, lua5_sockets, libuchardet, libiconv ? null, darwin +, lua, luasocket, libuchardet, libiconv ? null, darwin , x11Support ? true, mesa ? null, @@ -13,25 +13,25 @@ wayland ? null, libxkbcommon ? null -, rubberbandSupport ? !stdenv.isDarwin, rubberband ? null +, rubberbandSupport ? true, rubberband ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , sdl2Support ? true, SDL2 ? null -, alsaSupport ? !stdenv.isDarwin, alsaLib ? null +, alsaSupport ? true, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? true, libvdpau ? null -, dvdreadSupport ? !stdenv.isDarwin, libdvdread ? null -, dvdnavSupport ? dvdreadSupport, libdvdnav ? null +, dvdreadSupport ? true, libdvdread ? null +, dvdnavSupport ? true, libdvdnav ? null , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null , cacaSupport ? true, libcaca ? null , libpngSupport ? true, libpng ? null , youtubeSupport ? true, youtube-dl ? null , vaapiSupport ? true, libva ? null -, drmSupport ? !stdenv.isDarwin, libdrm ? null +, drmSupport ? true, libdrm ? null , vapoursynthSupport ? false, vapoursynth ? null , archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null @@ -127,14 +127,15 @@ in stdenv.mkDerivation rec { python3 ${waf} configure --prefix=$out $configureFlags ''; - nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ]; + nativeBuildInputs = [ + docutils makeWrapper perl + pkgconfig python3 which + ]; buildInputs = [ ffmpeg freetype libass libpthreadstubs - lua lua5_sockets libuchardet - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - libiconv Cocoa CoreAudio ]) - ++ optional alsaSupport alsaLib + lua luasocket libuchardet + ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora ++ optional xineramaSupport libXinerama @@ -157,7 +158,10 @@ in stdenv.mkDerivation rec { ++ optional archiveSupport libarchive ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] - ++ optionals waylandSupport [ wayland libxkbcommon ]; + ++ optionals waylandSupport [ wayland libxkbcommon ] + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libiconv Cocoa CoreAudio + ]); enableParallelBuilding = true; @@ -165,7 +169,14 @@ in stdenv.mkDerivation rec { python3 ${waf} build ''; - installPhase = '' + installPhase = + let + getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + + "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; + luaPath = getPath "lua"; + luaCPath = getPath "so"; + in + '' python3 ${waf} install # Use a standard font @@ -174,6 +185,8 @@ in stdenv.mkDerivation rec { # Ensure youtube-dl is available in $PATH for MPV wrapProgram $out/bin/mpv \ --add-flags "--scripts=${concatStringsSep "," scripts}" \ + --prefix LUA_PATH : "${luaPath}" \ + --prefix LUA_CPATH : "${luaCPath}" \ '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' @@ -199,5 +212,3 @@ in stdenv.mkDerivation rec { ''; }; } -# TODO: investigate caca support -# TODO: investigate lua5_sockets bug diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index cf77e3dfe663..faa21326fc0e 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, lib -, yad, mkvtoolnix, libnotify }: +, yad, mkvtoolnix-cli, libnotify }: stdenv.mkDerivation { name = "mpv-convert-script-2016-03-18.lua"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { substituteInPlace convert_script.lua \ ${subs "NOTIFY_CMD" "notify-send" "${libnotify}/bin/notify-send"} \ ${subs "YAD_CMD" "yad" "${yad}/bin/yad"} \ - ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix}/bin/mkvmerge"} + ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix-cli}/bin/mkvmerge"} ''; dontBuild = true; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 86b8dab7f1f2..aa9643416485 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { name = "openshot-qt-${version}"; - version = "2.3.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "026zxvg5mij49g021hipv3hspsx8m5bs4v9pm2axqw6rvszjk90z"; + sha256 = "182dldj9ybs6aqjfrc9dqx1mifdyhv0rf3ifxcp52cm9rz5yv8ml"; }; nativeBuildInputs = [ doxygen wrapGAppsHook ]; diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index d55f0aa1b35b..9858edf82389 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook -, gsettings_desktop_schemas, gtk3, keybinder3 +, gsettings-desktop-schemas, gtk3, keybinder3 }: stdenv.mkDerivation rec { name = "peek-${version}"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "phw"; repo = "peek"; rev = version; - sha256 = "04sc6gfrqvnx288rmgsywpjx9l6jcfn2qdbwjcbdvx4wl3gna0qm"; + sha256 = "1ihmq914g2h5iw86bigkkblzqimr50yq6z883lzq656xkcayd8gh"; }; nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; - buildInputs = [ gsettings_desktop_schemas gtk3 keybinder3 ]; + buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index c4d80344080d..48074a86b552 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook -, python3Packages, gst, gtk3, hicolor_icon_theme +, python3Packages, gst, gtk3, hicolor-icon-theme , gobjectIntrospection, librsvg, gnome3, libnotify # for gst-transcoder: , which, meson, ninja @@ -34,9 +34,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gobjectIntrospection gtk3 librsvg gnome3.gnome_desktop + gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas libnotify + gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst; [ gstreamer gst-editing-services diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix new file mode 100644 index 000000000000..5638fad39e5d --- /dev/null +++ b/pkgs/applications/video/screenkey/default.nix @@ -0,0 +1,60 @@ +{ lib +, substituteAll +, buildPythonApplication +, fetchFromGitHub +, distutils_extra +, setuptools-git +, intltool +, pygtk +, libX11 +, libXtst +, wrapGAppsHook +, defaultIconTheme +, hicolor_icon_theme +}: +buildPythonApplication rec { + pname = "screenkey"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "wavexx"; + repo = "screenkey"; + rev = "screenkey-${version}"; + sha256 = "14g7fiv9n7m03djwz1pp5034pffi87ssvss9bc1q8vq0ksn23vrw"; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + inherit libX11 libXtst; + }) + ]; + + nativeBuildInputs = [ + distutils_extra + setuptools-git + intltool + + wrapGAppsHook + ]; + + buildInputs = [ + defaultIconTheme + hicolor_icon_theme + ]; + + propagatedBuildInputs = [ + pygtk + ]; + + # screenkey does not have any tests + doCheck = false; + + meta = with lib; { + homepage = https://www.thregr.org/~wavexx/software/screenkey/; + description = "A screencast tool to display your keys inspired by Screenflick"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.rasendubi ]; + }; +} diff --git a/pkgs/applications/video/screenkey/paths.patch b/pkgs/applications/video/screenkey/paths.patch new file mode 100644 index 000000000000..7e5ed47fc19d --- /dev/null +++ b/pkgs/applications/video/screenkey/paths.patch @@ -0,0 +1,20 @@ +--- a/Screenkey/xlib.py ++++ b/Screenkey/xlib.py +@@ -6,7 +6,7 @@ + from ctypes import * + + ## base X11 +-libX11 = CDLL('libX11.so.6') ++libX11 = CDLL('@libX11@/lib/libX11.so.6') + + # types + Atom = c_ulong +@@ -278,7 +278,7 @@ + + + ## record extensions +-libXtst = CDLL('libXtst.so.6') ++libXtst = CDLL('@libXtst@/lib/libXtst.so.6') + + # types + XPointer = String \ No newline at end of file diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index e7deccee0d9f..9e547a791a48 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-17.9.0"; + name = "smplayer-18.2.2"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0s9856cmwl829d2xc2ycf97phpv4a2d39ybmnbhsrb07jq5hkw1a"; + sha256 = "0q0m9q643z6ih5gkf1fq3d6y99d62yxkhfgap98h251q6kd7dhis"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 536b4ba0fac4..3683973824a3 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, - desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme, + desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme, libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - desktop_file_utils + desktop-file-utils enchant gnome3.gtk gnome3.gtkmm @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { gst_all_1.gstreamermm gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - hicolor_icon_theme + hicolor-icon-theme libsigcxx libxmlxx xdg_utils diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix new file mode 100644 index 000000000000..bb519ef3dab0 --- /dev/null +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -0,0 +1,88 @@ +{ + alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype, + gdk_pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor, + libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, + libxcb, nspr, nss, stdenv, udev +}: + + let + rpath = stdenv.lib.makeLibraryPath ([ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libxcb + nspr + nss + stdenv.cc.cc + udev + ]); + in stdenv.mkDerivation rec { + name = "webtorrent-desktop-${version}"; + version = "0.19.0"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.19.0/webtorrent-desktop_${version}-1_amd64.deb"; + sha256 = "0v4fgvf8qgxjwg5kz30pcxl71pi9rri0l3cy20pid07rdd6r4sgd"; + } + else + throw "Webtorrent is not currently supported on ${stdenv.system}"; + phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ dpkg ]; + unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p $out + cp -R opt $out + + mv ./usr/share $out/share + mv $out/opt/webtorrent-desktop $out/libexec + chmod +x $out/libexec/WebTorrent + rmdir $out/opt + + chmod -R g-w $out + + # Patch WebTorrent + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${rpath}:$out/libexec $out/libexec/WebTorrent + + # Symlink to bin + mkdir -p $out/bin + ln -s $out/libexec/WebTorrent $out/bin/WebTorrent + + # Fix the desktop link + substituteInPlace $out/share/applications/webtorrent-desktop.desktop \ + --replace /opt/webtorrent-desktop/WebTorrent $out/bin/WebTorrent + ''; + + meta = with stdenv.lib; { + description = "Streaming torrent app for Mac, Windows, and Linux."; + homepage = https://webtorrent.io/desktop; + license = licenses.mit; + maintainers = [ maintainers.flokli ]; + platforms = [ + "x86_64-linux" + ]; + }; + } diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index b417489c14c0..5e44116415ea 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl -, lirc, shared_mime_info, libjpeg }: +, lirc, shared-mime-info, libjpeg }: stdenv.mkDerivation rec { name = "xine-ui-0.99.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd"; }; - nativeBuildInputs = [ pkgconfig shared_mime_info ]; + nativeBuildInputs = [ pkgconfig shared-mime-info ]; buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 86b6535e5396..8f456a2a49a8 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.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; + sha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 339d3e8490d9..af15240dc12e 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -198,13 +198,13 @@ rec { # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits docker_17_12 = dockerGen rec { - version = "17.12.0-ce"; - rev = "486a48d2701493bb65385788a291e36febb44ec1"; # git commit - sha256 = "14kp7wrzf3s9crk8px1dc575lchyrcl2dqiwr3sgxb9mzjfiyqps"; - runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; - runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; - containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; - containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; + version = "17.12.1-ce"; + rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit + sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i"; + runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e"; + runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln"; + containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55"; + containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index e9cee2503851..bd014dd60d37 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice_protocol, fontconfig +, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig , libX11, freefont_ttf }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL SDL2 SDL2_ttf openssl spice_protocol fontconfig + SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig libX11 freefont_ttf ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 694026d3bac2..00303be12da2 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -9,7 +9,7 @@ , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL , vncSupport ? true, libjpeg, libpng -, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol +, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , hostCpuOnly ? false @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice ] + ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ]; diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index cb84ad49aebd..40eadad68d09 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.2"; + version = "2.4"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5"; + sha256 = "14zcpzpdb5gxkxvckcdwq3mfv8b18zirbdskzddhqxjddkzayckz"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 452f082e20e7..947f4454362b 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/ wrapProgram $out/bin/rkt \ - --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib \ + --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \ --prefix PATH : ${iptables}/bin ''; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 74da6c4ab167..15ae244b3291 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib, +{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, systemd}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib spice_protocol glib + buildInputs = [ alsaLib spice-protocol glib libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 527371791082..f913ab688cf8 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, python2Packages, intltool, file -, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf +, wrapGAppsHook, gtkvnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt -, gsettings_desktop_schemas, glib, libosinfo, gnome3 -, spiceSupport ? true, spice_gtk ? null +, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 +, spiceSupport ? true, spice-gtk ? null }: with stdenv.lib; python2Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.4.3"; + version = "1.5.0"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj"; + sha256 = "d43a7b99d40acdcb8e9455e7874beee132cfcfce9eed0d6252e8f254a82cadc6"; }; nativeBuildInputs = [ @@ -23,15 +23,13 @@ python2Packages.buildPythonApplication rec { ]; buildInputs = - [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi - gsettings_desktop_schemas libosinfo - ] ++ optional spiceSupport spice_gtk; + [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi + gsettings-desktop-schemas libosinfo gtk3 + ] ++ optional spiceSupport spice-gtk; propagatedBuildInputs = with python2Packages; - [ eventlet greenlet gflags netaddr carrot routes PasteDeploy - m2crypto ipy twisted distutils_extra simplejson - cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python - pygobject3 ipaddr mox libvirt libxml2 requests + [ + pygobject3 ipaddr libvirt libxml2 requests ]; patchPhase = '' @@ -63,6 +61,8 @@ python2Packages.buildPythonApplication rec { manages Xen and LXC (linux containers). ''; license = licenses.gpl2; + # exclude Darwin since libvirt-glib currently doesn't build there + platforms = platforms.linux; maintainers = with maintainers; [ qknight offline fpletz ]; }; } diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 4c5000f0208c..9316496a547e 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,17 +1,17 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtmultimedia, qtsvg -, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol +, qtbase, qtmultimedia, qtsvg, qttools +, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol }: mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.48.79"; + version = "0.52.80"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "1mzncca9blc742vb77gyfza0sd1rby3qy5yl4x19nkllid92jn6k"; + sha256 = "131rs6c90vdf1j40qj7k6s939y8la9ma0q3labxb7ac3r8hvhn6a"; }; cmakeFlags = [ @@ -21,10 +21,10 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtsvg - libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol + libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 2f5a6192c86c..eb48e1d3d300 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen -, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl +, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen +, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl , libapparmor , spiceSupport ? true -, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null +, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null }: assert spiceSupport -> - spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null; + spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null; with stdenv.lib; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info - libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib + glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info + libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib libcap_ng numactl libapparmor ] ++ optionals stdenv.isx86_64 [ xen ] ++ optionals spiceSupport [ - spice_gtk spice_protocol libcap gdbm + spice-gtk spice-protocol libcap gdbm ]; postInstall = '' diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 22799a7af8e7..48f74ce72e5e 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -9,7 +9,7 @@ , withLibHVM ? true # qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir , alsaLib , ... } @ args: @@ -29,7 +29,7 @@ let }); qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib ]; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index b1fcf36a46c1..be6c4e3fcc7a 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -8,7 +8,7 @@ , withLibHVM ? true # qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir , alsaLib , ... } @ args: @@ -30,7 +30,7 @@ let xsa = import ./xsa-patches.nix { inherit fetchpatch; }; qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib ]; in diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 2808c8552eff..c23284d0b527 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,7 +4,7 @@ , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs -, libxkbcommon, xcbutilxrm, hicolor_icon_theme +, libxkbcommon, xcbutilxrm, hicolor-icon-theme }: with luaPackages; stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ with luaPackages; stdenv.mkDerivation rec { docbook_xsl findXMLCatalogs ]; - propagatedUserEnvPkgs = [ hicolor_icon_theme ]; + propagatedUserEnvPkgs = [ hicolor-icon-theme ]; buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection git lgi libpthreadstubs libstartup_notification libxdg_basedir lua nettools pango xcb-util-cursor diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 1c6b8a84c952..7aa604690f9a 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, dbus_glib, autoreconfHook, xorg }: +{ stdenv, fetchgit, pkgconfig, dbus-glib, autoreconfHook, xorg }: stdenv.mkDerivation rec { name = "kbdd"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ xorg.libX11 dbus_glib ]; + buildInputs = [ xorg.libX11 dbus-glib ]; meta = { description = "Simple daemon and library to make per window layout using XKB"; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 27cb564d2c6b..ed34e75f35db 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libxcb }: stdenv.mkDerivation rec { - name = "lemonbar-1.2"; + name = "lemonbar-1.3"; src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v1.2.tar.gz"; - sha256 = "1smz8lh930bnb6a4lrm07l3z2k071kc8p2pljk5wsrch3x2xhimq"; + url = "https://github.com/LemonBoy/bar/archive/v1.3.tar.gz"; + sha256 = "0zd3v8ys4jzi60pm3wq7p3pbbd5y0acimgiq46qx1ckmwg2q9rza"; }; buildInputs = [ libxcb perl ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 79752829e2a5..f889bf29f71a 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python27Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }: let cairocffi-xcffib = python27Packages.cairocffi.override { - pythonPath = [ python27Packages.xcffib ]; + withXcffib = true; }; in diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 215b8c38ece4..e7427fa7763a 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit sbcl lispPackages; + inherit sbcl lispPackages contrib; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix index 906ba0efda24..def5766e5ee1 100644 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus_glib +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib , desktopSupport , gtk2, gnome2_panel, GConf2 , libxfce4util, xfce4panel @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ glib dbus_glib ] + [ glib dbus-glib ] ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] # TODO: no idea where to find libpanelapplet-4.0 ++ optionals (desktopSupport == "gnome3") [ ] diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 48fd8665cb47..8e94ccfa49bc 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -58,7 +58,7 @@ let else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" - else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1" + else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; @@ -171,13 +171,20 @@ stdenv.mkDerivation { else if targetPlatform.isWindows then "pe" else "elf" + toString targetPlatform.parsed.cpu.bits; endianPrefix = if targetPlatform.isBigEndian then "big" else "little"; + sep = optionalString (!targetPlatform.isMips) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" else if targetPlatform.isArm then endianPrefix + "arm" else if targetPlatform.isx86_64 then "x86-64" else if targetPlatform.isi686 then "i386" + else if targetPlatform.isMips then { + "mips" = "btsmipn32"; # n32 variant + "mipsel" = "ltsmipn32"; # n32 variant + "mips64" = "btsmip"; + "mips64el" = "ltsmip"; + }.${targetPlatform.parsed.cpu.name} else throw "unknown emulation for platform: " + targetPlatform.config; - in targetPlatform.platform.bfdEmulation or (fmt + "-" + arch); + in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); depsTargetTargetPropagated = extraPackages; diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 346fd0e7908f..488fcb943721 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, - openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, + openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3, libsodium, postgresql, ... }: let @@ -45,13 +45,13 @@ in buildInputs = [ pkgconfig dbus_libs ]; }; gobject-sys = attrs: { - buildInputs = [ dbus_glib ]; + buildInputs = [ dbus-glib ]; }; gio-sys = attrs: { - buildInputs = [ dbus_glib ]; + buildInputs = [ dbus-glib ]; }; gdk-pixbuf-sys = attrs: { - buildInputs = [ dbus_glib ]; + buildInputs = [ dbus-glib ]; }; gdk-pixbuf = attrs: { buildInputs = [ gdk_pixbuf ]; diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index d03d85c07888..42a3ac27cb5b 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { export CARGO_HOME=$(mktemp -d cargo-home.XXX) + ${cargoUpdateHook} + cargo vendor cp -ar vendor $out diff --git a/pkgs/build-support/safe-discard-string-context.nix b/pkgs/build-support/safe-discard-string-context.nix deleted file mode 100644 index 293a15295d55..000000000000 --- a/pkgs/build-support/safe-discard-string-context.nix +++ /dev/null @@ -1,14 +0,0 @@ -# | Discard the context of a string while ensuring that expected path -# validity invariants hold. -# -# This relies on import-from-derivation, but it is only useful in -# contexts where the string is going to be used in an -# import-from-derivation anyway. -# -# safeDiscardStringContext : String → String -{ writeText }: s: - builtins.seq - (import (writeText - "discard.nix" - "${builtins.substring 0 0 s}null\n")) - (builtins.unsafeDiscardStringContext s) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 642365bdeb5c..8ab1fbc88731 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -748,571 +748,85 @@ rec { rpmDistros = { - fedora2i386 = { - name = "fedora-core-2-i386"; - fullName = "Fedora Core 2 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/core/2/i386/os/repodata/primary.xml.gz; - sha256 = "1nq1k2k0nzkii737cka301f0vbd2ix2wsfvi6bblpi748q6h2w4k"; + # Note: no i386 release for Fedora >= 26 + fedora26x86_64 = + let version = "26"; + in rec { + name = "fedora-${version}-x86_64"; + fullName = "Fedora ${version} (x86_64)"; + packagesList = fetchurl rec { + url = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; + sha256 = "880055a50c05b20641530d09b23f64501a000b2f92fe252417c530178730a95e"; + }; + urlPrefix = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os"; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; }; - urlPrefix = mirror://fedora/linux/core/2/i386/os; - runScripts = false; - packages = commonFedoraPackages; - }; - fedora3i386 = { - name = "fedora-core-3-i386"; - fullName = "Fedora Core 3 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/core/3/i386/os/repodata/primary.xml.gz; - sha256 = "13znspn4g1bkjkk47393k9chswgzl6nx1n0q6h2wrw52c7d9nw9i"; + fedora27x86_64 = + let version = "27"; + in rec { + name = "fedora-${version}-x86_64"; + fullName = "Fedora ${version} (x86_64)"; + packagesList = fetchurl rec { + url = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; + sha256 = "48986ce4583cd09825c6d437150314446f0f49fa1a1bd62dcfa1085295030fe9"; + }; + urlPrefix = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os"; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; }; - urlPrefix = mirror://fedora/linux/core/3/i386/os; - archs = ["noarch" "i386" "i586"]; - runScripts = false; - packages = commonFedoraPackages; - }; - fedora5i386 = { - name = "fedora-core-5-i386"; - fullName = "Fedora Core 5 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/core/5/i386/os/repodata/primary.xml.gz; - sha256 = "0lfk4mzrpiyls8h7k9ckc3vgywbmg05zsr4ag6qakgnv9gljijig"; + centos6i386 = + let version = "6.9"; + in rec { + name = "centos-${version}-i386"; + fullName = "CentOS ${version} (i386)"; + # N.B. Switch to vault.centos.org when the next release comes out + # urlPrefix = "http://vault.centos.org/${version}/os/i386"; + urlPrefix = "http://mirror.centos.org/centos-6/${version}/os/i386"; + packagesList = fetchurl rec { + url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; + sha256 = "b826a45082ef68340325c0855f3d2e5d5a4d0f77d28ba3b871791d6f14a97aeb"; + }; + archs = ["noarch" "i386"]; + packages = commonCentOSPackages ++ [ "procps" ]; }; - urlPrefix = mirror://fedora/linux/core/5/i386/os; - packages = commonFedoraPackages ++ [ "util-linux" ]; - }; - fedora7i386 = { - name = "fedora-7-i386"; - fullName = "Fedora 7 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/7/Everything/i386/os/repodata/primary.xml.gz; - sha256 = "0ssfa01jbwdf566rsxm443yi8f9b1drgfpv51904bark4glgvs33"; + centos6x86_64 = + let version = "6.9"; + in rec { + name = "centos-${version}-x86_64"; + fullName = "CentOS ${version} (x86_64)"; + # N.B. Switch to vault.centos.org when the next release comes out + # urlPrefix = "http://vault.centos.org/${version}/os/x86_64"; + urlPrefix = "http://mirror.centos.org/centos-6/${version}/os/x86_64"; + packagesList = fetchurl rec { + url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; + sha256 = "ed2b2d4ac98d774d4cd3e91467e1532f7e8b0275cfc91a0d214b532dcaf1e979"; + }; + archs = ["noarch" "x86_64"]; + packages = commonCentOSPackages ++ [ "procps" ]; }; - urlPrefix = mirror://fedora/linux/releases/7/Everything/i386/os; - packages = commonFedoraPackages; - }; - - fedora8i386 = { - name = "fedora-8-i386"; - fullName = "Fedora 8 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/8/Everything/i386/os/repodata/primary.xml.gz; - sha256 = "0kwf0jcp63pygpvgvwl4w58pph24xbcy6db6fnq2f3ly5myhz53n"; - }; - urlPrefix = http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/8/Everything/i386/os; - packages = commonFedoraPackages; - }; - - fedora8x86_64 = { - name = "fedora-8-x86_64"; - fullName = "Fedora 8 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/8/Everything/x86_64/os/repodata/primary.xml.gz; - sha256 = "11bfmpy3nz82zzmj5lfravvzlw514v4718adi4b06ps9zv3zpy8r"; - }; - urlPrefix = http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/8/Everything/x86_64/os; - packages = commonFedoraPackages; - archs = ["noarch" "x86_64"]; - }; - - fedora9i386 = { - name = "fedora-9-i386"; - fullName = "Fedora 9 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/9/Everything/i386/os/repodata/primary.xml.gz; - sha256 = "1qd7wb5hfxg4mkpf4k3w49hy0qqf704dqlj3igaibyzmrn9rvk7h"; - }; - urlPrefix = mirror://fedora/linux/releases/9/Everything/i386/os; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora9x86_64 = { - name = "fedora-9-x86_64"; - fullName = "Fedora 9 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/9/Everything/x86_64/os/repodata/primary.xml.gz; - sha256 = "1qv68i5s6gis4fbj4lxkibx8zxw5kqxapk95lvm76ml59gm7axxx"; - }; - urlPrefix = mirror://fedora/linux/releases/9/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora10i386 = { - name = "fedora-10-i386"; - fullName = "Fedora 10 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/10/Everything/i386/os/repodata/beeea88d162e76993c25b9dd8139868274ee7fa1-primary.xml.gz; - sha256 = "17lyvzqjsxw3ll7726dpg14f9jc2p3fz5cr5cwd8hp3rkm5nfclv"; - }; - urlPrefix = mirror://fedora/linux/releases/10/Everything/i386/os; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora10x86_64 = { - name = "fedora-10-x86_64"; - fullName = "Fedora 10 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/10/Everything/x86_64/os/repodata/7958210175e86b5cc843cf4bd0bc8659e445e261-primary.xml.gz; - sha256 = "02pzqmb26zmmzdni11dip3bar4kr54ddsrq9z4vda7ldwwkqd3py"; - }; - urlPrefix = mirror://fedora/linux/releases/10/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora11i386 = { - name = "fedora-11-i386"; - fullName = "Fedora 11 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/11/Everything/i386/os/repodata/4a59e5ec0a3a55979f2045c9e6824b87feb1c8c3df12d893e9ee3057ba482485-primary.xml.gz; - sha256 = "4a59e5ec0a3a55979f2045c9e6824b87feb1c8c3df12d893e9ee3057ba482485"; - }; - urlPrefix = mirror://fedora/linux/releases/11/Everything/i386/os; - archs = ["noarch" "i386" "i586"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora11x86_64 = { - name = "fedora-11-x86_64"; - fullName = "Fedora 11 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/11/Everything/x86_64/os/repodata/b3e9f0d474893d14b0352deddabc7e3ee017d038614e82d7c6d7717510d6ce7e-primary.xml.gz; - sha256 = "b3e9f0d474893d14b0352deddabc7e3ee017d038614e82d7c6d7717510d6ce7e"; - }; - urlPrefix = mirror://fedora/linux/releases/11/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora12i386 = { - name = "fedora-12-i386"; - fullName = "Fedora 12 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/12/Everything/i386/os/repodata/e27694b7824ee6bbf87af629950e6953eaddf91c73e489f5de690a7ecb9d726e-primary.xml.gz; - sha256 = "e27694b7824ee6bbf87af629950e6953eaddf91c73e489f5de690a7ecb9d726e"; - }; - urlPrefix = mirror://fedora/linux/releases/12/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora12x86_64 = { - name = "fedora-12-x86_64"; - fullName = "Fedora 12 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/12/Everything/x86_64/os/repodata/6b142ef02acbc77f405fbfdedd82451e692a01201471665052a0e00ba8ac0959-primary.xml.gz; - sha256 = "6b142ef02acbc77f405fbfdedd82451e692a01201471665052a0e00ba8ac0959"; - }; - urlPrefix = mirror://fedora/linux/releases/12/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora13i386 = { - name = "fedora-13-i386"; - fullName = "Fedora 13 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/13/Everything/i386/os/repodata/be70ac9e1031fd34222b2ec6cc8a337bc6fabd1d06969990955c5f358d138e35-primary.xml.gz; - sha256 = "be70ac9e1031fd34222b2ec6cc8a337bc6fabd1d06969990955c5f358d138e35"; - }; - urlPrefix = mirror://fedora/linux/releases/13/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora13x86_64 = { - name = "fedora-13-x86_64"; - fullName = "Fedora 13 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/13/Everything/x86_64/os/repodata/01996e6d20b0a4bf3390767bd26709932e42c54422b39005ec2dd4ef2e8b0f3a-primary.xml.gz; - sha256 = "01996e6d20b0a4bf3390767bd26709932e42c54422b39005ec2dd4ef2e8b0f3a"; - }; - urlPrefix = mirror://fedora/linux/releases/13/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora16i386 = { - name = "fedora-16-i386"; - fullName = "Fedora 16 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/16/Everything/i386/os/repodata/8d5e9b291748d8254e1e66ad2d35bdb7e020d8c2c6a84f928595597b7e546118-primary.xml.gz; - sha256 = "8d5e9b291748d8254e1e66ad2d35bdb7e020d8c2c6a84f928595597b7e546118"; - }; - urlPrefix = mirror://fedora/linux/releases/16/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - }; - - fedora16x86_64 = { - name = "fedora-16-x86_64"; - fullName = "Fedora 16 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/16/Everything/x86_64/os/repodata/3fffacc6006d9b4782e57f3f11fcb44ab2a1abf6625e4afb4bf6a1e6475dd107-primary.xml.gz; - sha256 = "3fffacc6006d9b4782e57f3f11fcb44ab2a1abf6625e4afb4bf6a1e6475dd107"; - }; - urlPrefix = mirror://fedora/linux/releases/16/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - }; - - fedora17i386 = { - name = "fedora-17-i386"; - fullName = "Fedora 17 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/17/Everything/i386/os/repodata/82dc1ea6d26e53a367dc6e7472113c4454c9a8ac7c98d4bfb11fd0b6f311450f-primary.xml.gz; - sha256 = "03s527rvdl0zn6zx963wmjlcjm247h8p4x3fviks6lvfsak1xp42"; - }; - urlPrefix = mirror://fedora/linux/releases/17/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora17x86_64 = { - name = "fedora-17-x86_64"; - fullName = "Fedora 17 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/17/Everything/x86_64/os/repodata/7009de56f1a1c399930fa72094a310a40d38153c96d0b5af443914d3d6a7d811-primary.xml.gz; - sha256 = "04fqlzbd651r8jpvbl4n7hakh3d422ir88571y9rkhx1y5bdw2bh"; - }; - urlPrefix = mirror://fedora/linux/releases/17/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora18i386 = { - name = "fedora-18-i386"; - fullName = "Fedora 18 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/18/Everything/i386/os/repodata/935f57e61365047b6aee346792bc68bfd24de30874ce5d26bf730a992d36678d-primary.xml.gz; - sha256 = "935f57e61365047b6aee346792bc68bfd24de30874ce5d26bf730a992d36678d"; - }; - urlPrefix = mirror://fedora/linux/releases/18/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora18x86_64 = { - name = "fedora-18-x86_64"; - fullName = "Fedora 18 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/18/Everything/x86_64/os/repodata/463ac49f2218e404607b2eeb3c04be1a648d90293f4239bbb6a63c2fed672bea-primary.xml.gz; - sha256 = "463ac49f2218e404607b2eeb3c04be1a648d90293f4239bbb6a63c2fed672bea"; - }; - urlPrefix = mirror://fedora/linux/releases/18/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora19i386 = { - name = "fedora-19-i386"; - fullName = "Fedora 19 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/19/Everything/i386/os/repodata/b72220bcdefff8b38de1c9029a630db4813e073f88c4b080ca274d133e0460d1-primary.xml.gz; - sha256 = "b72220bcdefff8b38de1c9029a630db4813e073f88c4b080ca274d133e0460d1"; - }; - urlPrefix = mirror://fedora/linux/releases/19/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora19x86_64 = { - name = "fedora-19-x86_64"; - fullName = "Fedora 19 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/19/Everything/x86_64/os/repodata/d3f67da6461748f57a06459e6877fd07858828e256f58f032704186a65430fd3-primary.xml.gz; - sha256 = "d3f67da6461748f57a06459e6877fd07858828e256f58f032704186a65430fd3"; - }; - urlPrefix = mirror://fedora/linux/releases/19/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora20i386 = { - name = "fedora-20-i386"; - fullName = "Fedora 20 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/20/Everything/i386/os/repodata/ae9c6ae73a12a64227e6b8e7b2d7e1c2a9515bd9c82f2af006c838e7a445dcb9-primary.xml.gz; - sha256 = "1ffw8njfff680vq2lby8v5dm3af2w7bv5rxqwqkl59hj7bknm75f"; - }; - urlPrefix = mirror://fedora/linux/releases/20/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora20x86_64 = { - name = "fedora-20-x86_64"; - fullName = "Fedora 20 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/20/Everything/x86_64/os/repodata/d7777ea6ec66e1c86c3fe1900adf5bf8d877fb77dd06e439bd76bbbec4e82094-primary.xml.gz; - sha256 = "1510x32bxfvnplwy81nxfzxpgn7qbgghm4717xnciqb6xjk7wxyp"; - }; - urlPrefix = mirror://fedora/linux/releases/20/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora21i386 = { - name = "fedora-21-i386"; - fullName = "Fedora 21 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/21/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "a6ad1140adeef65bbc1fdcc7f8f2b356f0d20c71bbe3f1625038e7f43fc44780"; - }; - urlPrefix = mirror://fedora/linux/releases/21/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora21x86_64 = { - name = "fedora-21-x86_64"; - fullName = "Fedora 21 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/21/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "e2a28baab2ea4632fad93f9f28144cda3458190888fdf7f2acc9bc289f397e96"; - }; - urlPrefix = mirror://fedora/linux/releases/21/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora23i386 = { - name = "fedora-23-i386"; - fullName = "Fedora 23 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/23/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "0d1012e6c1f1d694ab5354d95005791ce8de908016d07e5ed0b9dac9b9223492"; - }; - urlPrefix = mirror://fedora/linux/releases/23/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora23x86_64 = { - name = "fedora-23-x86_64"; - fullName = "Fedora 23 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/23/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "0fa09bb5f82e4a04890b91255f4b34360e38ede964fe8328f7377e36f06bad27"; - }; - urlPrefix = mirror://fedora/linux/releases/23/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora24i386 = { - name = "fedora-24-i386"; - fullName = "Fedora 24 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/24/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "6928e251628da7a74b79180739a43784e534eaa744ba4bcb18c847dff541f344"; - }; - urlPrefix = mirror://fedora/linux/releases/24/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora24x86_64 = { - name = "fedora-24-x86_64"; - fullName = "Fedora 24 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/24/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "8dcc989396ed27fadd252ba9b655019934bc3d9915f186f1f2f27e71eba7b42f"; - }; - urlPrefix = mirror://fedora/linux/releases/24/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora25i386 = { - name = "fedora-25-i386"; - fullName = "Fedora 25 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/25/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "4d399e5eebb8d543d50e2da274348280fae07a6efcc469491784582b39d73bba"; - }; - urlPrefix = mirror://fedora/linux/releases/25/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora25x86_64 = { - name = "fedora-25-x86_64"; - fullName = "Fedora 25 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/25/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "eaea04bff7327c49d90240992dff2be6d451a1758ef83e94825f23d4ff27e868"; - }; - urlPrefix = mirror://fedora/linux/releases/25/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - opensuse103i386 = { - name = "opensuse-10.3-i586"; - fullName = "openSUSE 10.3 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/10.3/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "0zb5kxsb755nqq9i8jdclmanacyf551ncx6a011v9jqphsvyfvd7"; - }; - urlPrefix = mirror://opensuse/10.3/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages ++ [ "devs" ]; - }; - - opensuse110i386 = { - name = "opensuse-11.0-i586"; - fullName = "openSUSE 11.0 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/11.0/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "13rv855aj8p3h1zpsji5xa1wpkhgq94gcxzvg05l2b68b15q3mwn"; - }; - urlPrefix = mirror://opensuse/11.0/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages; - }; - - opensuse110x86_64 = { - name = "opensuse-11.0-x86_64"; - fullName = "openSUSE 11.0 (x86_64)"; - packagesList = fetchurl { - url = mirror://opensuse/11.0/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "13rv855aj8p3h1zpsji5xa1wpkhgq94gcxzvg05l2b68b15q3mwn"; - }; - urlPrefix = mirror://opensuse/11.0/repo/oss/suse/; - archs = ["noarch" "x86_64"]; - packages = commonOpenSUSEPackages; - }; - - opensuse111i386 = { - name = "opensuse-11.1-i586"; - fullName = "openSUSE 11.1 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/11.1/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "1mfmp9afikj0hci1s8cpwjdr0ycbpfym9gdhci590r9fa75w221j"; - }; - urlPrefix = mirror://opensuse/11.1/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages; - }; - - opensuse111x86_64 = { - name = "opensuse-11.1-x86_64"; - fullName = "openSUSE 11.1 (x86_64)"; - packagesList = fetchurl { - url = mirror://opensuse/11.1/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "1mfmp9afikj0hci1s8cpwjdr0ycbpfym9gdhci590r9fa75w221j"; - }; - urlPrefix = mirror://opensuse/11.1/repo/oss/suse/; - archs = ["noarch" "x86_64"]; - packages = commonOpenSUSEPackages; - }; - - opensuse132i386 = { - name = "opensuse-13.2-i586"; - fullName = "openSUSE 13.2 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/13.2/repo/oss/suse/repodata/485e4f44e3c3ef3133accb589480933c2fe48dedfc44a7e5f9d5437cd9122a99-primary.xml.gz; - sha256 = "0klzmk680as4sb6h1wl0ynj0dds3m70qim66wwbiqlnnp6xkf83y"; - }; - urlPrefix = mirror://opensuse/13.2/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages; - }; - - opensuse132x86_64 = { - name = "opensuse-13.2-x86_64"; - fullName = "openSUSE 13.2 (x86_64)"; - packagesList = fetchurl { - url = mirror://opensuse/13.2/repo/oss/suse/repodata/485e4f44e3c3ef3133accb589480933c2fe48dedfc44a7e5f9d5437cd9122a99-primary.xml.gz; - sha256 = "0klzmk680as4sb6h1wl0ynj0dds3m70qim66wwbiqlnnp6xkf83y"; - }; - urlPrefix = mirror://opensuse/13.2/repo/oss/suse/; - archs = ["noarch" "x86_64"]; - packages = commonOpenSUSEPackages; - }; - - centos65i386 = { - name = "centos-6.5-i386"; - fullName = "CentOS 6.5 (i386)"; - packagesList = fetchurl { - url = http://vault.centos.org/6.5/os/i386/repodata/a89f27cc7d3cea431f3bd605a1e9309c32d5d409abc1b51a7b5c71c05f18a0c2-primary.xml.gz; - sha256 = "1hm031gw0wawgcdbbhdb17adaclw63ls21fn7cgl7siwgp62g7x8"; - }; - urlPrefix = http://vault.centos.org/6.5/os/i386; - archs = ["noarch" "i386"]; - packages = commonCentOSPackages ++ [ "procps" ]; - }; - - centos65x86_64 = { - name = "centos-6.5-x86_64"; - fullName = "CentOS 6.5 (x86_64)"; - packagesList = fetchurl { - url = http://vault.centos.org/6.5/os/x86_64/repodata/3353e378f5cb4bb6c3b3dd2ca266c6d68a1e29c36cf99f76aea3d8e158626024-primary.xml.gz; - sha256 = "0930c9cf3n53mrv9zybcqclix2nnqrka4b6xng1vcjybymwf6lrk"; - }; - urlPrefix = http://vault.centos.org/6.5/os/x86_64/; - archs = ["noarch" "x86_64"]; - packages = commonCentOSPackages ++ [ "procps" ]; - }; # Note: no i386 release for 7.x - centos71x86_64 = { - name = "centos-7.1-x86_64"; - fullName = "CentOS 7.1 (x86_64)"; - packagesList = fetchurl { - url = http://vault.centos.org/7.1.1503/os/x86_64/repodata/1386c5af55bda40669bb5ed91e0a22796c3ed7325367506109b09ea2657f22bd-primary.xml.gz; - sha256 = "1g92gxjs57mh15hm0rsk6bbkwv3r4851xnaypdlhd95xanpwb1hk"; + centos7x86_64 = + let version = "7.4.1708"; + in rec { + name = "centos-${version}-x86_64"; + fullName = "CentOS ${version} (x86_64)"; + # N.B. Switch to vault.centos.org when the next release comes out + # urlPrefix = "http://vault.centos.org/${version}/os/x86_64"; + urlPrefix = "http://mirror.centos.org/centos-7/${version}/os/x86_64"; + packagesList = fetchurl rec { + url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; + sha256 = "b686d3a0f337323e656d9387b9a76ce6808b26255fc3a138b1a87d3b1cb95ed5"; + }; + archs = ["noarch" "x86_64"]; + packages = commonCentOSPackages ++ [ "procps-ng" ]; }; - urlPrefix = http://vault.centos.org/7.1.1503/os/x86_64; - archs = ["noarch" "x86_64"]; - packages = commonCentOSPackages ++ [ "procps-ng" ]; - }; - - centos73x86_64 = { - name = "centos-7.3-x86_64"; - fullName = "CentOS 7.3 (x86_64)"; - packagesList = fetchurl { - url = http://vault.centos.org/7.3.1611/os/x86_64/repodata/dd86df27191d231cc6b7c5828fadb63b08db4725aef8e2613351667e649c9ca3-primary.xml.gz; - sha256 = "18wwkij7wrji6dhy5y5f4m3xn21vnsnqz0n5nz31q8qx34kxz1nx"; - }; - urlPrefix = http://vault.centos.org/7.3.1611/os/x86_64; - archs = ["noarch" "x86_64"]; - packages = commonCentOSPackages ++ [ "procps-ng" ]; - }; - - centos74x86_64 = rec { - name = "centos-7.4-x86_64"; - fullName = "CentOS 7.4 (x86_64)"; - # N.B. Switch to vault.centos.org when the next release comes out - urlPrefix = http://mirror.centos.org/centos-7/7.4.1708/os/x86_64; - packagesList = fetchurl { - url = "${urlPrefix}/repodata/b686d3a0f337323e656d9387b9a76ce6808b26255fc3a138b1a87d3b1cb95ed5-primary.xml.gz"; - sha256 = "1mayp4f3nzd8n4wa3hsz4lk8p076djkvk1wkdmjkwcipyfhd71mn"; - }; - archs = ["noarch" "x86_64"]; - packages = commonCentOSPackages ++ [ "procps-ng" ]; - }; }; @@ -1324,207 +838,6 @@ rec { # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are # wrong, but the SHA-1 and MD5 hashes are correct. Intrepid is fine. - ubuntu710i386 = { - name = "ubuntu-7.10-gutsy-i386"; - fullName = "Ubuntu 7.10 Gutsy (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/gutsy/main/binary-i386/Packages.bz2; - sha256 = "0fmac8svxq86a4w878g6syczvy5ff4jrdc1gajd3xd8z0dypnw27"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu804i386 = { - name = "ubuntu-8.04-hardy-i386"; - fullName = "Ubuntu 8.04 Hardy (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/hardy/main/binary-i386/Packages.bz2; - sha256 = "19132nc9fhdfmgmvn834lk0d8c0n3jv0ndz9inyynh9k6pc8b5hd"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu804x86_64 = { - name = "ubuntu-8.04-hardy-amd64"; - fullName = "Ubuntu 8.04 Hardy (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/hardy/main/binary-amd64/Packages.bz2; - sha256 = "1xjcgh0ydixmim7kgxss0mhfw0sibpgygvgsyac4bdz9m503sj3h"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu810i386 = { - name = "ubuntu-8.10-intrepid-i386"; - fullName = "Ubuntu 8.10 Intrepid (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/intrepid/main/binary-i386/Packages.bz2; - sha256 = "70483d40a9e9b74598f2faede7df5d5103ee60055af7374f8db5c7e6017c4cf6"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu810x86_64 = { - name = "ubuntu-8.10-intrepid-amd64"; - fullName = "Ubuntu 8.10 Intrepid (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/intrepid/main/binary-amd64/Packages.bz2; - sha256 = "01b2f3842cbdd5834446ddf91691bcf60f59a726dcefa23fb5b93fdc8ea7e27f"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu904i386 = { - name = "ubuntu-9.04-jaunty-i386"; - fullName = "Ubuntu 9.04 Jaunty (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/jaunty/main/binary-i386/Packages.bz2; - sha256 = "72c95e4901ad56ce8791723e2ae40bce2399f306f9956cac80e964011e1948d0"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu904x86_64 = { - name = "ubuntu-9.04-jaunty-amd64"; - fullName = "Ubuntu 9.04 Jaunty (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/jaunty/main/binary-amd64/Packages.bz2; - sha256 = "af760ce04e43f066b8938b1abdeff979a642f940515659ede44f7877ca358ca8"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu910i386 = { - name = "ubuntu-9.10-karmic-i386"; - fullName = "Ubuntu 9.10 Karmic (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/karmic/main/binary-i386/Packages.bz2; - sha256 = "6e3e813857496f2af6cd7e6ada06b3398fa067a7992c5fd7e8bd8fa92e3548b7"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diff" "mktemp" ]; - }; - - ubuntu910x86_64 = { - name = "ubuntu-9.10-karmic-amd64"; - fullName = "Ubuntu 9.10 Karmic (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/karmic/main/binary-amd64/Packages.bz2; - sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diff" "mktemp" ]; - }; - - ubuntu1004i386 = { - name = "ubuntu-10.04-lucid-i386"; - fullName = "Ubuntu 10.04 Lucid (i386)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/lucid/main/binary-i386/Packages.bz2; - sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa"; - }) - (fetchurl { - url = mirror://ubuntu/dists/lucid/universe/binary-i386/Packages.bz2; - sha256 = "13nvsb7na9igps2fdbbfpq4y8ihccmcs6x35pfyfp6rkhjgpzigy"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; - }; - - ubuntu1004x86_64 = { - name = "ubuntu-10.04-lucid-amd64"; - fullName = "Ubuntu 10.04 Lucid (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/lucid/main/binary-amd64/Packages.bz2; - sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0"; - }) - (fetchurl { - url = mirror://ubuntu/dists/lucid/universe/binary-amd64/Packages.bz2; - sha256 = "112lbnf8rcsbbh89aci4m6gwac0jy16838aij0av8n076zwkvlj9"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; - }; - - ubuntu1010i386 = { - name = "ubuntu-10.10-maverick-i386"; - fullName = "Ubuntu 10.10 Maverick (i386)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2; - sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0"; - }) - (fetchurl { - url = mirror://ubuntu/dists/maverick/universe/binary-i386/Packages.bz2; - sha256 = "1g5pnhx730wj32221ic8p2q6zcka23knpyg190mvq9x7kflcbfzy"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1010x86_64 = { - name = "ubuntu-10.10-maverick-amd64"; - fullName = "Ubuntu 10.10 Maverick (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2; - sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc"; - }) - (fetchurl { - url = mirror://ubuntu/dists/maverick/universe/binary-amd64/Packages.bz2; - sha256 = "0m26viwah29gh47p8m3jpnx6l84dhpwnms29m9bvqn1vwcrgjh0s"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1110i386 = { - name = "ubuntu-11.10-oneiric-i386"; - fullName = "Ubuntu 11.10 Oneiric (i386)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/oneiric/main/binary-i386/Packages.bz2; - sha256 = "11r1s76ppi7rwz08i20d7n4ndaj9lb9wsl9k8ww4s1c6agzpwv8a"; - }) - (fetchurl { - url = mirror://ubuntu/dists/oneiric/universe/binary-i386/Packages.bz2; - sha256 = "1dr59j8pjdhk07fpc0x73afcd9630kkdsbabx3bj92q71104yigz"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1110x86_64 = { - name = "ubuntu-11.10-oneiric-amd64"; - fullName = "Ubuntu 11.10 Oneiric (amd64)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/oneiric/main/binary-amd64/Packages.bz2; - sha256 = "07k784gxwaqmyggmzczy9hjkgfp6p6dcs8rhkxw5hfzn0jaf8l2s"; - }) - (fetchurl { - url = mirror://ubuntu/dists/oneiric/universe/binary-amd64/Packages.bz2; - sha256 = "1v3ldxn5jnnfgs863ryd6wl3fsb3glainr1ma2zn2l5vpzhpi2h1"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - ubuntu1204i386 = { name = "ubuntu-12.04-precise-i386"; fullName = "Ubuntu 12.04 Precise (i386)"; @@ -1545,7 +858,7 @@ rec { ubuntu1204x86_64 = { name = "ubuntu-12.04-precise-amd64"; fullName = "Ubuntu 12.04 Precise (amd64)"; - packagesList = + packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; @@ -1559,119 +872,17 @@ rec { packages = commonDebPackages ++ [ "diffutils" ]; }; - ubuntu1210i386 = { - name = "ubuntu-12.10-quantal-i386"; - fullName = "Ubuntu 12.10 Quantal (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/quantal/main/binary-i386/Packages.bz2; - sha256 = "bee3200ac8f037700ccd2311fb8b0de665bd02d46bdb2ae946cf50c5885001c3"; - }) - (fetchurl { - url = mirror://ubuntu/dists/quantal/universe/binary-i386/Packages.bz2; - sha256 = "9933ce12e7830b9c68a4aead08b86fcbb8d6ef0ea1fd133f0cf9d7126ad8c9bd"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1210x86_64 = { - name = "ubuntu-12.10-quantal-amd64"; - fullName = "Ubuntu 12.10 Quantal (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/quantal/main/binary-amd64/Packages.bz2; - sha256 = "ef14073f335ef118ebe1c7d45f5a0c17ef28f72abb57c10b9082ab5e04b5d003"; - }) - (fetchurl { - url = mirror://ubuntu/dists/quantal/universe/binary-amd64/Packages.bz2; - sha256 = "329a98312248c98092f8b91f232fc68fd3e6e2337ea4f348b3785465ae8dae17"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1304i386 = { - name = "ubuntu-13.04-raring-i386"; - fullName = "Ubuntu 13.04 Raring (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/raring/main/binary-i386/Packages.bz2; - sha256 = "b7da6802c5302439d9abf05ebe1ab4c3b82d7be9356f51a12c5bf4994f009181"; - }) - (fetchurl { - url = mirror://ubuntu/dists/raring/universe/binary-i386/Packages.bz2; - sha256 = "c1a59dd9132654194f4470932fd0f1582496465d8f96909b22accaf9f404024a"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1304x86_64 = { - name = "ubuntu-13.04-raring-amd64"; - fullName = "Ubuntu 13.04 Raring (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/raring/main/binary-amd64/Packages.bz2; - sha256 = "9ee6a67bedbda80b668a868bb81b5b3f30bbabac01f69d2a08961c37c8536356"; - }) - (fetchurl { - url = mirror://ubuntu/dists/raring/universe/binary-amd64/Packages.bz2; - sha256 = "8aba137ae18540a12de03a564c11496431a150ab2d4d1e93e2b4b691fa2a4850"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1310i386 = { - name = "ubuntu-13.10-saucy-i386"; - fullName = "Ubuntu 13.10 Saucy (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/saucy/main/binary-i386/Packages.bz2; - sha256 = "9b35d44a737e6aa7e1cb5e2b52ba0ed8717c8820b3950c2e7ade07024db9c138"; - }) - (fetchurl { - url = mirror://ubuntu/dists/saucy/universe/binary-i386/Packages.bz2; - sha256 = "897f64c19a742ac8524c17c1b5ec31b33ec8ab20c85463010d8bf04f5d14aa0f"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1310x86_64 = { - name = "ubuntu-13.10-saucy-amd64"; - fullName = "Ubuntu 13.10 Saucy (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/saucy/main/binary-amd64/Packages.bz2; - sha256 = "d000968f9653d7c25928002b0850fe2da97607682f63a351eb2c89896a219a12"; - }) - (fetchurl { - url = mirror://ubuntu/dists/saucy/universe/binary-amd64/Packages.bz2; - sha256 = "a899ce5513ce8540ce9b8da4c1cd85b16b231900881b3aa559f7ac3182cdbfc8"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - ubuntu1404i386 = { name = "ubuntu-14.04-trusty-i386"; fullName = "Ubuntu 14.04 Trusty (i386)"; packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2; - sha256 = "fdfc38663915c5cef3029872deb8c3bf52b98092073058086e2f1db0c71ebeb4"; + sha256 = "1d5y3v3v079gdq45hc07ja0bjlmzqfwdwwlq0brwxi8m75k3iz7x"; }) (fetchurl { url = mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2; - sha256 = "2afcf259332d88c5e02f5446c4926edd567ef1a00ce24ca7cb400cbf44e2a90f"; + sha256 = "03x9w92by320rfklrqhcl3qpwmnxds9c8ijl5zhcb21d6dcz5z1a"; }) ]; urlPrefix = mirror://ubuntu; @@ -1681,116 +892,14 @@ rec { ubuntu1404x86_64 = { name = "ubuntu-14.04-trusty-amd64"; fullName = "Ubuntu 14.04 Trusty (amd64)"; - packagesList = + packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2; - sha256 = "7095917eb8e4ac9161bc3b2ceeaf86e9265aae7b855a0e15d72096ecb05f1fc2"; + sha256 = "1hhzbyqfr5i0swahwnl5gfp5l9p9hspywb1vpihr3b74p1z935bh"; }) (fetchurl { url = mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2; - sha256 = "558637eeb8e340b871653e2060effe36e064677eca4eae62d9e4138dd402a610"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1410i386 = { - name = "ubuntu-14.10-utopic-i386"; - fullName = "Ubuntu 14.10 Utopic (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/utopic/main/binary-i386/Packages.bz2; - sha256 = "dc33a906ccb5625740251da759393d7daace65013d421c79fdd6c99a6490d989"; - }) - (fetchurl { - url = mirror://ubuntu/dists/utopic/universe/binary-i386/Packages.bz2; - sha256 = "e50553c033d9e478507405e63ce7d43c8060368ea851eca0c93b75b72fd85167"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1410x86_64 = { - name = "ubuntu-14.10-utopic-amd64"; - fullName = "Ubuntu 14.10 Utopic (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/utopic/main/binary-amd64/Packages.bz2; - sha256 = "9650775abec90a24c26dbb03f91a488180309144338f64f7044f7119d60d7182"; - }) - (fetchurl { - url = mirror://ubuntu/dists/utopic/universe/binary-amd64/Packages.bz2; - sha256 = "2acf0e39e64b4fd6d2b68b55c598fc167d7c3cabae233fc31a1e6b69eb6ecc63"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1504i386 = { - name = "ubuntu-15.04-vivid-i386"; - fullName = "Ubuntu 15.04 Vivid (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/vivid/main/binary-i386/Packages.bz2; - sha256 = "0bf587152fa3fc3524bf3a3caaf46ea43cc640a27b2b448577232f014a3ec1e4"; - }) - (fetchurl { - url = mirror://ubuntu/dists/vivid/universe/binary-i386/Packages.bz2; - sha256 = "3452cff96eb715ca36b73d4d0cdffbf06064cbc30b1097e334a2e493b94c7fac"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1504x86_64 = { - name = "ubuntu-15.04-vivid-amd64"; - fullName = "Ubuntu 15.04 Vivid (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/vivid/main/binary-amd64/Packages.bz2; - sha256 = "8f22c9bd389822702e65713e816250aa0d5829d6b3d75fd34f068de5f93de1d9"; - }) - (fetchurl { - url = mirror://ubuntu/dists/vivid/universe/binary-amd64/Packages.bz2; - sha256 = "feb88768e245a63ee04b0f3bcfc8899a1f03b2f831646dc2a59e4e58884b5cb9"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1510i386 = { - name = "ubuntu-15.10-wily-i386"; - fullName = "Ubuntu 15.10 Wily (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/wily/main/binary-i386/Packages.bz2; - sha256 = "ac9821095c63436fd4286539592295dd5de99bc82300f628e7a74111bb5dc370"; - }) - (fetchurl { - url = mirror://ubuntu/dists/wily/universe/binary-i386/Packages.bz2; - sha256 = "8951294f36c0755e945e8c37fdd046319f50553a8987ead1b68b21ffa53c5f7f"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1510x86_64 = { - name = "ubuntu-15.10-wily-amd64"; - fullName = "Ubuntu 15.10 Wily (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/wily/main/binary-amd64/Packages.bz2; - sha256 = "2877de7674c8c6a410c3ac479e46fec24164a4de250f22b3ff062073e3985013"; - }) - (fetchurl { - url = mirror://ubuntu/dists/wily/universe/binary-amd64/Packages.bz2; - sha256 = "714be7a2fd33b8bb577901c9223039dcc12c130c9244122648ee21a625e2a66d"; + sha256 = "04560ba8s4z4v5iawknagrkn9q1nzvpn081ycmqvhh73p3p3g1jm"; }) ]; urlPrefix = mirror://ubuntu; @@ -1817,7 +926,7 @@ rec { ubuntu1604x86_64 = { name = "ubuntu-16.04-xenial-amd64"; fullName = "Ubuntu 16.04 Xenial (amd64)"; - packagesList = + packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/xenial/main/binary-amd64/Packages.xz; sha256 = "110qnkhjkkwm316fbig3aivm2595ydz6zskc4ld5cr8ngcrqm1bn"; @@ -1831,138 +940,46 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1610i386 = { - name = "ubuntu-16.10-yakkety-i386"; - fullName = "Ubuntu 16.10 Yakkety (i386)"; + ubuntu1710i386 = { + name = "ubuntu-17.10-xenial-i386"; + fullName = "Ubuntu 17.10 Xenial (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/yakkety/main/binary-i386/Packages.xz; - sha256 = "da811f582779a969f738f2366c17e075cf0da3c4f2a4ed1926093a2355fd72ba"; + url = mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz; + sha256 = "18yrj4kqdzm39q0527m97h5ing58hkm9yq9iyj636zh2rclym3c8"; }) (fetchurl { - url = mirror://ubuntu/dists/yakkety/universe/binary-i386/Packages.xz; - sha256 = "5162b0a87173cd5dea7ce2273788befe36f38089d44a2379ed9dd92f76c6b2aa"; + url = mirror://ubuntu/dists/artful/universe/binary-i386/Packages.xz; + sha256 = "1v0njw2w80xfmxi7by76cs8hyxlla5h3gqajlpdw5srjgx2qrm2g"; }) ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1610x86_64 = { - name = "ubuntu-16.10-yakkety-amd64"; - fullName = "Ubuntu 16.10 Yakkety (amd64)"; - packagesList = + ubuntu1710x86_64 = { + name = "ubuntu-17.10-artful-amd64"; + fullName = "Ubuntu 17.10 Artful (amd64)"; + packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/yakkety/main/binary-amd64/Packages.xz; - sha256 = "356c4cfab0d7f77b75c473cd78b22ee7288f63b24c9739049924dc081dd2e3d1"; + url = mirror://ubuntu/dists/artful/main/binary-amd64/Packages.xz; + sha256 = "104g57j1l3vi8wb5f7rgjvjhf82ccs0vwhc59jfc4ynd51z7fqjk"; }) (fetchurl { - url = mirror://ubuntu/dists/yakkety/universe/binary-amd64/Packages.xz; - sha256 = "a72660f8feffd6978e3b9328c6259b5387ac0b4f33d1029e4a17091ceb5057e6"; + url = mirror://ubuntu/dists/artful/universe/binary-amd64/Packages.xz; + sha256 = "1qzs95wfy9inaskfx9cf1l5yd3aaqwzy72zzi9xyvkxi75k5gcn4"; }) ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - debian40i386 = { - name = "debian-4.0r9-etch-i386"; - fullName = "Debian 4.0r9 Etch (i386)"; - packagesList = fetchurl { - url = mirror://debian/dists/etch/main/binary-i386/Packages.bz2; - sha256 = "40eeeecc35e6895b6eb0bc601e38fe53fc985d1b1f3fea3766f34763d21f206f"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian40x86_64 = { - name = "debian-4.0r9-etch-amd64"; - fullName = "Debian 4.0r9 Etch (amd64)"; - packagesList = fetchurl { - url = mirror://debian/dists/etch/main/binary-amd64/Packages.bz2; - sha256 = "cf1c4c7d72e0da45797b046011254d2bd83f5ecb7389c7f30d2561be3f5b2e49"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian50i386 = { - name = "debian-5.0.10-lenny-i386"; - fullName = "Debian 5.0.10 Lenny (i386)"; - packagesList = fetchurl { - url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2; - sha256 = "fb390cf043a5b6bac50879ce1c0827882abdb560050313a6a326a03a4fc761d6"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian50x86_64 = { - name = "debian-5.0.10-lenny-amd64"; - fullName = "Debian 5.0.10 Lenny (amd64)"; - packagesList = fetchurl { - url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2; - sha256 = "1y4bb3n770fgwsrw8qiwsgf17k0ws2d6jmcfvqv07lj77dyj53wc"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian60i386 = { - name = "debian-6.0.10-squeeze-i386"; - fullName = "Debian 6.0.10 Squeeze (i386)"; - packagesList = fetchurl { - url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2; - sha256 = "c08899011a7a2b0df4da08f91eef3a80d112a247df988b1c966c9fb64c812392"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian60x86_64 = { - name = "debian-6.0.10-squeeze-amd64"; - fullName = "Debian 6.0.10 Squeeze (amd64)"; - packagesList = fetchurl { - url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2; - sha256 = "3f2ebd5221b9a4bdf7224acf728a51a987c63d32df1bbc20a97f177d2f184045"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - # Backward compatibility. - debian70i386 = debian7i386; - debian70x86_64 = debian7x86_64; - - debian7i386 = { - name = "debian-7.11-wheezy-i386"; - fullName = "Debian 7.11 Wheezy (i386)"; - packagesList = fetchurl { - url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2; - sha256 = "57ea423dc1c0cc082cae580360f8e7192c9fd60e2ef775a4ce7f48784277462d"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian7x86_64 = { - name = "debian-7.11-wheezy-amd64"; - fullName = "Debian 7.11 Wheezy (amd64)"; - packagesList = fetchurl { - url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2; - sha256 = "b400e459ce2f8af8621182c3a9ea843f0df3dc2d5662e6c6204f9406f5ff2d41"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - debian8i386 = { name = "debian-8.10-jessie-i386"; fullName = "Debian 8.10 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "b3aa33bfe0256f72b7aad07b6c714b790d9a20d86c1a448a6f36b35652a82ff0"; + sha256 = "1w1gm195dcrndy5486kcv0h9l3br9dqnqyyhmavp4vr5w2zk7amk"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; @@ -1973,11 +990,35 @@ rec { fullName = "Debian 8.10 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "689e77cdf5334a3fffa5ca504e8131ee9ec88a7616f12c9ea5a3d5ac3100a710"; + sha256 = "045700qsrmd3lng2rw8nfs5ci7pf660lwl6alpzkyjikyp6pg7k8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; + + debian9i386 = { + name = "debian-9.3-stretch-i386"; + fullName = "Debian 9.3 Stretch (i386)"; + packagesList = fetchurl { + url = mirror://debian/dists/stretch/main/binary-i386/Packages.xz; + sha256 = "1rpv0r92pkr9dmjvpffvgmq3an1s83npfmq870h67jqag3qpwj9l"; + }; + urlPrefix = mirror://debian; + packages = commonDebianPackages; + }; + + debian9x86_64 = { + name = "debian-9.3-stretch-amd64"; + fullName = "Debian 9.3 Stretch (amd64)"; + packagesList = fetchurl { + url = mirror://debian/dists/stretch/main/binary-amd64/Packages.xz; + sha256 = "1gnkvh7wc5yp0rw8kq8p8rlskvl0lc4cv3gdylw8qpqzy75xqlig"; + }; + urlPrefix = mirror://debian; + packages = commonDebianPackages; + }; + + }; @@ -1997,7 +1038,7 @@ rec { "make" "patch" "perl" - "pkgconfig" + "pkgconf-pkg-config" "rpm" "rpm-build" "tar" @@ -2101,6 +1142,7 @@ rec { # Needed because it provides /etc/login.defs, whose absence causes # the "passwd" post-installs script to fail. "login" + "passwd" ]; commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ]; diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 0e6a0450bb47..ec58dfd77492 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.14"; + version = "4.15"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "0wf9ymqxk1k5xwcl3n919p66a1aayif3x4cahj4w04y3k1wbhlih"; + sha256 = "01n1rq1kvambax85xamriawbga94mh63s5mgjmjljjgf50m7yw6f"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index de2edad451b9..9d002ef02ade 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,18 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: -stdenv.mkDerivation rec { - major = "0.0"; - minor = "25"; - name = "cantarell-fonts-${major}.${minor}"; +let + pname = "cantarell-fonts"; + version = "0.100"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/cantarell-fonts/${major}/${name}.tar.xz"; - sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1286rx1z7mrmi6snx957fprpcmd5p00l6drdfpbgf6mqapl6kb81"; }; + nativeBuildInputs = [ meson ninja gettext appstream-glib ]; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2"; + outputHash = "12ia41pr0rzjfay6y84asw3nxhyp1scq9zl0w4f6wkqj7vf1qfn1"; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 5cfd2ec1f472..191e52c427a7 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "1.204"; + version = "1.205"; in fetchzip { name = "fira-code-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0gngbnrq42ysz13w3s227ghv1yigw399r3w2415ipb5pba8vipad"; + sha256 = "0h8b89d1n3y56k7x9zrwm9fic09ccg1mc7g1258g152m5g6z6zms"; meta = with stdenv.lib; { homepage = https://github.com/tonsky/FiraCode; diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-4/default.nix similarity index 100% rename from pkgs/data/fonts/font-awesome-ttf/default.nix rename to pkgs/data/fonts/font-awesome-4/default.nix diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix new file mode 100644 index 000000000000..6bb175f1ecac --- /dev/null +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip }: + +let + version = "5.0.6"; +in fetchzip rec { + name = "font-awesome-${version}"; + + url = "https://github.com/FortAwesome/Font-Awesome/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Brands-Regular-400.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Regular-400.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype + ''; + + sha256 = "1p7xb8s371r62rx0akcnlkk4mspjid6y0s9h04gakx83ymgjlfg4"; + + meta = with stdenv.lib; { + description = "Font Awesome - OTF font"; + longDescription = '' + Font Awesome gives you scalable vector icons that can instantly be customized. + This package includes only the OTF font. For full CSS etc. see the project website. + ''; + homepage = http://fortawesome.github.io/Font-Awesome/; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ abaldeau ]; + }; +} diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 91e379de223a..84bf45a52bbe 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, moka-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; - buildInputs = [ moka-icon-theme ]; + postFixup = "gtk-update-icon-cache $out/share/icons/Arc"; meta = with stdenv.lib; { description = "Arc icon theme"; homepage = https://github.com/horst3180/arc-icon-theme; - license = with licenses; [ gpl3 ]; + license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/data/icons/deepin-icon-theme/default.nix b/pkgs/data/icons/deepin-icon-theme/default.nix new file mode 100644 index 000000000000..7a422beb9924 --- /dev/null +++ b/pkgs/data/icons/deepin-icon-theme/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-icon-theme"; + version = "15.12.52"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "141in9jlflmckd8rg4605dfks84p1p6b1zdbhbiwrg11xbl66f3l"; + + # Get rid of case collision in file names, which is an issue in + # darwin where file names are case insensitive. + extraPostFetch = '' + rm "$out"/Sea/apps/scalable/TeXmacs.svg + rm "$out"/deepin/apps/48/TeXmacs.svg + ''; + }; + + nativeBuildInputs = [ gtk3 papirus-icon-theme ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Deepin icon theme"; + homepage = https://github.com/linuxdeepin/deepin-icon-theme; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 77d29d52507e..db4b5ea6387b 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,26 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, cmake, gtk3 }: stdenv.mkDerivation rec { + name = "elementary-icon-theme-${version}"; version = "4.3.1"; - package-name = "elementary-icon-theme"; - - name = "${package-name}-${version}"; - src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; sha256 = "1rp22igvnx71l94j5a6px142329djhk2psm1wfgbhdxbj23hw9kb"; }; - dontBuild = true; + nativeBuildInputs = [ cmake gtk3 ]; + + postPatch = "cat > volumeicon/CMakeLists.txt"; + postFixup = "gtk-update-icon-cache $out/share/icons/elementary"; - installPhase = '' - install -dm 755 $out/share/{icons,doc/$name} - cp -dr --no-preserve='ownership' . $out/share/icons/Elementary/ - mv $out/share/icons/Elementary/{AUTHORS,CONTRIBUTORS,README.md} \ - $out/share/doc/$name/ - rm $out/share/icons/Elementary/{COPYING,pre-commit} - ''; meta = with stdenv.lib; { description = "Elementary icon theme"; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 9ff54d5d64d5..724f3a066cc8 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "elementary-xfce-icon-theme-${version}"; @@ -11,24 +11,21 @@ stdenv.mkDerivation rec { sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y"; }; - # fallback icon theme - propagatedBuildInputs = [ hicolor_icon_theme ]; - - dontBuild = true; + nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; installPhase = '' - install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' elementary-xfce{,-dark,-darker,-darkest} $out/share/icons/ + mkdir -p $out/share/icons + mv elementary-xfce* $out/share/icons ''; - postInstall = '' - for icons in "$out"/share/icons/*; do - "${gtk3.out}/bin/gtk-update-icon-cache" "$icons" + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme done ''; meta = with stdenv.lib; { - description = "Elementary icons for Xfce and other Gtk+ desktops like Gnome3"; + description = "Elementary icons for Xfce and other GTK+ desktops like GNOME"; homepage = https://github.com/shimmerproject/elementary-xfce; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index 37f46060ae31..fdad4f0f46da 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme, gtk3 }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "0hif030pd4w3s851k0s65w0mf2pik10ha25ycpsv91gpbgarqcns"; }; - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ elementary-icon-theme ]; + nativeBuildInputs = [ autoreconfHook elementary-icon-theme gtk3 ]; postPatch = '' substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out ''; + postFixup = "gtk-update-icon-cache $out/share/icons/Faba"; + meta = with stdenv.lib; { description = "A sexy and modern icon theme with Tango influences"; homepage = https://snwh.org/moka; diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index 3a871e86d9d1..bdb6f651e6a5 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, moka-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "faba-mono-icons"; + name = "${pname}-${version}"; + pname = "faba-mono-icons"; version = "2016-04-30"; src = fetchFromGitHub { owner = "snwh"; - repo = package-name; + repo = pname; rev = "2006c5281eb988c799068734f289a85443800cda"; sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; - buildInputs = [ moka-icon-theme ]; + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; meta = with stdenv.lib; { description = "The full set of Faba monochrome panel icons"; homepage = https://snwh.org/moka; - license = with licenses; [ gpl3 ]; + license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index e5a3faf7742b..03c5be143ded 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hicolor-icon-theme-0.15"; + name = "hicolor-icon-theme-0.17"; src = fetchurl { url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1k1kf2c5zbqh31nglc3nxs9j6wr083k9kjyql8p22ccc671mmi4w"; + sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i"; }; setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = https://icon-theme.freedesktop.org/releases/; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index f4f81f8de8be..82aafca11f4f 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, gtk3, kdeFrameworks }: stdenv.mkDerivation rec { name = "maia-icon-theme-${version}"; @@ -11,21 +11,19 @@ stdenv.mkDerivation rec { sha256 = "0f9l3k9abgg8islzddrxgbxaw6vbai5bvz5qi1v2fzir7ykx7bgj"; }; - dontBuild = true; - - installPhase = '' - install -dm 755 $out/share/icons - for f in "" "-dark"; do - rm icons$f/CMakeLists.txt - cp -dr --no-preserve='ownership' icons$f $out/share/icons/maia$f - done - ''; + nativeBuildInputs = [ + cmake + extra-cmake-modules + gtk3 + kdeFrameworks.plasma-framework + kdeFrameworks.kwindowsystem + ]; meta = with stdenv.lib; { description = "Icons based on Breeze and Super Flat Remix"; homepage = https://github.com/manjaro/artwork-maia; - license = licenses.free; - maintainers = [ maintainers.mounium ]; + license = licenses.free; # https://github.com/manjaro/artwork-maia/issues/27 + maintainers = with maintainers; [ mounium ]; platforms = platforms.all; }; } diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 5ac2a13be4d1..f3180db54dcf 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme, gtk3 }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "moka-icon-theme"; + name = "${pname}-${version}"; + pname = "moka-icon-theme"; version = "5.3.6"; src = fetchFromGitHub { owner = "snwh"; - repo = package-name; + repo = pname; rev = "v${version}"; sha256 = "17f8k8z8xvib4hkxq0cw9j7bhdpqpv5frrkyc4sbyildcbavzzbr"; }; - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ faba-icon-theme ]; + nativeBuildInputs = [ autoreconfHook faba-icon-theme gtk3 ]; postPatch = '' substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out ''; + postFixup = "gtk-update-icon-cache $out/share/icons/Moka"; + meta = with stdenv.lib; { description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; homepage = https://snwh.org/moka; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 08fd012bb41e..6b6b77ae5e8b 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,26 +1,28 @@ -{ stdenv, fetchFromGitHub, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "numix-icon-theme"; version = "17-12-25"; - package-name = "numix-icon-theme"; - - name = "${package-name}-${version}"; - src = fetchFromGitHub { owner = "numixproject"; - repo = package-name; + repo = pname; rev = version; sha256 = "0q3hpq2jc9iwnzzqpb12g1qzjsw4ckhdqkfqf6nirl87r5drkv6j"; }; - buildInputs = [ hicolor_icon_theme ]; - - dontBuild = true; + nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; installPhase = '' - install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/ + mkdir -p $out/share/icons + mv Numix{,-Light} $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done ''; meta = with stdenv.lib; { diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index f161d6fbbd67..f49009e76f3e 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,18 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3 }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "paper-icon-theme"; + name = "${pname}-${version}"; + pname = "paper-icon-theme"; version = "2017-11-20"; src = fetchFromGitHub { owner = "snwh"; - repo = package-name; + repo = pname; rev = "af0296ecc872ad723fad7dca6e7e89eb85cbb3a8"; sha256 = "18a9zl9lbw9gc3zas49w329xrps4slvkp4nv815nlnmimz8dj85m"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gtk3 ]; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; meta = with stdenv.lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index ef817a2e3f47..df974d8a0359 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,26 +1,31 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, gtk3 }: stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20171102"; + version = "20180214"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; - rev = "${version}"; - sha256 = "10q7ppizzqi8c564jydqivia43gp4j1z984igfyym2mdwdw71mzq"; + rev = version; + sha256 = "0lsp5cmq5wdqw6vyh6hqqrshgpzxfj8dx87l7qdlgrk73dajjmki"; }; - dontBuild = true; + nativeBuildInputs = [ gtk3 ]; installPhase = '' - install -dm 755 $out/share/icons - cp -dr Papirus{,-Dark,-Light} $out/share/icons/ - cp -dr ePapirus $out/share/icons/ + mkdir -p $out/share/icons + mv {,e}Papirus* $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done ''; meta = with stdenv.lib; { - description = "Papirus icon theme for Linux"; + description = "Papirus icon theme"; homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme; license = licenses.lgpl3; platforms = platforms.all; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 7f7932d01b4f..8a29600f250d 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/4c8b3501ea6fc9f41cd192ddc08e2d9583a1e679.tar.gz"; - sha256 = "0aa4pimgllqgn8bcy2p2cdwbpz6s6wk8j41w35jvzaqfj15gysnq"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9f6344416728bff8b5279e0c45941fd8da361eb9.tar.gz"; + sha256 = "0zm53wxvm7z72605qvgv0dzsfq91lyffpr850cks23r979pjvkv8"; } diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 4d824e6e8d77..dbf92ad066f5 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, python3, udev, systemd }: let - name = "media-player-info-22"; + name = "media-player-info-23"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; - sha256 = "0di3gfx5z8c34yspzyllydr5snzg71r985kbqhrhb1il51qxgrvy"; + url = "https://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; + sha256 = "1jy8xh4xjgjc4wj4qrw6sx2j3606zsj4bgiczhzf3xlpnkh6vax9"; }; buildInputs = [ udev systemd ]; @@ -25,7 +25,7 @@ in meta = with stdenv.lib; { description = "A repository of data files describing media player capabilities"; - homepage = http://www.freedesktop.org/wiki/Software/media-player-info/; + homepage = https://www.freedesktop.org/wiki/Software/media-player-info/; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; linux; diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix index bce1c5d81d89..65ad964736d1 100644 --- a/pkgs/data/misc/mime-types/default.nix +++ b/pkgs/data/misc/mime-types/default.nix @@ -1,21 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "mime-types-${version}"; +let version = "9"; - - src = fetchurl { - url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2"; - sha256 = "0pib8v0f5xwwm3xj2ygdi2dlxxvbq6p95l3fah5f66qj9xrqlqxl"; - }; - - dontBuild = true; - - installPhase = '' - runHook preInstall - install -Dm644 -t $out/etc mime.types - runHook postInstall +in fetchzip rec { + name = "mime-types-${version}"; + url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2"; + postFetch = '' + mkdir -p $out/etc + tar xjvf $downloadedFile --directory=$out/etc --strip-components=1 ''; + sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0"; meta = with stdenv.lib; { description = "A database of common mappings of file extensions to MIME types"; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 4fec962f16d8..cc4536785251 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -3,12 +3,17 @@ let overridden = set // overrides; set = with overridden; { # Backward compatibility. - gtkdoc = self.gtk_doc; + gtkdoc = self.gtk-doc; startup_notification = libstartup_notification; startupnotification = libstartup_notification; - gnomedocutils = self.gnome_doc_utils; + gnomedocutils = self.gnome-doc-utils; gnomeicontheme = self.gnome_icon_theme; gnomepanel = self.gnome_panel; + gnome_common = gnome-common; + gnome_keyring = gnome-keyring; + gnome_desktop = gnome-desktop; + gnome_settings_daemon = gnome-settings-daemon; + gnome_control_center = gnome-control-center; #### PLATFORM @@ -41,7 +46,7 @@ let overridden = set // overrides; set = with overridden; { libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { }; # for git-head builds - gnome_common = callPackage platform/gnome-common { }; + gnome-common = callPackage platform/gnome-common { }; gnome_mime_data = callPackage ./platform/gnome-mime-data { }; @@ -77,7 +82,7 @@ let overridden = set // overrides; set = with overridden; { #### DESKTOP - gnome_keyring = callPackage ./desktop/gnome-keyring { }; + gnome-keyring = callPackage ./desktop/gnome-keyring { }; libgweather = callPackage ./desktop/libgweather { }; @@ -97,15 +102,13 @@ let overridden = set // overrides; set = with overridden; { gnome_menus = callPackage ./desktop/gnome-menus { }; - gnome_desktop = callPackage ./desktop/gnome-desktop { }; + gnome-desktop = callPackage ./desktop/gnome-desktop { }; gnome_panel = callPackage ./desktop/gnome-panel { }; - gnome_session = callPackage ./desktop/gnome-session { }; + gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { }; - gnome_settings_daemon = callPackage ./desktop/gnome-settings-daemon { }; - - gnome_control_center = callPackage ./desktop/gnome-control-center { }; + gnome-control-center = callPackage ./desktop/gnome-control-center { }; gtksourceview = callPackage ./desktop/gtksourceview { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index c07dc9730e6d..7202be839082 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python -, shared_mime_info, desktop_file_utils, libunique, libtool, bzip2 -, glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd -, librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon +{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python +, shared-mime-info, desktop-file-utils, libunique, libtool, bzip2 +, glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd +, librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon , libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 , libSM }: @@ -14,9 +14,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils - gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon + buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils + gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 + libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon libSM ]; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix index 63df026836fa..b99f23555d38 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk -, intltool, GConf, gnome_doc_utils}: +, intltool, GConf, gnome-doc-utils}: stdenv.mkDerivation { name = "gnome-desktop-2.32.1"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { configureFlags = "--disable-scrollkeeper"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python libxml2Python libxslt which libX11 gtk - intltool GConf gnome_doc_utils ]; + intltool GConf gnome-doc-utils ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix index 50f2cd081332..26f3f624a042 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, -gtk, intltool, GConf, libgnome_keyring }: +gtk, intltool, GConf, libgnome-keyring }: stdenv.mkDerivation { name = "gnome-keyring-2.30.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj"; }; - buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome_keyring ]; + buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome-keyring ]; propagatedBuildInputs = [ glib libtasn1 ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index 514389c6faf8..d85b5494da47 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python -, glib, gtk, pango, atk, libXau, libcanberra_gtk2 -, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop -, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: +{ stdenv, fetchurl, pkgconfig, dbus-glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python +, glib, gtk, pango, atk, libXau, libcanberra-gtk2 +, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop +, libwnck, librsvg, libgweather, gnome-doc-utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: stdenv.mkDerivation { name = "gnome-panel-2.32.1"; @@ -12,10 +12,10 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk dbus_glib popt libxml2Python libxslt bzip2 python libXau intltool + [ gtk dbus-glib popt libxml2Python libxslt bzip2 python libXau intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf - gnome_menus gnome_desktop libwnck librsvg libgweather gnome_doc_utils - libtasn1 libtool libcanberra_gtk2 xorg.libICE xorg.libSM + gnome_menus gnome-desktop libwnck librsvg libgweather gnome-doc-utils + libtasn1 libtool libcanberra-gtk2 xorg.libICE xorg.libSM ]; nativeBuildInputs = [ pkgconfig intltool which ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix deleted file mode 100644 index 7678cb3a4b42..000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto -, intltool, libglade, startup_notification, GConf, upower, libSM }: - -stdenv.mkDerivation { - name = "gnome-session-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-session/2.32/gnome-session-2.32.1.tar.bz2; - sha256 = "0sk8qclarpar27va1ahzwjh2wsafys0xsdjzdg7cgygw6gj3rn92"; - }; - - buildInputs = - [ dbus_glib gtk libXau libXtst inputproto libglade startup_notification - GConf upower libSM - ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # gconf-sanity-check-2 not found - meta.broken = true; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index 37f995396861..9712ce64841f 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio +{ stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, gtk +, intltool, GConf, gnome-desktop, libglade, libgnomekbd, polkit, libpulseaudio , libSM }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = - [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit + [ dbus-glib libxklavier gtk GConf gnome-desktop libglade libgnomekbd polkit libpulseaudio libSM ]; diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index bd8b71d0daca..05da06846418 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib -, gnome_common, gtk, pango +, gnome-common, gtk, pango , libxml2Python, perl, intltool, gettext, gtk-mac-integration }: with stdenv.lib; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pango libxml2Python perl intltool gettext ] ++ optionals stdenv.isDarwin [ - autoreconfHook gnome_common gtk-mac-integration + autoreconfHook gnome-common gtk-mac-integration ]; preConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix index f0882e39a857..b846ef888c43 100644 --- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, glib, gtk, intltool, GConf, libglade}: +{stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, glib, gtk, intltool, GConf, libglade}: stdenv.mkDerivation { name = "libgnomekbd-2.32.0"; @@ -9,5 +9,5 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib libxklavier glib gtk intltool GConf libglade ]; + buildInputs = [ dbus-glib libxklavier glib gtk intltool GConf libglade ]; } diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 22604f214d48..d4935c498f13 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus_glib, gmime, libnotify, libgnome_keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor_icon_theme, tango-icon-theme }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.gnome-keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/desktops/gnome-2/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix index 10c790bc09cc..95dd97568f46 100644 --- a/pkgs/desktops/gnome-2/desktop/metacity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/metacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage -, libcanberra_gtk2, intltool, GConf, startup_notification, zenity, gnome_doc_utils -, gsettings_desktop_schemas }: +, libcanberra-gtk2, intltool, GConf, startup_notification, zenity, gnome-doc-utils +, gsettings-desktop-schemas }: stdenv.mkDerivation { name = "metacity-2.30.3"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; buildInputs = - [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra_gtk2 - intltool GConf startup_notification zenity gnome_doc_utils - gsettings_desktop_schemas + [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra-gtk2 + intltool GConf startup_notification zenity gnome-doc-utils + gsettings-desktop-schemas ]; } diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index 3ab8838c97b6..55a5f9c0a234 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk -, gnome_doc_utils, intltool, libglade, libX11, which }: +, gnome-doc-utils, intltool, libglade, libX11, which }: stdenv.mkDerivation { name = "zenity-2.32.1"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { configureFlags = "--disable-scrollkeeper"; buildInputs = [ gtk libglade libxml2 libxslt libX11 ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; } diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index afa27a93bad5..778a1cc920f1 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2 +{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 , polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: assert withGtk -> (gtk2 != null); @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ] + buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix index b0b669148ff3..9bcc9ab6cabe 100644 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi -, intltool, libbonobo, ORBit2, GConf, dbus_glib }: +, intltool, libbonobo, ORBit2, GConf, dbus-glib }: stdenv.mkDerivation { name = "at-spi-1.32.0"; @@ -13,5 +13,5 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi - intltool libbonobo ORBit2 GConf dbus_glib ]; + intltool libbonobo ORBit2 GConf dbus-glib ]; } diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix index c00f0a9c37b2..54a2bd526a94 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; }; - propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which + propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome-common tends to require which patches = [(fetchurl { name = "gnome-common-patch"; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 06af8a63200a..4ca0e791a2a9 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus_glib +{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = - [ libxml2 bzip2 openssl dbus_glib fam cdparanoia + [ libxml2 bzip2 openssl dbus-glib fam cdparanoia gnome_mime_data avahi acl ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 49b8cc88f9de..493f88290f3a 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool, -GConf, enchant, isocodes, gnome_icon_theme, gsettings_desktop_schemas }: +GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "4.10.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; }; - propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ]; + propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome_icon_theme GConf ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index d93ef73ca986..ee0bf5f82a09 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt +{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 5a488e052c19..2dcb85235ee4 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra_gtk2 +{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2 , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg }: @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra_gtk2 libtool ]; + buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ]; propagatedBuildInputs = [ glib libbonobo libogg ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 24cd851eef6a..838e51337453 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool -, gnome_vfs, libgnome_keyring, libglade }: +, gnome_vfs, libgnome-keyring, libglade }: stdenv.mkDerivation rec { name = "libgnomeui-${minVer}.5"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = - [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; + [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 545e89a85125..a96d4f7a8eaf 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,19 +1,32 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, itstool, libxml2, python3Packages, at_spi2_core +, itstool, libxml2, python3Packages, at-spi2-core , dbus, intltool, libwnck3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) src name; + name = "accerciser-${version}"; + version = "3.22.0"; - nativeBuildInputs = [ pkgconfig ]; + src = fetchurl { + url = "mirror://gnome/sources/accerciser/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool intltool ]; buildInputs = [ - gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi + gtk3 libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython - at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme + at-spi2-core dbus libwnck3 gnome3.defaultIconTheme ]; wrapPrefixVariables = [ "PYTHONPATH" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "accerciser"; + attrPath = "gnome3.accerciser"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Accerciser; description = "Interactive Python accessibility explorer"; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/src.nix b/pkgs/desktops/gnome-3/apps/accerciser/src.nix deleted file mode 100644 index 20bd00839649..000000000000 --- a/pkgs/desktops/gnome-3/apps/accerciser/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "accerciser-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/accerciser/3.22/accerciser-3.22.0.tar.xz; - sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index ca266d73fd35..eaf8528b6ffb 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -1,11 +1,21 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, glib -, evolution_data_server, evolution, sqlite -, wrapGAppsHook, itstool, desktop_file_utils -, clutter_gtk, libuuid, webkitgtk, zeitgeist +, evolution-data-server, evolution, sqlite +, wrapGAppsHook, itstool, desktop-file-utils +, clutter-gtk, libuuid, webkitgtk, zeitgeist , gnome3, librsvg, gdk_pixbuf, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "bijiben-${version}"; + version = "3.27.1"; + + src = fetchurl { + url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "bijiben"; attrPath = "gnome3.bijiben"; }; + }; doCheck = true; @@ -18,23 +28,22 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxml2 desktop_file_utils wrapGAppsHook + meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ glib clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist - gnome3.gsettings_desktop_schemas + buildInputs = [ glib clutter-gtk libuuid webkitgtk gnome3.tracker + gnome3.gnome-online-accounts zeitgeist + gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme librsvg - evolution_data_server evolution sqlite ]; + evolution-data-server evolution sqlite ]; enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Bijiben; description = "Note editor designed to remain simple to use"; - broken = true; maintainers = gnome3.maintainers; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/apps/bijiben/src.nix deleted file mode 100644 index ee573eaef8eb..000000000000 --- a/pkgs/desktops/gnome-3/apps/bijiben/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "bijiben-3.27.1"; - - src = fetchurl { - url = mirror://gnome/sources/bijiben/3.27/bijiben-3.27.1.tar.xz; - sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index e94a89c7f27c..77ee086a950c 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,27 +1,37 @@ -{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 -, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool +{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3 +, pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool , libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib -, libxslt, yelp_tools, gnome_common, gtk_doc -, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: +, libxslt, yelp-tools, gnome-common, gtk-doc +, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome-desktop, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "cheese-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/cheese/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; }; + }; nativeBuildInputs = [ pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib libxslt docbook_xml_dtd_43 docbook_xsl - autoreconfHook gtk_doc yelp_tools gnome_common + autoreconfHook gtk-doc yelp-tools gnome-common ]; buildInputs = [ gtk3 glib gnome-video-effects gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop - gst_all_1.gst-plugins-bad clutter_gtk clutter-gst - libcanberra_gtk3 libgudev ]; + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop + gst_all_1.gst-plugins-bad clutter-gtk clutter-gst + libcanberra-gtk3 libgudev ]; outputs = [ "out" "man" "devdoc" ]; patches = [ - gtk_doc.respect_xml_catalog_files_var_patch + gtk-doc.respect_xml_catalog_files_var_patch ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/apps/cheese/src.nix b/pkgs/desktops/gnome-3/apps/cheese/src.nix deleted file mode 100644 index 0237606ae35c..000000000000 --- a/pkgs/desktops/gnome-3/apps/cheese/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "cheese-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/cheese/3.26/cheese-3.26.0.tar.xz; - sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 4996120d4935..1119cf86a4c9 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,27 +1,37 @@ { stdenv, cmake, intltool, fetchurl, libxml2, webkitgtk, highlight , pkgconfig, gtk3, glib, libnotify, gtkspell3 -, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite +, wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap }: +, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let majVer = gnome3.version; in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evolution-${version}"; + version = "3.26.3"; + + src = fetchurl { + url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "091621f21827e2dfb8057f3b2c3a215c4e97a692c59d0a4ee33108af571de60e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "evolution"; attrPath = "gnome3.evolution"; }; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome3.evolution_data_server ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard + gnome3.evolution-data-server ]; buildInputs = [ gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu - gnome3.evolution_data_server libsecret libical gcr - webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 - libcanberra_gtk3 bogofilter gnome3.libgdata sqlite - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit + gnome3.evolution-data-server libsecret libical gcr + webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3 + libcanberra-gtk3 bogofilter gnome3.libgdata sqlite + gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas - gnome3.libgnome_keyring gnome3.glib_networking openldap + gnome3.gsettings-desktop-schemas + gnome3.libgnome-keyring gnome3.glib-networking openldap ]; nativeBuildInputs = [ cmake intltool itstool libxml2 pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/evolution/src.nix b/pkgs/desktops/gnome-3/apps/evolution/src.nix deleted file mode 100644 index 0c8155efde20..000000000000 --- a/pkgs/desktops/gnome-3/apps/evolution/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-3.26.3"; - - src = fetchurl { - url = mirror://gnome/sources/evolution/3.26/evolution-3.26.3.tar.xz; - sha256 = "091621f21827e2dfb8057f3b2c3a215c4e97a692c59d0a4ee33108af571de60e"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 181888293777..89f20ed6f150 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -2,7 +2,17 @@ , attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "file-roller-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/file-roller/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "file-roller"; attrPath = "gnome3.file-roller"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/apps/file-roller/src.nix deleted file mode 100644 index 090c88e1d3e3..000000000000 --- a/pkgs/desktops/gnome-3/apps/file-roller/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "file-roller-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/file-roller/3.26/file-roller-3.26.2.tar.xz; - sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 69056e28c260..d8f272931d9a 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -4,16 +4,26 @@ , gnome3, librsvg, gdk_pixbuf, file, gspell }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gedit-${version}"; + version = "3.22.1"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gedit"; attrPath = "gnome3.gedit"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk3 glib intltool itstool enchant isocodes gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup gnome3.libpeas gnome3.gtksourceview libxml2 - gnome3.gsettings_desktop_schemas gnome3.dconf file gspell ]; + gnome3.gsettings-desktop-schemas gnome3.dconf file gspell ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gedit/src.nix b/pkgs/desktops/gnome-3/apps/gedit/src.nix deleted file mode 100644 index 7a68b75eb2a7..000000000000 --- a/pkgs/desktops/gnome-3/apps/gedit/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gedit-3.22.1"; - - src = fetchurl { - url = mirror://gnome/sources/gedit/3.22/gedit-3.22.1.tar.xz; - sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 1179b2fdc5cf..1f8077ff4af8 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -2,7 +2,17 @@ wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "ghex-${version}"; + version = "3.18.3"; + + src = fetchurl { + url = "mirror://gnome/sources/ghex/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/ghex/src.nix b/pkgs/desktops/gnome-3/apps/ghex/src.nix deleted file mode 100644 index edaa51d94784..000000000000 --- a/pkgs/desktops/gnome-3/apps/ghex/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "ghex-3.18.3"; - - src = fetchurl { - url = mirror://gnome/sources/ghex/3.18/ghex-3.18.3.tar.xz; - sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 8b198b9c8797..0a6921bce6e3 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -4,14 +4,24 @@ , gnome3, gdk_pixbuf, libxslt }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "glade-${version}"; + version = "3.20.2"; + + src = fetchurl { + url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; }; + }; nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection ]; buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 - gnome3.gsettings_desktop_schemas + gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/apps/glade/src.nix b/pkgs/desktops/gnome-3/apps/glade/src.nix deleted file mode 100644 index b244d2434c9e..000000000000 --- a/pkgs/desktops/gnome-3/apps/glade/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "glade-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz; - sha256 = "07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 6126fed8e06f..674aa84dbc27 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib -, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk -, spice_protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala -, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils +, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk +, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala +, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret , libcap_ng, numactl, xen, libapparmor }: @@ -9,7 +9,17 @@ # TODO: ovirt (optional) stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-boxes-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-boxes"; attrPath = "gnome3.gnome-boxes"; }; + }; enableParallelBuilding = true; @@ -21,9 +31,9 @@ stdenv.mkDerivation rec { buildInputs = [ itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc - libvirt spice_gtk spice_protocol libsoup libosinfo systemd + libvirt spice-gtk spice-protocol libsoup libosinfo systemd tracker tracker-miners vala libcap yajl gmp gdbm cyrus_sasl libusb libarchive - gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret + gnome3.defaultIconTheme librsvg desktop-file-utils acl libgudev libsecret libcap_ng numactl xen libapparmor ]; @@ -31,7 +41,7 @@ stdenv.mkDerivation rec { for prog in "$out/bin/"*; do wrapProgram "$prog" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}" done ''; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix deleted file mode 100644 index b2c2f378bff4..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-boxes-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-boxes/3.26/gnome-boxes-3.26.2.tar.xz; - sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index c13d7e976e5c..e82d004995da 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,16 +1,26 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook -, gettext, libxml2, gnome3, gtk, evolution_data_server, libsoup -, glib, gnome_online_accounts, gsettings_desktop_schemas }: +, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup +, glib, gnome-online-accounts, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-calendar-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-calendar/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "19a2c737b9662be926fb68e7dc731d94c523d23fa7a49e435e6a0346770dc50e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-calendar"; attrPath = "gnome3.gnome-calendar"; }; + }; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ]; buildInputs = [ - gtk evolution_data_server libsoup glib gnome_online_accounts - gsettings_desktop_schemas gnome3.defaultIconTheme + gtk evolution-data-server libsoup glib gnome-online-accounts + gsettings-desktop-schemas gnome3.defaultIconTheme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix deleted file mode 100644 index 39f7f333495e..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calendar-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calendar/3.26/gnome-calendar-3.26.2.tar.xz; - sha256 = "19a2c737b9662be926fb68e7dc731d94c523d23fa7a49e435e6a0346770dc50e"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index a354c4f6316e..5b36ea83ee13 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -2,12 +2,22 @@ , intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-characters-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-characters"; attrPath = "gnome3.gnome-characters"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; buildInputs = [ gtk3 gjs gdk_pixbuf gobjectIntrospection - librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme + librsvg gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix deleted file mode 100644 index d7ac2cd8829b..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-characters-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-characters/3.26/gnome-characters-3.26.2.tar.xz; - sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 5441f1e5edc9..47fd071bf839 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,19 +1,29 @@ { stdenv, fetchurl -, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop_file_utils +, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils , vala, gtk3, glib, gsound , gnome3, gdk_pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-clocks-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-clocks/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-clocks"; attrPath = "gnome3.gnome-clocks"; }; + }; doCheck = true; nativeBuildInputs = [ - vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop_file_utils + vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils ]; buildInputs = [ - gtk3 glib gnome3.gsettings_desktop_schemas gdk_pixbuf gnome3.defaultIconTheme - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 libgweather gsound + gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme + gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound ]; prePatch = "patchShebangs build-aux/"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix deleted file mode 100644 index ea7878f48695..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-clocks-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-clocks/3.26/gnome-clocks-3.26.1.tar.xz; - sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index a3f6084c9f39..15c597980838 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -2,23 +2,33 @@ , pkgconfig, gtk3, glib, tracker, tracker-miners , itstool, libxslt, webkitgtk , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib, inkscape, poppler_utils -, gmp, desktop_file_utils, wrapGAppsHook }: +, gobjectIntrospection, json-glib, inkscape, poppler_utils +, gmp, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-documents-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ba0d3084359d666b90733bb43206d24190fa85304bfe45f674ab6e6a27cb7fc9"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-documents"; attrPath = "gnome3.gnome-documents"; }; + }; doCheck = true; configureFlags = [ "--enable-getting-started" ]; - nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop_file_utils docbook_xsl wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook ]; buildInputs = [ gtk3 glib inkscape poppler_utils - gnome3.gsettings_desktop_schemas gmp + gnome3.gsettings-desktop-schemas gmp gdk_pixbuf gnome3.defaultIconTheme librsvg evince libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - tracker tracker-miners gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib gnome3.libgepub ]; + tracker tracker-miners gnome3.libgdata gnome3.gnome-online-accounts + gnome3.gnome-desktop gnome3.libzapojit json-glib gnome3.libgepub ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix deleted file mode 100644 index de0332ea4037..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-documents-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-documents/3.26/gnome-documents-3.26.1.tar.xz; - sha256 = "ba0d3084359d666b90733bb43206d24190fa85304bfe45f674ab6e6a27cb7fc9"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 0c75ebd7c783..8531fc1c7c04 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-getting-started-docs-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-getting-started-docs"; attrPath = "gnome3.gnome-getting-started-docs"; }; + }; buildInputs = [ intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix deleted file mode 100644 index 3f1341b7cab8..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-getting-started-docs-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-getting-started-docs/3.26/gnome-getting-started-docs-3.26.2.tar.xz; - sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 91d5f7d00e49..66596d916a93 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -2,14 +2,24 @@ , intltool, itstool, libxml2, systemd }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-logs-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e17ca011e7bea756bd841e027e56cfe8c214bed4817cb35732ace4aa73ff8f5c"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-logs"; attrPath = "gnome3.gnome-logs"; }; + }; configureFlags = [ "--disable-tests" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 - systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme + systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix deleted file mode 100644 index 951620986685..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-logs-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-logs/3.26/gnome-logs-3.26.2.tar.xz; - sha256 = "e17ca011e7bea756bd841e027e56cfe8c214bed4817cb35732ace4aa73ff8f5c"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index bb8375d595ef..c03397a40d89 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -4,17 +4,27 @@ , webkitgtk }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-maps-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-maps/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-maps"; attrPath = "gnome3.gnome-maps"; }; + }; doCheck = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool gobjectIntrospection wrapGAppsHook gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph - gnome3.geocode_glib libchamplain file libsoup + gnome3.geocode-glib libchamplain file libsoup gdk_pixbuf librsvg libgweather autoreconfHook - gnome3.gsettings_desktop_schemas gnome3.evolution_data_server - gnome3.gnome_online_accounts gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas gnome3.evolution-data-server + gnome3.gnome-online-accounts gnome3.defaultIconTheme webkitgtk ]; # The .service file isn't wrapped with the correct environment diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix deleted file mode 100644 index 0fac7f865ca6..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-maps-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-maps/3.26/gnome-maps-3.26.2.tar.xz; - sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index f5454c1c3869..86ea9b6590e1 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -4,9 +4,19 @@ , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-music-${version}"; + version = "3.26.1"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-music/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7197dff12f441a52b4011512bfe8ec926f2ce4ca511f79b078e0e612d612f8c3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-music"; attrPath = "gnome3.gnome-music"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart @@ -15,7 +25,7 @@ stdenv.mkDerivation rec { python3Packages.pycairo python3Packages.dbus-python python3Packages.requests python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook - gnome3.gsettings_desktop_schemas makeWrapper tracker tracker-miners ]; + gnome3.gsettings-desktop-schemas makeWrapper tracker tracker-miners ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/apps/gnome-music/src.nix deleted file mode 100644 index 3ac99e146d46..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-music/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-music-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-music/3.26/gnome-music-3.26.1.tar.xz; - sha256 = "7197dff12f441a52b4011512bfe8ec926f2ce4ca511f79b078e0e612d612f8c3"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 0b19ba9f0f6d..2837e1d093f5 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -1,12 +1,22 @@ { stdenv, intltool, fetchurl, exempi, libxml2 , pkgconfig, gtk3, glib, tracker, tracker-miners , makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp, libmediaart, wrapGAppsHook -, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib +, desktop-file-utils, gmp, libmediaart, wrapGAppsHook +, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode-glib , dleyna-renderer }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-photos-${version}"; + version = "3.26.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-photos/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "028de4c8662b7d1dc3ca6c3fbe3ce7f6bb90dd097708e99f235a409756dbadab"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-photos"; attrPath = "gnome3.gnome-photos"; }; + }; # doCheck = true; @@ -14,12 +24,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata - gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart + gnome3.gsettings-desktop-schemas makeWrapper gmp libmediaart gdk_pixbuf gnome3.defaultIconTheme librsvg exempi gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif tracker tracker-miners libxml2 desktop_file_utils - wrapGAppsHook gexiv2 geocode_glib dleyna-renderer ]; + gnome3.gnome-online-accounts gnome3.gnome-desktop + lcms2 libexif tracker tracker-miners libxml2 desktop-file-utils + wrapGAppsHook gexiv2 geocode-glib dleyna-renderer ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix deleted file mode 100644 index b9bba1ab6a47..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-photos-3.26.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-photos/3.26/gnome-photos-3.26.3.tar.xz; - sha256 = "028de4c8662b7d1dc3ca6c3fbe3ce7f6bb90dd097708e99f235a409756dbadab"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 2fd0dfa5ac91..a295ef456df4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -7,14 +7,24 @@ , meson , ninja , upower -, desktop_file_utils +, desktop-file-utils , wrapGAppsHook , gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-power-manager-${version}"; + version = "3.26.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-power-manager/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-power-manager"; attrPath = "gnome3.gnome-power-manager"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { # needed by meson_post_install.sh glib.dev - desktop_file_utils + desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix deleted file mode 100644 index bdffa453504f..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-power-manager-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-power-manager/3.26/gnome-power-manager-3.26.0.tar.xz; - sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index d6804e09a482..9e43a3c52b45 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -2,12 +2,22 @@ , libgweather, intltool, itstool, geoclue2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-weather-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-weather/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-weather"; attrPath = "gnome3.gnome-weather"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook gjs intltool itstool - libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas + libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas ]; # The .service file isn't wrapped with the correct environment diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix deleted file mode 100644 index d12db5132536..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-weather-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz; - sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index dc75193e771c..f1d6dba21b08 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,17 +1,27 @@ { stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme -, telepathy_glib, gjs, meson, ninja, gettext, telepathy_idle, libxml2, desktop_file_utils +, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib -, gnome3, wrapGAppsHook, telepathy_logger, gspell }: +, gnome3, wrapGAppsHook, telepathy-logger, gspell }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "polari-${version}"; + version = "3.26.2"; - propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; + src = fetchurl { + url = "mirror://gnome/sources/polari/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "polari"; attrPath = "gnome3.polari"; }; + }; + + propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; nativeBuildInputs = [ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2 - desktop_file_utils gobjectIntrospection appstream-glib ]; - buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings_desktop_schemas - telepathy_glib telepathy_logger gjs gspell gdk_pixbuf libsecret libsoup ]; + desktop-file-utils gobjectIntrospection appstream-glib ]; + buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas + telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup ]; patches = [ (fetchpatch { diff --git a/pkgs/desktops/gnome-3/apps/polari/src.nix b/pkgs/desktops/gnome-3/apps/polari/src.nix deleted file mode 100644 index 8af7c33846db..000000000000 --- a/pkgs/desktops/gnome-3/apps/polari/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "polari-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/polari/3.26/polari-3.26.2.tar.xz; - sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 3bc69f67a4f8..1a8c2f55b1b0 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -2,27 +2,37 @@ , pkgconfig, gtk3, glib , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit, openssh }: +, libsecret, avahi, p11-kit, openssh }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "seahorse-${version}"; + version = "3.20.0"; + + src = fetchurl { + url = "mirror://gnome/sources/seahorse/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "seahorse"; attrPath = "gnome3.seahorse"; }; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg + gnome3.gsettings-desktop-schemas wrapGAppsHook gnupg gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala + libsecret avahi libsoup p11-kit vala openssh ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/apps/seahorse/src.nix deleted file mode 100644 index 0ae195a0a7ba..000000000000 --- a/pkgs/desktops/gnome-3/apps/seahorse/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "seahorse-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/seahorse/3.20/seahorse-3.20.0.tar.xz; - sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index e719fbf9f219..4f358cf0b4f6 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -2,7 +2,17 @@ , libsecret, itstool, makeWrapper, librsvg }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vinagre-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/vinagre/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "vinagre"; attrPath = "gnome3.vinagre"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret diff --git a/pkgs/desktops/gnome-3/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/apps/vinagre/src.nix deleted file mode 100644 index 3d1357c49898..000000000000 --- a/pkgs/desktops/gnome-3/apps/vinagre/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vinagre-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz; - sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 62cc4da6ba14..2178004a43ac 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,11 +1,21 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }: +, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "adwaita-icon-theme-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "adwaita-icon-theme"; attrPath = "gnome3.adwaita-icon-theme"; }; + }; # For convenience, we can specify adwaita-icon-theme only in packages - propagatedBuildInputs = [ hicolor_icon_theme ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; buildInputs = [ gdk_pixbuf librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix deleted file mode 100644 index 24f0955659ec..000000000000 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "adwaita-icon-theme-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.1.tar.xz; - sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index f94cb3c57c46..1ff67e35f0fd 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -4,7 +4,17 @@ , gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "baobab-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/baobab/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "baobab"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/baobab/src.nix b/pkgs/desktops/gnome-3/core/baobab/src.nix deleted file mode 100644 index d3e2f03feb8b..000000000000 --- a/pkgs/desktops/gnome-3/core/baobab/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "baobab-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/baobab/3.26/baobab-3.26.1.tar.xz; - sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index e463fe0e03f0..9b083ff5644b 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook +, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook }: let @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; buildInputs = with gnome3; - [ glib gtk clutter at_spi2_core dbus pythonEnv python3Packages.pygobject3 + [ glib gtk clutter at-spi2-core dbus pythonEnv python3Packages.pygobject3 libXtst gtk2 ]; propagatedBuildInputs = [ gnome3.libgee libxklavier ]; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index bf39965bf779..47ddf6b64861 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,12 +1,22 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "dconf-editor-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/dconf-editor/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "dconf-editor"; attrPath = "gnome3.dconf-editor"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme + buildInputs = [ vala libxslt glib dbus-glib gnome3.gtk libxml2 gnome3.defaultIconTheme intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/core/dconf-editor/src.nix deleted file mode 100644 index b21630641d94..000000000000 --- a/pkgs/desktops/gnome-3/core/dconf-editor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "dconf-editor-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/dconf-editor/3.26/dconf-editor-3.26.2.tar.xz; - sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 9a836869ec6e..c09a31c82264 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ]; - buildInputs = [ glib dbus_glib ]; + buildInputs = [ glib dbus-glib ]; postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace client/Makefile \ diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index f9156053819a..bf83c7aa8a15 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,40 +1,50 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, gnome3, gdk_pixbuf -, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream -, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control -, telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server, yelp_xsl -, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info +, dbus-glib, dbus_libs, telepathy-glib, telepathy-farstream +, clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts +, gcr, libsecret, folks, libpulseaudio, telepathy-mission-control +, telepathy-logger, libnotify, clutter, libsoup, gnutls +, evolution-data-server, yelp-xsl +, libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info , bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee -, isocodes, enchant, libchamplain, geoclue2, geocode_glib, cheese, libgudev }: +, isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "empathy-${version}"; + version = "3.12.14"; + + src = fetchurl { + url = "mirror://gnome/sources/empathy/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "empathy"; }; + }; propagatedUserEnvPkgs = [ - gnome_online_accounts shared_mime_info + gnome-online-accounts shared-mime-info ]; propagatedBuildInputs = [ - folks telepathy_logger evolution_data_server telepathy_mission_control + folks telepathy-logger evolution-data-server telepathy-mission-control ]; nativeBuildInputs = [ pkgconfig libtool intltool itstool file wrapGAppsHook - libxml2 libxslt yelp_xsl + libxml2 libxslt yelp-xsl ]; buildInputs = [ - gtk3 glib webkitgtk icu gnome_online_accounts - telepathy_glib clutter_gtk clutter-gst cogl + gtk3 glib webkitgtk icu gnome-online-accounts + telepathy-glib clutter-gtk clutter-gst cogl gst_all_1.gstreamer gst_all_1.gst-plugins-base gcr libsecret libpulseaudio gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas + libnotify clutter libsoup gnutls libgee p11-kit + libcanberra-gtk3 telepathy-farstream farstream + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas librsvg # Spell-checking enchant isocodes # Display maps, location awareness, geocode support - libchamplain geoclue2 geocode_glib + libchamplain geoclue2 geocode-glib # Cheese webcam support, camera monitoring cheese libgudev ]; diff --git a/pkgs/desktops/gnome-3/core/empathy/src.nix b/pkgs/desktops/gnome-3/core/empathy/src.nix deleted file mode 100644 index 7e54ed38fd36..000000000000 --- a/pkgs/desktops/gnome-3/core/empathy/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "empathy-3.12.14"; - - src = fetchurl { - url = mirror://gnome/sources/empathy/3.12/empathy-3.12.14.tar.xz; - sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index ae0abfd71502..1acd6eb69425 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,15 +1,25 @@ { fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: +, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "eog-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/eog/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "eog"; attrPath = "gnome3.eog"; }; + }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ]; buildInputs = with gnome3; [ libxml2 libjpeg gtk glib libpeas librsvg - gsettings_desktop_schemas shared_mime_info adwaita-icon-theme - gnome_desktop libexif dconf ]; + gsettings-desktop-schemas shared-mime-info adwaita-icon-theme + gnome-desktop libexif dconf ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/EyeOfGnome; diff --git a/pkgs/desktops/gnome-3/core/eog/src.nix b/pkgs/desktops/gnome-3/core/eog/src.nix deleted file mode 100644 index d0046d899bec..000000000000 --- a/pkgs/desktops/gnome-3/core/eog/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "eog-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/eog/3.26/eog-3.26.2.tar.xz; - sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 6dafa160b1f8..18a27af7977e 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,25 +1,35 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu , wrapGAppsHook, gnome3, libxml2, libxslt, itstool -, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, isocodes, desktop_file_utils, file -, gdk_pixbuf, gnome_common, gst_all_1, json_glib }: +, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit +, sqlite, gcr, isocodes, desktop-file-utils, file +, gdk_pixbuf, gnome-common, gst_all_1, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "epiphany-${version}"; + version = "3.26.4"; + + src = fetchurl { + url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "epiphany"; }; + }; # Tests need an X display mesonFlags = [ "-Dunit_tests=false" ]; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop_file_utils ]; + nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop-file-utils ]; - buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome_desktop libnotify - sqlite isocodes p11_kit icu gnome3.yelp_tools - gdk_pixbuf gnome3.defaultIconTheme gnome_common gcr - glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify + sqlite isocodes p11-kit icu gnome3.yelp-tools + gdk_pixbuf gnome3.defaultIconTheme gnome-common gcr + glib-networking 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 json_glib ]; + gst_all_1.gst-libav json-glib ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/epiphany/src.nix b/pkgs/desktops/gnome-3/core/epiphany/src.nix deleted file mode 100644 index 3365261b7bcf..000000000000 --- a/pkgs/desktops/gnome-3/core/epiphany/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "epiphany-3.26.4"; - - src = fetchurl { - url = mirror://gnome/sources/epiphany/3.26/epiphany-3.26.4.tar.xz; - sha256 = "390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index fab46b35af66..2d52e22c54cd 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,22 +1,32 @@ { fetchurl, stdenv, pkgconfig, intltool, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 +, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libsecret, wrapGAppsHook -, librsvg, gobjectIntrospection, yelp_tools +, librsvg, gobjectIntrospection, yelp-tools , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps , autoreconfHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evince-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "evince"; }; + }; nativeBuildInputs = [ - pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp_tools autoreconfHook + pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp-tools autoreconfHook ]; buildInputs = [ glib gtk3 pango atk gdk_pixbuf libxml2 - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas + gnome3.libgnome-keyring gnome3.gsettings-desktop-schemas poppler ghostscriptX djvulibre libspectre libsecret librsvg gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; @@ -35,7 +45,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/evince/src.nix b/pkgs/desktops/gnome-3/core/evince/src.nix deleted file mode 100644 index 6627be550884..000000000000 --- a/pkgs/desktops/gnome-3/core/evince/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evince-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/evince/3.26/evince-3.26.0.tar.xz; - sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index f6ee457dc63f..f5723f673bb2 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,17 +1,27 @@ { fetchurl, stdenv, pkgconfig, gnome3, python3, dconf , intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true -, vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }: +, p11-kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true +, vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evolution-data-server-${version}"; + version = "3.26.3"; + + src = fetchurl { + url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "evolution-data-server"; }; + }; nativeBuildInputs = [ cmake pkgconfig intltool python3 gperf makeWrapper ] ++ stdenv.lib.optional valaSupport vala; buildInputs = with gnome3; [ - glib libsoup libxml2 gtk gnome_online_accounts - gcr p11_kit libgweather libgdata libaccounts-glib json_glib + glib libsoup libxml2 gtk gnome-online-accounts + gcr p11-kit libgweather libgdata libaccounts-glib json-glib icu sqlite kerberos openldap webkitgtk ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix deleted file mode 100644 index 906df1b2160a..000000000000 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-data-server-3.26.3"; - - src = fetchurl { - url = mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.3.tar.xz; - sha256 = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 6be27021023a..776f76642222 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -1,35 +1,42 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs -, telepathy_glib, evolution_data_server, libsecret, db }: +, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus_libs +, telepathy-glib, evolution-data-server, libsecret, db }: # TODO: enable more folks backends let - majorVersion = "0.11"; -in -stdenv.mkDerivation rec { - name = "folks-${majorVersion}.4"; + version = "0.11.4"; +in stdenv.mkDerivation rec { + name = "folks-${version}"; src = fetchurl { - url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/folks/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57"; }; propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; # dbus_daemon needed for tests - buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs + buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus_libs vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-fatal-warnings"; NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" - "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; + "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; enableParallelBuilding = true; postBuild = "rm -rf $out/share/gtk-doc"; + passthru = { + updateScript = gnome3.updateScript { + packageName = "folks"; + attrPath = "gnome3.folks"; + versionPolicy = "none"; + }; + }; + meta = { description = "Folks"; diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index 99883c8a3f67..3e7ba45b03ae 100644 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 +{ stdenv, fetchurl, pkgconfig, dbus-glib, gnome3 ? null, glib, libxml2 , intltool, polkit, orbit, python, withGtk ? false }: assert withGtk -> (gnome3 != null); @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus_glib ]; + propagatedBuildInputs = [ glib dbus-glib ]; nativeBuildInputs = [ pkgconfig intltool ]; # ToDo: ldap reported as not found but afterwards reported as supported diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 2569b4e2c7ad..aa26c660768b 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -1,9 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk +{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib +, libgcrypt, libtasn1, dbus-glib, gtk, pango, gdk_pixbuf, atk , gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gcr-${version}"; + version = "3.20.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gcr/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gcr"; attrPath = "gnome3.gcr"; }; + }; outputs = [ "out" "dev" ]; @@ -12,10 +22,10 @@ stdenv.mkDerivation rec { buildInputs = let gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome in [ - gpg libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk + gpg libgcrypt libtasn1 dbus-glib pango gdk_pixbuf atk ]; - propagatedBuildInputs = [ glib gtk p11_kit ]; + propagatedBuildInputs = [ glib gtk p11-kit ]; #doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gcr/src.nix b/pkgs/desktops/gnome-3/core/gcr/src.nix deleted file mode 100644 index d166f033266c..000000000000 --- a/pkgs/desktops/gnome-3/core/gcr/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gcr-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz; - sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 796e103fdb3c..ef9439a30291 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,10 +1,20 @@ { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth +, gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth , librsvg, coreutils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gdm-${version}"; + version = "3.26.2.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gdm"; attrPath = "gnome3.gdm"; }; + }; # Only needed to make it build preConfigure = '' @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ]; buildInputs = [ glib accountsservice systemd gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam plymouth librsvg ]; + libcanberra-gtk3 pam plymouth librsvg ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gdm/src.nix b/pkgs/desktops/gnome-3/core/gdm/src.nix deleted file mode 100644 index 8d92167a0391..000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdm-3.26.2.1"; - - src = fetchurl { - url = mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz; - sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix index 4d75bdc49963..e97e557e87a0 100644 --- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix +++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix @@ -1,10 +1,20 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "geocode-glib-${version}"; + version = "3.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "geocode-glib"; attrPath = "gnome3.geocode-glib"; }; + }; buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; + [ intltool pkgconfig glib libsoup json-glib ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/core/geocode-glib/src.nix deleted file mode 100644 index 394e3a68c35c..000000000000 --- a/pkgs/desktops/gnome-3/core/geocode-glib/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "geocode-glib-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz; - sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index e2ae74931030..6e9f6c464df1 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -3,7 +3,17 @@ , makeWrapper }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gjs-${version}"; + version = "1.50.4"; + + src = fetchurl { + url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gjs"; attrPath = "gnome3.gjs"; }; + }; outputs = [ "out" "installedTests" ]; diff --git a/pkgs/desktops/gnome-3/core/gjs/src.nix b/pkgs/desktops/gnome-3/core/gjs/src.nix deleted file mode 100644 index d42b2e845585..000000000000 --- a/pkgs/desktops/gnome-3/core/gjs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gjs-1.50.4"; - - src = fetchurl { - url = mirror://gnome/sources/gjs/1.50/gjs-1.50.4.tar.xz; - sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index eb801caf5657..0aea3c4eac48 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, gnome3, intltool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-backgrounds-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; + }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix deleted file mode 100644 index 9d86b7168ad0..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-backgrounds-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-backgrounds/3.26/gnome-backgrounds-3.26.2.tar.xz; - sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 3dbb4e32654f..11816f68ff48 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3, gobjectIntrospection }: +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-bluetooth-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-bluetooth"; attrPath = "gnome3.gnome-bluetooth"; }; + }; nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; - buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3 - gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; + buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix deleted file mode 100644 index 31aab6649d75..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-bluetooth-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-bluetooth/3.26/gnome-bluetooth-3.26.1.tar.xz; - sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 12b8af206ea0..8376bea1a038 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -3,18 +3,28 @@ , itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-calculator-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-calculator"; attrPath = "gnome3.gnome-calculator"; }; + }; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ bash gtk3 glib intltool itstool libxml2 gnome3.gtksourceview mpfr gmp gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas gnome3.dconf libsoup libmpc ]; + gnome3.gsettings-desktop-schemas gnome3.dconf libsoup libmpc ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/Calculator; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix deleted file mode 100644 index 517220c94572..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calculator-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calculator/3.26/gnome-calculator-3.26.0.tar.xz; - sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index f9261e183ef1..23fd157a528a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, which, gnome3, autoconf, automake }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-common-${version}"; + version = "3.18.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-common/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-common"; attrPath = "gnome3.gnome-common"; }; + }; patches = [(fetchurl { name = "gnome-common-patch"; @@ -9,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; })]; - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which + propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which meta = with stdenv.lib; { maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/core/gnome-common/src.nix deleted file mode 100644 index 8ffe7e20e1a9..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-common/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-common-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz; - sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 9078b9e051cd..eb2f7631ba8c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -1,16 +1,26 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db +{ stdenv, intltool, fetchurl, evolution-data-server, db , pkgconfig, gtk3, glib, libsecret -, libchamplain, clutter_gtk, geocode_glib +, libchamplain, clutter-gtk, geocode-glib , bash, wrapGAppsHook, itstool, folks, libnotify, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake, autoconf }: +, gnome3, librsvg, gdk_pixbuf, file, telepathy-glib, nspr, nss +, libsoup, vala, dbus-glib, automake, autoconf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-contacts-${version}"; + version = "3.26"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-contacts"; attrPath = "gnome3.gnome-contacts"; }; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard evolution-data-server ]; # force build from vala preBuild = '' @@ -18,14 +28,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ vala automake autoconf pkgconfig intltool itstool wrapGAppsHook file ]; - buildInputs = [ gtk3 glib evolution_data_server gnome3.gsettings_desktop_schemas libnotify - folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib - libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter_gtk geocode_glib db ]; + buildInputs = [ gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas libnotify + folks gnome3.gnome-desktop telepathy-glib libsecret dbus-glib + libxml2 libsoup gnome3.gnome-online-accounts nspr nss + gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib db ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix deleted file mode 100644 index bf3df1bc84fe..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-contacts-3.26"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-contacts/3.26/gnome-contacts-3.26.tar.xz; - sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 9d20eb750ab9..8774de41c4b2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,29 +1,39 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook -, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio +, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio , gdk_pixbuf, librsvg, libnotify, libgudev , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, libkrb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, libtool -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk +, libwacom, samba, shared-mime-info, tzdata, libtool +, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter-gtk , fontconfig, sound-theme-freedesktop, grilo }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-control-center-${version}"; + version = "3.26.2"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-control-center/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-control-center"; attrPath = "gnome3.gnome-control-center"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook libtool libxslt docbook_xsl docbook_xsl_ns - shared_mime_info + shared-mime-info ]; buildInputs = with gnome3; [ - ibus gtk glib glib_networking upower gsettings_desktop_schemas - libxml2 gnome_desktop gnome_settings_daemon polkit libgtop - gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk + ibus gtk glib glib-networking upower gsettings-desktop-schemas + libxml2 gnome-desktop gnome-settings-daemon polkit libgtop + gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify - grilo libpwquality cracklib vino libcanberra_gtk3 libgudev - gdk_pixbuf defaultIconTheme librsvg clutter clutter_gtk + grilo libpwquality cracklib vino libcanberra-gtk3 libgudev + gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk networkmanager modemmanager gnome-bluetooth tracker ]; @@ -39,7 +49,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share" + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share" # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix deleted file mode 100644 index 948768904aea..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-control-center-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-control-center/3.26/gnome-control-center-3.26.2.tar.xz; - sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 99ff1b6f3a16..7e85e27d6be9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,9 +1,19 @@ { stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, xkeyboard_config, isocodes, itstool, wayland +, intltool, gnome-doc-utils, xkeyboard_config, isocodes, itstool, wayland , libseccomp, bubblewrap, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-desktop-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-desktop"; attrPath = "gnome3.gnome-desktop"; }; + }; # this should probably be setuphook for glib NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; @@ -11,14 +21,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig which itstool intltool libxslt gnome_doc_utils gobjectIntrospection + pkgconfig which itstool intltool libxslt gnome-doc-utils gobjectIntrospection ]; buildInputs = [ libX11 bubblewrap xkeyboard_config isocodes wayland gtk3 glib libseccomp ]; - propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; + propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ]; patches = [ ./bubblewrap-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix deleted file mode 100644 index f3c0d446d3f1..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-desktop-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-desktop/3.26/gnome-desktop-3.26.2.tar.xz; - sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 6cfdd45c2f9c..95fcfac1d751 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop_file_utils, appstream-glib, libxslt +{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 , gnome3, gtk, glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-dictionary-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-dictionary/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-dictionary"; attrPath = "gnome3.gnome-dictionary"; }; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gnome3.defaultIconTheme ]; nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool - desktop_file_utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; - buildInputs = [ gtk glib gnome3.gsettings_desktop_schemas ]; + desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; + buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Dictionary; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix deleted file mode 100644 index 92a50430bd1f..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-dictionary-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-dictionary/3.26/gnome-dictionary-3.26.1.tar.xz; - sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 188ad99b73cd..0937f5c30823 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,18 +1,28 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread , meson, ninja, gtk, glib, wrapGAppsHook, libnotify , itstool, gnome3, gdk_pixbuf, libxml2 -, libcanberra_gtk3, libxslt, docbook_xsl, libpwquality }: +, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-disk-utility-${version}"; + version = "3.26.2"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl wrapGAppsHook libxml2 ]; - buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra_gtk3 + buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 gdk_pixbuf udisks2 gnome3.defaultIconTheme - gnome3.gnome_settings_daemon gnome3.gsettings_desktop_schemas ]; + gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix deleted file mode 100644 index e3241153a930..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-disk-utility-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-disk-utility/3.26/gnome-disk-utility-3.26.2.tar.xz; - sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index dade56158fb1..3774ff32db04 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -3,12 +3,22 @@ , wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-font-viewer-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; }; + }; doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix deleted file mode 100644 index c31f09938c92..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-font-viewer-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-font-viewer/3.26/gnome-font-viewer-3.26.0.tar.xz; - sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index d4f5835ed3a2..f7f06e35d3ac 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook +, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, wrapGAppsHook , docbook_xsl, docbook_xml_dtd_42, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-keyring-${version}"; + version = "3.20.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-keyring"; attrPath = "gnome3.gnome-keyring"; }; + }; outputs = [ "out" "dev" ]; buildInputs = with gnome3; [ - dbus libgcrypt pam gtk3 libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit + dbus libgcrypt pam gtk3 libgnome-keyring + pango gcr gdk_pixbuf atk p11-kit ]; # In 3.20.1, tests do not support Python 3 diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix deleted file mode 100644 index ffee6211232e..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-keyring-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz; - sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index c6fa6cb16584..2abe8b28c039 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,13 +1,23 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common, gtk_doc -, telepathy_glib, intltool, dbus_libs, icu, glib_networking +, webkitgtk, json-glib, rest, libsecret, dbus-glib, gnome-common, gtk-doc +, telepathy-glib, intltool, dbus_libs, icu, glib-networking , libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-online-accounts-${version}"; + version = "3.26.2"; - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-online-accounts"; attrPath = "gnome3.gnome-online-accounts"; }; + }; + + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -22,11 +32,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig vala gnome_common intltool wrapGAppsHook - libxslt docbook_xsl_ns docbook_xsl gtk_doc + pkgconfig vala gnome-common intltool wrapGAppsHook + libxslt docbook_xsl_ns docbook_xsl gtk-doc ]; buildInputs = [ - glib gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib glib_networking icu libsoup + glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib glib-networking icu libsoup gcr kerberos ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix deleted file mode 100644 index c43183c7c57d..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-accounts-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-accounts/3.26/gnome-online-accounts-3.26.2.tar.xz; - sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index d8e878715602..1df5465382a9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, dleyna-server, wrapGAppsHook }: +, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-online-miners-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-miners/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest + gnome3.gnome-online-accounts gnome3.libmediaart + gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest dleyna-server ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix deleted file mode 100644 index 3b8306c6a1a5..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-miners-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-miners/3.26/gnome-online-miners-3.26.0.tar.xz; - sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 5986b07229f5..1f7aa4d874ad 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,9 +1,19 @@ -{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3 +{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 , bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib , gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-screenshot-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-screenshot/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-screenshot"; attrPath = "gnome3.gnome-screenshot"; }; + }; doCheck = true; @@ -12,12 +22,12 @@ stdenv.mkDerivation rec { patchShebangs build-aux/postinstall.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ]; - buildInputs = [ bash gtk3 glib libcanberra_gtk3 - gnome3.gsettings_desktop_schemas ]; + buildInputs = [ bash gtk3 glib libcanberra-gtk3 + gnome3.gsettings-desktop-schemas ]; patches = [ ./prevent-cache-updates.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix deleted file mode 100644 index 72b1e6625452..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-screenshot-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-screenshot/3.26/gnome-screenshot-3.26.0.tar.xz; - sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 2cd92ce39ca1..c8bc61462213 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,15 +1,25 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower +{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus-glib, json-glib, upower , libxslt, intltool, makeWrapper, systemd, xorg, epoxy }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-session-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-session"; attrPath = "gnome3.gnome-session"; }; + }; configureFlags = "--enable-systemd"; buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd + [ pkgconfig glib gnome-desktop gtk dbus-glib json-glib libxslt + gnome3.gnome-settings-daemon xorg.xtrans gnome3.defaultIconTheme + gsettings-desktop-schemas upower intltool gconf makeWrapper systemd epoxy ]; @@ -24,8 +34,8 @@ stdenv.mkDerivation rec { --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" \ - --suffix XDG_CONFIG_DIRS : "${gnome3.gnome_settings_daemon}/etc/xdg" + --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share" \ + --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/core/gnome-session/src.nix deleted file mode 100644 index bb9dec1efc23..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-session/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-session-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-session/3.26/gnome-session-3.26.1.tar.xz; - sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 6de97f3dea26..e3c84dfa9fd8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,20 +1,30 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, libxkbfile, libpulseaudio, libcanberra-gtk3, upower, colord, libgweather, polkit , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager , docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config, tzdata }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-settings-daemon-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-settings-daemon"; attrPath = "gnome3.gnome-settings-daemon"; }; + }; # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager - libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio - libcanberra_gtk3 upower colord libgweather xkeyboard_config - polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ]; + [ intltool pkgconfig ibus gtk glib gsettings-desktop-schemas networkmanager + libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio + libcanberra-gtk3 upower colord libgweather xkeyboard_config + polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt + libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome-themes-standard ]; postPatch = '' substituteInPlace plugins/datetime/tz.h --replace /usr/share/zoneinfo/zone.tab ${tzdata}/share/zoneinfo/zone.tab diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix deleted file mode 100644 index 1c3fbbfc2efa..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-settings-daemon-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-settings-daemon/3.26/gnome-settings-daemon-3.26.2.tar.xz; - sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index fd90b8867d7b..a76dd35711a8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -2,7 +2,17 @@ , bash, makeWrapper, itstool, gnome3, file }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-shell-extensions-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-shell-extensions"; attrPath = "gnome3.gnome-shell-extensions"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix deleted file mode 100644 index 150a15d0a5f3..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-extensions-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell-extensions/3.26/gnome-shell-extensions-3.26.2.tar.xz; - sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 693560454b17..026f5436237a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json_glib, libcroco, gettext, libsecret -, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip, glibcLocales -, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 +{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret +, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core +, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, p11-kit, unzip, glibcLocales +, sqlite, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet , gst_all_1 }: @@ -12,7 +12,13 @@ let pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-shell-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c"; + }; # Needed to find /etc/NetworkManager/VPN mesonFlags = [ "--sysconfdir=/etc" ]; @@ -21,17 +27,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ]; buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice + [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf (librsvg.override { enableIntrospection = true; }) - clutter networkmanager libstartup_notification telepathy_glib - libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server + clutter networkmanager libstartup_notification telepathy-glib + libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server libical nss gtk gstreamer gdm - libcanberra_gtk3 gnome_control_center geoclue2 + libcanberra-gtk3 gnome-control-center geoclue2 defaultIconTheme sqlite gnome3.gnome-bluetooth libgweather # not declared at build time, but typelib is needed at runtime gnome3.gnome-clocks # schemas needed - at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon + at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon gst_all_1.gst-plugins-good # recording gobjectIntrospection (stdenv.lib.getLib dconf) ]; propagatedUserEnvPkgs = [ @@ -70,6 +76,7 @@ in stdenv.mkDerivation rec { passthru = { mozillaPlugin = "/lib/mozilla/plugins"; + updateScript = gnome3.updateScript { packageName = "gnome-shell"; attrPath = "gnome3.gnome-shell"; }; }; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell/src.nix deleted file mode 100644 index 83cdd0682fda..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell/3.26/gnome-shell-3.26.2.tar.xz; - sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 37650ae5a142..354924c5c436 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3, libxslt -, json_glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk_doc, desktop_file_utils }: +, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-software-${version}"; + version = "3.26.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2f74fd5fb222c99d4fcb91500cea0c62a0eb8022700bdea51acecb41c63f8e48"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-software"; attrPath = "gnome3.gnome-software"; }; + }; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook libxslt docbook_xml_dtd_42 - valgrind-light docbook_xsl gtk_doc desktop_file_utils ]; + valgrind-light docbook_xsl gtk-doc desktop-file-utils ]; buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gtkspell3 json_glib libsecret ostree + gnome3.gsettings-desktop-schemas gnome3.gnome-desktop + gtkspell3 json-glib libsecret ostree polkit attr acl libyaml ]; propagatedBuildInputs = [ isocodes ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/core/gnome-software/src.nix deleted file mode 100644 index 99c6415e83dc..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-software/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-software-3.26.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-software/3.26/gnome-software-3.26.3.tar.xz; - sha256 = "2f74fd5fb222c99d4fcb91500cea0c62a0eb8022700bdea51acecb41c63f8e48"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix index d66efca66d9c..673140c3e1b6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix @@ -14,16 +14,16 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bash gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; + gnome3.gsettings-desktop-schemas wrapGAppsHook libxml2 ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index c32d9d95d88f..0e64bc4362c7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -3,21 +3,31 @@ , itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-system-monitor-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-system-monitor"; attrPath = "gnome3.gnome-system-monitor"; }; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bash gtk3 glib intltool itstool libxml2 gtkmm3 libgtop wrapGAppsHook gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas systemd ]; + gnome3.gsettings-desktop-schemas systemd ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix deleted file mode 100644 index b5d527632efe..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-system-monitor-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-system-monitor/3.26/gnome-system-monitor-3.26.0.tar.xz; - sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index b28c3a4c45d8..703bb6fe110e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,21 +1,31 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3 -, gnome_doc_utils, intltool, which, libuuid, vala -, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: +, gnome-doc-utils, intltool, which, libuuid, vala +, desktop-file-utils, itstool, wrapGAppsHook, appdata-tools }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-terminal-${version}"; + version = "3.26.2"; - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools + src = fetchurl { + url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-terminal"; attrPath = "gnome3.gnome-terminal"; }; + }; + + buildInputs = [ gnome3.gtk gnome3.gsettings-desktop-schemas gnome3.vte appdata-tools gnome3.dconf itstool gnome3.nautilus ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 - vala desktop_file_utils wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which libuuid libxml2 + vala desktop-file-utils wrapGAppsHook ]; # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; # FIXME: enable for gnome3 diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix deleted file mode 100644 index a6072ba7ca5e..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-terminal-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-terminal/3.26/gnome-terminal-3.26.2.tar.xz; - sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix index 3db252d063f2..720120b392de 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix @@ -2,7 +2,17 @@ , gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-themes-standard-${version}"; + version = "3.22.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-themes-standard"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix deleted file mode 100644 index dcda746c8dd1..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-themes-standard-3.22.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.3.tar.xz; - sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 6ab72ab7826d..8854e7a2d0c3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-user-docs-${version}"; + version = "3.26.2.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "93136f5baffd160c14e1b39f0ac60b9768975edac2da2b30c945faef534af8f5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-user-docs"; attrPath = "gnome3.gnome-user-docs"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gnome3.yelp itstool libxml2 intltool ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix deleted file mode 100644 index c18bad6b4cd8..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-user-docs-3.26.2.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-user-docs/3.26/gnome-user-docs-3.26.2.1.tar.xz; - sha256 = "93136f5baffd160c14e1b39f0ac60b9768975edac2da2b30c945faef534af8f5"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 0b83f6eb2267..642ee0badf1e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,10 +1,20 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus , pkgconfig, gtk3, glib, libxml2, gnused, systemd , bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: +, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-user-share-${version}"; + version = "3.18.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-user-share"; attrPath = "gnome3.gnome-user-share"; }; + }; doCheck = true; @@ -24,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool libxml2 libtool wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra_gtk3 systemd ]; + nautilus libnotify libcanberra-gtk3 systemd ]; postInstall = '' mkdir -p $out/share/gsettings-schemas/$name diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix deleted file mode 100644 index 2d06f9e7a7cf..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "3.18"; - minor = "3"; - name = "gnome-user-share-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/${major}/${name}.tar.xz"; - sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index eb600770e0ac..63dc6870ad40 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, dleyna-server, itstool }: +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av +, gmime, json-glib, avahi, tracker, dleyna-server, itstool }: stdenv.mkDerivation rec { major = "0.3"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata - lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts - gnome3.totem-pl-parser gnome3.rest gmime json_glib + lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts + gnome3.totem-pl-parser gnome3.rest gmime json-glib avahi gnome3.libmediaart tracker dleyna-server intltool itstool ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index 977dd7ffd6fb..89614a327a6a 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -1,9 +1,19 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection # just for passthru -, gnome3, gtk3, gsettings_desktop_schemas }: +, gnome3, gtk3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gsettings-desktop-schemas-${version}"; + version = "3.24.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gsettings-desktop-schemas/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; + }; preInstall = '' mkdir -p $out/share/gsettings-schemas/${name}/glib-2.0/schemas diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix deleted file mode 100644 index 1eca56c509bf..000000000000 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gsettings-desktop-schemas-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.1.tar.xz; - sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix index 45001e551273..b3948942c12b 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix @@ -1,16 +1,26 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared_mime_info }: +, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }: let checkInputs = [ xvfb_run dbus ]; in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gtksourceview-${version}"; + version = "3.24.6"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gtksourceview"; attrPath = "gnome3.gtksourceview"; }; + }; propagatedBuildInputs = [ # Required by gtksourceview-3.0.pc gtk3 # Used by gtk_source_language_manager_guess_language - shared_mime_info + shared-mime-info ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix deleted file mode 100644 index ec7a8a6aaa57..000000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceview-3.24.6"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz; - sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix index 7763867bcbff..ae4f75bf76a7 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix @@ -1,7 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }: +{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gtksourceviewmm-${version}"; + version = "3.21.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceviewmm/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gtksourceviewmm"; attrPath = "gnome3.gtksourceviewmm"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glibmm gtkmm gtksourceview ]; diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix deleted file mode 100644 index 21618c45e051..000000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceviewmm-3.21.2"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceviewmm/3.21/gtksourceviewmm-3.21.2.tar.xz; - sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 731ff7e2688e..ff9b232cb7a8 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash, appdata-tools +, glib, desktop-file-utils, bash, appdata-tools , wrapGAppsHook, gnome3, itstool, libxml2 , callPackage, unzip, gobjectIntrospection }: @@ -7,20 +7,30 @@ # use packaged gnome3.adwaita-icon-theme stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gucharmap-${version}"; + version = "10.0.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gucharmap/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gucharmap"; }; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools - gnome3.yelp_tools libxml2 desktop_file_utils gobjectIntrospection + gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection ]; - buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ]; unicode-data = callPackage ./unicode-data.nix {}; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix deleted file mode 100644 index fb38e3bf386b..000000000000 --- a/pkgs/desktops/gnome-3/core/gucharmap/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gucharmap-10.0.3"; - - src = fetchurl { - url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.3.tar.xz; - sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix index ddf245f49e06..816ed6476e6b 100644 --- a/pkgs/desktops/gnome-3/core/libgdata/default.nix +++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl, uhttpmock }: +{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib +, gobjectIntrospection, liboauth, gnome3, p11-kit, openssl, uhttpmock }: let majorVersion = "0.17"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection - liboauth gcr gnome_online_accounts p11_kit openssl uhttpmock ]; + liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; - propagatedBuildInputs = [ json_glib ]; + propagatedBuildInputs = [ json-glib ]; meta = with stdenv.lib; { description = "GData API library"; diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix index 319f089b9206..6301f6f4ab65 100644 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgnomekbd-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libgnomekbd/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgnomekbd"; attrPath = "gnome3.libgnomekbd"; }; + }; nativeBuildInputs = [ pkgconfig file intltool makeWrapper ]; buildInputs = [ glib gtk3 libxklavier ]; diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix deleted file mode 100644 index 431006daf4fb..000000000000 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgnomekbd-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.0.tar.xz; - sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix index 01b3c9bc0930..ad14abb10008 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -2,10 +2,20 @@ , pango, gdk_pixbuf, atk, tzdata, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgweather-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/libgweather/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgweather"; attrPath = "gnome3.libgweather"; }; + }; configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ]; + propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode-glib ]; nativeBuildInputs = [ pkgconfig intltool gnome3.vala ]; # Prevent building vapi into ${vala} derivation directory diff --git a/pkgs/desktops/gnome-3/core/libgweather/src.nix b/pkgs/desktops/gnome-3/core/libgweather/src.nix deleted file mode 100644 index 799713c28a4a..000000000000 --- a/pkgs/desktops/gnome-3/core/libgweather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgweather-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.1.tar.xz; - sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index 998a1a02b3f9..8eaa927ac7b9 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -3,7 +3,17 @@ }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libpeas-${version}"; + version = "1.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libpeas/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libpeas"; attrPath = "gnome3.libpeas"; }; + }; configureFlags = [ "--enable-python3" ]; diff --git a/pkgs/desktops/gnome-3/core/libpeas/src.nix b/pkgs/desktops/gnome-3/core/libpeas/src.nix deleted file mode 100644 index 6f2cd82fb215..000000000000 --- a/pkgs/desktops/gnome-3/core/libpeas/src.nix +++ /dev/null @@ -1,13 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "1.22"; - minor = "0"; - version = "${major}.${minor}"; - name = "libpeas-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz"; - sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix index dab1a0fea8a0..8bd9e11d95f3 100644 --- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: +{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gtk, gnome-online-accounts }: stdenv.mkDerivation rec { name = "libzapojit-0.0.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; + buildInputs = [ glib intltool json-glib rest libsoup gtk gnome-online-accounts ]; meta = with stdenv.lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index e1343d9977d7..dc89c8c674ab 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,10 +1,20 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, zenity, libcanberra_gtk3 +, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "mutter-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; }; + }; configureFlags = [ "--with-x" @@ -36,10 +46,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; buildInputs = with gnome3; [ - glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode_glib libinput libgudev libwacom - libcanberra_gtk3 zenity xkeyboard_config libxkbfile + glib gobjectIntrospection gtk gsettings-desktop-schemas upower + gnome-desktop cairo pango cogl clutter zenity libstartup_notification + gnome3.geocode-glib libinput libgudev libwacom + libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire ]; diff --git a/pkgs/desktops/gnome-3/core/mutter/src.nix b/pkgs/desktops/gnome-3/core/mutter/src.nix deleted file mode 100644 index b3d0841a2e5c..000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "mutter-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/mutter/3.26/mutter-3.26.2.tar.xz; - sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 0a7cd139d2cc..8ed7bb2f01a0 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,15 +1,25 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop_file_utils, wrapGAppsHook -, gtk, gnome3, gnome-autoar, glib, dbus_glib, shared_mime_info, libnotify, libexif +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook +, gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif , exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "nautilus-${version}"; + version = "3.26.2"; - nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop_file_utils ]; + src = fetchurl { + url = "mirror://gnome/sources/nautilus/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4"; + }; - buildInputs = [ dbus_glib shared_mime_info libexif gtk exempi libnotify libselinux - tracker tracker-miners gnome3.gnome_desktop gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas ]; + passthru = { + updateScript = gnome3.updateScript { packageName = "nautilus"; attrPath = "gnome3.nautilus"; }; + }; + + nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ]; + + buildInputs = [ dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux + tracker tracker-miners gnome3.gnome-desktop gnome3.adwaita-icon-theme + gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ gnome-autoar ]; @@ -21,6 +31,7 @@ stdenv.mkDerivation rec { # Thumbnailers --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/core/nautilus/src.nix b/pkgs/desktops/gnome-3/core/nautilus/src.nix deleted file mode 100644 index 1cc14391e394..000000000000 --- a/pkgs/desktops/gnome-3/core/nautilus/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "nautilus-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/nautilus/3.26/nautilus-3.26.2.tar.xz; - sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index e4213b240a28..f982af2d56db 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -3,7 +3,17 @@ , libxml2, sane-backends, vala, gnome3, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "simple-scan-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d172825b1b77e2e32c21fc847fd670c4711a504b09688f8567a98ac9516fe212"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "simple-scan"; }; + }; buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb gtk libwebp packagekit sane-backends vala ]; @@ -51,6 +61,7 @@ stdenv.mkDerivation rec { ''; homepage = https://launchpad.net/simple-scan; license = licenses.gpl3Plus; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/simple-scan/src.nix b/pkgs/desktops/gnome-3/core/simple-scan/src.nix deleted file mode 100644 index fb430db7d844..000000000000 --- a/pkgs/desktops/gnome-3/core/simple-scan/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "simple-scan-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/simple-scan/3.26/simple-scan-3.26.2.tar.xz; - sha256 = "d172825b1b77e2e32c21fc847fd670c4711a504b09688f8567a98ac9516fe212"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 37b311256bd9..00cec2f93b9f 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,16 +1,26 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz +, clutter-gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 , gdk_pixbuf, librsvg, gtk3, harfbuzz }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "sushi-${version}"; + version = "3.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/sushi/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "sushi"; attrPath = "gnome3.sushi"; }; + }; propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ file intltool gobjectIntrospection glib gtk3 - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf + clutter-gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper harfbuzz ]; diff --git a/pkgs/desktops/gnome-3/core/sushi/src.nix b/pkgs/desktops/gnome-3/core/sushi/src.nix deleted file mode 100644 index a713aef6f7f0..000000000000 --- a/pkgs/desktops/gnome-3/core/sushi/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "sushi-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/sushi/3.24/sushi-3.24.0.tar.xz; - sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix index c763621564c7..ef6bc97b1c67 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "totem-pl-parser-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/totem-pl-parser/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "totem-pl-parser"; attrPath = "gnome3.totem-pl-parser"; }; + }; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; buildInputs = [ gmime libxml2 libsoup ]; diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix deleted file mode 100644 index 2935111df27d..000000000000 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "totem-pl-parser-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.0.tar.xz; - sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index c26b9b45dfdf..a9d8b2ad11cb 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,11 +1,21 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter -, clutter_gtk, clutter-gst, python3Packages, shared_mime_info +, clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, dbus_glib, vala, gnome3, librsvg +, bash, wrapGAppsHook, itstool, libxml2, dbus-glib, vala, gnome3, librsvg , gdk_pixbuf, file, tracker, nautilus }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "totem-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/totem/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "totem"; attrPath = "gnome3.totem"; }; + }; doCheck = true; @@ -16,14 +26,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ]; - buildInputs = [ gtk3 glib gnome3.grilo clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins + buildInputs = [ gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins 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 gnome3.libpeas shared_mime_info dbus_glib - gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome_desktop - gnome3.gsettings_desktop_schemas tracker nautilus ]; + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info dbus-glib + gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas tracker nautilus ]; propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; diff --git a/pkgs/desktops/gnome-3/core/totem/src.nix b/pkgs/desktops/gnome-3/core/totem/src.nix deleted file mode 100644 index e051b13dee8d..000000000000 --- a/pkgs/desktops/gnome-3/core/totem/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "totem-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/totem/3.26/totem-3.26.0.tar.xz; - sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index baff249a03a3..6cb3aa39c214 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -2,15 +2,25 @@ , pkgconfig, gtk3, glib , bash, wrapGAppsHook, itstool, vala, sqlite, libxslt , gnome3, librsvg, gdk_pixbuf, libnotify -, evolution_data_server, gst_all_1, poppler +, evolution-data-server, gst_all_1, poppler , icu, taglib, libjpeg, libtiff, giflib, libcue , libvorbis, flac, exempi, networkmanager , libpng, libexif, libgsf, libuuid, bzip2 -, libsoup, json_glib, libseccomp +, libsoup, json-glib, libseccomp , libiptcdata }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "tracker-miners-${version}"; + version = "2.0.3"; + + src = fetchurl { + url = "mirror://gnome/sources/tracker-miners/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "12413a9f8dfa705a48a2697dcbb3eef12ee91bb98f392a23ba4bda7813e41d1b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "tracker-miners"; attrPath = "gnome3.tracker-miners"; }; + }; NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; @@ -19,9 +29,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ]; # TODO: add libgrss, libenca buildInputs = [ - bzip2 evolution_data_server exempi flac giflib glib gnome3.totem-pl-parser + bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu - json_glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup + json-glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup libtiff libuuid libvorbis libxml2 poppler taglib upower ]; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix b/pkgs/desktops/gnome-3/core/tracker-miners/src.nix deleted file mode 100644 index 1c5ee9b35fa1..000000000000 --- a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tracker-miners-2.0.3"; - - src = fetchurl { - url = mirror://gnome/sources/tracker-miners/2.0/tracker-miners-2.0.3.tar.xz; - sha256 = "12413a9f8dfa705a48a2697dcbb3eef12ee91bb98f392a23ba4bda7813e41d1b"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 59455f320b53..f75de96669d2 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,19 +1,29 @@ { stdenv, fetchurl, intltool, pkgconfig , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt -, gnome3, icu, libuuid, networkmanager, libsoup, json_glib }: +, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "tracker-${version}"; + version = "2.0.2"; + + src = fetchurl { + url = "mirror://gnome/sources/tracker/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ece71a56c29151a76fc1b6e43c15dd1b657b37162dc948fa2487faf5ddb47fda"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "tracker"; attrPath = "gnome3.tracker"; }; + }; enableParallelBuilding = true; nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook ]; # TODO: add libstemmer buildInputs = [ - glib libxml2 sqlite upower icu networkmanager libsoup libuuid json_glib + glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib ]; - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings_desktop_schemas + # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas configureFlags = [ "--disable-unit-tests" ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/tracker/src.nix b/pkgs/desktops/gnome-3/core/tracker/src.nix deleted file mode 100644 index 887ae9a865a9..000000000000 --- a/pkgs/desktops/gnome-3/core/tracker/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tracker-2.0.2"; - - src = fetchurl { - url = mirror://gnome/sources/tracker/2.0/tracker-2.0.2.tar.xz; - sha256 = "ece71a56c29151a76fc1b6e43c15dd1b657b37162dc948fa2487faf5ddb47fda"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index bd446623fc25..4365451636ae 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -1,24 +1,34 @@ { stdenv, fetchurl, lib, wrapGAppsHook , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup -, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null +, telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null , libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null , zlib ? null, libjpeg ? null , libXdamage ? null, libXfixes ? null, libXext ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , networkmanager ? null }: with lib; stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vino-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/vino/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "vino"; attrPath = "gnome3.vino"; }; + }; doCheck = true; buildInputs = [ wrapGAppsHook pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup - ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] - ++ optional gnomeKeyringSupport libgnome_keyring3 + ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ] + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ filter (p: p != null) [ libsecret gnutls libgcrypt avahi zlib libjpeg libXdamage libXfixes libXext networkmanager diff --git a/pkgs/desktops/gnome-3/core/vino/src.nix b/pkgs/desktops/gnome-3/core/vino/src.nix deleted file mode 100644 index 8cf55272da97..000000000000 --- a/pkgs/desktops/gnome-3/core/vino/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vino-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/vino/3.22/vino-3.22.0.tar.xz; - sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 251e27334b11..4abeb2ba9618 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -1,10 +1,20 @@ { stdenv, fetchurl, intltool, pkgconfig , gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls -, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2 +, fetchFromGitHub, autoconf, automake, libtool, gtk-doc, gperf, pcre2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vte-${version}"; + version = "0.50.2"; + + src = fetchurl { + url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "vte"; attrPath = "gnome3.vte"; }; + }; nativeBuildInputs = [ gobjectIntrospection intltool pkgconfig vala gperf libxml2 ]; buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix index c40972e955fa..e6dc005fe58e 100644 --- a/pkgs/desktops/gnome-3/core/vte/ng.nix +++ b/pkgs/desktops/gnome-3/core/vte/ng.nix @@ -1,4 +1,4 @@ -{ gnome3, fetchFromGitHub, autoconf, automake, gtk_doc, gettext, libtool, gperf }: +{ gnome3, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: gnome3.vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; @@ -14,5 +14,5 @@ gnome3.vte.overrideAttrs (oldAttrs: rec { preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; nativeBuildInputs = oldAttrs.nativeBuildInputs or [] - ++ [ gtk_doc autoconf automake gettext libtool gperf ]; + ++ [ gtk-doc autoconf automake gettext libtool gperf ]; }) diff --git a/pkgs/desktops/gnome-3/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix deleted file mode 100644 index c63873767dc4..000000000000 --- a/pkgs/desktops/gnome-3/core/vte/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vte-0.50.2"; - - src = fetchurl { - url = mirror://gnome/sources/vte/0.50/vte-0.50.2.tar.xz; - sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index eaceadcc85c4..28e89cad9fb8 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -1,10 +1,20 @@ { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-tools-${version}"; + version = "3.18.0"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp-tools/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp-tools"; attrPath = "gnome3.yelp-tools"; }; + }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl ]; + buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/core/yelp-tools/src.nix deleted file mode 100644 index f03c6d1bc311..000000000000 --- a/pkgs/desktops/gnome-3/core/yelp-tools/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-tools-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz; - sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 353b9ccb55e3..341a7d7582ca 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -2,7 +2,17 @@ , itstool, libxml2, libxslt, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-xsl-${version}"; + version = "3.20.1"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp-xsl/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp-xsl"; attrPath = "gnome3.yelp-xsl"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix deleted file mode 100644 index de5d68d1fab1..000000000000 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-xsl-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz; - sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 6b458598c299..661ddc1f12f4 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -4,17 +4,27 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-${version}"; + version = "3.26.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl + libxml2 libxslt icu file makeWrapper gnome3.yelp-xsl librsvg gdk_pixbuf gnome3.defaultIconTheme groff - gnome3.gsettings_desktop_schemas wrapGAppsHook + gnome3.gsettings-desktop-schemas wrapGAppsHook gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/yelp/src.nix b/pkgs/desktops/gnome-3/core/yelp/src.nix deleted file mode 100644 index dd06a6bf1ebb..000000000000 --- a/pkgs/desktops/gnome-3/core/yelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/yelp/3.26/yelp-3.26.0.tar.xz; - sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 80f2dde534ec..fd55fd9f87a6 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,8 +1,18 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool, wrapGAppsHook }: +, gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "zenity-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "zenity"; attrPath = "gnome3.zenity"; }; + }; preBuild = '' mkdir -p $out/include @@ -10,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/zenity/src.nix b/pkgs/desktops/gnome-3/core/zenity/src.nix deleted file mode 100644 index ad0ce2f4d733..000000000000 --- a/pkgs/desktops/gnome-3/core/zenity/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "zenity-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/zenity/3.26/zenity-3.26.0.tar.xz; - sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830"; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 0650ddf04eae..80e9058bfb1c 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, lib }: let @@ -13,25 +13,31 @@ let callPackage = pkgs.newScope self; + # Convert a version to branch (3.26.18 → 3.26) + # Used for finding packages on GNOME mirrors + versionBranch = version: builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version)); + + updateScript = callPackage ./update.nix { }; + version = "3.26"; maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ]; corePackages = with gnome3; [ - pkgs.desktop_file_utils pkgs.ibus - pkgs.shared_mime_info # for update-mime-database + pkgs.desktop-file-utils pkgs.ibus + pkgs.shared-mime-info # for update-mime-database glib # for gsettings gtk3.out # for gtk-update-icon-cache - glib_networking gvfs dconf gnome-backgrounds gnome_control_center - gnome-menus gnome_settings_daemon gnome_shell - gnome_themes_standard defaultIconTheme gnome-shell-extensions - pkgs.hicolor_icon_theme + glib-networking gvfs dconf gnome-backgrounds gnome-control-center + gnome-menus gnome-settings-daemon gnome-shell + gnome-themes-standard defaultIconTheme gnome-shell-extensions + pkgs.hicolor-icon-theme ]; optionalPackages = with gnome3; [ baobab eog epiphany evince gucharmap nautilus totem vino yelp gnome-bluetooth gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-log gnome-system-monitor simple-scan - gnome_terminal gnome-user-docs evolution file-roller gedit + gnome-terminal gnome-user-docs evolution file-roller gedit gnome-clocks gnome-music gnome-tweak-tool gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool @@ -46,8 +52,8 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 - clutter clutter-gst clutter_gtk cogl gtkvnc; + inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2 + clutter clutter-gst clutter-gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -81,11 +87,11 @@ let evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - evolution_data_server = callPackage ./core/evolution-data-server { }; + evolution-data-server = callPackage ./core/evolution-data-server { }; gconf = callPackage ./core/gconf { }; - geocode_glib = callPackage ./core/geocode-glib { }; + geocode-glib = callPackage ./core/geocode-glib { }; gcr = callPackage ./core/gcr { }; # ToDo: tests fail @@ -93,8 +99,8 @@ let gjs = callPackage ./core/gjs { }; - glib_networking = pkgs.glib_networking.override { - inherit gsettings_desktop_schemas; + glib-networking = pkgs.glib-networking.override { + inherit gsettings-desktop-schemas; }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; @@ -103,13 +109,13 @@ let gnome-contacts = callPackage ./core/gnome-contacts { }; - gnome_control_center = callPackage ./core/gnome-control-center { }; + gnome-control-center = callPackage ./core/gnome-control-center { }; gnome-calculator = callPackage ./core/gnome-calculator { }; - gnome_common = callPackage ./core/gnome-common { }; + gnome-common = callPackage ./core/gnome-common { }; - gnome_desktop = callPackage ./core/gnome-desktop { }; + gnome-desktop = callPackage ./core/gnome-desktop { }; gnome-dictionary = callPackage ./core/gnome-dictionary { }; @@ -119,27 +125,27 @@ let gnome-menus = callPackage ./core/gnome-menus { }; - gnome_keyring = callPackage ./core/gnome-keyring { }; + gnome-keyring = callPackage ./core/gnome-keyring { }; - libgnome_keyring = callPackage ./core/libgnome-keyring { }; + libgnome-keyring = callPackage ./core/libgnome-keyring { }; libgnomekbd = callPackage ./core/libgnomekbd { }; folks = callPackage ./core/folks { }; - gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; + gnome-online-accounts = callPackage ./core/gnome-online-accounts { }; gnome-online-miners = callPackage ./core/gnome-online-miners { }; - gnome_session = callPackage ./core/gnome-session { }; + gnome-session = callPackage ./core/gnome-session { }; - gnome_shell = callPackage ./core/gnome-shell { }; + gnome-shell = callPackage ./core/gnome-shell { }; gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; gnome-screenshot = callPackage ./core/gnome-screenshot { }; - gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; + gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; gnome-software = callPackage ./core/gnome-software { }; @@ -147,9 +153,9 @@ let gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - gnome_terminal = callPackage ./core/gnome-terminal { }; + gnome-terminal = callPackage ./core/gnome-terminal { }; - gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; + gnome-themes-standard = callPackage ./core/gnome-themes-standard { }; gnome-user-docs = callPackage ./core/gnome-user-docs { }; @@ -159,7 +165,7 @@ let grilo-plugins = callPackage ./core/grilo-plugins { }; - gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; + gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { }; gsound = callPackage ./core/gsound { }; @@ -193,36 +199,36 @@ let nautilus = callPackage ./core/nautilus { }; - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { + networkmanager-openvpn = pkgs.networkmanager-openvpn.override { inherit gnome3; }; - networkmanager_pptp = pkgs.networkmanager_pptp.override { + networkmanager-pptp = pkgs.networkmanager-pptp.override { inherit gnome3; }; - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { + networkmanager-vpnc = pkgs.networkmanager-vpnc.override { inherit gnome3; }; - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { + networkmanager-openconnect = pkgs.networkmanager-openconnect.override { inherit gnome3; }; - networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { + networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { inherit gnome3; }; - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { + networkmanager-l2tp = pkgs.networkmanager-l2tp.override { inherit gnome3; }; - networkmanager_iodine = pkgs.networkmanager_iodine.override { + networkmanager-iodine = pkgs.networkmanager-iodine.override { inherit gnome3; }; networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings_desktop_schemas glib_networking; + inherit gnome3 gsettings-desktop-schemas glib-networking; }; rest = callPackage ./core/rest { }; @@ -249,9 +255,9 @@ let yelp = callPackage ./core/yelp { }; - yelp_xsl = callPackage ./core/yelp-xsl { }; + yelp-xsl = callPackage ./core/yelp-xsl { }; - yelp_tools = callPackage ./core/yelp-tools { }; + yelp-tools = callPackage ./core/yelp-tools { }; zenity = callPackage ./core/zenity { }; @@ -401,6 +407,34 @@ let gnome-packagekit = callPackage ./misc/gnome-packagekit { }; +#### Legacy aliases + + evolution_data_server = evolution-data-server; # added 2018-02-25 + geocode_glib = geocode-glib; # added 2018-02-25 + glib_networking = glib-networking; # added 2018-02-25 + gnome_common = gnome-common; # added 2018-02-25 + gnome_control_center = gnome-control-center; # added 2018-02-25 + gnome_desktop = gnome-desktop; # added 2018-02-25 + gnome_keyring = gnome-keyring; # added 2018-02-25 + gnome_online_accounts = gnome-online-accounts; # added 2018-02-25 + gnome_session = gnome-session; # added 2018-02-25 + gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25 + gnome_shell = gnome-shell; # added 2018-02-25 + gnome_terminal = gnome-terminal; # added 2018-02-25 + gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 + libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 + libgnome_keyring = libgnome-keyring; # added 2018-02-25 + networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 + networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 + networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 + networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 + networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 + networkmanager_pptp = networkmanager-pptp; # added 2018-02-25 + networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 + yelp_xsl = yelp-xsl; # added 2018-02-25 + yelp_tools = yelp-tools; # added 2018-02-25 + }; in self; # pkgsFun diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 4347f72cc5f6..419588f86842 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -2,7 +2,17 @@ itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "anjuta-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/anjuta/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "anjuta"; attrPath = "gnome3.anjuta"; }; + }; enableParallelBuilding = true; @@ -14,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl gnome3.libgda gnome3.gtksourceview - gnome3.gsettings_desktop_schemas + gnome3.gsettings-desktop-schemas ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/devtools/anjuta/src.nix deleted file mode 100644 index 32843b14d8e4..000000000000 --- a/pkgs/desktops/gnome-3/devtools/anjuta/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "anjuta-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/anjuta/3.26/anjuta-3.26.0.tar.xz; - sha256 = "fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 08dbade67fbf..321e887cba6d 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -1,13 +1,23 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool, gsettings_desktop_schemas }: +, webkitgtk, intltool, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "devhelp-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "10bd468ae2188abd98af9ba7b81aced337d2206e9d843eb44520be5b00d77d8e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "devhelp"; attrPath = "gnome3.devhelp"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme - gsettings_desktop_schemas + gsettings-desktop-schemas ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix deleted file mode 100644 index 15c4671e31fb..000000000000 --- a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "devhelp-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/devhelp/3.26/devhelp-3.26.1.tar.xz; - sha256 = "10bd468ae2188abd98af9ba7b81aced337d2206e9d843eb44520be5b00d77d8e"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix index f12bbb0ca41d..07fc15f0d553 100644 --- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gdl-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gdl/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gdl"; attrPath = "gnome3.gdl"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gtk3 intltool ]; diff --git a/pkgs/desktops/gnome-3/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/devtools/gdl/src.nix deleted file mode 100644 index 6475b36508cb..000000000000 --- a/pkgs/desktops/gnome-3/devtools/gdl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdl-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gdl/3.26/gdl-3.26.0.tar.xz; - sha256 = "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 50960f41a312..3949e29089c8 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-devel-docs-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "12eea77b550acfa617e14a89e4d24f93881294340abcc2c3abc7092c851703c3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome3.gnome-devel-docs"; }; + }; buildInputs = [ intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix deleted file mode 100644 index 4838b8f9d09e..000000000000 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-devel-docs-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-devel-docs/3.26/gnome-devel-docs-3.26.0.tar.xz; - sha256 = "12eea77b550acfa617e14a89e4d24f93881294340abcc2c3abc7092c851703c3"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index cf200cb32925..19853b19fcae 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -3,7 +3,17 @@ gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "nemiver-${version}"; + version = "0.9.6"; + + src = fetchurl { + url = "mirror://gnome/sources/nemiver/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "nemiver"; attrPath = "gnome3.nemiver"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/devtools/nemiver/src.nix deleted file mode 100644 index 2fcf639fe1b4..000000000000 --- a/pkgs/desktops/gnome-3/devtools/nemiver/src.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "nemiver-0.9.6"; - - src = fetchurl { - url = mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz; - sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; - }; -} - diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 11d891b67434..d22dbd49d393 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ]; - buildInputs = [ gnome3.gnome_shell python pygobject3 requests ]; + buildInputs = [ gnome3.gnome-shell python pygobject3 requests ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix new file mode 100644 index 000000000000..43e94ce6bfbb --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-no-title-bar-${version}"; + version = "8"; + + src = fetchFromGitHub { + owner = "franglais125"; + repo = "no-title-bar"; + rev = "v${version}"; + sha256 = "0n3ayf7k2icy913sjl1d6iwm21i8fivv0f7wj7gck8q7q2j7i3bz"; + }; + + nativeBuildInputs = [ + glib gettext + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + xprop = "${xorg.xprop}/bin/xprop"; + xwininfo = "${xorg.xwininfo}/bin/xwininfo"; + }) + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + meta = with stdenv.lib; { + description = "Integrates maximized windows with the top panel"; + homepage = https://github.com/franglais125/no-title-bar; + license = licenses.gpl2; + maintainers = with maintainers; [ jonafato svsdep ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch new file mode 100644 index 000000000000..9a53d63860da --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch @@ -0,0 +1,56 @@ +--- a/decoration.js ++++ b/decoration.js +@@ -181,7 +181,7 @@ + let act = win.get_compositor_private(); + let xwindow = act && act['x-window']; + if (xwindow) { +- let xwininfo = GLib.spawn_command_line_sync('xwininfo -children -id 0x%x'.format(xwindow)); ++ let xwininfo = GLib.spawn_command_line_sync('@xwininfo@ -children -id 0x%x'.format(xwindow)); + if (xwininfo[0]) { + let str = xwininfo[1].toString(); + +@@ -207,7 +207,7 @@ + // Try enumerating all available windows and match the title. Note that this + // may be necessary if the title contains special characters and `x-window` + // is not available. +- let result = GLib.spawn_command_line_sync('xprop -root _NET_CLIENT_LIST'); ++ let result = GLib.spawn_command_line_sync('@xprop@ -root _NET_CLIENT_LIST'); + if (result[0]) { + let str = result[1].toString(); + +@@ -218,7 +218,7 @@ + + // For each window ID, check if the title matches the desired title. + for (var i = 0; i < windowList.length; ++i) { +- let cmd = 'xprop -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE'; ++ let cmd = '@xprop@ -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE'; + let result = GLib.spawn_command_line_sync(cmd); + + if (result[0]) { +@@ -258,7 +258,7 @@ + } + + let id = this._guessWindowXID(win); +- let cmd = 'xprop -id ' + id; ++ let cmd = '@xprop@ -id ' + id; + + let xprops = GLib.spawn_command_line_sync(cmd); + if (!xprops[0]) { +@@ -277,7 +277,7 @@ + m = str.match(/^_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED(\(CARDINAL\))? = ([0-9]+)$/m); + if (m) { + let state = !!parseInt(m[2]); +- cmd = ['xprop', '-id', id, ++ cmd = ['@xprop@', '-id', id, + '-f', '_NO_TITLE_BAR_ORIGINAL_STATE', '32c', + '-set', '_NO_TITLE_BAR_ORIGINAL_STATE', + (state ? '0x1' : '0x0')]; +@@ -358,7 +358,7 @@ + let winXID = this._guessWindowXID(win); + if (winXID == null) + return; +- let cmd = ['xprop', '-id', winXID, ++ let cmd = ['@xprop@', '-id', winXID, + '-f', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED', '32c', + '-set', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED', + (hide ? '0x1' : '0x0')]; diff --git a/pkgs/desktops/gnome-3/extensions/pixel-saver/default.nix b/pkgs/desktops/gnome-3/extensions/pixel-saver/default.nix deleted file mode 100644 index ccc3fd578e94..000000000000 --- a/pkgs/desktops/gnome-3/extensions/pixel-saver/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "gnome-shell-extension-pixel-saver-${version}"; - version = "1.10"; - - src = fetchFromGitHub { - owner = "deadalnix"; - repo = "pixel-saver"; - rev = version; - sha256 = "040ayzhpv9jq49vp32w85wvjs57047faa7872qm4brii450iy7v4"; - }; - - uuid = "pixel-saver@deadalnix.me"; - - installPhase = '' - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - ''; - - meta = with stdenv.lib; { - description = "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way"; - license = licenses.mit; - maintainers = with maintainers; [ jonafato ]; - platforms = platforms.linux; - homepage = https://github.com/deadalnix/pixel-saver; - }; -} diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome-3/find-latest-version.py new file mode 100644 index 000000000000..e6089c69c042 --- /dev/null +++ b/pkgs/desktops/gnome-3/find-latest-version.py @@ -0,0 +1,58 @@ +import argparse +import json +import requests +import sys + +def version_to_list(version): + return list(map(int, version.split('.'))) + +def odd_unstable(version_str, selected): + version = version_to_list(version_str) + if len(version) < 2: + return True + + even = version[1] % 2 == 0 + if selected == 'stable': + return even + else: + return not even + +def no_policy(version, selected): + return True + +version_policies = { + 'odd-unstable': odd_unstable, + 'none': no_policy, +} + +def make_version_policy(version_predicate, selected): + return lambda version: version_predicate(version, selected) + +parser = argparse.ArgumentParser(description='Find latest version for a GNOME package by crawling their release server.') +parser.add_argument('package-name', help='Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.') +parser.add_argument('version-policy', help='Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.', choices=version_policies.keys(), nargs='?', default='odd-unstable') +parser.add_argument('requested-release', help='Most of the time, we will want to update to stable version but sometimes it is useful to test.', choices=['stable', 'unstable'], nargs='?', default='stable') + + +if __name__ == '__main__': + args = parser.parse_args() + + package_name = getattr(args, 'package-name') + requested_release = getattr(args, 'requested-release') + version_predicate = version_policies[getattr(args, 'version-policy')] + version_policy = make_version_policy(version_predicate, requested_release) + + # The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762 + cache = json.loads(requests.get('https://ftp.gnome.org/pub/GNOME/sources/{}/cache.json'.format(package_name)).text) + if type(cache) != list or cache[0] != 4: + print('Unknown format of cache.json file.', file=sys.stderr) + sys.exit(1) + + versions = cache[2][package_name] + versions = sorted(filter(version_policy, versions), key=version_to_list) + + if len(versions) == 0: + print('No versions matched.', file=sys.stderr) + sys.exit(1) + + print(versions[-1]) diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 40e1473b59e2..b194ac42bf24 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils -, guile_2_0, libcanberra_gtk3 }: +, wrapGAppsHook, gconf, librsvg, libxml2, desktop-file-utils +, guile_2_0, libcanberra-gtk3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "aisleriot-${version}"; + version = "3.22.4"; + + src = fetchurl { + url = "mirror://gnome/sources/aisleriot/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "fe8dee3ad771ab778d37740a26410778aa5c61e8eb75dd42b9a5e5719c6e34fb"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "aisleriot"; attrPath = "gnome3.aisleriot"; }; + }; configureFlags = [ "--with-card-theme-formats=svg" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf - librsvg libxml2 desktop_file_utils guile_2_0 libcanberra_gtk3 ]; + librsvg libxml2 desktop-file-utils guile_2_0 libcanberra-gtk3 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Aisleriot; diff --git a/pkgs/desktops/gnome-3/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/games/aisleriot/src.nix deleted file mode 100644 index 7fee97bae1df..000000000000 --- a/pkgs/desktops/gnome-3/games/aisleriot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "aisleriot-3.22.4"; - - src = fetchurl { - url = mirror://gnome/sources/aisleriot/3.22/aisleriot-3.22.4.tar.xz; - sha256 = "fe8dee3ad771ab778d37740a26410778aa5c61e8eb75dd42b9a5e5719c6e34fb"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 48b2b3823729..8806344f3b38 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "five-or-more-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/five-or-more/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7c24f7f2603df99299d38b40b14c005aaad88820113ed71e4b3765ac3b027772"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "five-or-more"; attrPath = "gnome3.five-or-more"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/games/five-or-more/src.nix deleted file mode 100644 index 676e1a7d75a3..000000000000 --- a/pkgs/desktops/gnome-3/games/five-or-more/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "five-or-more-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/five-or-more/3.26/five-or-more-3.26.0.tar.xz; - sha256 = "7c24f7f2603df99299d38b40b14c005aaad88820113ed71e4b3765ac3b027772"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 486fe5c486e0..22032f16f477 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: +, intltool, itstool, libcanberra-gtk3, librsvg, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "four-in-a-row-${version}"; + version = "3.22.2"; + + src = fetchurl { + url = "mirror://gnome/sources/four-in-a-row/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "bc4194e8ab6d1d2a6a63a2e91945cd5465f49ebf0dae2eecacc66e69db56a420"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "four-in-a-row"; attrPath = "gnome3.four-in-a-row"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg + gtk3 wrapGAppsHook intltool itstool libcanberra-gtk3 librsvg libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix deleted file mode 100644 index 9e2b23f3996b..000000000000 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "four-in-a-row-3.22.2"; - - src = fetchurl { - url = mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.2.tar.xz; - sha256 = "bc4194e8ab6d1d2a6a63a2e91945cd5465f49ebf0dae2eecacc66e69db56a420"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index bfa345c4a40b..f50542770c4f 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -2,7 +2,17 @@ , intltool, itstool, librsvg, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-chess-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-chess/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "a0f6f862ab7067626a3a86cdc9c14dde595e38e6719e0198cb967e11facf1f12"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-chess"; attrPath = "gnome3.gnome-chess"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/games/gnome-chess/src.nix deleted file mode 100644 index ee682d3801bd..000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-chess/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-chess-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-chess/3.26/gnome-chess-3.26.0.tar.xz; - sha256 = "a0f6f862ab7067626a3a86cdc9c14dde595e38e6719e0198cb967e11facf1f12"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 13afae2eb2cb..c1f91092bb0d 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -2,7 +2,17 @@ , librsvg, libxml2, intltool, itstool, libgee, libgames-support }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-klotski-${version}"; + version = "3.22.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-klotski/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-klotski"; attrPath = "gnome3.gnome-klotski"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix deleted file mode 100644 index e37f3642c82e..000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-klotski-3.22.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.2.tar.xz; - sha256 = "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 3d0d5d6df467..b9a4638a947c 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-mahjongg-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-mahjongg"; attrPath = "gnome3.gnome-mahjongg"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix deleted file mode 100644 index c021136ee304..000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-mahjongg-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-mahjongg/3.22/gnome-mahjongg-3.22.0.tar.xz; - sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index d76e585bb4eb..ce5dc8bc14c0 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2, libgames-support, libgee }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-mines-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-mines/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2b041eaf0d57307498c56d8e285b2e539f634fdba95d689f6af75aa4ed6edde9"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-mines"; attrPath = "gnome3.gnome-mines"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/games/gnome-mines/src.nix deleted file mode 100644 index 39096f00e42c..000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-mines/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-mines-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-mines/3.26/gnome-mines-3.26.0.tar.xz; - sha256 = "2b041eaf0d57307498c56d8e285b2e539f634fdba95d689f6af75aa4ed6edde9"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 90fdccc11860..302d8fb21010 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool +, librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool , libxml2, libgee, libgames-support }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-nibbles-${version}"; + version = "3.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-nibbles/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-nibbles"; attrPath = "gnome3.gnome-nibbles"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme + librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme libgee libgames-support ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix deleted file mode 100644 index 133e9651fa74..000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-nibbles-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-3.24.0.tar.xz; - sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index cd13e6ab9585..aa5e00606c7a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,13 +1,23 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2, libgames-support +, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgames-support , libgee}: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-robots-${version}"; + version = "3.22.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-robots/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "c5d63f0fcae66d0df9b10e39387d09875555909f0aa7e57ef8552621d852082f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 libxml2 gnome3.defaultIconTheme libgames-support libgee ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/games/gnome-robots/src.nix deleted file mode 100644 index 09e4ad6c9673..000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-robots/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-robots-3.22.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.2.tar.xz; - sha256 = "c5d63f0fcae66d0df9b10e39387d09875555909f0aa7e57ef8552621d852082f"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index a0f83d48c3da..b3380e6bb96c 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook -, json_glib, qqwing, itstool, libxml2 }: +, json-glib, qqwing, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-sudoku-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-sudoku/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "8774c7093a97131b94d39142f1e044c8619cfdb6ad2546176271589fbb12d3a0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-sudoku"; attrPath = "gnome3.gnome-sudoku"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook gtk3 gnome3.libgee - json_glib qqwing itstool libxml2 ]; + json-glib qqwing itstool libxml2 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Sudoku; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix deleted file mode 100644 index f19142cf251e..000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-sudoku-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-sudoku/3.26/gnome-sudoku-3.26.0.tar.xz; - sha256 = "8774c7093a97131b94d39142f1e044c8619cfdb6ad2546176271589fbb12d3a0"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index d456abe6dc1f..4f87fb50d619 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: +, librsvg, libcanberra-gtk3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-taquin-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-taquin/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "de352bb2dfcd759de37f6bccf1e4790760e020b4bb06a1bc8d5f03d89613b6fd"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-taquin"; attrPath = "gnome3.gnome-taquin"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook librsvg libcanberra-gtk3 intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix deleted file mode 100644 index 30a33e28e2de..000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-taquin-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-taquin/3.26/gnome-taquin-3.26.1.tar.xz; - sha256 = "de352bb2dfcd759de37f6bccf1e4790760e020b4bb06a1bc8d5f03d89613b6fd"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 37218776f123..f456b7ee6831 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -2,7 +2,17 @@ , libxml2, intltool, itstool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-tetravex-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-tetravex/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix deleted file mode 100644 index e79b18263b99..000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-tetravex-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-tetravex/3.22/gnome-tetravex-3.22.0.tar.xz; - sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 857aec9700f3..db01eb86f173 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -2,7 +2,17 @@ , libxml2, intltool, itstool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "hitori-${version}"; + version = "3.22.4"; + + src = fetchurl { + url = "mirror://gnome/sources/hitori/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "hitori"; attrPath = "gnome3.hitori"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/hitori/src.nix b/pkgs/desktops/gnome-3/games/hitori/src.nix deleted file mode 100644 index 93dcd5de62e3..000000000000 --- a/pkgs/desktops/gnome-3/games/hitori/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "hitori-3.22.4"; - - src = fetchurl { - url = mirror://gnome/sources/hitori/3.22/hitori-3.22.4.tar.xz; - sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 3836548b3ab2..d31457f868c4 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, libxml2, dconf }: +, intltool, itstool, libcanberra-gtk3, libxml2, dconf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "iagno-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/iagno/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3476810d0c42aa1600484de2c111c94e0cf5247a98f071b23a0b5e3036362121"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "iagno"; attrPath = "gnome3.iagno"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; + dconf libxml2 libcanberra-gtk3 wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/iagno/src.nix b/pkgs/desktops/gnome-3/games/iagno/src.nix deleted file mode 100644 index 86c1f30e5d66..000000000000 --- a/pkgs/desktops/gnome-3/games/iagno/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "iagno-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/iagno/3.26/iagno-3.26.1.tar.xz; - sha256 = "3476810d0c42aa1600484de2c111c94e0cf5247a98f071b23a0b5e3036362121"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 7bd3ca95de94..1a163352cfc8 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }: +, intltool, itstool, clutter, clutter-gtk, libxml2, dconf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "lightsoff-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/lightsoff/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d12572bc7b70481320ec90c6130ad794b559a9990d08bef158a1d826aaa35976"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "lightsoff"; attrPath = "gnome3.lightsoff"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf - libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; + libxml2 clutter clutter-gtk wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/games/lightsoff/src.nix deleted file mode 100644 index 18528df24a38..000000000000 --- a/pkgs/desktops/gnome-3/games/lightsoff/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "lightsoff-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/lightsoff/3.26/lightsoff-3.26.0.tar.xz; - sha256 = "d12572bc7b70481320ec90c6130ad794b559a9990d08bef158a1d826aaa35976"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 514b2a035575..b0572f981ded 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, libcanberra_gtk3 -, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }: +, librsvg, libcanberra-gtk3 +, intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "quadrapassel-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/quadrapassel/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "quadrapassel"; attrPath = "gnome3.quadrapassel"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libcanberra_gtk3 itstool intltool clutter - libxml2 clutter_gtk wrapGAppsHook ]; + libcanberra-gtk3 itstool intltool clutter + libxml2 clutter-gtk wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/games/quadrapassel/src.nix deleted file mode 100644 index 57bdb4771ddf..000000000000 --- a/pkgs/desktops/gnome-3/games/quadrapassel/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "quadrapassel-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/quadrapassel/3.22/quadrapassel-3.22.0.tar.xz; - sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index c6416960b7aa..92da14fb5597 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf -, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }: +, clutter, clutter-gtk, intltool, itstool, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "swell-foop-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/swell-foop/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "122e2b5a51ad0144ea6b5fd2736ac43b101c7892198948e697bfc4c014bbba22"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "swell-foop"; attrPath = "gnome3.swell-foop"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; + dconf wrapGAppsHook itstool intltool clutter clutter-gtk libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/games/swell-foop/src.nix deleted file mode 100644 index 082081ca36c7..000000000000 --- a/pkgs/desktops/gnome-3/games/swell-foop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "swell-foop-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/swell-foop/3.26/swell-foop-3.26.0.tar.xz; - sha256 = "122e2b5a51ad0144ea6b5fd2736ac43b101c7892198948e697bfc4c014bbba22"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index 6f6beee89615..f8d799b69141 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "tali-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/tali/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg diff --git a/pkgs/desktops/gnome-3/games/tali/src.nix b/pkgs/desktops/gnome-3/games/tali/src.nix deleted file mode 100644 index 108144cc3eef..000000000000 --- a/pkgs/desktops/gnome-3/games/tali/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tali-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/tali/3.22/tali-3.22.0.tar.xz; - sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index b33488e34fce..73d3b555ba9f 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee - libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server - sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; + libsoup libgdata gnome3.gnome-online-accounts gnome3.evolution-data-server + sqlite itstool xdg_utils gnome3.gsettings-desktop-schemas ]; preFixup = '' wrapProgram "$out/bin/california" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings-desktop-schemas}/share" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index a912fb1c98b2..f8c296252617 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant -, wrapGAppsHook, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra_gtk3, libsecret, gmime +, wrapGAppsHook, gdk_pixbuf, cmake, desktop-file-utils +, libnotify, libcanberra-gtk3, libsecret, gmime , libpthreadstubs, sqlite -, gnome3, librsvg, gnome_doc_utils, webkitgtk }: +, gnome3, librsvg, gnome-doc-utils, webkitgtk }: let majorVersion = "0.12"; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop_file_utils gnome_doc_utils ]; - buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr + nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop-file-utils gnome-doc-utils ]; + buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite + libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; preConfigure = '' diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix index 364a52ee5cdf..779f21882e63 100644 --- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json_glib }: +, gnome3, libsoup, json-glib }: stdenv.mkDerivation rec { name = "gfbgraph-0.2.3"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gnome3.gnome_online_accounts ]; - propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; + buildInputs = [ glib gnome3.gnome-online-accounts ]; + propagatedBuildInputs = [ libsoup json-glib gnome3.rest ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 4180cd3b8ea1..314539b7f9e6 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,10 +1,20 @@ { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib -, json_glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret +, json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection +, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret , libsoup }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gitg-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gitg/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gitg"; }; + }; preCheck = '' substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" @@ -13,11 +23,11 @@ stdenv.mkDerivation rec { makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - propagatedUserEnvPkgs = [ shared_mime_info - gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ shared-mime-info + gnome3.gnome-themes-standard ]; - buildInputs = [ gtk3 glib json_glib libgee libpeas gnome3.libsoup - libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas + buildInputs = [ gtk3 glib json-glib libgee libpeas gnome3.libsoup + libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ]; diff --git a/pkgs/desktops/gnome-3/misc/gitg/src.nix b/pkgs/desktops/gnome-3/misc/gitg/src.nix deleted file mode 100644 index c72e2830ad1e..000000000000 --- a/pkgs/desktops/gnome-3/misc/gitg/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gitg-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz; - sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 3a35a87ceafc..48c14461daa3 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -3,7 +3,17 @@ }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-autoar-${version}"; + version = "0.2.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-autoar/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix deleted file mode 100644 index ee2ade83ee6c..000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-autoar-0.2.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.2.tar.xz; - sha256 = "e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index cce734b474e4..ecc0711482fa 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit -, fontconfig, libcanberra_gtk3, systemd, libnotify, wrapGAppsHook, dbus_glib, dbus_libs, desktop_file_utils }: +, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus_libs, desktop-file-utils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-packagekit-${version}"; + version = "3.26.0"; - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-packagekit/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417"; + }; - nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop_file_utils ]; + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-packagekit"; attrPath = "gnome3.gnome-packagekit"; }; + }; + + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + + nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit - libcanberra_gtk3 libnotify dbus_glib dbus_libs ]; + libcanberra-gtk3 libnotify dbus-glib dbus_libs ]; prePatch = "patchShebangs meson_post_install.sh"; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix deleted file mode 100644 index 5448eb8a83a7..000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-packagekit-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-packagekit/3.26/gnome-packagekit-3.26.0.tar.xz; - sha256 = "6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix index 4e8eaffde435..35c3a678e843 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix @@ -4,19 +4,29 @@ , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-tweak-tool-${version}"; + version = "3.26.4"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "fda08044d22c258bbd93dbad326d282d4d1184b98795ae8e3e5f07f8275005df"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-tweak-tool"; attrPath = "gnome3.gnome-tweak-tool"; }; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook ]; buildInputs = [ - gtk3 glib gnome3.gsettings_desktop_schemas + gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme librsvg - libnotify gnome3.gnome_shell python3Packages.pygobject3 - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.mutter gnome3.gnome_desktop gobjectIntrospection + libnotify gnome3.gnome-shell python3Packages.pygobject3 + libsoup gnome3.gnome-settings-daemon gnome3.nautilus + gnome3.mutter gnome3.gnome-desktop gobjectIntrospection ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix deleted file mode 100644 index 8af28e17dcd1..000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-tweak-tool-3.26.4"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-tweak-tool/3.26/gnome-tweak-tool-3.26.4.tar.xz; - sha256 = "fda08044d22c258bbd93dbad326d282d4d1184b98795ae8e3e5f07f8275005df"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 3e1c897ffff9..aaedd6ef632d 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ]; buildInputs = [ glib gjs mutter gnome3.adwaita-icon-theme - gtk3 gnome3.gnome_control_center dbus + gtk3 gnome3.gnome-control-center dbus clutter pango appstream-glib systemd gobjectIntrospection ]; configureFlags = [ "--with-controlcenterdir=$(out)/share/gnome-control-center/keybindings" diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix index 2bbf219e3f3a..5d2dc08e7e35 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix @@ -1,7 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gspell-${version}"; + version = "1.6.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gspell/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f4d329348775374eec18158f8dcbbacf76f85be5ce002a92d93054ece70ec4de"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gspell"; attrPath = "gnome3.gspell"; }; + }; propagatedBuildInputs = [ enchant ]; # required for pkgconfig @@ -9,6 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 isocodes ]; meta = with stdenv.lib; { + description = "A spell-checking library for GTK+ applications"; + homepage = https://wiki.gnome.org/Projects/gspell; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gspell/src.nix b/pkgs/desktops/gnome-3/misc/gspell/src.nix deleted file mode 100644 index 9ae78f39e4e1..000000000000 --- a/pkgs/desktops/gnome-3/misc/gspell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gspell-1.6.1"; - - src = fetchurl { - url = mirror://gnome/sources/gspell/1.6/gspell-1.6.1.tar.xz; - sha256 = "f4d329348775374eec18158f8dcbbacf76f85be5ce002a92d93054ece70ec4de"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 3f65ab36b0bb..1b912109cfd5 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -2,11 +2,21 @@ , gnome3, enchant, isocodes }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gtkhtml-${version}"; + version = "4.10.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gtkhtml/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gtkhtml"; attrPath = "gnome3.gtkhtml"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas ]; + gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix deleted file mode 100644 index 21876ec9c399..000000000000 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtkhtml-4.10.0"; - - src = fetchurl { - url = mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz; - sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index edb34996867b..ce7bb6f75b5c 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -1,7 +1,23 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 +, mysqlSupport ? false, mysql ? null +, postgresSupport ? false, postgresql ? null +}: + +assert mysqlSupport -> mysql != null; +assert postgresSupport -> postgresql != null; stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgda-${version}"; + version = "5.2.4"; + + src = fetchurl { + url = "mirror://gnome/sources/libgda/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgda"; attrPath = "gnome3.libgda"; }; + }; patches = [ (fetchurl { @@ -11,21 +27,24 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ - "--enable-gi-system-install=no" - ]; + configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ] + ++ (optional (mysqlSupport) "--with-mysql=yes") + ++ (optional (postgresSupport) "--with-postgres=yes"); enableParallelBuilding = true; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool itstool libxml2 gtk3 openssl ]; + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 ]; + buildInputs = with stdenv.lib; [ gtk3 openssl ] + ++ optional (mysqlSupport) mysql.connector-c + ++ optional (postgresSupport) postgresql; meta = with stdenv.lib; { description = "Database access library"; homepage = http://www.gnome-db.org/; license = [ licenses.lgpl2 licenses.gpl2 ]; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgda/src.nix b/pkgs/desktops/gnome-3/misc/libgda/src.nix deleted file mode 100644 index 8812ccc8ccd9..000000000000 --- a/pkgs/desktops/gnome-3/misc/libgda/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgda-5.2.4"; - - src = fetchurl { - url = mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz; - sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix index 3c9652de4990..865586b51192 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix @@ -1,11 +1,21 @@ { stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2 -, gtk_doc, gobjectIntrospection, libgit2, glib }: +, gtk-doc, gobjectIntrospection, libgit2, glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgit2-glib-${version}"; + version = "0.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/libgit2-glib/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2ad6f20db2e38bbfdb6cb452704fe8a911036b86de82dc75bb0f3b20db40ce9c"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgit2-glib"; attrPath = "gnome3.libgit2-glib"; }; + }; nativeBuildInputs = [ - gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection + gnome3.gnome-common libtool pkgconfig vala gtk-doc gobjectIntrospection ]; propagatedBuildInputs = [ @@ -16,6 +26,10 @@ stdenv.mkDerivation rec { buildInputs = [ libssh2 ]; meta = with stdenv.lib; { + description = "A glib wrapper library around the libgit2 git access library"; + homepage = https://wiki.gnome.org/Projects/Libgit2-glib; + license = licenses.lgpl21; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix deleted file mode 100644 index d233dc3a4015..000000000000 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgit2-glib-0.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.2.tar.xz; - sha256 = "2ad6f20db2e38bbfdb6cb452704fe8a911036b86de82dc75bb0f3b20db40ce9c"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 5634d2a48d54..82e56d3f96c4 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, - dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook, + dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook, glib, gobjectIntrospection, libpeas }: @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobjectIntrospection libpeas - dbus_glib libcanberra gst_all_1.gstreamer + dbus-glib libcanberra gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3.gsettings_desktop_schemas - gnome3.gnome_shell gtk3 gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas + gnome3.gnome-shell gtk3 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix new file mode 100644 index 000000000000..b7a6ce16d11f --- /dev/null +++ b/pkgs/desktops/gnome-3/update.nix @@ -0,0 +1,11 @@ +{ lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }: +{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }: + +let + python = python3.withPackages (p: [ p.requests ]); +in writeScript "update-${packageName}" '' + set -o errexit + PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]} + latest_tag=$(python "${./find-latest-version.py}" "${packageName}" "${versionPolicy}" "stable") + update-source-version "${attrPath}" "$latest_tag" +'' diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index da33999087ed..0ada9af3b5e0 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, +{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools, poppler_qt5, wrapGAppsHook }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { poppler_qt5 fluxbox xscreensaver - desktop_file_utils + desktop-file-utils numlockx ]; diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix index e3cb02e8b8af..c40b9c4e9f94 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { xorg.libXdmcp xorg.libSM openbox - hicolor_icon_theme + hicolor-icon-theme ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index c6607dad2902..05b9d966fc43 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor_icon_theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "atril-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { poppler mate.caja mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 1aef8d3d184f..3383847f16c6 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-extensions-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - dbus_glib + dbus-glib gupnp mate.caja mate.mate-desktop diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index a80f89feff29..070808504d14 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libexif exempi mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; patches = [ diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 8e46102cf5a6..74d32ce1f216 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "engrampa-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { libxml2 gnome3.gtk mate.caja - hicolor_icon_theme + hicolor-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index c3af73282e5c..23e167412919 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "eom-${version}"; @@ -17,18 +17,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib exempi lcms2 libexif libjpeg librsvg libxml2 - shared_mime_info + shared-mime-info gnome3.gtk gnome3.libpeas mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; meta = { diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 9a926b78c3d7..e5a544ae33e5 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "marco-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - libcanberra_gtk3 + libcanberra-gtk3 libgtop gnome2.startup_notification gnome3.gtk diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index f56d594303c9..0be643c97189 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus-glib, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-applets-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { wirelesstools mate.libmateweather mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; configureFlags = [ "--enable-suid=no" ]; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index e9b789bdc4e9..fdee351aeed5 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, - libxklavier, libcanberra_gtk3, librsvg, libappindicator-gtk3, - desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, + libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, + desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,20 +16,20 @@ stdenv.mkDerivation rec { pkgconfig intltool itstool - desktop_file_utils + desktop-file-utils wrapGAppsHook ]; buildInputs = [ libxml2 - dbus_glib + dbus-glib libxklavier - libcanberra_gtk3 + libcanberra-gtk3 librsvg libappindicator-gtk3 gnome3.gtk gnome3.dconf - hicolor_icon_theme + hicolor-icon-theme mate.mate-desktop mate.libmatekbd mate.mate-menus diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 6e1f9778e313..2d868d2e0821 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, mate, hicolor_icon_theme }: +{ stdenv, fetchurl, autoreconfHook, mate, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mate.mate-icon-theme hicolor_icon_theme ]; + buildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; meta = { description = "Faenza icon theme from MATE"; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index a42116a63af5..93ad93b07b98 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3, mate }: +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3, mate }: stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; - buildInputs = [ librsvg hicolor_icon_theme ]; + buildInputs = [ librsvg hicolor-icon-theme ]; postInstall = '' for theme in "$out"/share/icons/*; do diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 4ff636c3c734..512327c06208 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-indicator-applet-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { gtk3 libindicator-gtk3 mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index f4ee94b4bd37..514da3a11724 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra_gtk3, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-media-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - libcanberra_gtk3 + libcanberra-gtk3 gnome3.gtk mate.libmatemixer mate.mate-desktop diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 53b441a293a6..59df2b7d59bd 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, libcanberra_gtk3, +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3, libnotify, libwnck3, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib - libcanberra_gtk3 + dbus-glib + libcanberra-gtk3 libnotify libwnck3 gnome3.gtk diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index b05a9a68af04..0adcb58758c3 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-panel-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - dbus_glib + dbus-glib libwnck3 librsvg libxml2 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mate.libmateweather mate.mate-desktop mate.mate-menus - hicolor_icon_theme + hicolor-icon-theme ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index df38485fbc75..ddde6acf0e0e 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra_gtk3, dbus_glib, upower, gnome3, libtool, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { glib itstool libxml2 - libcanberra_gtk3 + libcanberra-gtk3 gnome3.gtk - gnome3.libgnome_keyring + gnome3.libgnome-keyring libnotify - dbus_glib + dbus-glib upower mate.mate-panel ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index e1ae6b4ae1dc..3b5d303816ba 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-screensaver-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - dbus_glib + dbus-glib libXScrnSaver libnotify pam diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 130db2420ef1..dfd3766df297 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus-glib, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-sensors-applet-${version}"; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { libxslt libatasmart libnotify - dbus_glib + dbus-glib lm_sensors mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index d154b80263c6..97c80cdc2e4e 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus_glib, systemd, - libSM, libXtst, gtk3, hicolor_icon_theme, mate, +{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd, + libSM, libXtst, gtk3, hicolor-icon-theme, mate, wrapGAppsHook }: @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib systemd libSM libXtst gtk3 mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index dc1272115b8e..b97b5294d39b 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus_glib, libxklavier, libcanberra_gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio }: @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib libxklavier - libcanberra_gtk3 + libcanberra-gtk3 libnotify nss polkit diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index f5393cad0b88..23123fd2db1a 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, mod_dnssd, apacheHttpd, hicolor_icon_theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-user-share-${version}"; @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - dbus_glib + dbus-glib libnotify - libcanberra_gtk3 + libcanberra-gtk3 libxml2 mate.caja - hicolor_icon_theme + hicolor-icon-theme # Should mod_dnssd and apacheHttpd be runtime dependencies? # In gnome-user-share they are not. #mod_dnssd diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 946dc3efd253..f96eecb0a4e6 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-utils-${version}"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libgtop - libcanberra_gtk3 + libcanberra-gtk3 libxml2 mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 13a34f90fcdd..22e790784d57 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = with gnome3; [ glib gtk3 granite libnotify gettext vte_290 libgee - gsettings_desktop_schemas defaultIconTheme + gsettings-desktop-schemas defaultIconTheme ]; meta = { description = "Elementary OS's terminal"; diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 44e8a26eee15..4be84589080c 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,12 +1,12 @@ { - mkDerivation, extra-cmake-modules, shared_mime_info, + mkDerivation, extra-cmake-modules, shared-mime-info, bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative }: mkDerivation { name = "bluedevil"; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index f00c4e73a887..6da0ad22d115 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { libsForQt5, lib, fetchurl, - gconf, gsettings_desktop_schemas, + gconf, gsettings-desktop-schemas, debug ? false, }: @@ -105,7 +105,7 @@ let breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; - kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings_desktop_schemas; }; + kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; }; kdecoration = callPackage ./kdecoration.nix {}; kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; kgamma5 = callPackage ./kgamma5.nix {}; @@ -135,6 +135,7 @@ let powerdevil = callPackage ./powerdevil.nix {}; sddm-kcm = callPackage ./sddm-kcm.nix {}; systemsettings = callPackage ./systemsettings.nix {}; + user-manager = callPackage ./user-manager.nix {}; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; }; in diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index f792f3b939f4..35d90a246bc6 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings_desktop_schemas + knewstuff, gsettings-desktop-schemas }: mkDerivation { @@ -10,12 +10,12 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings_desktop_schemas + knewstuff gsettings-desktop-schemas ]; patches = [ ./0001-follow-symlinks.patch ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGLIB_SCHEMAS_DIR=${gsettings_desktop_schemas.out}/" + "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch index 79b5cfb437e2..75144d352223 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch +++ b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch @@ -16,7 +16,7 @@ index 568cb34..98a5992 100644 #include -const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml"; -+const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml"; ++const QString MobileProviders::ProvidersFile = "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"; bool localeAwareCompare(const QString & one, const QString & two) { return one.localeAwareCompare(two) < 0; diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index cc1dcb7ee9f7..214dbd9cc042 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -4,7 +4,7 @@ kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, - mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt, + mobile-broadband-provider-info, modemmanager-qt, networkmanager-qt, openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid }: @@ -15,13 +15,13 @@ mkDerivation { kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui - mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect + mobile-broadband-provider-info modemmanager-qt networkmanager-qt openconnect qca-qt5 solid ]; patches = [ (substituteAll { src = ./0001-mobile-broadband-provider-info-path.patch; - inherit mobile_broadband_provider_info; + inherit mobile-broadband-provider-info; }) (substituteAll { src = ./0002-openvpn-binary-path.patch; diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 0bfad2b5c8e4..b60b5298d6db 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kdoctools, gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, - libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem + libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem }: mkDerivation { @@ -10,6 +10,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n - libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem + libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem ]; } diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 65912083a4cf..6becf3bf420b 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -1,5 +1,5 @@ { - mkDerivation, extra-cmake-modules, shared_mime_info, + mkDerivation, extra-cmake-modules, shared-mime-info, libpthreadstubs, libXcursor, libXdmcp, qtquickcontrols2, qtx11extras, karchive, ki18n, kio, knewstuff @@ -7,7 +7,7 @@ mkDerivation { name = "sddm-kcm"; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs libXcursor libXdmcp qtquickcontrols2 qtx11extras diff --git a/pkgs/desktops/plasma-5/user-manager.nix b/pkgs/desktops/plasma-5/user-manager.nix new file mode 100644 index 000000000000..f46792fc48f7 --- /dev/null +++ b/pkgs/desktops/plasma-5/user-manager.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, khtml, + ki18n, kiconthemes, kio, kwindowsystem, libpwquality +}: + +mkDerivation { + name = "user-manager"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcmutils kconfig khtml ki18n kiconthemes kio kwindowsystem + libpwquality + ]; +} diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 54b112927690..65e4463600a9 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared_mime_info, hicolor_icon_theme }: +{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared-mime-info, hicolor-icon-theme }: let version = "2.11"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gtk shared_mime_info hicolor_icon_theme libSM ]; + buildInputs = [ libxml2 gtk shared-mime-info hicolor-icon-theme libSM ]; patches = [ ./rox-filer-2.11-in-source-build.patch diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index a2b91aaaa79e..d66fa2049e65 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util -, gtk, gtksourceview, dbus, dbus_glib, makeWrapper +, gtk, gtksourceview, dbus, dbus-glib, makeWrapper , dconf }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool libxfce4util - gtk gtksourceview dbus dbus_glib makeWrapper + gtk gtksourceview dbus dbus-glib makeWrapper dconf ]; diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index c26327f4d920..f376b743c824 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus_glib +{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib , libnotify, popt, xfce }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool bison flex ]; - buildInputs = [ gtk libical dbus_glib libnotify popt xfce.libxfce4util + buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util xfce.xfce4panel ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix index 598c50380928..3b27456d78a3 100644 --- a/pkgs/desktops/xfce/applications/parole.nix +++ b/pkgs/desktops/xfce/applications/parole.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1 -, gtk, dbus_glib, libxfce4ui, libxfce4util, xfconf +, gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf , taglib, libnotify , withGstPlugins ? true }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - gtk dbus_glib libxfce4ui libxfce4util xfconf + gtk dbus-glib libxfce4ui libxfce4util xfconf taglib libnotify ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]); diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index b38b97b90438..f849fbd20a73 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, libexif, gtk -, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf -, hicolor_icon_theme, makeWrapper +, exo, dbus-glib, libxfce4util, libxfce4ui, xfconf +, hicolor-icon-theme, makeWrapper }: stdenv.mkDerivation rec { @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool libexif gtk dbus_glib exo libxfce4util - libxfce4ui xfconf hicolor_icon_theme makeWrapper + [ pkgconfig intltool libexif gtk dbus-glib exo libxfce4util + libxfce4ui xfconf hicolor-icon-theme makeWrapper ]; postInstall = '' wrapProgram "$out/bin/ristretto" \ - --prefix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" + --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" ''; meta = { diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index ad1727da3b93..773a8274f341 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus_glib +{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus-glib , exo, libxfce4util, libxfce4ui }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ]; + buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ]; meta = { homepage = http://www.xfce.org/projects/terminal; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index ffcdf4835779..4c855b8ddeb6 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup -, makeWrapper, glib_networking, exo, hicolor_icon_theme, wrapGAppsHook }: +, makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme glib_networking + xfce4panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking ]; meta = { diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index a213b27a7619..6b5ee4b31328 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util -, hicolor_icon_theme }: +, hicolor-icon-theme }: stdenv.mkDerivation rec { p_name = "exo"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/ nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor_icon_theme ]; + buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ]; meta = with stdenv.lib; { homepage = "http://www.xfce.org/projects/${p_name}"; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 58fc6c3fe4be..e8d5b4acd769 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf -, libglade, libstartup_notification, hicolor_icon_theme +, libglade, libstartup_notification, hicolor-icon-theme , withGtk3 ? false, gtk3 }: let @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libxfce4util xfconf libglade - libstartup_notification hicolor_icon_theme + libstartup_notification hicolor-icon-theme ] ++ optional withGtk3 gtk3; propagatedBuildInputs = [ xorg.libICE xorg.libSM ]; diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index 106cda6b9757..7fe76057c930 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk -, libxfce4util, xfconf, libglade, libstartup_notification, hicolor_icon_theme }: +, libxfce4util, xfconf, libglade, libstartup_notification, hicolor-icon-theme }: let p_name = "libxfcegui4"; ver_maj = "4.10"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade - libstartup_notification hicolor_icon_theme + libstartup_notification hicolor-icon-theme ]; meta = { diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix index bfc55f87b5cd..bf44fc0adbba 100644 --- a/pkgs/desktops/xfce/core/thunar-build.nix +++ b/pkgs/desktops/xfce/core/thunar-build.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool -, gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev +, gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev , exo, libxfce4util, xfconf, xfce4panel, wrapGAppsHook }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ intltool - gtk dbus_glib libstartup_notification libnotify libexif pcre udev + gtk dbus-glib libstartup_notification libnotify libexif pcre udev exo libxfce4util xfconf xfce4panel ]; # TODO: optionality? diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 6e785c9438bb..3e1d2be2b531 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk_pixbuf, curl, freetype , libgsf, poppler, bzip2 }: let p_name = "tumbler"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - intltool dbus_glib gdk_pixbuf curl freetype + intltool dbus-glib gdk_pixbuf curl freetype poppler libgsf bzip2 ]; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index e9f6240cbdfe..26548f6daa42 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification -, makeWrapper, xfce4mixer, hicolor_icon_theme -, withGtk3 ? false, gtk3, gettext, glib_networking +, makeWrapper, xfce4mixer, hicolor-icon-theme +, withGtk3 ? false, gtk3, gettext, glib-networking }: let inherit (stdenv.lib) optional; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck - garcon xfconf libstartup_notification makeWrapper hicolor_icon_theme + garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme ] ++ xfce4mixer.gst_plugins ++ optional withGtk3 gtk3; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xfce4-panel" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index c72061e577e8..9425c4d8884b 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus_glib, upower, xfconf -, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor_icon_theme +{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf +, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor-icon-theme , withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }: let p_name = "xfce4-power-manager"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig intltool glib dbus_glib upower xfconf libxfce4util - libnotify hicolor_icon_theme + [ pkgconfig intltool glib dbus-glib upower xfconf libxfce4util + libnotify hicolor-icon-theme ] ++ (if withGtk3 then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ] diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index edc810d38972..73939d535872 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit -, libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus_glib, xfconf, libglade, xorg -, hicolor_icon_theme +, libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus-glib, xfconf, libglade, xorg +, hicolor-icon-theme }: let @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib + [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib xfconf xfce4panel libglade xorg.iceauth xorg.libSM - polkit hicolor_icon_theme + polkit hicolor-icon-theme ]; #TODO: upower-glib, gconf (assistive?), gnome keyring preBuild = '' diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index fbf03cc4a81d..9aa66a1343f6 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus-glib }: let p_name = "xfconf"; ver_maj = "4.12"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib libxfce4util ]; - propagatedBuildInputs = [ dbus_glib ]; + propagatedBuildInputs = [ dbus-glib ]; meta = with stdenv.lib; { homepage = http://docs.xfce.org/xfce/xfconf/start; diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 165381451425..491185ff2c09 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify -, hicolor_icon_theme }: +, hicolor-icon-theme }: let p_name = "xfdesktop"; ver_maj = "4.12"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf - libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme + libglade xfce4panel thunar exo garcon libnotify hicolor-icon-theme ]; patches = [(fetchpatch { diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index d27f498842e3..968c845a0119 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant -, shared_mime_info, gtksourceview, gtk2 +, shared-mime-info, gtksourceview, gtk2 , targetVersion ? "4.5" }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - mono makeWrapper nant shared_mime_info gtksourceview + mono makeWrapper nant shared-mime-info gtksourceview gtk2 ]; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 696728e6f32c..087f74700214 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -2,7 +2,7 @@ let options = rec { - /* TODO: there are also MacOS, FreeBSD and Windows versions */ + /* TODO: there are also FreeBSD and Windows versions */ x86_64-linux = { arch = "linuxx86"; sha256 = "0hs1f3z7crgzvinpj990kv9gvbsipxvcvwbmk54n51nasvc5025q"; @@ -21,6 +21,18 @@ let runtime = "armcl"; kernel = "linuxarm"; }; + x86_64-darwin = { + arch = "darwinx86"; + sha256 = "5adbea3d8b4a2e29af30d141f781c6613844f468c0ccfa11bae908c3e9641939"; + runtime = "dx86cl64"; + kernel = "darwinx8664"; + }; + i686-darwin = { + arch = "darwinx86"; + sha256 = x86_64-darwin.sha256; + runtime = "dx86cl"; + kernel = "darwinx8632"; + }; armv6l-linux = armv7l-linux; }; cfg = options.${stdenv.system}; @@ -37,12 +49,22 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256; }; - buildInputs = [ gcc glibc m4 ]; + buildInputs = if stdenv.isDarwin then [ m4 ] else [ gcc glibc m4 ]; CCL_RUNTIME = cfg.runtime; CCL_KERNEL = cfg.kernel; - postPatch = '' + postPatch = if stdenv.isDarwin then '' + substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ + --replace "M4 = gm4" "M4 = m4" \ + --replace "dtrace" "/usr/sbin/dtrace" \ + --replace "mig" "/usr/bin/mig" \ + --replace "/bin/rm" "${coreutils}/bin/rm" \ + --replace "/bin/echo" "${coreutils}/bin/echo" + + substituteInPlace lisp-kernel/m4macros.m4 \ + --replace "/bin/pwd" "${coreutils}/bin/pwd" + '' else '' substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ --replace "/bin/rm" "${coreutils}/bin/rm" \ --replace "/bin/echo" "${coreutils}/bin/echo" @@ -63,7 +85,7 @@ stdenv.mkDerivation rec { cp -r . "$out/share/ccl-installation" mkdir -p "$out/bin" - echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" + echo -e '#!${stdenv.shell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" chmod a+x "$out"/bin/"${CCL_RUNTIME}" ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl ''; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index fd8930bc8547..8f9f6e19993d 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -11,11 +11,12 @@ let , name ? "" , developerProgram ? false , python ? python27 + , runPatches ? [] }: stdenv.mkDerivation rec { name = "cudatoolkit-${version}"; - inherit (args) version; + inherit version runPatches; dontPatchELF = true; dontStrip = true; @@ -48,35 +49,34 @@ let rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64"; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + unpackPhase = '' sh $src --keep --noexec + cd pkg/run_files sh cuda-linux*.run --keep --noexec sh cuda-samples*.run --keep --noexec - cd pkg - ''; + mv pkg ../../$(basename $src) + cd ../.. + rm -rf pkg - buildPhase = '' - chmod -R u+w . - while IFS= read -r -d ''$'\0' i; do - if ! isELF "$i"; then continue; fi - echo "patching $i..." - if [[ ! $i =~ \.so ]]; then - patchelf \ - --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i - fi - if [[ $i =~ libcudart ]]; then - rpath2= - else - rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 - fi - patchelf --set-rpath $rpath2 --force-rpath $i - done < <(find . -type f -print0) + for patch in $runPatches; do + sh $patch --keep --noexec + mv pkg $(basename $patch) + done ''; installPhase = '' mkdir $out + cd $(basename $src) perl ./install-linux.pl --prefix="$out" + cd .. + for patch in $runPatches; do + cd $(basename $patch) + perl ./install_patch.pl --silent --accept-eula --installdir="$out" + cd .. + done rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? @@ -117,6 +117,23 @@ let echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook ''; + preFixup = '' + while IFS= read -r -d ''$'\0' i; do + if ! isELF "$i"; then continue; fi + echo "patching $i..." + if [[ ! $i =~ \.so ]]; then + patchelf \ + --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i + fi + if [[ $i =~ libcudart ]]; then + rpath2= + else + rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 + fi + patchelf --set-rpath $rpath2 --force-rpath $i + done < <(find $out $lib $doc -type f -print0) + ''; + passthru = { cc = gcc; majorVersion = @@ -163,16 +180,28 @@ in { }; cudatoolkit8 = common { - version = "8.0.61"; + version = "8.0.61.2"; url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"; sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; + runPatches = [ + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run"; + sha256 = "1iaz5rrsnsb1p99qiqvxn6j3ksc7ry8xlr397kqcjzxqbljbqn9d"; + }) + ]; gcc = gcc5; }; cudatoolkit9 = common { - version = "9.0.176"; - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; - sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; + version = "9.1.85.1"; + url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux"; + sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4"; + runPatches = [ + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux"; + sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g"; + }) + ]; gcc = gcc6; }; diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index e645ecb41bd2..7376aec27501 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gambit-bootstrap-${version}"; - version = "4.8.8"; - tarball_version = "v4_8_8"; + version = "4.8.9"; + tarball_version = "v4_8_9"; src = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-${tarball_version}-devel.tgz"; - sha256 = "075k2z04d6svxqf9paj3xvp0mm0xzy0vbma1y61s0lkywdim8xjz"; + sha256 = "b7f86c794711792ca556ce41f8bc7043dffc395c01bb6d8d119bc2f454f89fbf"; }; buildInputs = [ autoconf ]; diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 7466c85ca6ed..95e8dba762a2 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gambit-${version}"; - version = "4.8.8-435-gd1991ba7"; + version = "4.8.9"; bootstrap = import ./bootstrap.nix ( pkgs ); src = fetchgit { url = "https://github.com/feeley/gambit.git"; - rev = "d1991ba7e90ed0149964320f7cafa1a8289e61f0"; - sha256 = "02harwcsqxxcxgn2yc1y9kyxdp32mampyvnbxrzg2jzfmnp5g6cm"; + rev = "dd54a71dfc0bd09813592f1645d755867a02195d"; + sha256 = "120kg73k39gshrwas8a3xcrxgnq1c7ww92wgy4d3mmrwy3j9nzzc"; }; # Use makeStaticLibraries to enable creation of statically linked binaries diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 6b2718f5e692..c63867a1d2db 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -317,8 +317,8 @@ stdenv.mkDerivation ({ # Platform-specific flags optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ - # Trick that should be taken out once we have a mips64el-linux not loongson2f - optional (targetPlatform == hostPlatform && stdenv.system == "mips64el-linux") "--with-arch=loongson2f" + # Trick that should be taken out once we have a mipsel-linux not loongson2f + optional (targetPlatform == hostPlatform && stdenv.system == "mipsel-linux") "--with-arch=loongson2f" ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index f67582385e6f..c1a411120d03 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "gerbil-${version}"; - version = "0.12-DEV-1404-g0a266db"; + version = "0.12-RELEASE"; src = fetchgit { url = "https://github.com/vyzo/gerbil.git"; - rev = "0a266db5e2e241272711bc150cc2607204bf2b78"; - sha256 = "1lvawqn8havfyxkkgfqffc213zq2pgm179l42yj49fy3fhpzia4m"; + rev = "5618892d7939e1cb4ef5247912e0bc1ec99f6b52"; + sha256 = "0b2valahf5k81r4sp6y12d44fb286p92s7k6dphij0kmvg0dp818"; }; # Use makeStaticLibraries to enable creation of statically linked binaries diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 51dd24671bdd..8758ee59d384 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.0.4"; }; meta.license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 54323458d9bd..5bd05b257ca5 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.0.4"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index c4780690f678..e4bf23c6e9e2 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.10.3"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 4f00ef8fb751..988392e74b9e 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.4.2"; }; meta.license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 7f636284c68d..86925c406cfc 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.4.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index 481b8d90918c..982008563a06 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.6.3"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 15f105946f51..47fc090c1ff1 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.8.4"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 011822994ed3..7d11ffb66c60 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.0.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index f4aa2de3241e..1c3f260da1c1 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.2.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index e7ec9be16b69..8f7cdc9568e4 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -24,7 +24,7 @@ # platform). Static libs are always built. enableShared ? true -, version ? "8.4.0.20180204" +, version ? "8.4.0.20180224" , # Whether to backport https://phabricator.haskell.org/D4388 for # deterministic profiling symbol names, at the cost of a slightly # non-standard GHC API @@ -77,8 +77,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; - rev = "111737cd218751f06ea58d3cf2c7c144265b5dfc"; - sha256 = "0ksp0k3sp928aq2cv6whgbfmjnr7l2j10diha13nncksp4byf0s9"; + rev = "a1e15c8f59092ef2d11be7966bd20688d8dc01e6"; + sha256 = "1pimf5ryl76r3vwnc2n0qzk4yh7zckp2r2g5rlz8nbddsws2v893"; }; enableParallelBuilding = true; @@ -190,7 +190,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.4.1"; }; meta = { diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 82cef10ce3be..bc3ccbdcdf51 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.5"; }; meta = { diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.10.nix similarity index 89% rename from pkgs/development/compilers/go/1.8.nix rename to pkgs/development/compilers/go/1.10.nix index 7775a17a646c..145f6a17978d 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8.7"; + version = "1.10"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "06v83fb75079dy2dc1927sr9bwvcpkkzl9d4wcw10scj70vj4a0x"; + sha256 = "1dzs1mz3zxgg1qyi2lrlxdz1lsvazxvmj9cb69pgqnwjlh3jpw0l"; }; # perl is used for testing go vet @@ -73,6 +73,10 @@ stdenv.mkDerivation rec { sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go # Remove the timezone naming test sed -i '/TestLoadFixed/areturn' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go @@ -93,9 +97,10 @@ stdenv.mkDerivation rec { sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go sed -i '/TestCurrent/areturn' src/os/user/user_test.go + sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + sed -i '/TestRead0/areturn' src/os/os_test.go sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go @@ -104,19 +109,18 @@ stdenv.mkDerivation rec { sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - sed -i 's/unrecognized/unknown/' src/cmd/go/build.go touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - - sed -i '1 a\exit 0' misc/cgo/errors/test.bash ''; - patches = - [ ./remove-tools-1.8.patch - ./ssl-cert-file.patch - ./creds-test.patch - ./remove-test-pie-1.8.patch - ]; + patches = [ + ./remove-tools-1.9.patch + ./ssl-cert-file-1.9.patch + ./remove-test-pie.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ]; postPatch = optionalString stdenv.isDarwin '' echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" @@ -134,7 +138,6 @@ stdenv.mkDerivation rec { GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - # Hopefully avoids test timeouts on Hydra GO_TEST_TIMEOUT_SCALE = 3; @@ -172,11 +175,11 @@ stdenv.mkDerivation rec { disallowedReferences = [ go_bootstrap ]; meta = with stdenv.lib; { - branch = "1.8"; + branch = "1.9"; homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index f1017d4a48c4..c866212170c4 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.9.patch ./ssl-cert-file-1.9.patch - ./creds-test.patch + ./creds-test-1.9.patch ./remove-test-pie-1.9.patch ./go-1.9-skip-flaky-19608.patch ./go-1.9-skip-flaky-20072.patch diff --git a/pkgs/development/compilers/go/creds-test-1.9.patch b/pkgs/development/compilers/go/creds-test-1.9.patch new file mode 100644 index 000000000000..09f78959ff9c --- /dev/null +++ b/pkgs/development/compilers/go/creds-test-1.9.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go +--- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 ++++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100 +@@ -62,8 +62,8 @@ + if sys, ok := err.(*os.SyscallError); ok { + err = sys.Err + } +- if err != syscall.EPERM { +- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) ++ if err != syscall.EPERM && err != syscall.EINVAL { ++ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) + } + } + diff --git a/pkgs/development/compilers/go/creds-test.patch b/pkgs/development/compilers/go/creds-test.patch index 09f78959ff9c..6a18e6cc42e8 100644 --- a/pkgs/development/compilers/go/creds-test.patch +++ b/pkgs/development/compilers/go/creds-test.patch @@ -1,14 +1,13 @@ -diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go ---- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 -+++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100 -@@ -62,8 +62,8 @@ - if sys, ok := err.(*os.SyscallError); ok { - err = sys.Err +--- source.org/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/syscall/creds_test.go 2018-02-22 10:43:47.223615358 +0000 +@@ -76,8 +76,8 @@ + if sys, ok := err.(*os.SyscallError); ok { + err = sys.Err + } +- if err != syscall.EPERM { +- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) ++ if err != syscall.EPERM && err != syscall.EINVAL { ++ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) + } } -- if err != syscall.EPERM { -- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) -+ if err != syscall.EPERM && err != syscall.EINVAL { -+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) - } - } diff --git a/pkgs/development/compilers/go/remove-test-pie-1.8.patch b/pkgs/development/compilers/go/remove-test-pie-1.8.patch deleted file mode 100644 index d09e143c74c1..000000000000 --- a/pkgs/development/compilers/go/remove-test-pie-1.8.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index c51dcea..8fbec5e 100644 ---- a/src/cmd/dist/test.go -+++ b/src/cmd/dist/test.go -@@ -461,17 +461,5 @@ func (t *tester) registerTests() { - }) - } - -- // Test internal linking of PIE binaries where it is supported. -- if t.goos == "linux" && t.goarch == "amd64" { -- t.tests = append(t.tests, distTest{ -- name: "pie_internal", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", "go", "test", "reflect", "-short", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60), t.tags(), t.runFlag("")) -- return nil -- }, -- }) -- } -- - // sync tests - t.tests = append(t.tests, distTest{ - name: "sync_cpu", \ No newline at end of file diff --git a/pkgs/development/compilers/go/remove-test-pie.patch b/pkgs/development/compilers/go/remove-test-pie.patch new file mode 100644 index 000000000000..fb8e116af76f --- /dev/null +++ b/pkgs/development/compilers/go/remove-test-pie.patch @@ -0,0 +1,24 @@ +--- source.org/src/cmd/dist/test.go 2018-02-22 10:40:40.089632339 +0000 ++++ source/src/cmd/dist/test.go 2018-02-22 10:56:53.075193788 +0000 +@@ -526,21 +526,6 @@ + }) + } + +- // Test internal linking of PIE binaries where it is supported. +- if goos == "linux" && goarch == "amd64" && !isAlpineLinux() { +- // Issue 18243: We don't have a way to set the default +- // dynamic linker used in internal linking mode. So +- // this test is skipped on Alpine. +- t.tests = append(t.tests, distTest{ +- name: "pie_internal", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- } +- + // sync tests + t.tests = append(t.tests, distTest{ + name: "sync_cpu", diff --git a/pkgs/development/compilers/go/remove-tools-1.8.patch b/pkgs/development/compilers/go/remove-tools-1.8.patch deleted file mode 100644 index b53e48e1a515..000000000000 --- a/pkgs/development/compilers/go/remove-tools-1.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/go/build/build.go b/src/go/build/build.go -index 9706b8b..f250751 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1513,7 +1513,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index 441dcd9..a50277e 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -230,6 +230,17 @@ func GOROOT() string { - return sys.DefaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/go/ssl-cert-file.patch b/pkgs/development/compilers/go/ssl-cert-file.patch deleted file mode 100644 index 052655eed52c..000000000000 --- a/pkgs/development/compilers/go/ssl-cert-file.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go -index a4b33c7..9700b75 100644 ---- a/src/crypto/x509/root_cgo_darwin.go -+++ b/src/crypto/x509/root_cgo_darwin.go -@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) { - import "C" - import ( - "errors" -+ "io/ioutil" -+ "os" - "unsafe" - ) - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - var data C.CFDataRef = nil - err := C.FetchPEMRoots(&data) -diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go -index 66cdb5e..bb28036 100644 ---- a/src/crypto/x509/root_darwin.go -+++ b/src/crypto/x509/root_darwin.go -@@ -61,17 +61,25 @@ func execSecurityRoots() (*CertPool, error) { - println(fmt.Sprintf("crypto/x509: %d certs have a trust policy", len(hasPolicy))) - } - -- cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") -- data, err := cmd.Output() -- if err != nil { -- return nil, err -- } -- - var ( - mu sync.Mutex - roots = NewCertPool() - numVerified int // number of execs of 'security verify-cert', for debug stats - ) - -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ -+ cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") -+ data, err := cmd.Output() -+ if err != nil { -+ return nil, err -+ } -+ - blockCh := make(chan *pem.Block) - var wg sync.WaitGroup -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index 7bcb3d6..3986e1a 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ - var firstErr error - for _, file := range certFiles { - data, err := ioutil.ReadFile(file) diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix new file mode 100644 index 000000000000..ce324b353ec5 --- /dev/null +++ b/pkgs/development/compilers/graalvm/default.nix @@ -0,0 +1,206 @@ +{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: + +let + # pre-download some cache entries ('mx' will not be able to download under nixbld1) + makeMxCache = list: + stdenv.mkDerivation { + name = "mx-cache"; + buildCommand = '' + mkdir $out + ${lib.concatMapStrings ({url, name, sha1}: '' + ln -s ${fetchurl { inherit url sha1; }} $out/${name} + echo -n ${sha1} > $out/${name}.sha1 + '') list} + ''; + }; + + jvmci8-mxcache = [ + rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; } + rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; } + rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; } + rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; } + rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; } + rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6.sources_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } + rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; } + rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; } + rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; } + rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } + rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2.sources_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } + rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; } + rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; } + rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12.jar; } + rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12-sources.jar; } + rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3.jar; } + rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3-sources.jar; } + rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}.so"; url = https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-0d031013db9a80d6c88330c42c983fbfa7053193.so; } + ]; + + graal-mxcache = jvmci8-mxcache ++ [ + rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; } + rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; } + rec { sha1 = "aca5eb39e2a12fddd6c472b240afe9ebea3a6733"; name = "org.json_${sha1}.jar"; url = mirror://maven/org/json/json/20160810/json-20160810.jar; } + rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}.jar"; url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; } + rec { sha1 = "476d9a44cd19d6b55f81571077dfa972a4f8a083"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/java-allocation-instrumenter/java-allocation-instrumenter-8f0db117e64e.jar; } + rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-5.0.4.jar; } + rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-tree-5.0.4.jar; } + rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } + rec { sha1 = "616a4fca49c5d610a3354e78cd97e7627024bb66"; name = "GSON_SHADOWED_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4.jar; } + rec { sha1 = "b13337a4ffd095c2e27ea401dc6edfca0d23a6e4"; name = "GSON_SHADOWED.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4-sources.jar; } + ]; + +in rec { + + mx = stdenv.mkDerivation { + name = "mx"; + src = fetchFromGitHub { + owner = "graalvm"; + repo = "mx"; + rev = "22557cf7ec417c49aca20c13a9123045005d72d0"; # HEAD at 2018-02-16 + sha256 = "070647ih2qzcssj7yripbg1w9bjwi1rcp1blx5z3jbp1shrr6563"; + }; + nativeBuildInputs = [ makeWrapper ]; + buildPhase = '' + substituteInPlace mx --replace /bin/pwd pwd + ''; + installPhase = '' + mkdir -p $out/bin + cp -dpR * $out/bin + wrapProgram $out/bin/mx --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} + ''; + meta = with stdenv.lib; { + homepage = https://github.com/graalvm/mx; + description = "Command-line tool used for the development of Graal projects"; + license = licenses.unfree; + platforms = python27.meta.platforms; + }; + }; + + # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too) + jvmci8 = stdenv.mkDerivation rec { + version = "0.41"; + name = let + n = "jvmci8u161-${version}"; + in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then + n + else + throw "length of string `${n}' must be equal to the length of `${oraclejdk8.name}'"; + src = fetchFromGitHub { + owner = "graalvm"; + repo = "graal-jvmci-8"; + rev = "jvmci-${version}"; + sha256 = "0pajf114l8lzczfdzz968c3s1ardiy4q5ya8p2kmwxl06giy95qr"; + }; + buildInputs = [ mx mercurial ]; + postUnpack = '' + # a fake mercurial dir to prevent mx crash and supply the version to mx + ( cd $sourceRoot + hg init + hg add + hg commit -m 'dummy commit' + hg tag ${lib.escapeShellArg src.rev} + hg checkout ${lib.escapeShellArg src.rev} + ) + ''; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format-overflow" # newly detected by gcc7 + ]; + buildPhase = '' + cp -dpR ${oraclejdk8} writable-copy-of-jdk + chmod +w -R writable-copy-of-jdk + + export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild + export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache} + mx --java-home $(pwd)/writable-copy-of-jdk build + ''; + installPhase = '' + mv jdk1.8.0_*/linux-amd64/product $out + find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \; + ''; + dontStrip = true; # why? see in oraclejdk derivation + inherit (oraclejdk8) meta; + }; + + graalvm8 = stdenv.mkDerivation rec { + version = "0.31"; + name = let + n = "graal-vm-8-${version}"; + in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then + n + else + throw "length of string `${n}' must be equal to the length of `${jvmci8.name}'"; + src = fetchFromGitHub { + owner = "oracle"; + repo = "graal"; + rev = "vm-enterprise-${version}"; + sha256 = "0rhd6dk2jpbxgdprqvdk991b2k177jrjgyjabdnmv5lzlhczy676"; + }; + buildInputs = [ mx zlib mercurial jvmci8 ]; + postUnpack = '' + # a fake mercurial dir to prevent mx crash and supply the version to mx + ( cd $sourceRoot + hg init + hg add + hg commit -m 'dummy commit' + hg tag ${lib.escapeShellArg src.rev} + hg checkout ${lib.escapeShellArg src.rev} + ) + ''; + buildPhase = '' + # make a copy of jvmci8 + cp -dpR ${jvmci8} $out + chmod +w -R $out + find $out -type f -exec sed -i "s#${jvmci8}#$out#g" {} \; + + export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild + export MX_CACHE_DIR=${makeMxCache graal-mxcache} + ( cd substratevm; mx --java-home $out build --no-daemon ) + ''; + installPhase = '' + # add graal files + mkdir -p $out/jre/tools/{profiler,chromeinspector} + cp -pR substratevm/svmbuild/native-image-root/linux-amd64/bin/* $out/jre/bin/ + cp -pLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks + cp -pLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/ + cp -pR $MX_ALT_OUTPUT_ROOT/truffle/dists/* $out/jre/lib/truffle/ + cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/ + cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/ + echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties + ln -s --relative $out/jre/bin/native-image $out/bin/native-image + cp $out/jre/tools/nfi/bin/libtrufflenfi.so $out/jre/lib/amd64/ + cp -dpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/ + + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/jre/lib/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + ''; + dontStrip = true; # why? see in oraclejdk derivation + doInstallCheck = true; + installCheckPhase = '' + echo ${lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); + } + } + ''} > HelloWorld.java + $out/bin/javac HelloWorld.java + + # run on JVM with Graal Compiler + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + + # Ahead-Of-Time compilation + $out/bin/native-image -no-server HelloWorld + ./helloworld + ./helloworld | fgrep 'Hello World' + ''; + meta = with stdenv.lib; { + homepage = https://github.com/oracle/graal; + description = "High-Performance Polyglot VM"; + license = licenses.unfree; + maintainers = with maintainers; [ volth ]; + platforms = [ "x86_64-linux" ]; + }; + }; +} diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/pkgs/development/compilers/ocaml/4.06.nix index b913d169e97a..b54b8a6288fe 100644 --- a/pkgs/development/compilers/ocaml/4.06.nix +++ b/pkgs/development/compilers/ocaml/4.06.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "06"; - patch_version = "0"; - sha256 = "1dy542yfnnw10zvh5s9qzswliq11mg7l0bcyss3501qw3vwvadhj"; + patch_version = "1"; + sha256 = "1n3pygfssd6nkrq876wszm5nm3v4605q4k16a66h1nmq9wvf01vg"; # If the executable is stipped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index 946a9bedbf51..bac36d61068d 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.10.6"; + name = "scala-2.10.7"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0rrdrndnxy8m76gppqh7yr68qfx0kxns5bwc69k4swz6va1zbbal"; + sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index 469c8c8e3bc5..1145ebab5245 100644 --- a/pkgs/development/compilers/scala/2.11.nix +++ b/pkgs/development/compilers/scala/2.11.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.11.11"; + name = "scala-2.11.12"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "02whsszxabyhyrbcmgg3figaxknmfzy4f3wmgrqqwik89jk7q0qj"; + sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix deleted file mode 100644 index c98e2e75c171..000000000000 --- a/pkgs/development/compilers/scala/2.9.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl }: - -# at runtime, need jre or jdk - -stdenv.mkDerivation rec { - name = "scala-2.9.3"; - - src = fetchurl { - url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "faaab229f78c945063e8fd31c045bc797c731194296d7a4f49863fd87fc4e7b9"; - }; - - installPhase = '' - mkdir -p $out - rm bin/*.bat - rm lib/scalacheck.jar - mv * $out - ''; - - meta = { - description = "A general purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = http://www.scala-lang.org/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - branch = "2.9"; - }; -} diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 360f96e12427..fc142a4026bd 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -145,7 +145,6 @@ let url = "https://github.com/apple/swift-llbuild/commit/303a89bc6da606c115560921a452686aa0655f5e.diff"; sha256 = "04sw7ym1grzggj1v3xrzr2ljxz8rf9rnn9n5fg1xjbwlrdagkc7m"; }; - in stdenv.mkDerivation rec { name = "swift-${version_friendly}"; @@ -247,6 +246,9 @@ stdenv.mkDerivation rec { # https://bugs.swift.org/browse/SR-5779 sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake + # https://bugs.swift.org/browse/SR-4838 + sed -i -e '30i#include ' lldb/include/lldb/Utility/TaskPool.h + substituteInPlace clang/lib/Driver/ToolChains.cpp \ --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \ ' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);' @@ -287,7 +289,7 @@ stdenv.mkDerivation rec { # TODO: Use wrappers to get these on the PATH for swift tools, instead ln -s ${clang}/bin/* $out/bin/ - ln -s ${targetPackages.stdenv.cc.bintools}/bin/ar $out/bin/ar + ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar wrapProgram $out/bin/swift \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 6de85495bee3..a6d83fc770c7 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -196,6 +196,9 @@ go.stdenv.mkDerivation ( find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; + # Disable go cache, which is not reused in nix anyway + GOCACHE = "off"; + shellHook = '' d=$(mktemp -d "--suffix=-$name") '' + toString (map (dep: '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index acd485e332f6..db92fb310818 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -80,7 +80,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "0vvh1k7i6y4bqy6fn8z5i6ndqv6x94hvk2zh5gw99na8kfri7sxq"; + sha256 = "0fdcv9nig896ckl9x51ximxsvja1ii8qysf6c9ickvc0511hvr9w"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -833,7 +833,7 @@ self: super: { rev = "8b79823c32e234c161baec67fdf7907952ca62b8"; sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz"; }; - }).override { language-c = self.language-c_0_7_2; }; + }); # Needs pginit to function and pgrep to verify. tmp-postgres = overrideCabal super.tmp-postgres (drv: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 56f61fddb33e..c63ec7b70f78 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -197,7 +197,9 @@ self: super: { mono-traversable = addBuildDepend super.mono-traversable self.semigroups; natural-transformation = addBuildDepend super.natural-transformation self.semigroups; optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail]; + parsec = addBuildDepends super.parsec [self.fail self.semigroups]; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; + reflection = addBuildDepend super.reflection self.semigroups; semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]); texmath = addBuildDepend super.texmath self.network-uri; yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 3e8ff6b73eaa..bad0d642b06c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -42,16 +42,6 @@ self: super: { unix = null; xhtml = null; - # Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1: - # Distribution/Simple/CCompiler.hs:64:10: error: - # • No instance for (Semigroup CDialect) - # arising from the superclasses of an instance declaration - # • In the instance declaration for ‘Monoid CDialect’ - # | - # 64 | instance Monoid CDialect where - # | ^^^^^^^^^^^^^^^ - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal; }; #pkgs.haskell.packages.ghc822.jailbreak-cabal; - ## Shadowed: ## Needs bump to a versioned attribute @@ -62,11 +52,11 @@ self: super: { ## Needs bump to a versioned attribute ## Issue: https://github.com/sol/doctest/issues/189 - doctest = overrideCabal super.doctest_0_14_0 (drv: { + doctest = overrideCabal super.doctest_0_14_1 (drv: { ## Setup: Encountered missing dependencies: ## ghc >=7.0 && <8.4 ## - ## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory)) + ## uncaught exception: IOException of type NoSuchThing (cabal: rawSystem: runInteractiveProcess: exec: does not exist (No such file or directory)) doCheck = false; }); @@ -77,6 +67,8 @@ self: super: { free = super.free_5; ## Needs bump to a versioned attribute + ## Setup: Encountered missing dependencies: + ## base >=3 && <4.11 ## Needed for (<>) in prelude funcmp = super.funcmp_1_9; @@ -107,36 +99,20 @@ self: super: { }); ## Needs bump to a versioned attribute - ## breaks hspec: ## Setup: Encountered missing dependencies: - ## hspec-discover ==2.4.7 + ## hspec-discover ==2.4.8 hspec-discover = super.hspec-discover_2_4_8; - ## Needs bump to a versioned attribute - ## Ambiguous occurrence ‘<>’ - ## It could refer to either ‘Prelude.<>’, - ## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24 - language-c = super.language-c_0_7_2; - ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: ## free ==4.*, template-haskell >=2.4 && <2.13 lens = super.lens_4_16; - ## Needs bump to a versioned attribute - QuickCheck = super.QuickCheck_2_11_3; - ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: ## doctest >=0.11.1 && <0.14 semigroupoids = super.semigroupoids_5_2_2; - ## Needs bump to a versioned attribute - ## • No instance for (Semigroup Builder) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid Builder’ - stringbuilder = super.stringbuilder_0_5_1; - ## Needs bump to a versioned attribute ## Issue: https://github.com/haskell/test-framework/issues/35 test-framework = overrideCabal super.test-framework_0_8_2_0 (drv: { @@ -170,6 +146,21 @@ self: super: { ## Upstreamed + ## Upstreamed, awaiting a Hackage release + deriving-compat = overrideCabal super.deriving-compat (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.5 && <2.13 + src = pkgs.fetchFromGitHub { + owner = "haskell-compat"; + repo = "deriving-compat"; + rev = "e592c6f8af53866dcf6f5700175a3b02bb4f77d3"; + sha256 = "0h4qadk7fmz5v3lbdsxfbf3ha81f73xn7v0s6wia16ika5yvfggs"; + }; + ## Setup: Encountered missing dependencies: + ## th-abstraction >=0.2.2 && <1 + libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ th-abstraction ]); + }); + ## Upstreamed, awaiting a Hackage release haskell-gi = overrideCabal super.haskell-gi (drv: { ## Setup: Encountered missing dependencies: @@ -209,6 +200,22 @@ self: super: { }; }); + ## Upstreamed, awaiting a Hackage release + http-api-data = overrideCabal super.http-api-data (drv: { + ## • No instance for (Semigroup Form) + ## arising from the 'deriving' clause of a data type declaration + ## Possible fix: + src = pkgs.fetchFromGitHub { + owner = "fizruk"; + repo = "http-api-data"; + rev = "83aac9540f4a304927c601c5db12f4dc2bf93816"; + sha256 = "14hy13szr09vsisxi25a4qfajqjwznvn222bqk55dcdlnrgf0zi9"; + }; + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11 + jailbreak = true; + }); + ## Upstreamed, awaiting a Hackage release lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: { ## Setup: Encountered missing dependencies: @@ -263,6 +270,19 @@ self: super: { }; }); + ## Upstreamed, awaiting a Hackage release + tar = overrideCabal super.tar (drv: { + ## • No instance for (Semigroup (Entries e)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (Entries e)’ + src = pkgs.fetchFromGitHub { + owner = "haskell"; + repo = "tar"; + rev = "abf2ccb8f7da0514343a0b2624cabebe081bdfa8"; + sha256 = "0s33lgrr574i1r7zc1jqahnwx3dv47ny30mbx5zfpdzjw0jdl5ny"; + }; + }); + ## Upstreamed, awaiting a Hackage release th-desugar = overrideCabal super.th-desugar (drv: { ## • Could not deduce (MonadIO (DsM q)) @@ -324,7 +344,7 @@ self: super: { doCheck = false; ## Setup: Encountered missing dependencies: ## data-or ==1.0.* - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-or ]; + libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ data-or ]); }); ## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233 @@ -353,6 +373,23 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/sol/hpack/pull/277 + ## Issue: https://github.com/sol/hpack/issues/276 + hpack = overrideCabal super.hpack (drv: { + ## • No instance for (Semigroup Dependencies) + ## arising from the 'deriving' clause of a data type declaration + ## Possible fix: + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "hpack"; + rev = "acce0cffcc1d165a0fd9f0b83878dfbd622ea0d6"; + sha256 = "1wv0ya1gb1hwd9w8g4z5aig694q3arsqhxv0d4wcp270xnq9ja8y"; + }; + ## Setup: Encountered missing dependencies: + ## http-client -any, http-client-tls -any, http-types -any + libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ http-client http-client-tls http-types ]); + }); + ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 monadplus = overrideCabal super.monadplus (drv: { ## • No instance for (Semigroup (Partial a b)) @@ -390,7 +427,7 @@ self: super: { ## monad-control -any, ## prim-uniq -any, ## reflection -any, - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-default self.haskell-src-exts self.lens self.monad-control self.prim-uniq self.reflection self.split self.template-haskell self.unbounded-delays ]; + libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ data-default haskell-src-exts lens monad-control prim-uniq reflection split template-haskell unbounded-delays ]); }); ## Unmerged. PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13 @@ -432,6 +469,32 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/vincenthz/hs-tls/pull/270 + tls = overrideCabal super.tls (drv: { + ## • No instance for (Semigroup Credentials) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Credentials’ + src = pkgs.fetchFromGitHub { + owner = "ocheron"; + repo = "hs-tls"; + rev = "763656fbc6c2edabb43fc63d8717960f4b26e6e7"; + sha256 = "0v7f9b78w6prkbscdx5ggjixll9z1zfqzm5x0ap4wvynnflkspqb"; + }; + prePatch = "cd core; "; + }); + + ## Unmerged. PR: https://github.com/Soostone/uri-bytestring/pull/0 + uri-bytestring = overrideCabal super.uri-bytestring (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.9 && <2.13 + src = pkgs.fetchFromGitHub { + owner = "koenigmaximilian"; + repo = "uri-bytestring"; + rev = "105d5855bbf9c78d1e48394677b42a058e242fc9"; + sha256 = "144hr12k0d61zpgxv62vwlzy6bfs01fqh7qr4qsbv457sznmbb9d"; + }; + }); + ## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17 wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { ## Ambiguous occurrence ‘<>’ @@ -445,6 +508,34 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/vincenthz/hs-certificate/pull/89 + x509 = overrideCabal super.x509 (drv: { + ## • No instance for (Semigroup DistinguishedName) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid DistinguishedName’ + src = pkgs.fetchFromGitHub { + owner = "bgamari"; + repo = "hs-certificate"; + rev = "2c5f54ba69c8a0531d10f9b37542bf958ede54c9"; + sha256 = "1fakr9gqz8k62rnjdsslfavbqrhn92jq9mahyc91f9zhisxp5kdf"; + }; + prePatch = "cd x509; "; + }); + + ## Unmerged. PR: https://github.com/vincenthz/hs-certificate/pull/89 + x509-store = overrideCabal super.x509-store (drv: { + ## • No instance for (Semigroup CertificateStore) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid CertificateStore’ + src = pkgs.fetchFromGitHub { + owner = "bgamari"; + repo = "hs-certificate"; + rev = "2c5f54ba69c8a0531d10f9b37542bf958ede54c9"; + sha256 = "1fakr9gqz8k62rnjdsslfavbqrhn92jq9mahyc91f9zhisxp5kdf"; + }; + prePatch = "cd x509-store; "; + }); + ## Non-code, configuration-only change @@ -472,6 +563,13 @@ self: super: { jailbreak = true; }); + cabal2nix = super.cabal2nix.override { + ## • No instance for (Semigroup (List a)) + ## arising from the 'deriving' clause of a data type declaration + ## Possible fix: + hpack = self.hpack; + }; + cabal-doctest = overrideCabal super.cabal-doctest (drv: { ## Setup: Encountered missing dependencies: ## Cabal >=1.10 && <2.1, base >=4.3 && <4.11 @@ -485,15 +583,12 @@ self: super: { }); deepseq-generics = overrideCabal super.deepseq-generics (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 ## https://github.com/haskell-hvr/deepseq-generics/pull/4 jailbreak = true; }); - doctest_0_14_0 = overrideCabal super.doctest_0_14_0 (drv: { - ## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory)) - doCheck = false; - }); - exception-transformers = overrideCabal super.exception-transformers (drv: { ## Setup: Encountered missing dependencies: ## HUnit >=1.2 && <1.6 @@ -525,12 +620,26 @@ self: super: { jailbreak = true; }); + hnix = overrideCabal super.hnix (drv: { + ## Setup: Encountered missing dependencies: + ## deriving-compat ==0.3.* + jailbreak = true; + }); + integer-logarithms = overrideCabal super.integer-logarithms (drv: { ## Setup: Encountered missing dependencies: ## base >=4.3 && <4.11 jailbreak = true; }); + jailbreak-cabal = super.jailbreak-cabal.override { + ## • No instance for (Semigroup CDialect) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid CDialect’ + ## Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1: + Cabal = self.Cabal; + }; + kan-extensions = overrideCabal super.kan-extensions (drv: { ## Setup: Encountered missing dependencies: ## free ==4.* @@ -567,13 +676,6 @@ self: super: { jailbreak = true; }); - ## Issue: https://github.com/pcapriotti/optparse-applicative/issues/288 - optparse-applicative = overrideCabal super.optparse-applicative (drv: { - ## Setup: Encountered missing dependencies: - ## QuickCheck >=2.8 && <2.11 - doCheck = false; - }); - quickcheck-instances = overrideCabal super.quickcheck-instances (drv: { ## Setup: Encountered missing dependencies: ## base >=4.5 && <4.11 @@ -600,7 +702,7 @@ self: super: { tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: { ## Setup: Encountered missing dependencies: - ## base >=4.8 && <4.11, tasty ==0.11.* + ## base >=4.8 && <4.11 jailbreak = true; }); @@ -611,18 +713,19 @@ self: super: { jailbreak = true; }); + ## Issue: https://github.com/ChrisPenner/rasa/issues/54 text-lens = overrideCabal super.text-lens (drv: { + ## Failures: + ## test/Spec.hs:136: + ## 1) TextLens.range gets "" if invalid range + ## uncaught exception: ErrorCall (Data.Text.Array.new: size overflow + ## CallStack (from HasCallStack): + ## error, called at libraries/text/Data/Text/Array.hs:132:20 in text-1.2.3.0:Data.Text.Array) + ## Randomized with seed 2114194349 + ## Finished in 0.0017 seconds + doCheck = false; ## Setup: Encountered missing dependencies: - ## base >=4.9.0.0 && <4.10, - ## extra >=1.4.10 && <1.5, - ## hspec >=2.2.4 && <2.3, - ## lens ==4.14.* - jailbreak = true; - }); - - th-abstraction = overrideCabal super.th-abstraction (drv: { - ## Setup: Encountered missing dependencies: - ## template-haskell >=2.5 && <2.13 + ## extra >=1.4.10 && <1.5, lens ==4.14.* jailbreak = true; }); @@ -648,4 +751,5 @@ self: super: { ## base >=4.8 && <4.11 jailbreak = true; }); + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9eed0a057777..827c5d72a342 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 10.5 + # LTS Haskell 10.7 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -77,7 +77,7 @@ default-package-overrides: - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - Agda ==2.5.3 - - airship ==0.9.2 + - airship ==0.9.3 - alarmclock ==0.4.0.3 - alerta ==0.1.0.6 - alerts ==0.1.0.0 @@ -209,7 +209,7 @@ default-package-overrides: - async-extra ==0.2.0.0 - async-refresh ==0.2.0.2 - async-refresh-tokens ==0.3.0.1 - - async-timer ==0.1.4.0 + - async-timer ==0.1.4.1 - atom-basic ==0.2.5 - atom-conduit ==0.5.0.1 - atomic-primops ==0.8.1.1 @@ -351,7 +351,7 @@ default-package-overrides: - Cabal ==2.0.1.1 - cabal-doctest ==1.0.6 - cabal-file-th ==0.2.4 - - cabal-rpm ==0.12 + - cabal-rpm ==0.12.1 - cabal-toolkit ==0.0.5 - cache ==0.1.0.1 - cairo ==0.13.4.2 @@ -367,7 +367,7 @@ default-package-overrides: - cassava-conduit ==0.4.0.1 - cassette ==0.1.0 - cast ==0.1.0.2 - - cayley-client ==0.4.2 + - cayley-client ==0.4.3 - cereal ==0.5.5.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 @@ -376,9 +376,9 @@ default-package-overrides: - ChannelT ==0.0.0.4 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.3 - - Chart ==1.8.2 - - Chart-cairo ==1.8.2 - - Chart-diagrams ==1.8.2 + - Chart ==1.8.3 + - Chart-cairo ==1.8.3 + - Chart-diagrams ==1.8.3 - chart-unit ==0.5.5.0 - chaselev-deque ==0.5.0.5 - ChasingBottoms ==1.3.1.3 @@ -427,7 +427,7 @@ default-package-overrides: - colour ==2.3.4 - colour-accelerate ==0.2.0.0 - combinatorial ==0.0 - - comfort-graph ==0.0.2.1 + - comfort-graph ==0.0.3 - commutative ==0.0.1.4 - comonad ==5.0.3 - comonads-fd ==4.0 @@ -448,7 +448,7 @@ default-package-overrides: - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduit ==1.2.13 - - conduit-algorithms ==0.0.7.1 + - conduit-algorithms ==0.0.7.2 - conduit-combinators ==1.1.2 - conduit-connection ==0.1.0.4 - conduit-extra ==1.2.3.2 @@ -516,7 +516,7 @@ default-package-overrides: - cubicbezier ==0.6.0.5 - cubicspline ==0.1.2 - cublas ==0.4.0.0 - - cuda ==0.9.0.0 + - cuda ==0.9.0.1 - cue-sheet ==1.0.1 - cufft ==0.8.0.0 - curl ==1.3.8 @@ -628,7 +628,7 @@ default-package-overrides: - docopt ==0.7.0.5 - doctemplates ==0.2.1 - doctest ==0.13.0 - - doctest-discover ==0.1.0.7 + - doctest-discover ==0.1.0.8 - doctest-driver-gen ==0.1.0.1 - do-list ==1.0.1 - dom-parser ==3.0.0 @@ -673,12 +673,12 @@ default-package-overrides: - elm-export ==0.6.0.1 - elm-export-persistent ==0.1.2 - emailaddress ==0.2.0.0 - - email-validate ==2.3.2.1 + - email-validate ==2.3.2.2 - enclosed-exceptions ==1.0.2 - EntrezHTTP ==1.0.4 - entropy ==0.3.8 - enummapset ==0.5.2.1 - - enumset ==0.0.4 + - enumset ==0.0.4.1 - envelope ==0.2.2.0 - envparse ==0.4 - envy ==1.3.0.2 @@ -702,7 +702,7 @@ default-package-overrides: - eventful-sql-common ==0.2.0 - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - - event-list ==0.1.1.3 + - event-list ==0.1.2 - eventsource-api ==1.1.1 - eventsource-geteventstore-store ==1.0.4 - eventsource-store-specs ==1.0.1 @@ -719,12 +719,12 @@ default-package-overrides: - executable-path ==0.0.3.1 - exhaustive ==1.1.5 - expiring-cache-map ==0.0.6.1 - - explicit-exception ==0.1.9 + - explicit-exception ==0.1.9.2 - exp-pairs ==0.1.5.2 - extensible ==0.4.7.1 - extensible-effects ==2.1.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.3 + - extra ==1.6.4 - extractable-singleton ==0.0.1 - extrapolate ==0.3.1 - fail ==4.9.0.0 @@ -735,7 +735,7 @@ default-package-overrides: - fast-logger ==2.4.11 - fast-math ==1.0.2 - fb ==1.1.1 - - fclabels ==2.0.3.2 + - fclabels ==2.0.3.3 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - fedora-haskell-tools ==0.4 @@ -767,7 +767,7 @@ default-package-overrides: - flexible-defaults ==0.0.1.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - - flow ==1.0.10 + - flow ==1.0.11 - fmlist ==0.9.2 - fmt ==0.5.0.0 - fn ==0.3.0.2 @@ -840,7 +840,7 @@ default-package-overrides: - getopt-generics ==0.13.0.1 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - - ghc-events ==0.7.0 + - ghc-events ==0.7.1 - ghc-exactprint ==0.5.6.0 - ghcid ==0.6.10 - ghcjs-base-stub ==0.1.0.4 @@ -865,7 +865,7 @@ default-package-overrides: - giphy-api ==0.5.2.0 - git ==0.2.1 - github ==0.18 - - github-release ==1.1.3 + - github-release ==1.1.4 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -891,7 +891,7 @@ default-package-overrides: - GLURaw ==2.0.0.3 - GLUT ==2.7.0.12 - gluturtle ==0.0.58.1 - - gnuplot ==0.5.5 + - gnuplot ==0.5.5.1 - goggles ==0.1.0.3 - gogol ==0.3.0 - gogol-adexchange-buyer ==0.3.0 @@ -1038,7 +1038,7 @@ default-package-overrides: - hasbolt ==0.1.3.0 - hashable ==1.2.6.1 - hashable-time ==0.2.0.1 - - hashids ==1.0.2.3 + - hashids ==1.0.2.4 - hashmap ==1.3.3 - hashtables ==1.2.2.1 - haskeline ==0.7.4.2 @@ -1154,7 +1154,7 @@ default-package-overrides: - hpio ==0.9.0.5 - hpp ==0.5.1 - hpqtypes ==1.5.1.1 - - hprotoc ==2.4.6 + - hprotoc ==2.4.7 - hquantlib ==0.0.4.0 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 @@ -1318,9 +1318,9 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.2 - ip ==1.1.2 - ip6addr ==0.5.3 - - iproute ==1.7.1 + - iproute ==1.7.2 - IPv6Addr ==1.0.1 - - IPv6DB ==0.2.4 + - IPv6DB ==0.2.5 - ipython-kernel ==0.9.0.1 - irc ==0.6.1.0 - irc-client ==1.0.1.1 @@ -1335,7 +1335,7 @@ default-package-overrides: - ixset ==1.0.7 - ixset-typed ==0.3.1.1 - ix-shapable ==0.1.0 - - jack ==0.7.1.1 + - jack ==0.7.1.3 - jailbreak-cabal ==1.3.2 - javascript-extras ==0.3.2.0 - jmacro ==0.6.14 @@ -1379,7 +1379,7 @@ default-package-overrides: - labels ==0.3.3 - lackey ==0.4.7 - lame ==0.1.1 - - language-c ==0.7.1 + - language-c ==0.7.2 - language-c-quote ==0.12.1 - language-docker ==1.0.0 - language-fortran ==0.5.1 @@ -1387,7 +1387,7 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.8 - language-javascript ==0.6.0.10 - - language-puppet ==1.3.14 + - language-puppet ==1.3.15 - lapack-carray ==0.0 - lapack-ffi ==0.0 - lapack-ffi-tools ==0.0.0.1 @@ -1462,10 +1462,10 @@ default-package-overrides: - lrucache ==1.2.0.0 - lrucaching ==0.3.3 - lucid ==2.9.9 - - lxd-client ==0.1.0.5 + - lxd-client ==0.1.0.6 - lxd-client-config ==0.1.0.1 - lzma ==0.0.0.3 - - lzma-conduit ==1.2.0 + - lzma-conduit ==1.2.1 - machines ==0.6.3 - machines-binary ==0.3.0.3 - machines-directory ==0.2.1.0 @@ -1475,7 +1475,7 @@ default-package-overrides: - mainland-pretty ==0.6.1 - makefile ==1.1.0.0 - mallard ==0.6.1.1 - - managed ==1.0.5 + - managed ==1.0.6 - mandrill ==0.5.3.2 - markdown ==0.1.16 - markdown-unlit ==0.4.1 @@ -1518,7 +1518,7 @@ default-package-overrides: - microsoft-translator ==0.1.1 - microspec ==0.1.0.0 - microstache ==1.0.1.1 - - midi ==0.2.2.1 + - midi ==0.2.2.2 - midi-music-box ==0.0.0.4 - mighty-metropolis ==1.2.0 - milena ==0.5.2.1 @@ -1544,7 +1544,7 @@ default-package-overrides: - model ==0.4.4 - modern-uri ==0.1.2.1 - modify-fasta ==0.8.2.3 - - moesocks ==1.0.0.43 + - moesocks ==1.0.0.44 - mole ==0.0.6 - monad-control ==1.0.2.2 - monad-control-aligned ==0.0.1 @@ -1579,14 +1579,14 @@ default-package-overrides: - monad-time ==0.2 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - mongoDB ==2.3.0.2 + - mongoDB ==2.3.0.4 - monoidal-containers ==0.3.0.2 - monoid-extras ==0.4.2 - monoid-subclasses ==0.4.4 - - monoid-transformer ==0.0.3 + - monoid-transformer ==0.0.4 - mono-traversable ==1.0.8.1 - mono-traversable-instances ==0.1.0.0 - - morte ==1.6.14 + - morte ==1.6.15 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.1 @@ -1626,7 +1626,7 @@ default-package-overrides: - nettle ==0.2.0 - netwire ==5.0.2 - netwire-input ==0.0.6 - - netwire-input-glfw ==0.0.7 + - netwire-input-glfw ==0.0.8 - network ==2.6.3.3 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 @@ -1647,7 +1647,7 @@ default-package-overrides: - network-transport-tests ==0.2.4.2 - network-uri ==2.6.1.0 - newtype ==0.2 - - newtype-generics ==0.5.1 + - newtype-generics ==0.5.2.1 - next-ref ==0.1.0.2 - nfc ==0.1.0 - nicify-lib ==1.0.1 @@ -1658,7 +1658,7 @@ default-package-overrides: - nondeterminism ==1.4 - non-empty ==0.3 - non-empty-sequence ==0.2.0.2 - - non-negative ==0.1.1.2 + - non-negative ==0.1.2 - normaldistribution ==1.1.0.3 - normalization-insensitive ==2.0.1 - NoTrace ==0.3.0.2 @@ -1666,7 +1666,7 @@ default-package-overrides: - n-tuple ==0.0.1.1 - numbers ==3000.2.0.1 - numeric-extras ==0.1 - - numeric-prelude ==0.4.2 + - numeric-prelude ==0.4.3 - numhask ==0.1.4.0 - numhask-range ==0.1.3.0 - NumInstances ==1.4 @@ -1702,9 +1702,9 @@ default-package-overrides: - operational ==0.2.3.5 - operational-class ==0.3.0.0 - opml-conduit ==0.6.0.4 - - optional-args ==1.0.1 + - optional-args ==1.0.2 - options ==1.2.1.1 - - optparse-applicative ==0.14.0.0 + - optparse-applicative ==0.14.1.0 - optparse-generic ==1.2.3 - optparse-simple ==0.1.0 - optparse-text ==0.1.1.0 @@ -1727,16 +1727,16 @@ default-package-overrides: - ParsecTools ==0.0.2.0 - parser-combinators ==0.4.0 - parsers ==0.12.8 - - partial-handler ==1.0.2 + - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-order ==0.1.2.1 - - partial-semigroup ==0.3.0.2 + - partial-semigroup ==0.3.0.3 - path ==0.6.1 - path-extra ==0.0.6 - path-io ==1.3.3 - path-pieces ==0.2.1 - path-text-utf8 ==0.0.1.0 - - pathtype ==0.8 + - pathtype ==0.8.1 - pathwalk ==0.3.1.2 - patience ==0.1.1 - pattern-arrows ==0.0.2 @@ -1799,7 +1799,7 @@ default-package-overrides: - pointedlist ==0.6.1 - pointful ==1.0.9 - pointless-fun ==1.1.0.6 - - poll ==0.0 + - poll ==0.0.0.1 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 @@ -1831,7 +1831,7 @@ default-package-overrides: - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - prettyprinter ==1.1.1 - - prettyprinter-ansi-terminal ==1.1.1.1 + - prettyprinter-ansi-terminal ==1.1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 @@ -1858,8 +1858,8 @@ default-package-overrides: - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.5 - - protocol-buffers ==2.4.6 - - protocol-buffers-descriptor ==2.4.6 + - protocol-buffers ==2.4.7 + - protocol-buffers-descriptor ==2.4.7 - proto-lens ==0.2.2.0 - proto-lens-arbitrary ==0.1.1.1 - proto-lens-combinators ==0.1.0.8 @@ -1886,7 +1886,7 @@ default-package-overrides: - QuickCheck ==2.10.1 - quickcheck-arbitrary-adt ==0.2.0.0 - quickcheck-assertions ==0.3.0 - - quickcheck-classes ==0.3.2 + - quickcheck-classes ==0.3.3 - quickcheck-combinators ==0.0.2 - quickcheck-instances ==0.3.16.1 - quickcheck-io ==0.2.0 @@ -1983,7 +1983,7 @@ default-package-overrides: - retry ==0.7.6.0 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - - riak ==1.1.2.3 + - riak ==1.1.2.4 - riak-protobuf ==0.23.0.0 - RNAlien ==1.3.7 - rng-utils ==0.3.0 @@ -2049,7 +2049,7 @@ default-package-overrides: - servant-exceptions ==0.1.1 - servant-foreign ==0.10.1 - servant-generic ==0.1.0.1 - - servant-js ==0.9.3.1 + - servant-js ==0.9.3.2 - servant-JuicyPixels ==0.3.0.3 - servant-kotlin ==0.1.0.3 - servant-lucid ==0.7.1 @@ -2062,7 +2062,7 @@ default-package-overrides: - servant-static-th ==0.1.0.6 - servant-subscriber ==0.6.0.1 - servant-swagger ==1.1.4 - - servant-swagger-ui ==0.2.4.3.4.0 + - servant-swagger-ui ==0.2.5.3.9.1 - servant-websockets ==1.0.0 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 @@ -2072,13 +2072,13 @@ default-package-overrides: - serversession-frontend-yesod ==1.0 - servius ==1.2.0.3 - ses-html ==0.4.0.0 - - set-cover ==0.0.8 + - set-cover ==0.0.9 - setenv ==0.1.1.3 - setlocale ==1.0.0.5 - set-monad ==0.2.0.0 - sets ==0.0.5.2 - SHA ==1.6.4.2 - - shake ==0.16 + - shake ==0.16.3 - shake-language-c ==0.11.0 - shakespeare ==2.0.15 - shell-conduit ==4.6.1 @@ -2087,7 +2087,7 @@ default-package-overrides: - shikensu ==0.3.8 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - - show-prettyprint ==0.2 + - show-prettyprint ==0.2.0.1 - signal ==0.1.0.4 - silently ==1.2.5 - simple ==0.11.2 @@ -2096,7 +2096,7 @@ default-package-overrides: - simple-sendfile ==0.2.27 - simple-session ==0.10.1.1 - simple-templates ==0.8.0.1 - - singleton-bool ==0.1.2.0 + - singleton-bool ==0.1.3 - singleton-nats ==0.4.0.4 - singletons ==2.3.1 - siphash ==1.0.3 @@ -2123,9 +2123,9 @@ default-package-overrides: - sort ==1.0.0.0 - sorted-list ==0.2.0.0 - sourcemap ==0.1.6 - - sox ==0.2.2.7 + - sox ==0.2.3 - soxlib ==0.0.3 - - sparse-linear-algebra ==0.2.9.8 + - sparse-linear-algebra ==0.2.9.9 - spdx ==0.2.2.0 - special-values ==0.1.0.0 - speculate ==0.3.2 @@ -2170,9 +2170,9 @@ default-package-overrides: - stopwatch ==0.1.0.4 - storable-complex ==0.2.2 - storable-endian ==0.2.6 - - storable-record ==0.0.3.1 + - storable-record ==0.0.4 - storable-tuple ==0.0.3.3 - - storablevector ==0.2.12.1 + - storablevector ==0.2.13 - store ==0.4.3.2 - store-core ==0.4.1 - Strafunski-StrategyLib ==5.0.0.10 @@ -2189,8 +2189,8 @@ default-package-overrides: - strict-concurrency ==0.2.4.2 - strict-types ==0.1.2 - stringable ==0.1.3 - - stringbuilder ==0.5.0 - - string-class ==0.1.6.5 + - stringbuilder ==0.5.1 + - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 @@ -2241,7 +2241,7 @@ default-package-overrides: - tasty-expected-failure ==0.11.0.4 - tasty-fail-fast ==0.0.3 - tasty-golden ==2.3.1.2 - - tasty-hedgehog ==0.1.0.1 + - tasty-hedgehog ==0.1.0.2 - tasty-hspec ==1.1.3.3 - tasty-html ==0.4.1.1 - tasty-hunit ==0.9.2 @@ -2310,7 +2310,7 @@ default-package-overrides: - threads ==0.5.1.5 - threads-extras ==0.1.0.2 - threepenny-editors ==0.5.6 - - threepenny-gui ==0.8.2.0 + - threepenny-gui ==0.8.2.1 - threepenny-gui-flexbox ==0.4.2 - th-reify-compat ==0.0.1.3 - th-reify-many ==0.1.8 @@ -2391,7 +2391,7 @@ default-package-overrides: - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 - tz ==0.1.3.0 - - tzdata ==0.1.20170320.0 + - tzdata ==0.1.20180122.0 - ua-parser ==0.7.4.1 - uglymemo ==0.1.0.1 - unagi-chan ==0.4.1.0 @@ -2402,7 +2402,7 @@ default-package-overrides: - unexceptionalio ==0.3.0 - unfoldable ==0.9.5 - unfoldable-restricted ==0.0.3 - - unicode ==0.0 + - unicode ==0.0.1 - unicode-show ==0.1.0.2 - unicode-transforms ==0.3.3 - unification-fd ==0.10.0.1 @@ -2410,8 +2410,8 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - Unique ==0.4.7.2 - unique ==0 + - Unique ==0.4.7.2 - unit-constraint ==0.0.0 - units-parser ==0.1.1.2 - universe ==1.0 @@ -2448,21 +2448,21 @@ default-package-overrides: - uuid-types ==1.0.3 - vado ==0.0.9 - validate-input ==0.4.0.0 - - validation ==0.6.2 + - validation ==0.6.3 - validationt ==0.2.0.0 - - validity ==0.4.0.3 + - validity ==0.4.0.4 - validity-aeson ==0.1.0.0 - validity-bytestring ==0.2.0.0 - validity-containers ==0.2.0.0 - validity-path ==0.2.0.2 - validity-scientific ==0.1.0.0 - - validity-text ==0.2.0.0 + - validity-text ==0.2.0.1 - validity-time ==0.1.0.0 - validity-unordered-containers ==0.1.0.0 - validity-uuid ==0.0.0.0 - validity-vector ==0.1.0.0 - varying ==0.7.0.3 - - vault ==0.3.0.7 + - vault ==0.3.1.0 - vcswrapper ==0.1.6 - vector ==0.12.0.1 - vector-algorithms ==0.7.0.1 @@ -2505,7 +2505,7 @@ default-package-overrides: - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==0.3.0 - - wai-middleware-rollbar ==0.8.3 + - wai-middleware-rollbar ==0.8.4 - wai-middleware-static ==0.8.1 - wai-middleware-throttle ==0.2.2.0 - wai-predicates ==0.10.0 @@ -2585,7 +2585,7 @@ default-package-overrides: - xlsx ==0.6.0 - xlsx-tabular ==0.2.2 - xml ==1.3.14 - - xml-basic ==0.1.2 + - xml-basic ==0.1.3 - xml-conduit ==1.7.1.2 - xml-conduit-parse ==0.3.1.2 - xml-conduit-writer ==0.1.1.2 @@ -2612,7 +2612,7 @@ default-package-overrides: - YampaSynth ==0.2 - yeshql ==3.0.1.3 - yesod ==1.4.5 - - yesod-alerts ==0.1.1.0 + - yesod-alerts ==0.1.2.0 - yesod-auth ==1.4.21 - yesod-auth-basic ==0.1.0.2 - yesod-auth-fb ==1.8.1 @@ -2658,7 +2658,7 @@ default-package-overrides: - zeromq4-haskell ==0.7.0 - zim-parser ==0.2.1.0 - zip ==0.2.0 - - zip-archive ==0.3.2.2 + - zip-archive ==0.3.2.4 - zippers ==0.2.5 - ziptastic-client ==0.3.0.3 - ziptastic-core ==0.2.0.3 @@ -2697,7 +2697,6 @@ extra-packages: - hoogle == 5.0.14 # required by hie-hoogle - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x - - language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192. - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index edec2724d84d..55f463885bdb 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -471,10 +471,6 @@ self: super: builtins.intersectAttrs super { ''; }); - # Fails to link against with newer gsl versions because a deprecrated function - # was removed - hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; }; - # tests run executable, relying on PATH # without this, tests fail with "Couldn't launch intero process" intero = overrideCabal super.intero (drv: { @@ -492,11 +488,8 @@ self: super: builtins.intersectAttrs super { liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell); - # Haskell OpenCV bindings need contrib code enabled in the C++ library. - opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; }; - # Without this override, the builds lacks pkg-config. - opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); + opencv-extra = addPkgconfigDepend super.opencv-extra pkgs.opencv3; # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5382e63bce61..6bd18f713647 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2704,23 +2704,6 @@ self: { }) {}; "Chart" = callPackage - ({ mkDerivation, array, base, colour, data-default-class, lens, mtl - , old-locale, operational, time, vector - }: - mkDerivation { - pname = "Chart"; - version = "1.8.2"; - sha256 = "13g27db8ln2n1hr2wvpa855x0x1izk3c10lb85an7972b5lw2hl4"; - libraryHaskellDepends = [ - array base colour data-default-class lens mtl old-locale - operational time vector - ]; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "A library for generating 2D Charts and Plots"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Chart_1_8_3" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector }: @@ -2735,27 +2718,9 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-cairo" = callPackage - ({ mkDerivation, array, base, cairo, Chart, colour - , data-default-class, lens, mtl, old-locale, operational, time - }: - mkDerivation { - pname = "Chart-cairo"; - version = "1.8.2"; - sha256 = "1hcg80ddq638cad6m69q61aa0fbj3glnb3a6pbbg8gy4ljfvmn3w"; - libraryHaskellDepends = [ - array base cairo Chart colour data-default-class lens mtl - old-locale operational time - ]; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Cairo backend for Charts"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Chart-cairo_1_8_3" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time }: @@ -2770,32 +2735,9 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-diagrams" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour - , containers, data-default-class, diagrams-core, diagrams-lib - , diagrams-postscript, diagrams-svg, lens, mtl, old-locale - , operational, svg-builder, SVGFonts, text, time - }: - mkDerivation { - pname = "Chart-diagrams"; - version = "1.8.2"; - sha256 = "0hczp9dj9qs3g72hcgikym1bq3ki90graxfx068h5hds0kn1s66a"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base blaze-markup bytestring Chart colour containers - data-default-class diagrams-core diagrams-lib diagrams-postscript - diagrams-svg lens mtl old-locale operational svg-builder SVGFonts - text time - ]; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Diagrams backend for Charts"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Chart-diagrams_1_8_3" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib , diagrams-postscript, diagrams-svg, lens, mtl, old-locale @@ -2815,7 +2757,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-gtk" = callPackage @@ -2942,6 +2883,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "Clash-Royale-Hack-Cheats" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Clash-Royale-Hack-Cheats"; + version = "1.0.1"; + sha256 = "19cvhy78s7vl9b6pdi04nrf4iqxb7a2yivmq5fymdxxvdxg9ykds"; + revision = "2"; + editedCabalFile = "0lhljmc8nn7mrdxyx3645m8gkwkpqvcdkfp5dal9pi90in9kd4wp"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ClassLaws" = callPackage ({ mkDerivation, base, ChasingBottoms, mtl, QuickCheck }: mkDerivation { @@ -4823,6 +4786,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Eight-Ball-Pool-Hack-Cheats" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Eight-Ball-Pool-Hack-Cheats"; + version = "1.0.1"; + sha256 = "0k620c0ia441rfvxaw2q5n43g5pnml4sn1cr1vzclc9iz0mfdy72"; + revision = "2"; + editedCabalFile = "13dkqc5pa7sjf3xfwgs7kajb7f1ai187w35p8pzni5is0hnaxfmz"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "EitherT" = callPackage ({ mkDerivation, base, monad-control, transformers , transformers-base @@ -5318,6 +5303,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Facebook-Password-Hacker-Online-Latest-Version" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Facebook-Password-Hacker-Online-Latest-Version"; + version = "1.0.1"; + sha256 = "0xvr2bj800i7ssbn6gbz4pknhakrgifkirf3rsn6ln4g35h29m07"; + revision = "1"; + editedCabalFile = "0p70xim6ay9ffs5s69nw64znridyb7fzdfawh3gp0fzlybzmjypy"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs text + ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Facts" = callPackage ({ mkDerivation, AC-Angle, base, containers, digits, QuickCheck , template-haskell @@ -5829,6 +5838,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Fortnite-Hack-Cheats-Free-V-Bucks-Generator" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Fortnite-Hack-Cheats-Free-V-Bucks-Generator"; + version = "1.0.1"; + sha256 = "02qj2lmf74m0d58fr09grylcmzzygi06rkn37bzpaiqr8fb032js"; + revision = "4"; + editedCabalFile = "1k976a5lnjzxgy486c7msh0d35zj4l3w671n4rivqzr9xfwhmb8d"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Foster" = callPackage ({ mkDerivation, array, base, cmdtheline, containers, criterion , random, strict @@ -6694,6 +6725,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Glob_0_9_2" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.9.2"; + sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -9250,6 +9305,8 @@ self: { pname = "HarmTrace-Base"; version = "1.6.0.0"; sha256 = "03rma29wkrcixvd5whmmlqkhiznxgff3dq8jmw6w7xzr9fn72f9b"; + revision = "1"; + editedCabalFile = "0fldc14b2lj8pvkmxly0ld9mmx33yvswh7sg85g62w4yixsr6fdl"; libraryHaskellDepends = [ base binary containers ghc-prim ListLike uu-parsinglib ]; @@ -9257,7 +9314,7 @@ self: { base binary containers ghc-prim ListLike QuickCheck random uu-parsinglib ]; - homepage = "https://bitbucket.org/bash/harmtrace-base"; + homepage = "https://github.com/chordify/HarmTrace-Base"; description = "Parsing and unambiguously representing musical chords"; license = stdenv.lib.licenses.lgpl3; }) {}; @@ -10415,36 +10472,6 @@ self: { }) {}; "IPv6DB" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger - , hedis, hspec, http-client, http-types, IPv6Addr, mtl - , optparse-applicative, text, unordered-containers, vector, wai - , wai-logger, warp - }: - mkDerivation { - pname = "IPv6DB"; - version = "0.2.4"; - sha256 = "1axppdhckdch3kjcmw8dga76v865xccdwsksxfnahg32k613g8zd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring fast-logger hedis http-types IPv6Addr mtl - optparse-applicative text unordered-containers vector wai - wai-logger warp - ]; - testHaskellDepends = [ - aeson base hspec http-client http-types vector - ]; - homepage = "http://ipv6db.cybervisible.com"; - description = "A RESTful Web Service for IPv6-related data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "IPv6DB_0_2_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl , optparse-applicative, text, unordered-containers, vector, wai @@ -10957,6 +10984,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-stbir" = callPackage + ({ mkDerivation, base, c2hs, data-default-class, JuicyPixels + , vector + }: + mkDerivation { + pname = "JuicyPixels-stbir"; + version = "0.1.0.0"; + sha256 = "0jlb72hbiqbnjm5q63ywrw5dljfzpgbw91xk7ijrsfm209pprcqz"; + libraryHaskellDepends = [ + base data-default-class JuicyPixels vector + ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/mtolly/JuicyPixels-stbir"; + description = "Scale JuicyPixels images with stb_image_resize"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "JuicyPixels-util" = callPackage ({ mkDerivation, base, JuicyPixels, vector }: mkDerivation { @@ -11596,8 +11640,8 @@ self: { ({ mkDerivation, base, containers, hmatrix, vector }: mkDerivation { pname = "Learning"; - version = "0.0.2"; - sha256 = "0gp8c2xwpsnwbhvdwnpiv3pzmg2i12fv4h1x1fna9q4smgnpfjpb"; + version = "0.1.0"; + sha256 = "14hlr86c605bpfcawvi4vy0hcwph4ji38ql8pic6bawyvcn7pybn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hmatrix vector ]; @@ -12217,8 +12261,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Mapping"; - version = "0.1.0.1"; - sha256 = "14gjly5dlz5bdi9niqdg6gzf9hin87xnl9hsqlzdpgbk6hzg0az8"; + version = "2.0.0.0"; + sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/zaoqi/Mapping.hs"; description = "Mapping"; @@ -12530,6 +12574,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Mobile-Legends-Hack-Cheats" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Mobile-Legends-Hack-Cheats"; + version = "1.0.1"; + sha256 = "1alyhdrliyy6hi88svbnmwf76vl6ipd92r835r2j1qyvbadi63fl"; + revision = "2"; + editedCabalFile = "1vcysv7jsik7i6s8a5jw3fzan0zv8104yv9ggvmlbq5n8sg9yjgq"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Modulo" = callPackage ({ mkDerivation, base, numeric-prelude }: mkDerivation { @@ -13270,6 +13336,27 @@ self: { license = "unknown"; }) {}; + "Network-NineP_0_4_2" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, convertible + , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl + , network, NineP, regex-posix, stateref, transformers + }: + mkDerivation { + pname = "Network-NineP"; + version = "0.4.2"; + sha256 = "136pqyxpjyml0hfblpj6hmhsy2i8r796shcnl0rwljmvw1mhcg6d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers convertible exceptions hslogger + monad-loops monad-peel mstate mtl network NineP regex-posix + stateref transformers + ]; + description = "High-level abstraction over 9P protocol"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "NewBinary" = callPackage ({ mkDerivation, array, base, integer }: mkDerivation { @@ -21359,6 +21446,17 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-zalgo" = callPackage + ({ mkDerivation, array, base, random }: + mkDerivation { + pname = "acme-zalgo"; + version = "0.1.2.1"; + sha256 = "1yd3xrdkxf3hgapi4w5vg79nxmw8y5rnyki5pqi00mca9wjspdhz"; + libraryHaskellDepends = [ array base random ]; + description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛"; + license = stdenv.lib.licenses.mit; + }) {}; + "acme-zero" = callPackage ({ mkDerivation }: mkDerivation { @@ -22187,6 +22285,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-options" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "aeson-options"; + version = "0.0.0"; + sha256 = "0z2r1rnh819wms8l1scv18l178i2y1ixcjm6ir59vir5bl19wxm0"; + libraryHaskellDepends = [ aeson base ]; + homepage = "https://github.com/serokell/aeson-options"; + description = "Options to derive FromJSON/ToJSON instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "aeson-parsec-picky" = callPackage ({ mkDerivation, aeson, base, parsec, scientific, text , unordered-containers, vector @@ -22857,36 +22967,6 @@ self: { }) {}; "airship" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, bytestring-trie, case-insensitive, containers - , cryptohash, directory, either, filepath, http-date, http-media - , http-types, lifted-base, microlens, mime-types, mmorph - , monad-control, mtl, network, old-locale, random, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-base, unix, unordered-containers, wai, wai-extra - }: - mkDerivation { - pname = "airship"; - version = "0.9.2"; - sha256 = "02r607yqvr5w6i6hba0ifbc02fshxijd4g46ygird9lsarcr2svp"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring - bytestring-trie case-insensitive containers cryptohash directory - either filepath http-date http-media http-types lifted-base - microlens mime-types mmorph monad-control mtl network old-locale - random text time transformers transformers-base unix - unordered-containers wai wai-extra - ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit tasty-quickcheck text - transformers wai - ]; - homepage = "https://github.com/helium/airship/"; - description = "A Webmachine-inspired HTTP library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "airship_0_9_3" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, bytestring-trie, case-insensitive, containers , cryptohash, directory, either, filepath, http-date, http-media @@ -22914,7 +22994,6 @@ self: { homepage = "https://github.com/helium/airship/"; description = "A Webmachine-inspired HTTP library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "airtable-api" = callPackage @@ -29053,6 +29132,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "async-combinators" = callPackage + ({ mkDerivation, async, base, hedgehog, HUnit, safe-exceptions + , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, universum + , unliftio-core + }: + mkDerivation { + pname = "async-combinators"; + version = "0.0.0"; + sha256 = "1rj9fahpch74ygkx3lv4282lb775cklxi3c5wys544binnya9v7b"; + libraryHaskellDepends = [ + async base safe-exceptions universum unliftio-core + ]; + testHaskellDepends = [ + base hedgehog HUnit safe-exceptions tasty tasty-discover + tasty-hedgehog tasty-hunit universum + ]; + homepage = "https://github.com/serokell/async-combinators"; + description = "Async combinators"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "async-dejafu" = callPackage ({ mkDerivation, base, concurrency, dejafu, exceptions, HUnit , hunit-dejafu @@ -29193,28 +29293,6 @@ self: { }) {}; "async-timer" = callPackage - ({ mkDerivation, base, containers, criterion, HUnit, lifted-async - , lifted-base, monad-control, safe-exceptions, test-framework - , test-framework-hunit, transformers-base - }: - mkDerivation { - pname = "async-timer"; - version = "0.1.4.0"; - sha256 = "00kdhxq0wpml4f7gdjvr2h8km8i3yj68bawpa229rzpp0y0yp3k3"; - libraryHaskellDepends = [ - base lifted-async lifted-base monad-control safe-exceptions - transformers-base - ]; - testHaskellDepends = [ - base containers criterion HUnit lifted-async test-framework - test-framework-hunit - ]; - homepage = "https://github.com/mtesseract/async-timer"; - description = "Provides API for timer based execution of IO actions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "async-timer_0_1_4_1" = callPackage ({ mkDerivation, base, containers, criterion, HUnit, lifted-async , lifted-base, monad-control, safe-exceptions, test-framework , test-framework-hunit, transformers-base @@ -29234,6 +29312,25 @@ self: { homepage = "https://github.com/mtesseract/async-timer#readme"; description = "Provides API for timer based execution of IO actions"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "async-timer_0_2_0_0" = callPackage + ({ mkDerivation, async, base, containers, criterion + , safe-exceptions, tasty, tasty-hunit, unliftio, unliftio-core + }: + mkDerivation { + pname = "async-timer"; + version = "0.2.0.0"; + sha256 = "1q6f0ig8m1ij1yz07b36799gavppb7dkwyvlc724gaj1q72bych6"; + libraryHaskellDepends = [ + async base safe-exceptions unliftio unliftio-core + ]; + testHaskellDepends = [ + async base containers criterion tasty tasty-hunit + ]; + homepage = "https://github.com/mtesseract/async-timer#readme"; + description = "Provides API for timer based execution of IO actions"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -29628,8 +29725,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.17"; - sha256 = "13bxd28pyxyna8vv3vg8d29wmyi6iv296jqbcjh0p12jicxgf4i8"; + version = "0.2.0.22"; + sha256 = "19x2pa6fb1k343b4c07xwyc879kfwya1kll0bp59paza1bqhhnnk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -29644,29 +29741,31 @@ self: { }) {}; "ats-pkg" = callPackage - ({ mkDerivation, ansi-wl-pprint, ats-setup, base, binary - , bytestring, bzlib, Cabal, cli-setup, composition-prelude - , containers, cpphs, dependency, dhall, directory, file-embed - , http-client, http-client-tls, lens, lzma, optparse-applicative - , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary - , text, unix, zip-archive, zlib + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib + , Cabal, cli-setup, composition-prelude, containers, dependency + , dhall, directory, file-embed, filemanip, http-client + , http-client-tls, lzma, microlens, microlens-th + , optparse-applicative, parallel-io, process, shake, shake-ats + , shake-ext, tar, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.4.2.19"; - sha256 = "0l8lrr4b99csr5wd4r9lxcax8b9jh8ij80hxsmwzs777fl295yjf"; + version = "2.6.1.16"; + sha256 = "0wbdndrc6vwac8qyihz52cbhd6nv5sjvw7ssrl8g92gziwjbrgf3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - ansi-wl-pprint ats-setup base binary bytestring bzlib + ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed http-client http-client-tls lens lzma - optparse-applicative parallel-io process shake shake-ats shake-ext - tar temporary text unix zip-archive zlib + file-embed filemanip http-client http-client-tls lzma microlens + microlens-th parallel-io process shake shake-ats shake-ext tar text + unix zip-archive zlib + ]; + executableHaskellDepends = [ + base composition-prelude directory microlens optparse-applicative + shake shake-ats temporary text ]; - libraryToolDepends = [ cpphs ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/atspkg#readme"; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; @@ -29674,31 +29773,35 @@ self: { }) {}; "ats-setup" = callPackage - ({ mkDerivation, base, bytestring, Cabal, dependency, directory - , filemanip, http-client, http-client-tls, parallel-io, process - , tar, unix, zlib + ({ mkDerivation, base, bytestring, Cabal, composition-prelude + , dependency, directory, filemanip, http-client, http-client-tls + , parallel-io, process, tar, unix, zlib }: mkDerivation { pname = "ats-setup"; - version = "0.3.0.2"; - sha256 = "1fxk1602kh4i2dgfdjalnwfp37w8r775vd21431pkwf5xcf9ax0g"; + version = "0.4.0.2"; + sha256 = "13sv7wwz6m6s9x3mr4phsf62ayyn95bdpj6cv93kyzadyi3vfvd6"; libraryHaskellDepends = [ - base bytestring Cabal dependency directory filemanip http-client - http-client-tls parallel-io process tar unix zlib + base bytestring Cabal composition-prelude dependency directory + filemanip http-client http-client-tls parallel-io process tar unix + zlib ]; description = "ATS scripts for Cabal builds"; license = stdenv.lib.licenses.bsd3; }) {}; "ats-storable" = callPackage - ({ mkDerivation, base, bytestring, composition-prelude, text }: + ({ mkDerivation, base, bytestring, composition-prelude, hspec + , microlens, microlens-th, text + }: mkDerivation { pname = "ats-storable"; - version = "0.2.1.0"; - sha256 = "1d374jkiifyn6hqr584waqhk4kirqibycs0fszf1v21dkk14jyvx"; + version = "0.3.0.1"; + sha256 = "1apzmyq9a4hjn9d0fz7pxvxflq61kp26fa6gz3c50pdjby55zhns"; libraryHaskellDepends = [ - base bytestring composition-prelude text + base bytestring composition-prelude microlens microlens-th text ]; + testHaskellDepends = [ base hspec ]; homepage = "https://github.com//ats-generic#readme"; description = "Marshal ATS types into Haskell"; license = stdenv.lib.licenses.bsd3; @@ -32404,12 +32507,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "basement_0_0_6" = callPackage + "basement_0_0_7" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; - version = "0.0.6"; - sha256 = "1xszp4nf55hr6iglqf1dx1yb9pgm3gpw81wwpjkwdn0602a3p8lw"; + version = "0.0.7"; + sha256 = "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell-foundation/foundation"; description = "Foundation scrap box of array & string"; @@ -33488,6 +33591,8 @@ self: { pname = "bifunctors"; version = "5.5.2"; sha256 = "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark"; + revision = "2"; + editedCabalFile = "0glrvir6md8a1ncr6ah95a5mnn7n9v8yl85afvdx24i9z1nr1319"; libraryHaskellDepends = [ base base-orphans comonad containers semigroups tagged template-haskell th-abstraction transformers transformers-compat @@ -35295,8 +35400,8 @@ self: { }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.3.2"; - sha256 = "1zgvn1zkajslg221fk345vfgbi9pi9lr5ki3m4qpwgr3pvlz2h10"; + version = "0.4.0"; + sha256 = "18m799psijcj81hxyrnwjvwgb9z92pw5qk5hb7yny905f0wbbar1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring bytestring-lexing @@ -38111,7 +38216,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_34" = callPackage + "brick_0_34_1" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, stm, template-haskell, text, text-zipper @@ -38119,8 +38224,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.34"; - sha256 = "1n835ma8a73zcb4q0r066d9ql4071qf1d30cpv2xhwqc5p4c2i41"; + version = "0.34.1"; + sha256 = "0y07xq5r5qbn5fqkp0cy1s9a50lnqmk35dvmil38xn2g23dgmfys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38940,8 +39045,8 @@ self: { }: mkDerivation { pname = "burnt-explorer"; - version = "0.1.1"; - sha256 = "1swv8xy06bk3wkhg788mzlpgwghyp7v3g3c22c09jji9kxwsgslv"; + version = "1.0.0"; + sha256 = "1lddgjbm62k7avxvq8mlw7z4swbjavffk05nx5nla5fll7v4q219"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -39472,8 +39577,8 @@ self: { pname = "bytestring-plain"; version = "0.1.0.2"; sha256 = "1pgxwrn8m27cc01kbbxq4rd1q15lpapii2izjlhv3ilhbfxgnbcy"; - revision = "1"; - editedCabalFile = "0cjnvc57v2g543d4si3pwcsj56pjsm84sv2hn19yrd44bzajmcna"; + revision = "2"; + editedCabalFile = "06aysffha231adrhar9jqh49m7k3wga3ascvs7a17l4vx6p16ygs"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim hashable ]; @@ -40592,8 +40697,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.12"; - sha256 = "05k5rqwcdz6aq1jidf03dsrjd3rgisw6r2vq1gz6z49ps5sj628f"; + version = "0.12.1"; + sha256 = "0avp7prkzp522mpqnn60xmsqqp10zhp1phhlj14qzp4162772fss"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41573,6 +41678,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "canon" = callPackage + ({ mkDerivation, arithmoi, array, base, containers, polynomial }: + mkDerivation { + pname = "canon"; + version = "0.1.0.4"; + sha256 = "0hy28s1rgzsqcbs600ppj74ls1xvm39fdjjba4p3f1cfw7g5ai1f"; + libraryHaskellDepends = [ + arithmoi array base containers polynomial + ]; + homepage = "https://github.com/grandpascorpion/canon"; + description = "Massive Number Arithmetic"; + license = stdenv.lib.licenses.mit; + }) {}; + "canonical-filepath" = callPackage ({ mkDerivation, base, deepseq, directory, filepath }: mkDerivation { @@ -42135,8 +42254,8 @@ self: { pname = "case-insensitive"; version = "1.2.0.10"; sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6"; - revision = "1"; - editedCabalFile = "153x2i7gw7lyhydlf0924vfxmkk53r65c40104bbha2bhp1vj7fi"; + revision = "2"; + editedCabalFile = "197c93pa4lq6rgv59s9q9m11lziyyy6jlizvqap4lz0ijfnmj1gx"; libraryHaskellDepends = [ base bytestring deepseq hashable text ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text @@ -42495,6 +42614,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava-conduit_0_4_0_2" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, cassava + , conduit, containers, criterion, mtl, QuickCheck, text + }: + mkDerivation { + pname = "cassava-conduit"; + version = "0.4.0.2"; + sha256 = "0kqa91m4ihs3jsp4d22q9qvsanfigawkc3i98p7zns54g0qckgiz"; + libraryHaskellDepends = [ + array base bifunctors bytestring cassava conduit containers mtl + text + ]; + testHaskellDepends = [ + base bytestring cassava conduit QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/domdere/cassava-conduit"; + description = "Conduit interface for cassava package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-embed" = callPackage ({ mkDerivation, base, bytestring, cassava, template-haskell , vector @@ -42824,27 +42965,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.4.2"; - sha256 = "1pzsr7jcqsi27mnxgq4y5np4ysig29cmk27iqp0m73xj5fiss6z8"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_4_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -43554,23 +43674,24 @@ self: { }) {}; "cgrep" = callPackage - ({ mkDerivation, ansi-terminal, array, async, base, bytestring - , cmdargs, containers, directory, dlist, either, filepath, ghc-prim - , mtl, process, regex-base, regex-pcre, regex-posix, safe, split - , stm, stringsearch, transformers, unicode-show, unix-compat - , unordered-containers, utf8-string + ({ mkDerivation, aeson, ansi-terminal, array, async, base + , bytestring, cmdargs, containers, directory, dlist, either + , filepath, ghc-prim, mtl, process, regex-base, regex-pcre + , regex-posix, safe, split, stm, stringsearch, transformers + , unicode-show, unix-compat, unordered-containers, utf8-string + , yaml }: mkDerivation { pname = "cgrep"; - version = "6.6.22"; - sha256 = "0nh8smbhwkqygxdv61yd82n26q6d4sdh4zzixcq5pczzacfzp8j9"; + version = "6.6.24"; + sha256 = "0clnnhr5srrl3z2crfrs7csihrgcq5p9d9vgqbgxsf741jnfmhcx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal array async base bytestring cmdargs containers + aeson ansi-terminal array async base bytestring cmdargs containers directory dlist either filepath ghc-prim mtl process regex-base regex-pcre regex-posix safe split stm stringsearch transformers - unicode-show unix-compat unordered-containers utf8-string + unicode-show unix-compat unordered-containers utf8-string yaml ]; homepage = "http://awgn.github.io/cgrep/"; description = "Command line tool"; @@ -43793,7 +43914,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "chart-unit_0_6_0_2" = callPackage + "chart-unit_0_6_1_0" = callPackage ({ mkDerivation, base, colour, data-default, diagrams-lib , diagrams-svg, doctest, foldl, formatting, generic-lens , generic-lens-labels, lens, linear, mwc-probability, mwc-random @@ -43803,8 +43924,8 @@ self: { }: mkDerivation { pname = "chart-unit"; - version = "0.6.0.2"; - sha256 = "1xdnjdhm20nfp6gypz01rj7i0dz9f3ds5sdacynsmvvj3gi2zimr"; + version = "0.6.1.0"; + sha256 = "07aiw8n7b23k9n1g4inpmdbkmmahl7vdvqr575rc7n0bnwwfyvi0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46002,6 +46123,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clexer" = callPackage + ({ mkDerivation, base, containers, mtl, parsec }: + mkDerivation { + pname = "clexer"; + version = "0.1.0.0"; + sha256 = "1x2q496jqvgqjbwncszl1h9ylkq6rn8h2fsp7w771xkyslfq46xy"; + libraryHaskellDepends = [ base containers mtl parsec ]; + description = "Lexes C++ code into simple tokens"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cli" = callPackage ({ mkDerivation, base, directory, mtl, QuickCheck, tasty , tasty-quickcheck, terminfo, transformers @@ -46469,8 +46601,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "1.7.2"; - sha256 = "1w6rdmb5a50vdski2k4xwysrbxaycybijgak0hvpsjhnf16yb04f"; + version = "1.7.3"; + sha256 = "10in4z00in2js5w2zgg6ydm7i2n0f0y2ass421p5rqpfv9q7y179"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -47284,8 +47416,8 @@ self: { }: mkDerivation { pname = "codeworld-api"; - version = "0.2.2.0"; - sha256 = "14q4aqmp2q4jf1w1j071lypysj3b6fxd7k8n4hwi81c8g6n67r81"; + version = "0.2.2.1"; + sha256 = "0vb3v8d4jdzk14zs1jv4m5f2wa32bpxsfa0zr4f3w6z77as136sx"; libraryHaskellDepends = [ base blank-canvas cereal cereal-text containers hashable mtl random random-shuffle text time @@ -48130,25 +48262,6 @@ self: { }) {}; "comfort-graph" = callPackage - ({ mkDerivation, base, containers, QuickCheck, transformers - , utility-ht - }: - mkDerivation { - pname = "comfort-graph"; - version = "0.0.2.1"; - sha256 = "02brkbrvs6q7nss3mpqcqwgz3nmim2xz30nvbkxqy7zdxci6kign"; - libraryHaskellDepends = [ - base containers QuickCheck transformers utility-ht - ]; - testHaskellDepends = [ - base containers QuickCheck transformers utility-ht - ]; - homepage = "http://hub.darcs.net/thielema/comfort-graph"; - description = "Graph structure with type parameters for nodes and edges"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "comfort-graph_0_0_3" = callPackage ({ mkDerivation, base, containers, QuickCheck, semigroups , transformers, utility-ht }: @@ -48165,7 +48278,6 @@ self: { homepage = "http://hub.darcs.net/thielema/comfort-graph"; description = "Graph structure with type parameters for nodes and edges"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comic" = callPackage @@ -48911,8 +49023,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.2.0.1"; - sha256 = "1rb7hy5xfmpv8hr4ik49883ph027g9kskfc77yzwrx29q3jmq3gj"; + version = "1.3.0.4"; + sha256 = "0dsd67ffhwfbq7y9f8c6q9nd05ayyxi85mzvc8kgj7f21cpvclmg"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; description = "Higher-order function combinators"; @@ -49339,14 +49451,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_4_0_0" = callPackage + "concurrency_1_4_0_1" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.4.0.0"; - sha256 = "0rpljvcswb1smidvxh7nwb6ms2gr8wf0gzs0kapiqc9g3wlr1r9r"; + version = "1.4.0.1"; + sha256 = "17i50sxfir5nf6ldc14h6wfa03ap7z4lmihd8qpl2mb0px5ak7b9"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -49471,6 +49583,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_4" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.4"; + sha256 = "0zq50g3l9f55vhwjw6s6jf1nqyi0a7f1ih7vas686ckj2z33z9ay"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -49731,34 +49860,6 @@ self: { }) {}; "conduit-algorithms" = callPackage - ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit - , conduit-combinators, conduit-extra, containers, deepseq - , directory, HUnit, lzma-conduit, mtl, resourcet, stm, stm-conduit - , test-framework, test-framework-hunit, test-framework-th - , transformers, vector - }: - mkDerivation { - pname = "conduit-algorithms"; - version = "0.0.7.1"; - sha256 = "153g4lhd8ah97hbdvjxc1j4cnkdmpy6x2pbdjv2n7wyn80mqh9i7"; - libraryHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq lzma-conduit mtl resourcet stm - stm-conduit transformers vector - ]; - testHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory HUnit lzma-conduit mtl - resourcet stm stm-conduit test-framework test-framework-hunit - test-framework-th transformers vector - ]; - homepage = "https://github.com/luispedro/conduit-algorithms#readme"; - description = "Conduit-based algorithms"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "conduit-algorithms_0_0_7_2" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq , directory, HUnit, lzma-conduit, mtl, resourcet, stm, stm-conduit @@ -50607,6 +50708,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "connection-string" = callPackage + ({ mkDerivation, base, containers, doctest, megaparsec + , parser-combinators, text + }: + mkDerivation { + pname = "connection-string"; + version = "0.1.0.0"; + sha256 = "0hkszhms7n6vp9w8agik0qndz2a3f8l56yxidw9l9mjn3sx769g2"; + revision = "1"; + editedCabalFile = "0zirgds0ha3245cagx3fhssz58bpyzci7zv4mw9rfnc1k48v69b2"; + libraryHaskellDepends = [ + base containers megaparsec parser-combinators + ]; + testHaskellDepends = [ base doctest text ]; + homepage = "https://github.com/Porges/connection-string-hs"; + description = "A library for parsing connection strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "consistent" = callPackage ({ mkDerivation, base, lifted-async, lifted-base, monad-control , stm, transformers, transformers-base, unordered-containers @@ -50681,12 +50801,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "constaparser" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, vector }: + mkDerivation { + pname = "constaparser"; + version = "0.1.0.0"; + sha256 = "02psvhz05j61b50sqrwhmfsf9cmvgrjd9k3yn2d57139k7qdwr3d"; + libraryHaskellDepends = [ attoparsec base bytestring vector ]; + homepage = "https://github.com/chessai/constaparser"; + description = "Parse ByteStrings of a constant length"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "constrained-categories" = callPackage ({ mkDerivation, base, tagged, void }: mkDerivation { pname = "constrained-categories"; - version = "0.3.0.1"; - sha256 = "0zga3841195dv0aw9x91ww9fl8y61chxicg3i4g6797dy0cv2752"; + version = "0.3.1.0"; + sha256 = "0xxmbvzxa2phwn25haxbr6gv0cnh92c1i2l5anhckqizx29gl668"; libraryHaskellDepends = [ base tagged void ]; homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; @@ -50736,6 +50868,8 @@ self: { pname = "constrained-normal"; version = "1.0.2"; sha256 = "1mq0w2qndrjx9ap9dkyxvz91fbszsnwlhh4hnm9g2dx020fawgac"; + revision = "1"; + editedCabalFile = "0vlmsqgx7cpl65ibmx23hdqdyplgvbn144j9plkmrcs5aam1jsdj"; libraryHaskellDepends = [ base ]; homepage = "http://dx.doi.org/10.1145/2500365.2500602"; description = "Normalised Deep Embeddings for Constrained Type-Class Instances"; @@ -51189,6 +51323,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "contravariant-extras_0_3_4" = callPackage + ({ mkDerivation, base, base-prelude, contravariant, semigroups + , template-haskell, tuple-th + }: + mkDerivation { + pname = "contravariant-extras"; + version = "0.3.4"; + sha256 = "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n"; + libraryHaskellDepends = [ + base base-prelude contravariant semigroups template-haskell + tuple-th + ]; + homepage = "https://github.com/nikita-volkov/contravariant-extras"; + description = "Extras for the \"contravariant\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "control-bool" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -51226,6 +51378,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "control-iso" = callPackage + ({ mkDerivation, base, bytestring, newtype-generics, profunctors + , text + }: + mkDerivation { + pname = "control-iso"; + version = "0.1.0.0"; + sha256 = "1z4z3plxs06w485injj2azk8bl42wy0i6c65c4j7fzkkyk7pqbfj"; + libraryHaskellDepends = [ + base bytestring newtype-generics profunctors text + ]; + description = "A typeclass for type isomorphisms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "control-monad-attempt" = callPackage ({ mkDerivation, attempt, base, transformers }: mkDerivation { @@ -52848,8 +53015,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "9.1"; - sha256 = "1rhwbwhaxx15jpy9jacdxcrqfxh8nm84w5jadsrb947nhjjwczj6"; + version = "9.3"; + sha256 = "1w1mb43hb6zn8n8r261j623jrgxx54h8jifhcby8nnfyl3h97c69"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector @@ -53074,6 +53241,8 @@ self: { pname = "criterion"; version = "1.2.6.0"; sha256 = "0a9pjmy74cd3yirihyabavsfa6b9rrrgav86qdagw5nwjw7as1bc"; + revision = "1"; + editedCabalFile = "094z5gbgnsbfwwn5qsila3bfg0dqg63zq6rmhsf973dca00b8syz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -53107,6 +53276,8 @@ self: { pname = "criterion"; version = "1.3.0.0"; sha256 = "0csgk6njr6a3i895d10pajf7z4r9hx8aj2r0c3rj5li6vrm37f8q"; + revision = "1"; + editedCabalFile = "1yfv8c3azrdba8nsw9za3flklryn7490hgcjqxjal3m9xbh7g1pn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -53755,16 +53926,16 @@ self: { }: mkDerivation { pname = "cryptoconditions"; - version = "0.1.0.0"; - sha256 = "0dbhlv7nh0awnvi1rwg3s25ksbxgvdlci543bwqp5ilkqdl3vlh0"; + version = "0.2.3.0"; + sha256 = "1gwq1527n6xf19xzcqzhgg6cl85albq3sgp25dxm3pvi45dvinas"; libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types base base64-bytestring + aeson asn1-encoding asn1-parse asn1-types base base64-bytestring bytestring containers cryptonite memory text ]; testHaskellDepends = [ aeson aeson-quick asn1-encoding base base16-bytestring - base64-bytestring bytestring cryptonite tasty tasty-hunit text - transformers + base64-bytestring bytestring containers cryptonite tasty + tasty-hunit text transformers ]; homepage = "https://github.com/libscott/cryptoconditions-hs"; description = "Interledger Crypto-Conditions"; @@ -53922,6 +54093,8 @@ self: { pname = "cryptoids"; version = "0.5.0.0"; sha256 = "05xywzs7waz01c0p3y02qlf4yfhfpmpzpdfs2cmv5rmphf1hzck2"; + revision = "3"; + editedCabalFile = "0px43xzijabkf727gfza6nm3p8v8higa9nl71vvadvyp7jm4hbnl"; libraryHaskellDepends = [ base binary bytestring cryptoids-class cryptoids-types cryptonite directory exceptions filepath memory @@ -53936,6 +54109,8 @@ self: { pname = "cryptoids-class"; version = "0.0.0"; sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy"; + revision = "2"; + editedCabalFile = "1y2qav6izihivhxzv8fn4d7vrp0cvbfv84k8l4x6av6iwfbak5s8"; libraryHaskellDepends = [ base cryptoids-types exceptions ]; description = "Typeclass-based interface to cryptoids"; license = stdenv.lib.licenses.bsd3; @@ -53947,6 +54122,8 @@ self: { pname = "cryptoids-types"; version = "0.0.0"; sha256 = "0qp6lx1k2mqay1i4wgkwgaqamp33gijw0wb13rh71i0qwyvnr51b"; + revision = "1"; + editedCabalFile = "0i12f6rsphs4plkxc8w3dalyf9iy5q67lkm4fxv4g1zcicqxgmqy"; libraryHaskellDepends = [ base binary http-api-data path-pieces ]; description = "Shared types for encrypting internal object identifiers before exposure"; license = stdenv.lib.licenses.bsd3; @@ -54353,6 +54530,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "csv-conduit_0_6_8" = callPackage + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , conduit, conduit-extra, containers, data-default, directory + , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl + , primitive, resourcet, test-framework, test-framework-hunit, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "csv-conduit"; + version = "0.6.8"; + sha256 = "1rb2dkci33gmqr82a4fc74lrdvxrcn0aibh3arlylklhm15y7w7y"; + libraryHaskellDepends = [ + array attoparsec base blaze-builder bytestring conduit + conduit-extra containers data-default exceptions ghc-prim mmorph + monad-control mtl primitive resourcet text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers directory HUnit mtl primitive + test-framework test-framework-hunit text transformers vector + ]; + homepage = "http://github.com/ozataman/csv-conduit"; + description = "A flexible, fast, conduit-based CSV parser library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "csv-enumerator" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , bytestring, containers, directory, enumerator, safe, transformers @@ -54401,20 +54605,23 @@ self: { }) {}; "csv-to-qif" = callPackage - ({ mkDerivation, base, Cabal, explicit-exception, hspec, regex-tdfa - , split, spreadsheet + ({ mkDerivation, base, Cabal, explicit-exception, hspec, parsec + , QuickCheck, regex-tdfa, split, spreadsheet }: mkDerivation { pname = "csv-to-qif"; - version = "0.3.2"; - sha256 = "1mfy19fvi92zzzqn70ga2p5csmc8qm0qnkn3vyl41ic6f69vm73x"; + version = "0.3.3"; + sha256 = "0ln7s3k1m802x00sr0py3l3zsww2wnv2lcb2fb71966pwqrbr4fp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base explicit-exception regex-tdfa split spreadsheet + base explicit-exception parsec regex-tdfa split spreadsheet ]; - testHaskellDepends = [ base Cabal hspec regex-tdfa split ]; - homepage = "https://github.com/mrVanDalo/csv-to-qif/"; + testHaskellDepends = [ + base Cabal explicit-exception hspec parsec QuickCheck regex-tdfa + split spreadsheet + ]; + homepage = "http://mrvandalo.github.io/csv-to-qif/"; description = "A small program that will read csv files and create qif files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -54584,27 +54791,6 @@ self: { }) {}; "cuda" = callPackage - ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath - , pretty, template-haskell - }: - mkDerivation { - pname = "cuda"; - version = "0.9.0.0"; - sha256 = "0zbichiribg9549fipsvq60abzz3j4i9ilf92j34avarby15q6ld"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ - base bytestring filepath template-haskell - ]; - libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base pretty ]; - homepage = "https://github.com/tmcdonell/cuda"; - description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cuda_0_9_0_1" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath , pretty, template-haskell }: @@ -54623,7 +54809,6 @@ self: { homepage = "https://github.com/tmcdonell/cuda"; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cudd" = callPackage @@ -54650,6 +54835,8 @@ self: { pname = "cue-sheet"; version = "1.0.1"; sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1"; + revision = "1"; + editedCabalFile = "05f1w3jhwk09jaknq2ipfsfdlh95rg614m1c1diwi2z9s6hwi3cx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class exceptions megaparsec @@ -56804,8 +56991,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-list-zigzag"; - version = "0.1.1.0"; - sha256 = "1pywxmwjlhf81vcb6ivcnf341hlmilgf77pi5kj5iad1hdznkp1y"; + version = "0.1.1.1"; + sha256 = "1gfgdn4v9gs2chmrxn1xh66qa8ivn8w4nb5vv1jg9y3isnvjax6q"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/erisco/data-list-zigzag"; description = "A list but with a balanced enumeration of Cartesian product"; @@ -57185,6 +57372,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-stm32" = callPackage + ({ mkDerivation, ansi-wl-pprint, attoparsec, base, containers, hxt + , hxt-xpath, pretty-simple, text, time + }: + mkDerivation { + pname = "data-stm32"; + version = "0.1.0.0"; + sha256 = "104m1lnm9kf64m3a0svahsvscmcmnb0ixvwm1vh32r61r1rc9fh1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint attoparsec base containers hxt hxt-xpath + pretty-simple text time + ]; + executableHaskellDepends = [ + ansi-wl-pprint attoparsec base containers hxt hxt-xpath + pretty-simple text time + ]; + testHaskellDepends = [ + ansi-wl-pprint attoparsec base containers hxt hxt-xpath + pretty-simple text time + ]; + homepage = "https://github.com/sorki/data-stm32#readme"; + description = "ARM SVD and CubeMX XML parser and pretty printer for STM32 family"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-store" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, criterion , deepseq, ixset, lens, mtl, QuickCheck, random, safecopy, tables @@ -58365,6 +58579,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dde" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "dde"; + version = "0.0.1"; + sha256 = "1mv3i56l3al386g6jr1dpkjx0mwpq25maqkw7zv8qdnshkg1x33f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base vector ]; + executableHaskellDepends = [ base vector ]; + testHaskellDepends = [ base vector ]; + homepage = "https://github.com/masterdezign/dde#readme"; + description = "Delay differential equations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dead-code-detection" = callPackage ({ mkDerivation, base, containers, directory, filepath , getopt-generics, ghc, ghc-paths, gitrev, Glob, graph-wrapper @@ -59058,14 +59288,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_0_0_2" = callPackage + "dejafu_1_1_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, profunctors, random, ref-fd, transformers }: mkDerivation { pname = "dejafu"; - version = "1.0.0.2"; - sha256 = "0j98kvqi746swpw6jsg8vfjw16y7d0nmiysxfsl7yrnqzma9nyx6"; + version = "1.1.0.1"; + sha256 = "0mhzij16sqgckk62n4mdwnkmrv2vp7884ivr24wnl73xwcyw6v15"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck profunctors random ref-fd transformers @@ -59657,6 +59887,8 @@ self: { pname = "deriving-compat"; version = "0.4.1"; sha256 = "0lzcbnvzcnrrvr61mrqdx4i8fylknf4jwrpncxr9lhpxgp4fqqk4"; + revision = "1"; + editedCabalFile = "12pzj7ng66xyyj6aixd0mds8vf0p9syivngrjz9xcsi63d76dsbn"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -59944,32 +60176,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_9_1" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring - , bytestring, case-insensitive, charset, containers, contravariant - , cryptohash, deepseq, exceptions, http-client, http-client-tls - , lens-family-core, optparse-generic, parsers, prettyprinter - , system-fileio, system-filepath, tasty, tasty-hunit, text - , text-format, transformers, trifecta, unordered-containers, vector + "dhall_1_10_0" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base + , base16-bytestring, bytestring, case-insensitive, containers + , contravariant, cryptohash, deepseq, directory, exceptions + , filepath, haskeline, http-client, http-client-tls + , insert-ordered-containers, lens-family-core, mtl + , optparse-generic, parsers, prettyprinter + , prettyprinter-ansi-terminal, repline, scientific, tasty + , tasty-hunit, text, text-format, transformers, trifecta + , unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.9.1"; - sha256 = "1kwv5mhcabg3bwnp9j7z01xxv1a0xnpc6n0yw02k8xhrhdz60hdq"; + version = "1.10.0"; + sha256 = "1z9z9f0qw0p7nywpgamkgfz3h3ikhkshrphsviz94vwhnrflq1wf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base base16-bytestring bytestring case-insensitive - charset containers contravariant cryptohash exceptions http-client - http-client-tls lens-family-core parsers prettyprinter - system-fileio system-filepath text text-format transformers - trifecta unordered-containers vector + containers contravariant cryptohash directory exceptions filepath + http-client http-client-tls insert-ordered-containers + lens-family-core parsers prettyprinter prettyprinter-ansi-terminal + scientific text text-format transformers trifecta + unordered-containers vector ]; executableHaskellDepends = [ - base optparse-generic prettyprinter system-filepath text trifecta + ansi-terminal base haskeline mtl optparse-generic prettyprinter + prettyprinter-ansi-terminal repline text trifecta ]; testHaskellDepends = [ - base containers deepseq prettyprinter tasty tasty-hunit text vector + base deepseq insert-ordered-containers prettyprinter tasty + tasty-hunit text vector ]; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; @@ -59998,20 +60236,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_7" = callPackage + "dhall-bash_1_0_9" = callPackage ({ mkDerivation, base, bytestring, containers, dhall - , neat-interpolation, optparse-generic, shell-escape, text - , text-format, trifecta, vector + , insert-ordered-containers, neat-interpolation, optparse-generic + , shell-escape, text, text-format, trifecta, vector }: mkDerivation { pname = "dhall-bash"; - version = "1.0.7"; - sha256 = "1mwxzrr5dmlm1892a4akgs52jl0bwiyf2qpl2mnr91y7fnmn00qs"; + version = "1.0.9"; + sha256 = "1knnljzh7gccma1xbj3ahrj6cyqfp7lisiv51nnwpxizb7vdfnx0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers dhall neat-interpolation shell-escape - text text-format vector + base bytestring containers dhall insert-ordered-containers + neat-interpolation shell-escape text text-format vector ]; executableHaskellDepends = [ base bytestring dhall optparse-generic text trifecta @@ -60059,14 +60297,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_0_10" = callPackage + "dhall-json_1_0_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall , optparse-generic, text, trifecta, vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.0.10"; - sha256 = "0zqb5hh3520l75walfnyr1i9dqphjxcawchvm12shjz2vqpi6wpq"; + version = "1.0.11"; + sha256 = "14jkf3j9iwnhkyz4wl6lvvci8ad21s20rk9kr7hr3fcmzv39alwf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base dhall text vector ]; @@ -60101,20 +60339,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-nix_1_0_10" = callPackage + "dhall-nix_1_1_0" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix - , neat-interpolation, optparse-generic, text, text-format, trifecta - , vector + , insert-ordered-containers, neat-interpolation, optparse-generic + , scientific, text, text-format, trifecta, vector }: mkDerivation { pname = "dhall-nix"; - version = "1.0.10"; - sha256 = "09iy1a0nc2mwbsly58na9lw4jh7wv7zq0lspdcynhsxj3xv2q23n"; + version = "1.1.0"; + sha256 = "0g2wyr79krbfdv1z6c8w78kz3w1y0jbx8778qgxbjp70inkwq5gl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-fix dhall hnix neat-interpolation text - text-format vector + base containers data-fix dhall hnix insert-ordered-containers + neat-interpolation scientific text text-format vector ]; executableHaskellDepends = [ base dhall hnix optparse-generic text trifecta @@ -60137,6 +60375,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-text_1_0_6" = callPackage + ({ mkDerivation, base, dhall, optparse-generic, text }: + mkDerivation { + pname = "dhall-text"; + version = "1.0.6"; + sha256 = "0r08x1s75qsfmn6gnfm0ikh80cq3dbgj7bp4jb8f5pz7p2azh72v"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base dhall optparse-generic text ]; + description = "Template text using Dhall"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -61657,6 +61909,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "direct-sqlite_2_3_22" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, directory + , HUnit, temporary, text + }: + mkDerivation { + pname = "direct-sqlite"; + version = "2.3.22"; + sha256 = "0fv90nm68k3vfj87kw6kfsvmk5kyvvrjcyp73s8m0pm6y7ypgg7a"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring directory HUnit temporary text + ]; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "directed-cubical" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , parallel, QuickCheck, unordered-containers, vector @@ -62399,8 +62669,8 @@ self: { }: mkDerivation { pname = "distributed-process-lifted"; - version = "0.3.0.0"; - sha256 = "1n0jic03x959rnkaavcywhz0zbqhaya53y0ydh13qs83a1y13m7i"; + version = "0.3.0.1"; + sha256 = "1074f1wblsmx89hkblds3npf2ha3p8ighdq0kjywb5522addbxrk"; libraryHaskellDepends = [ base deepseq distributed-process distributed-process-monad-control lifted-base monad-control mtl network-transport transformers @@ -63240,7 +63510,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "docker_0_5_0_1" = callPackage + "docker_0_5_1_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , conduit-combinators, conduit-extra, connection, containers , data-default-class, directory, exceptions, filemanip, filepath @@ -63248,22 +63518,20 @@ self: { , lens-aeson, monad-control, mtl, network, process, QuickCheck , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck , temporary, text, time, tls, transformers, transformers-base - , unordered-containers, uuid, vector, x509, x509-store, x509-system - , zlib + , unliftio-core, unordered-containers, uuid, vector, x509 + , x509-store, x509-system, zlib }: mkDerivation { pname = "docker"; - version = "0.5.0.1"; - sha256 = "0357d9hnrr990ysp87c17a8brnkp1w2w666m5jxhkap53n2dji4v"; - revision = "1"; - editedCabalFile = "1rrhgk3g33ppzxp3yqwdsj7l9nrmxl2xssb97slm7l81vypvs5z5"; + version = "0.5.1.0"; + sha256 = "1g1bmz185hibm0n23yxkili4v8768yascd8mc8z2pil9bky7lvww"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions filemanip filepath http-client http-conduit http-types monad-control mtl network resourcet scientific tar temporary text - time tls transformers transformers-base unordered-containers uuid - vector x509 x509-store x509-system zlib + time tls transformers transformers-base unliftio-core + unordered-containers uuid vector x509 x509-store x509-system zlib ]; testHaskellDepends = [ aeson base bytestring connection containers directory http-client @@ -63442,7 +63710,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "doctest_0_14_0" = callPackage + "doctest_0_14_1" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -63450,8 +63718,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.14.0"; - sha256 = "18qia153653fib1jdrdyvxa3wjcfhdn371r97mwv03q915i4bm3g"; + version = "0.14.1"; + sha256 = "1phnrsh2gjls54mlpqhfjs0x003jbrsz1sijy107mbg2gnck9cfj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63474,29 +63742,6 @@ self: { }) {}; "doctest-discover" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , filepath - }: - mkDerivation { - pname = "doctest-discover"; - version = "0.1.0.7"; - sha256 = "0w5xgw841fxp26n4c9srp84g0m0b105sa1snwrjg5dvxa7d6asmc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring directory doctest filepath - ]; - executableHaskellDepends = [ - aeson base bytestring directory doctest filepath - ]; - testHaskellDepends = [ base doctest ]; - doHaddock = false; - homepage = "http://github.com/karun012/doctest-discover"; - description = "Easy way to run doctests via cabal"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "doctest-discover_0_1_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath }: @@ -63517,7 +63762,6 @@ self: { homepage = "http://github.com/karun012/doctest-discover"; description = "Easy way to run doctests via cabal"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover-configurator" = callPackage @@ -66449,6 +66693,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-core_0_1_1_4" = callPackage + ({ mkDerivation, base, containers, ghc-prim, text + , unordered-containers + }: + mkDerivation { + pname = "ekg-core"; + version = "0.1.1.4"; + sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36"; + libraryHaskellDepends = [ + base containers ghc-prim text unordered-containers + ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/tibbe/ekg-core"; + description = "Tracking of system metrics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-elastic" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname , http-client, lens, text, time, unordered-containers, wreq @@ -67276,8 +67538,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.1"; - sha256 = "0qvxysiap3r4mi3xff5nsk9qv6diqxfgwj186bypbamzvzlz0lav"; + version = "2.3.2.2"; + sha256 = "1nwa97cnf04mapk6r5fr3bjzjb5gyfn0nmhz4a2x0p2ci01hrida"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -67941,17 +68203,6 @@ self: { }) {}; "enumset" = callPackage - ({ mkDerivation, base, data-accessor, storable-record }: - mkDerivation { - pname = "enumset"; - version = "0.0.4"; - sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w"; - libraryHaskellDepends = [ base data-accessor storable-record ]; - description = "Sets of enumeration values represented by machine words"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "enumset_0_0_4_1" = callPackage ({ mkDerivation, base, data-accessor, semigroups, storable-record }: mkDerivation { @@ -67963,7 +68214,6 @@ self: { ]; description = "Sets of enumeration values represented by machine words"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "env-locale" = callPackage @@ -68545,6 +68795,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors_2_2_4" = callPackage + ({ mkDerivation, base, exceptions, safe, text, transformers + , transformers-compat, unexceptionalio + }: + mkDerivation { + pname = "errors"; + version = "2.2.4"; + sha256 = "0v5jdjh6k3wys2m1ff6pgiydy6fzd0r0pn2k3bsisrj6nf6gff7a"; + libraryHaskellDepends = [ + base exceptions safe text transformers transformers-compat + unexceptionalio + ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "errors-ext" = callPackage ({ mkDerivation, base, errors, exceptions, HUnit, monad-control , mtl, transformers @@ -68849,6 +69116,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eternity" = callPackage + ({ mkDerivation, attoparsec, base, cereal, directory, foldl, potoki + , potoki-cereal, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "eternity"; + version = "0.1"; + sha256 = "04pcfnr1vl1s85gi2bqqca3frwjljw3307mw2psh8aa9h9qrf21b"; + libraryHaskellDepends = [ + attoparsec base cereal directory foldl potoki potoki-cereal text + ]; + testHaskellDepends = [ + cereal directory potoki potoki-cereal QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/metrix-ai/eternity"; + description = "Native event-sourcing database"; + license = stdenv.lib.licenses.mit; + }) {}; + + "eternity-timestamped" = callPackage + ({ mkDerivation, attoparsec, base, cereal, directory, eternity + , foldl, generic-random, hashable, potoki, QuickCheck, text, time + }: + mkDerivation { + pname = "eternity-timestamped"; + version = "0.2.1"; + sha256 = "0pqihqhq2jh1sr30wkk6sy3p5zyw62i3fqqac48lciggzpmajaa2"; + libraryHaskellDepends = [ + attoparsec base cereal directory eternity foldl generic-random + hashable potoki QuickCheck text time + ]; + homepage = "https://github.com/metrix-ai/eternity-timestamped"; + description = "Automatic timestamping for Eternity"; + license = stdenv.lib.licenses.mit; + }) {}; + "ether" = callPackage ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim , lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged @@ -69228,25 +69533,6 @@ self: { }) {}; "event-list" = callPackage - ({ mkDerivation, base, non-negative, QuickCheck, random - , transformers, utility-ht - }: - mkDerivation { - pname = "event-list"; - version = "0.1.1.3"; - sha256 = "05l4bsq3pglyf81dq26djz9xsjsabxwq5k6z3wi43d7a774510pm"; - libraryHaskellDepends = [ - base non-negative QuickCheck transformers utility-ht - ]; - testHaskellDepends = [ - base non-negative QuickCheck random transformers utility-ht - ]; - homepage = "http://code.haskell.org/~thielema/event-list/"; - description = "Event lists with relative or absolute time stamps"; - license = "GPL"; - }) {}; - - "event-list_0_1_2" = callPackage ({ mkDerivation, base, non-negative, QuickCheck, random, semigroups , transformers, utility-ht }: @@ -69264,7 +69550,6 @@ self: { homepage = "http://code.haskell.org/~thielema/event-list/"; description = "Event lists with relative or absolute time stamps"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "event-monad" = callPackage @@ -69967,8 +70252,8 @@ self: { pname = "exceptions"; version = "0.8.3"; sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd"; - revision = "4"; - editedCabalFile = "18iip6wffnrp1jgnf09gxg4v17ymjank50kjshxvcy9s9l9g13ln"; + revision = "5"; + editedCabalFile = "1kfgp41i6mfz9gjczp3flvqxfhnznd81rwldv8j05807n6mnqqii"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -69981,6 +70266,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptions_0_9_0" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers, transformers-compat + }: + mkDerivation { + pname = "exceptions"; + version = "0.9.0"; + sha256 = "1k66qq82srx62hmfqis5x7p2cjyq218rg9xks2sl960x5p4jvl8g"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 transformers + transformers-compat + ]; + homepage = "http://github.com/ekmett/exceptions/"; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "execs" = callPackage ({ mkDerivation, base, directory, process, text }: mkDerivation { @@ -70426,20 +70734,6 @@ self: { }) {}; "explicit-exception" = callPackage - ({ mkDerivation, base, deepseq, transformers }: - mkDerivation { - pname = "explicit-exception"; - version = "0.1.9"; - sha256 = "1kxx42kzm3r0mji7756yblpr7ys3lhx937jixgm8q1zsyg36m2hz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base deepseq transformers ]; - homepage = "http://www.haskell.org/haskellwiki/Exception"; - description = "Exceptions which are explicit in the type signature"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "explicit-exception_0_1_9_2" = callPackage ({ mkDerivation, base, deepseq, semigroups, transformers }: mkDerivation { pname = "explicit-exception"; @@ -70451,7 +70745,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Exception"; description = "Exceptions which are explicit in the type signature"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "explicit-iomodes" = callPackage @@ -70786,8 +71079,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.3"; - sha256 = "06ds0jlx6sljwdf63l154qbzia9mnsri79i9qm3xikky3nj9ia1m"; + version = "1.6.4"; + sha256 = "02i4wjp9wgnp2f89d7fj3jnc2pkkcnw068qh85sim3pfabz0a9hw"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -71202,22 +71495,24 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, arithmoi, ats-setup, base, Cabal, combinat - , composition-prelude, criterion, gmpint, hspec, QuickCheck + ({ mkDerivation, arithmoi, ats-pkg, base, Cabal, combinat + , composition-prelude, criterion, gmpint, hspec, numbertheory + , QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.3.2.5"; - sha256 = "0sln2am6xrm73y3731gy1wabc8cdvnrksgzvrl0qwlinshc4pd74"; - setupHaskellDepends = [ ats-setup base Cabal ]; + version = "0.3.3.1"; + sha256 = "1xbhg1qvd8zilmcc58dci4kk5l44wd0shdz11ssacf0pg2hpqc3n"; + setupHaskellDepends = [ ats-pkg base Cabal ]; libraryHaskellDepends = [ base composition-prelude gmpint ]; + librarySystemDepends = [ numbertheory ]; testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; homepage = "https://github.com/vmchale/fast-arithmetic#readme"; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {numbertheory = null;}; "fast-builder" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion @@ -71339,8 +71634,8 @@ self: { }: mkDerivation { pname = "fast-tags"; - version = "1.3"; - sha256 = "1pqz3r2dg0i462fd4fm3fz4p0m05878gic8xr1hxzk2f2ljsc7fq"; + version = "1.4"; + sha256 = "17gnpf5w9a3k4wjwzj6qrsn5fm508pqq8wy4zsqjy3pfprm3239z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -71849,6 +72144,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fcg" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "fcg"; + version = "0.0.0"; + sha256 = "07qbka3fkkmc18crafh6c5ahs7fv1a1kfhga8mxfkm75k3h15h3l"; + isLibrary = false; + isExecutable = true; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fckeditor" = callPackage ({ mkDerivation, base, cgi, HaXml, xhtml }: mkDerivation { @@ -71863,26 +72170,6 @@ self: { }) {}; "fclabels" = callPackage - ({ mkDerivation, base, criterion, HUnit, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "fclabels"; - version = "2.0.3.2"; - sha256 = "1c42f420bih3azhis9hhcdk6ijm10wp9rqa2kh763g68qgzq6pad"; - revision = "3"; - editedCabalFile = "19gd2jwjpfrmq80gpjk05djhn42vvj88fgka5yr7yaq6mfx103by"; - libraryHaskellDepends = [ base mtl template-haskell transformers ]; - testHaskellDepends = [ - base HUnit mtl template-haskell transformers - ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/sebastiaanvisser/fclabels"; - description = "First class accessor labels implemented as lenses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fclabels_2_0_3_3" = callPackage ({ mkDerivation, base, criterion, HUnit, mtl, template-haskell , transformers }: @@ -71898,7 +72185,6 @@ self: { homepage = "https://github.com/sebastiaanvisser/fclabels"; description = "First class accessor labels implemented as lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fclabels-monadlib" = callPackage @@ -72892,14 +73178,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filecache_0_3_0" = callPackage + "filecache_0_3_1" = callPackage ({ mkDerivation, base, containers, directory, exceptions, filepath , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time }: mkDerivation { pname = "filecache"; - version = "0.3.0"; - sha256 = "0lizyqksip8vw7gf0zi4ggfh07ql43avim25dwdlk9blv7kyxng4"; + version = "0.3.1"; + sha256 = "199npfbnnbf01ygwj559ikz51bfz23pggnvgdmj2azscbd80mbq7"; libraryHaskellDepends = [ base containers directory exceptions filepath fsnotify mtl stm strict-base-types time @@ -72999,6 +73285,8 @@ self: { pname = "filepath-crypto"; version = "0.1.0.0"; sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0"; + revision = "2"; + editedCabalFile = "00wjrwssdz98v2hafq271132bs766npgycqd5v2b5k0cd3mdk9lv"; libraryHaskellDepends = [ base binary bytestring case-insensitive cryptoids cryptoids-class cryptoids-types exceptions filepath sandi template-haskell @@ -73542,8 +73830,8 @@ self: { }: mkDerivation { pname = "fix-imports"; - version = "1.0.5"; - sha256 = "01fy2s94aq7mnnp24g5i8sxvlpb6arnmv8n2fr153lwmg3n2w1qb"; + version = "1.1.0"; + sha256 = "1w2j7l6515khp0zl3cf6pyxsv55c65qqfcxi94vikd8fk88sswd9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -73984,6 +74272,8 @@ self: { pname = "flac"; version = "0.1.2"; sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; + revision = "1"; + editedCabalFile = "1hl2dgf4ccbk0qk6yqdwr1qbdjp4yi25dhs595lmnf7wrhk7662f"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions @@ -74264,6 +74554,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "flip-cmd" = callPackage + ({ mkDerivation, base, process, safe-exceptions }: + mkDerivation { + pname = "flip-cmd"; + version = "0.1.0.0"; + sha256 = "1pl31lfsfsc1qlnkrvif3j9imz6pac325bgys7x7365xy46zkad6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base process safe-exceptions ]; + homepage = "https://github.com/aiya000/hs-flip-cmd"; + description = "e.g. `flip systemctl foo.service start` does `systemctl start foo.service`"; + license = stdenv.lib.licenses.mit; + }) {}; + "flippers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -74378,30 +74682,18 @@ self: { }) {}; "flow" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: - mkDerivation { - pname = "flow"; - version = "1.0.10"; - sha256 = "1k8p475m1485nq4236jf53gmls264c5dy8x57zihb7gbvgnl71fj"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - homepage = "https://github.com/tfausak/flow#readme"; - description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flow_1_0_11" = callPackage ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; version = "1.0.11"; sha256 = "11cgab1wyqdjzyx6ygh91yl03w70aivspmlavl4if6p9yr5z9rw7"; + revision = "2"; + editedCabalFile = "13gyzkk29qkq8pnfnxvq2ymag2r3f6h1hpxk7yhy1r3k9hmp5469"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; homepage = "https://github.com/tfausak/flow#readme"; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow-er" = callPackage @@ -75844,12 +76136,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foundation_0_0_19" = callPackage + "foundation_0_0_20" = callPackage ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; - version = "0.0.19"; - sha256 = "053g5fdg9p74irvdh3g19hkb6g28h0sngkh2zqwplbxwy59dhfxq"; + version = "0.0.20"; + sha256 = "0bg4g0xf4pb2vmahnfp8c4f0a3v0av73lb5g8bwnp170khxfcsms"; libraryHaskellDepends = [ base basement ghc-prim ]; testHaskellDepends = [ base basement ]; benchmarkHaskellDepends = [ base basement gauge ]; @@ -76186,6 +76478,8 @@ self: { pname = "free"; version = "5"; sha256 = "1s4avwm4lnscmxv3fy0zws3vbg61sczgxm1m3cdnqxp95bd6p4c7"; + revision = "1"; + editedCabalFile = "13kxrs6097cwh80hawdmdrz4l5cqmrwkxh667spx8hx390102ddf"; libraryHaskellDepends = [ base bifunctors comonad containers distributive exceptions mtl profunctors semigroupoids semigroups template-haskell transformers @@ -76571,6 +76865,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "freer-simple_1_1_0_0" = callPackage + ({ mkDerivation, base, criterion, extensible-effects, free, mtl + , natural-transformation, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers-base + }: + mkDerivation { + pname = "freer-simple"; + version = "1.1.0.0"; + sha256 = "00dvn620xg24pxw1h9p7dgl5wj25q77mfdsmxlmijsr0ysqwv611"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base natural-transformation transformers-base + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion extensible-effects free mtl + ]; + homepage = "https://github.com/lexi-lambda/freer-simple#readme"; + description = "Implementation of a friendly effect system for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel , pretty, random, syb @@ -79935,8 +80256,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.1.1.1"; - sha256 = "0z4kqlgqg016233f8smj6jzjd6n7cgsvyff0npnghv1gdlr9pfwc"; + version = "0.1.1.2"; + sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -80274,25 +80595,6 @@ self: { }) {}; "ghc-events" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers, text - , vector - }: - mkDerivation { - pname = "ghc-events"; - version = "0.7.0"; - sha256 = "12vs1vpi969391k1n7apg2sd399dl5xdkjgb8rbn9sj0dmp9l946"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers text vector - ]; - executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-events_0_7_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, text , vector }: @@ -80309,7 +80611,6 @@ self: { testHaskellDepends = [ base ]; description = "Library and tool for parsing .eventlog files from GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-events-analyze" = callPackage @@ -80665,8 +80966,8 @@ self: { pname = "ghc-paths"; version = "0.1.0.9"; sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg"; - revision = "2"; - editedCabalFile = "1gs6biqbcabgmrwhc1bq1bdaxdwwh26v4mpvj5c7cfyigc64gwyk"; + revision = "3"; + editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; @@ -81001,8 +81302,8 @@ self: { }: mkDerivation { pname = "ghc-vis"; - version = "0.8"; - sha256 = "03c73ip8k92fjrafaaj3mykql222y2fjiwx13lwvm5jk2p00is78"; + version = "0.9"; + sha256 = "134m5hzpbggifvigw2f4q6ci1lm5r2457va8lb0j7daiadq7xhcw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl @@ -82557,14 +82858,14 @@ self: { , sandi, securemem, shakespeare, socks, split, stm, stm-chans , tagsoup, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun , template-haskell, text, time, torrent, transformers, unix - , unix-compat, unordered-containers, utf8-string, uuid, wai + , unix-compat, unordered-containers, utf8-string, uuid, vector, wai , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core , yesod-form, yesod-static }: mkDerivation { pname = "git-annex"; - version = "6.20180112"; - sha256 = "0662780hzv2afajphjmgglm01d5w5vs4rp7xa1px1bznk67yjdxw"; + version = "6.20180227"; + sha256 = "11p77510vcg7sjd1y5grpgbm1299qviilf4d7xw2pr0vk5qn5mgp"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -82591,8 +82892,8 @@ self: { securemem shakespeare socks split stm stm-chans tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time torrent transformers unix unix-compat unordered-containers - utf8-string uuid wai wai-extra warp warp-tls yesod yesod-core - yesod-form yesod-static + utf8-string uuid vector wai wai-extra warp warp-tls yesod + yesod-core yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -83124,8 +83425,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.1.3"; - sha256 = "040yd8npjv54xfh4fv4i1p9x6qsa5qj1m5wblr7xjf0w090sblf0"; + version = "1.1.4"; + sha256 = "0jnxlvs69jc5d60s266f5clsfx1jr517b7yzl08hnka5km8qqdkb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83225,6 +83526,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-webhooks" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time + , vector + }: + mkDerivation { + pname = "github-webhooks"; + version = "0.9.0"; + sha256 = "1gzks7l39il0g9maj2hkfwpz8rnrnmc05fhcsr27a6c08962gn0f"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite deepseq + deepseq-generics memory text time vector + ]; + testHaskellDepends = [ aeson base bytestring hspec text vector ]; + homepage = "https://github.com/onrock-eng/github-webhooks#readme"; + description = "Aeson instances for GitHub Webhook payloads"; + license = stdenv.lib.licenses.mit; + }) {}; + "gitignore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , http-conduit, network, safe, text @@ -83562,8 +83882,8 @@ self: { ({ mkDerivation, base, linear }: mkDerivation { pname = "gjk2d"; - version = "0.1.0.1"; - sha256 = "0yvbh660p65njr33py743ifjlm4njmb15b5sghbhhdi5g1b9qn6w"; + version = "0.1.0.2"; + sha256 = "163av54lmkqbayx9vkvviv3mdqq60zwkk9kjn75j7mk13d0iwpp3"; libraryHaskellDepends = [ base linear ]; testHaskellDepends = [ base linear ]; homepage = "https://github.com/suzumiyasmith/gjk2d#readme"; @@ -84452,16 +84772,17 @@ self: { }) {}; "gmpint" = callPackage - ({ mkDerivation, base, recursion-schemes }: + ({ mkDerivation, base, gmp, recursion-schemes }: mkDerivation { pname = "gmpint"; - version = "0.1.0.4"; - sha256 = "023acr1a69b9r380zlk8bsgfjw0l4h381pk7bwar7mbv3zzsnmxn"; + version = "0.1.0.5"; + sha256 = "1xi840k962nz3mkf48sc08z4lbdmx8rmix00gzxywyjyia33zg3r"; libraryHaskellDepends = [ base recursion-schemes ]; + librarySystemDepends = [ gmp ]; homepage = "https://github.com/vmchale/gmpint#readme"; description = "GMP integer conversions"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) gmp;}; "gnome-desktop" = callPackage ({ mkDerivation, base, directory, gconf, glib, gtk, random }: @@ -84494,7 +84815,7 @@ self: { description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gnome_keyring;}; + }) {gnome_keyring = null;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome_vfs @@ -84568,27 +84889,6 @@ self: { }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage - ({ mkDerivation, array, base, containers, data-accessor - , data-accessor-transformers, deepseq, filepath, process, temporary - , time, transformers, utility-ht - }: - mkDerivation { - pname = "gnuplot"; - version = "0.5.5"; - sha256 = "1ka756zvc6q5hkjhi8zknb7d5whizmyl7ff0qzclx1n8qbx4jv98"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base containers data-accessor data-accessor-transformers - deepseq filepath process temporary time transformers utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; - description = "2D and 3D plots using gnuplot"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gnuplot_0_5_5_1" = callPackage ({ mkDerivation, array, base, containers, data-accessor , data-accessor-transformers, deepseq, filepath, process , semigroups, temporary, time, transformers, utility-ht @@ -84608,7 +84908,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; description = "2D and 3D plots using gnuplot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gnutls" = callPackage @@ -87543,6 +87842,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graphs_0_7_1" = callPackage + ({ mkDerivation, array, base, containers, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "graphs"; + version = "0.7.1"; + sha256 = "02g21jpz8jm8j1kpszk8vglw1733z2jp32dc650z40nxlmxpmlxc"; + libraryHaskellDepends = [ + array base containers transformers transformers-compat void + ]; + homepage = "http://github.com/ekmett/graphs"; + description = "A simple monadic graph library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "graphted" = callPackage ({ mkDerivation, base, indexed }: mkDerivation { @@ -93433,6 +93749,8 @@ self: { pname = "hasbolt"; version = "0.1.3.0"; sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx"; + revision = "1"; + editedCabalFile = "0420drijspw73092rh3mhyrz4i7pph1fz3m0hcshs1zmngqibvv2"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default hex network text transformers @@ -93768,21 +94086,6 @@ self: { }) {}; "hashids" = callPackage - ({ mkDerivation, base, bytestring, containers, split }: - mkDerivation { - pname = "hashids"; - version = "1.0.2.3"; - sha256 = "0d15h8q4llq7x82g3r3pnyj1lw3ryj5q4nvi2i152agpx0sl5mzc"; - revision = "2"; - editedCabalFile = "1l4zz47c0kcpwi7l4dsizddi2c1a6k3v6a0b6w4wjylvzd066fz0"; - libraryHaskellDepends = [ base bytestring containers split ]; - testHaskellDepends = [ base bytestring containers split ]; - homepage = "http://hashids.org/"; - description = "Hashids generates short, unique, non-sequential ids from numbers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hashids_1_0_2_4" = callPackage ({ mkDerivation, base, bytestring, containers, split }: mkDerivation { pname = "hashids"; @@ -93793,7 +94096,6 @@ self: { homepage = "http://hashids.org/"; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashing" = callPackage @@ -94406,18 +94708,19 @@ self: { "haskell-dap" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, filepath, ghc, ghc-boot, ghc-paths, ghci, haskeline - , process, time, transformers, unix + , process, text, time, transformers, unix }: mkDerivation { pname = "haskell-dap"; - version = "0.0.2.0"; - sha256 = "1wxidyga0abxyxwiy9qxjl8qj456rlcflav18jz3227yc6y4ziwz"; + version = "0.0.3.0"; + sha256 = "0l09s90mfwnyc3nz3xpgja6dh99qm2yvim4r0fxyvh0adfzkmiwn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ array base bytestring containers deepseq directory filepath ghc - ghc-boot ghc-paths ghci haskeline process time transformers unix + ghc-boot ghc-paths ghci haskeline process text time transformers + unix ]; homepage = "https://github.com/phoityne/haskell-dap"; description = "haskell-dap is a GHCi having DAP interface"; @@ -96468,16 +96771,16 @@ self: { }) {}; "haskelzinc" = callPackage - ({ mkDerivation, base, containers, filepath, parsec3, pretty - , process + ({ mkDerivation, base, containers, directory, filepath, parsec + , pretty, process }: mkDerivation { pname = "haskelzinc"; - version = "0.3.0.9"; - sha256 = "1vg5jxzn69y2pbpsw2qc6ida0p0v4dhgp68psn4rmpxxbjl7n10s"; + version = "0.3.1.0"; + sha256 = "0k3rsqassxjjwxn0cs2g8jl7hl3qmvdvrfdcclc3bf9pjf93jvwh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers filepath parsec3 pretty process + base containers directory filepath parsec pretty process ]; description = "CP in Haskell through MiniZinc"; license = stdenv.lib.licenses.bsd3; @@ -97095,8 +97398,8 @@ self: { }: mkDerivation { pname = "haskus-utils"; - version = "0.7.0.0"; - sha256 = "0s28m6bhc5a1q3z7r1pd9f1l0nhsk5lnsi8y9zqadyg8j4jcv9kx"; + version = "0.8.0.0"; + sha256 = "1r2r1198hhv75f4yqcy5crr764dvvj766bgp3v3b5sdl603q8cl3"; libraryHaskellDepends = [ base containers extra file-embed list-t mtl stm stm-containers template-haskell transformers vector @@ -99329,21 +99632,23 @@ self: { "hedgehog-gen-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , hedgehog, lens, protolude, regex-genex, regex-posix, scientific - , tasty, tasty-hedgehog, text, unordered-containers, vector + , hedgehog, lens, protolude, regex-genex, regex-pcre, scientific + , tasty, tasty-hedgehog, text, time, timerep, tz + , unordered-containers, vector }: mkDerivation { pname = "hedgehog-gen-json"; - version = "0.1.0"; - sha256 = "1b2sb33ah8df2v36hq1axf8dc5d3kflvpb70fcs2pbr44wzrv8x4"; + version = "0.2.0"; + sha256 = "1irr4lniz5s176r6fnhd7sjnxbs627yif1yd8nd8jrq9p1rwc5jm"; libraryHaskellDepends = [ aeson base bytestring containers exceptions hedgehog lens protolude - regex-genex scientific text unordered-containers vector + regex-genex scientific text time timerep tz unordered-containers + vector ]; testHaskellDepends = [ aeson base bytestring containers exceptions hedgehog lens protolude - regex-genex regex-posix scientific tasty tasty-hedgehog text - unordered-containers vector + regex-genex regex-pcre scientific tasty tasty-hedgehog text time + timerep tz unordered-containers vector ]; homepage = "https://github.com/githubuser/haskell-hedgehog-gen-json#readme"; description = "JSON generators for Hedgehog"; @@ -100081,6 +100386,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "here_1_2_13" = callPackage + ({ mkDerivation, base, haskell-src-meta, mtl, parsec + , template-haskell + }: + mkDerivation { + pname = "here"; + version = "1.2.13"; + sha256 = "001wfyvigl2xswqysnpignkl124hybf833875mkcsn8yp8krqvs0"; + libraryHaskellDepends = [ + base haskell-src-meta mtl parsec template-haskell + ]; + homepage = "https://github.com/tmhedberg/here"; + description = "Here docs & interpolated strings via quasiquotation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heredoc" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -100485,6 +100807,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hex-text" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, doctest, text + }: + mkDerivation { + pname = "hex-text"; + version = "0.1.0.0"; + sha256 = "0if46jkzd67jwp56vmvd021qq2vfzpmaf1v2w07cy0w61icfvjxr"; + libraryHaskellDepends = [ base base16-bytestring bytestring text ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/typeclasses/hex-text"; + description = "ByteString-Text hexidecimal conversions"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hexchat" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -103487,6 +103823,23 @@ self: { license = "GPL"; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl_0_18_2_0" = callPackage + ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector + }: + mkDerivation { + pname = "hmatrix-gsl"; + version = "0.18.2.0"; + sha256 = "0gvghbyavlk808826qwy4r667i9mxf2ml5xjsbna5slx4sbj7jfs"; + libraryHaskellDepends = [ + array base hmatrix process random vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numerical computation"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex , vector @@ -106339,36 +106692,6 @@ self: { }) {}; "hprotoc" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , directory, filepath, haskell-src-exts, mtl, parsec - , protocol-buffers, protocol-buffers-descriptor, utf8-string - }: - mkDerivation { - pname = "hprotoc"; - version = "2.4.6"; - sha256 = "05n8mgrbskdx2r78kvl1q8zzgha9jsds7gvajkc54wcgprfhv42z"; - revision = "1"; - editedCabalFile = "0bs5h6mq6yrwiwfq0l20b4an73myxq6gbaxjffdifscqzq8pdk94"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - executableToolDepends = [ alex ]; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hprotoc_2_4_7" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec , protocol-buffers, protocol-buffers-descriptor, utf8-string @@ -106394,7 +106717,6 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hprotoc-fork" = callPackage @@ -107224,12 +107546,15 @@ self: { }: mkDerivation { pname = "hs-rs-notify"; - version = "0.1.0.3"; - sha256 = "0nrhks103kcj8m0f20gp3bgg21pvi4v1vaif275pra4bv0bzl3nh"; + version = "0.1.0.18"; + sha256 = "0ffs9bbs076i3a44zszhv8kdxalz2m2yfg0fham971jil33gx2pc"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base filepath process protolude text unix ]; - librarySystemDepends = [ notifier ]; + executableHaskellDepends = [ base protolude ]; + executableSystemDepends = [ notifier ]; testHaskellDepends = [ base protolude ]; homepage = "https://github.com/NoRedInk/hs-rs-notify#readme"; description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify"; @@ -107384,20 +107709,20 @@ self: { }) {}; "hs2ats" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, cases, composition-prelude + ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude , cpphs, criterion, deepseq, haskell-src-exts, hspec , hspec-dirstream, language-ats, lens, optparse-generic - , system-filepath, text + , system-filepath }: mkDerivation { pname = "hs2ats"; - version = "0.2.1.5"; - sha256 = "0jxyj9pggs4m2ypw12z5xjrc5r0cq5gxi3dllbmvvablxlwzfkv1"; + version = "0.2.1.7"; + sha256 = "01hinvxj9v04kzvyck01z4ky3b1gmffwxvl7wri2ggps26h2d5gf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base cases composition-prelude cpphs deepseq - haskell-src-exts language-ats lens optparse-generic text + ansi-wl-pprint base casing composition-prelude cpphs deepseq + haskell-src-exts language-ats lens optparse-generic ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -108853,6 +109178,29 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_0_9_5_1" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, fail + , lua5_3, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "0.9.5.1"; + sha256 = "1l3lkmzcal3106acw2bvky5dlblz4n331gnl1ly18j79flbzn7v8"; + configureFlags = [ "-fsystem-lua" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions fail mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers QuickCheck quickcheck-instances tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text + ]; + description = "A Lua language interpreter embedding in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit , ieee754, QuickCheck, quickcheck-instances, scientific, text @@ -110042,24 +110390,19 @@ self: { }) {}; "hspkcs11" = callPackage - ({ mkDerivation, base, bytestring, c2hs, cipher-aes, cprng-aes - , crypto-api, RSA, testpack, unix, utf8-string + ({ mkDerivation, base, base64-bytestring, bytestring, c2hs + , cipher-aes, cprng-aes, crypto-api, RSA, unix, utf8-string }: mkDerivation { pname = "hspkcs11"; - version = "0.3"; - sha256 = "1cgp0fqwh4r33c4g7pm95cim78kjr9yyq7z1n79f3c30lnvsany9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring crypto-api RSA unix utf8-string - ]; + version = "0.6"; + sha256 = "12jjz5r6pcqqlalxagi1bv1igjfwz7npbdr8vm4kznhv44bkhlp7"; + libraryHaskellDepends = [ base bytestring unix utf8-string ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ - base bytestring cipher-aes cprng-aes crypto-api RSA testpack unix - utf8-string + testHaskellDepends = [ + base base64-bytestring bytestring cipher-aes cprng-aes crypto-api + RSA unix utf8-string ]; - executableToolDepends = [ c2hs ]; homepage = "https://github.com/denisenkom/hspkcs11"; description = "Wrapper for PKCS #11 interface"; license = stdenv.lib.licenses.mit; @@ -112820,12 +113163,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_0_1_0" = callPackage + "hunit-dejafu_1_0_1_2" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.0.1.0"; - sha256 = "1vnxxyjycbz5xcfyyrl2hi2xkfqdqajlx1jbxvmq3d0w76p3zvdk"; + version = "1.0.1.2"; + sha256 = "1lnw8rr0lf43rzsv3c5knm96kpnsxmpijqh7njhrgbx9wzy81mg7"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -113344,6 +113687,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-hspec-hedgehog_0_1_0_2" = callPackage + ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: + mkDerivation { + pname = "hw-hspec-hedgehog"; + version = "0.1.0.2"; + sha256 = "1rafrpys347qc60van79y55n13pjdhdx64j495g4hhvyzf32az67"; + libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; + testHaskellDepends = [ base hedgehog hspec ]; + homepage = "https://github.com/githubuser/hw-hspec-hedgehog#readme"; + description = "Interoperability between hspec and hedgehog"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-int" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -114913,6 +115270,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hzenity" = callPackage + ({ mkDerivation, base, containers, data-default, process + , process-extras, text, time + }: + mkDerivation { + pname = "hzenity"; + version = "0.1"; + sha256 = "04y0a72rczwsmxig029f6jgdkc15rmf2fnsbc5pvy26nksh5i7zk"; + libraryHaskellDepends = [ + base containers data-default process process-extras text time + ]; + homepage = "https://github.com/emilaxelsson/hzenity"; + description = "Haskell interface to Zenity dialogs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hzk" = callPackage ({ mkDerivation, base, bytestring, resource-pool, tasty , tasty-hunit, time, zookeeper_mt @@ -115321,6 +115694,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "identicon-style-squares" = callPackage + ({ mkDerivation, base, bytestring, cryptohash, identicon + , JuicyPixels, polyvariadic + }: + mkDerivation { + pname = "identicon-style-squares"; + version = "0.1.0.0"; + sha256 = "12iawbazg5dd6n2giyib3ihj42xh9fnp53lgi3a5gd5x8spixwi9"; + libraryHaskellDepends = [ + base identicon JuicyPixels polyvariadic + ]; + testHaskellDepends = [ + base bytestring cryptohash identicon JuicyPixels + ]; + homepage = "https://github.com/fgaz/identicon-styles"; + description = "Squares style for the identicon package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "identifiers" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, containers , criterion, deepseq, hashable, ListLike, QuickCheck @@ -116145,8 +116537,8 @@ self: { }: mkDerivation { pname = "imap"; - version = "0.3.0.5"; - sha256 = "1wkm6agp0gsqg8lqfqp7sm0aq64426lpfw56nmnzvfk1hkq2gwmp"; + version = "0.3.0.6"; + sha256 = "1acmjpp2l4d7p5yxayd3w6h8mc29siq3y3s50cj0n8japmqrrcgm"; libraryHaskellDepends = [ attoparsec base bytestring connection containers derive either exceptions hslogger list-t network pipes random rolling-queue stm @@ -117430,6 +117822,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "inline-java_0_8_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc + , hspec, jni, jvm, language-java, mtl, process, template-haskell + , temporary, text + }: + mkDerivation { + pname = "inline-java"; + version = "0.8.2"; + sha256 = "0f38w4p29xzrzqjdn2r3yfh2m9iai6dwbj52jhrliiy87gnvwwmy"; + libraryHaskellDepends = [ + base bytestring Cabal directory filepath ghc jni jvm language-java + mtl process template-haskell temporary text + ]; + testHaskellDepends = [ base hspec jni jvm text ]; + homepage = "http://github.com/tweag/inline-java#readme"; + description = "Java interop via inline Java code in Haskell modules"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-r" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default-class, deepseq, directory, exceptions, filepath @@ -117967,6 +118379,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "intern_0_9_2" = callPackage + ({ mkDerivation, array, base, bytestring, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "intern"; + version = "0.9.2"; + sha256 = "081fyiq00cvx4nyagr34kwnag9njv65wdps5j4ydin6sjq7b58wk"; + libraryHaskellDepends = [ + array base bytestring hashable text unordered-containers + ]; + homepage = "http://github.com/ekmett/intern/"; + description = "Efficient hash-consing for arbitrary data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "internetmarke" = callPackage ({ mkDerivation, base, explicit-exception, HPDF, parsec, process , transformers, utility-ht @@ -118848,26 +119277,6 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.1"; - sha256 = "1viyxq3m1aifl05w0hxwrhhhcfpmvwz4ymil2gngi4nfm0yd1f2p"; - libraryHaskellDepends = [ - appar base byteorder containers network - ]; - testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe - ]; - homepage = "http://www.mew.org/~kazu/proj/iproute/"; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_2" = callPackage ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec , network, QuickCheck, safe }: @@ -118885,7 +119294,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/iproute/"; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -119005,7 +119413,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-client_1_1_0_0" = callPackage + "irc-client_1_1_0_1" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-chans @@ -119013,8 +119421,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.0.0"; - sha256 = "0xg4carlcrzjh8igvnqwmxp64ha7x2wjp5d5lvadbml36zvq189y"; + version = "1.1.0.1"; + sha256 = "01p3p6x1ww5hcwq25nr7czm5z8xiz3sr998krdwfj94nl6z4n2ag"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -119369,9 +119777,9 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "is"; - version = "0.4"; - sha256 = "0bg7irvyzmlay3xkwsqn08waiylpllyvpkj3n3vwib6iwizqnqkz"; - libraryHaskellDepends = [ base ]; + version = "0.4.1"; + sha256 = "1133npzv5rvcfxarafbmm6jfam45qdm3r33wc5qq920m0w60xi2a"; + libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Generic pattern predicates"; license = stdenv.lib.licenses.bsd3; @@ -120208,26 +120616,6 @@ self: { }) {}; "jack" = callPackage - ({ mkDerivation, array, base, bytestring, enumset, event-list - , explicit-exception, libjack2, midi, non-negative, transformers - }: - mkDerivation { - pname = "jack"; - version = "0.7.1.1"; - sha256 = "0h3c62knq5hblsplgp25wm94hbv6id8c97wv8xgzbvalj4lmsyyi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring enumset event-list explicit-exception midi - non-negative transformers - ]; - libraryPkgconfigDepends = [ libjack2 ]; - homepage = "http://www.haskell.org/haskellwiki/JACK"; - description = "Bindings for the JACK Audio Connection Kit"; - license = "GPL"; - }) {inherit (pkgs) libjack2;}; - - "jack_0_7_1_3" = callPackage ({ mkDerivation, array, base, bytestring, enumset, event-list , explicit-exception, libjack2, midi, non-negative, semigroups , transformers @@ -120246,7 +120634,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libjack2;}; "jack-bindings" = callPackage @@ -120367,8 +120754,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.3.2"; - sha256 = "0wym2mz4bvcmwg10v90dx14n41qhmn58bgccnxy7li9ahqwvj0f0"; + version = "0.5.4"; + sha256 = "0bqvxnysynpznhibwlcmcg849psjm0q158mh50w0bcwa7jx6v441"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120883,6 +121270,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) jdk;}; + "jni_0_6_0" = callPackage + ({ mkDerivation, base, bytestring, choice, constraints, containers + , cpphs, deepseq, inline-c, jdk, singletons + }: + mkDerivation { + pname = "jni"; + version = "0.6.0"; + sha256 = "04phf6sqfp8g9rqfj2lxg2j43350wlini1dnsjwyr6yvy888z9ba"; + libraryHaskellDepends = [ + base bytestring choice constraints containers deepseq inline-c + singletons + ]; + librarySystemDepends = [ jdk ]; + libraryToolDepends = [ cpphs ]; + homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; + description = "Complete JNI raw bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) jdk;}; + "jobqueue" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, fast-logger, HDBC @@ -122432,6 +122839,54 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jvm_0_4_2" = callPackage + ({ mkDerivation, base, bytestring, choice, constraints, criterion + , deepseq, distributed-closure, exceptions, hspec, jni, singletons + , text, vector + }: + mkDerivation { + pname = "jvm"; + version = "0.4.2"; + sha256 = "1z3lk2f7bmhi8bj4v32fymjr2bf9czjd73qm6gk33z4mxknddwbh"; + libraryHaskellDepends = [ + base bytestring choice constraints distributed-closure exceptions + jni singletons text vector + ]; + testHaskellDepends = [ base bytestring hspec jni text ]; + benchmarkHaskellDepends = [ + base criterion deepseq jni singletons + ]; + homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; + description = "Call JVM methods from Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "jvm-batching" = callPackage + ({ mkDerivation, base, bytestring, Cabal, criterion, deepseq + , distributed-closure, hspec, inline-java, jni, jvm, singletons + , split, text, vector + }: + mkDerivation { + pname = "jvm-batching"; + version = "0.1.1"; + sha256 = "06vxhlpvb8ilj0xm5k7chzpsn0f7m48l7728g2m7likh55rs2dxq"; + setupHaskellDepends = [ base Cabal inline-java ]; + libraryHaskellDepends = [ + base bytestring distributed-closure inline-java jni jvm singletons + text vector + ]; + testHaskellDepends = [ + base bytestring hspec inline-java jvm text vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq jvm split vector + ]; + homepage = "http://github.com/tweag/inline-java/tree/master/jvm-batching#readme"; + description = "Provides batched marshalling of values between Java and Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jvm-binary" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , directory, filepath, tasty, tasty-discover, tasty-hspec @@ -122472,17 +122927,23 @@ self: { }) {}; "jvm-streaming" = callPackage - ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni - , jvm, singletons, streaming + ({ mkDerivation, base, Cabal, criterion, deepseq + , distributed-closure, hspec, inline-java, jni, jvm, jvm-batching + , singletons, streaming, vector }: mkDerivation { pname = "jvm-streaming"; - version = "0.2.2"; - sha256 = "1s0bla6yhw1ic637h2ss8f3aihc26ca5bndhsi5g02fn0gzw644m"; + version = "0.3"; + sha256 = "02qnfs06knia1c2r5hglhf4ahrls7i6q352dykyns4x1ps5kks5r"; + setupHaskellDepends = [ base Cabal inline-java jvm-batching ]; libraryHaskellDepends = [ - base distributed-closure inline-java jni jvm singletons streaming + base distributed-closure inline-java jni jvm jvm-batching + singletons streaming vector ]; testHaskellDepends = [ base hspec inline-java jvm streaming ]; + benchmarkHaskellDepends = [ + base criterion deepseq jvm streaming vector + ]; homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; description = "Expose Java iterators as streams from the streaming package"; license = stdenv.lib.licenses.bsd3; @@ -122749,6 +123210,8 @@ self: { pname = "kan-extensions"; version = "5.1"; sha256 = "019jyrilk97i5bj8v044ig03m66h02q4b073m1fksrk7y9c8wgqr"; + revision = "1"; + editedCabalFile = "1xaam291gxmsbibi2ai4l6c36iwkpmfy6vik1916j6jp326pa3z9"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant distributive fail free mtl profunctors semigroupoids tagged @@ -124408,6 +124871,8 @@ self: { pname = "kure"; version = "2.16.12"; sha256 = "1n95f1ijxjxgbq8a33jzmd91yk15bgxx8damxs04y99kzih7sgjc"; + revision = "2"; + editedCabalFile = "07x04clvlzl2wr20pmis52jfyw4fanyaq00zx76r2zn7zdcvysy3"; libraryHaskellDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -125402,6 +125867,8 @@ self: { pname = "lame"; version = "0.1.1"; sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; + revision = "1"; + editedCabalFile = "0p7nwbn22bmk2p7vpcpqs89dxxshjg3cbdx1qc1h8pczgaz3c1dl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class directory exceptions filepath @@ -125436,6 +125903,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lang" = callPackage + ({ mkDerivation, base, bytestring, http-streams, Mapping }: + mkDerivation { + pname = "lang"; + version = "0.2.1"; + sha256 = "1pzj4iyrhlvgbk68d68xmfi75l2nz9ya1nm6iqz1qvmpj9rd3fsy"; + libraryHaskellDepends = [ base bytestring http-streams Mapping ]; + homepage = "语.ml"; + description = "A Lisp"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "language-asn1" = callPackage ({ mkDerivation, base, parsec, syb }: mkDerivation { @@ -125451,18 +125930,19 @@ self: { }) {}; "language-ats" = callPackage - ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base - , composition-prelude, criterion, deepseq, happy, hspec - , hspec-dirstream, lens, recursion-schemes, system-filepath + ({ mkDerivation, alex, ansi-wl-pprint, array, base + , composition-prelude, containers, criterion, deepseq, happy, hspec + , hspec-dirstream, microlens, microlens-th, mtl, recursion-schemes + , system-filepath, transformers }: mkDerivation { pname = "language-ats"; - version = "0.3.0.7"; - sha256 = "0q1nap6277w13f389jlvyp62018ywzay7rc04j6n5wmcs240inff"; + version = "1.2.0.0"; + sha256 = "072a37nd9ngis8m1kx7xlr13kd8v24j3cnzllval2ygy9siw4p1l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base composition-prelude deepseq - lens recursion-schemes + ansi-wl-pprint array base composition-prelude containers deepseq + microlens microlens-th mtl recursion-schemes transformers ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -125518,46 +125998,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c_0_7_0" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, filepath, happy, pretty, process, syb - }: - mkDerivation { - pname = "language-c"; - version = "0.7.0"; - sha256 = "1j4slggwj5g0rnrdxafgn2savv14sl2nqk7lfy3qj73vmpn1d86d"; - libraryHaskellDepends = [ - array base bytestring containers directory filepath pretty process - syb - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ base directory filepath process ]; - homepage = "http://visq.github.io/language-c/"; - description = "Analysis and generation of C code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-c" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, filepath, happy, pretty, process, syb - }: - mkDerivation { - pname = "language-c"; - version = "0.7.1"; - sha256 = "1jm9yzj727wsbfpnqkvbavbaq0vzv4i2p8p2kqqwkgmkz4ip2i57"; - libraryHaskellDepends = [ - array base bytestring containers directory filepath pretty process - syb - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ base directory filepath process ]; - homepage = "http://visq.github.io/language-c/"; - description = "Analysis and generation of C code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-c_0_7_2" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, pretty, process, syb }: @@ -125574,7 +126015,6 @@ self: { homepage = "http://visq.github.io/language-c/"; description = "Analysis and generation of C code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-c-comments" = callPackage @@ -126278,54 +126718,6 @@ self: { }) {}; "language-puppet" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, exceptions, filecache, filepath - , formatting, Glob, hashable, hruby, hslogger, hspec - , hspec-megaparsec, http-api-data, http-client, HUnit, lens - , lens-aeson, megaparsec, memory, mtl, neat-interpolation - , operational, optparse-applicative, parallel-io, parsec - , pcre-utils, process, protolude, random, regex-pcre-builtin - , scientific, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.3.14"; - sha256 = "1vf80dfdi2w5kwkbpqjqd9iahi7fg8qw5h243x8j286hzg3hx59d"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory exceptions - filecache filepath formatting hashable hruby hslogger hspec - http-api-data http-client lens lens-aeson megaparsec memory mtl - operational parsec pcre-utils process protolude random - regex-pcre-builtin scientific servant servant-client split stm - strict-base-types text time transformers unix unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint base bytestring containers Glob hslogger - http-client lens megaparsec mtl optparse-applicative parallel-io - regex-pcre-builtin strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl neat-interpolation protolude scientific - strict-base-types temporary text transformers unix - unordered-containers vector - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; - }) {}; - - "language-puppet_1_3_15" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, exceptions, filecache, filepath @@ -126370,7 +126762,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -131544,8 +131936,8 @@ self: { ({ mkDerivation, base, containers, text, transformers }: mkDerivation { pname = "localization"; - version = "1.0.0.20180213"; - sha256 = "1dpmlmpmb4hbv9b5010l5fypjmas3hb4vfmcnfnrajm7wp7qzg2y"; + version = "1.0.1.20180226"; + sha256 = "1172rmrk5xgqsy9igg9bspbybvhmbpakvjijn6gnp715a01gfadd"; libraryHaskellDepends = [ base containers text transformers ]; description = "Library for localization (l10n)"; license = stdenv.lib.licenses.gpl3; @@ -131912,7 +132304,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "log-warper_1_8_7" = callPackage + "log-warper_1_8_10" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, containers , data-default, deepseq, directory, filepath, fmt, hspec , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens @@ -131923,8 +132315,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.8.7"; - sha256 = "0bwk9wg2dhc56h7hwbnlxmw22pwswdlcf2bpjx62f9135q2cs7d8"; + version = "1.8.10"; + sha256 = "0wl1i68xnvla6fzgxfkqbk6hhqx9h0yp4br30y0fzwyk8p5v4l37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132075,6 +132467,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_4" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.4"; + sha256 = "14j63172ml4yj7sqscjxdkxxg869w6hvnlysf9s79qzbjnw44h3h"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, wl-pprint-text @@ -133443,37 +133859,6 @@ self: { }) {}; "lxd-client" = callPackage - ({ mkDerivation, aeson, async, base, bimap, bytestring, connection - , containers, data-default, directory, either, exceptions, filepath - , hspec, hspec-core, http-api-data, http-client, http-client-tls - , http-media, http-types, mtl, network, random, semigroups, servant - , servant-client, text, tls, transformers, turtle, unix, uuid - , websockets, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "lxd-client"; - version = "0.1.0.5"; - sha256 = "1981q1b71xgmxlis2hydhzhcwcspyrwnllg3fdrajv7m9z1zlryc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bimap bytestring connection containers - data-default directory either exceptions filepath http-api-data - http-client http-client-tls http-media http-types mtl network - semigroups servant servant-client text tls transformers unix - websockets x509 x509-store x509-validation - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base exceptions hspec hspec-core random text turtle uuid - ]; - homepage = "https://github.com/hverr/haskell-lxd-client#readme"; - description = "LXD client written in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "lxd-client_0_1_0_6" = callPackage ({ mkDerivation, aeson, async, base, bimap, bytestring, connection , containers, data-default, directory, either, exceptions, filepath , hspec, hspec-core, http-api-data, http-client, http-client-tls @@ -133620,28 +134005,6 @@ self: { }) {}; "lzma-conduit" = callPackage - ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit - , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers - }: - mkDerivation { - pname = "lzma-conduit"; - version = "1.2.0"; - sha256 = "0jpzl1nb422d1a5k4ylh5wkl225x816xnx1y7qkd8wzxp5xxa7ba"; - libraryHaskellDepends = [ - base bytestring conduit lzma resourcet transformers - ]; - testHaskellDepends = [ - base base-compat bytestring conduit HUnit QuickCheck resourcet - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://github.com/alphaHeavy/lzma-conduit"; - description = "Conduit interface for lzma/xz compression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "lzma-conduit_1_2_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers @@ -134510,17 +134873,6 @@ self: { }) {}; "managed" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "managed"; - version = "1.0.5"; - sha256 = "1q3j8w6z8jaxh5a0ifzj51vipyhfrb1hk6l87pm319ysv91rkjdr"; - libraryHaskellDepends = [ base transformers ]; - description = "A monad for managed values"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "managed_1_0_6" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; @@ -134529,7 +134881,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee" = callPackage @@ -135550,6 +135901,8 @@ self: { pname = "massiv"; version = "0.1.0.0"; sha256 = "1hy87l8jv06jmgws7r28qh44ja1a4swpaki9z8dn9lviddlhiz3d"; + revision = "1"; + editedCabalFile = "0y4dyambndn36qa5v4raxi16lfr91bpj9jqksy1kkrf65wr89cma"; libraryHaskellDepends = [ base data-default-class deepseq ghc-prim primitive vector ]; @@ -135569,8 +135922,8 @@ self: { pname = "massiv-io"; version = "0.1.0.0"; sha256 = "1qj94ypn5yzl3pjdnpddjv926d1wjcvm1n673mg4i0x5pr71w7lw"; - revision = "1"; - editedCabalFile = "1k6hg12q6m6gi6w6km04r6hx7zq7xfdhxz90arlm1izag3dv1ic2"; + revision = "2"; + editedCabalFile = "1bzn45kcf3j275bzj00hsvxvxi3csm08bflnsbmy8ixkqcfdlizy"; libraryHaskellDepends = [ base bytestring data-default deepseq directory filepath JuicyPixels massiv netpbm process vector @@ -137187,21 +137540,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "memory_0_14_14" = callPackage + "memory_0_14_16" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, foundation - , ghc-prim, tasty, tasty-hunit, tasty-quickcheck + , ghc-prim }: mkDerivation { pname = "memory"; - version = "0.14.14"; - sha256 = "03lnb7nqshddiwqbz1vpba7mb6l80nav896rr77vlp8m41b9h6qx"; + version = "0.14.16"; + sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v"; libraryHaskellDepends = [ base basement bytestring deepseq foundation ghc-prim ]; - testHaskellDepends = [ - base basement bytestring foundation tasty tasty-hunit - tasty-quickcheck - ]; + testHaskellDepends = [ base basement bytestring foundation ]; homepage = "https://github.com/vincenthz/hs-memory"; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; @@ -137995,29 +138345,6 @@ self: { }) {}; "midi" = callPackage - ({ mkDerivation, base, binary, bytestring, event-list - , explicit-exception, monoid-transformer, non-negative, QuickCheck - , random, transformers, utility-ht - }: - mkDerivation { - pname = "midi"; - version = "0.2.2.1"; - sha256 = "1kq3218g5cisyg6vmm4pm096zjs1954s6ng4pkdx8pxp39rk26a4"; - libraryHaskellDepends = [ - base binary bytestring event-list explicit-exception - monoid-transformer non-negative QuickCheck random transformers - utility-ht - ]; - testHaskellDepends = [ - base bytestring event-list explicit-exception non-negative - QuickCheck transformers utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/MIDI"; - description = "Handling of MIDI messages and files"; - license = "GPL"; - }) {}; - - "midi_0_2_2_2" = callPackage ({ mkDerivation, base, binary, bytestring, event-list , explicit-exception, monoid-transformer, non-negative, QuickCheck , random, semigroups, transformers, utility-ht @@ -138038,7 +138365,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Handling of MIDI messages and files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-alsa" = callPackage @@ -139196,6 +139522,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmorph_1_1_1" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.1.1"; + sha256 = "17hhfvdr2cclrhslsph3jaly7gfn7caajbzh7xr2prgvxmjhsdg3"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmtf" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-msgpack , hspec, QuickCheck, text @@ -139369,7 +139709,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "modern-uri_0_2_0_0" = callPackage + "modern-uri_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-megaparsec , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged @@ -139377,10 +139717,10 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.2.0.0"; - sha256 = "01wq2w2kfy9zlpsh8pwcs61xjy3xdwbz6nd0skb6g3bigrqs2w8z"; + version = "0.2.1.0"; + sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6"; revision = "1"; - editedCabalFile = "1svq0ndnv5jfz3nhxwdx4vxim5sahfcryj5ik4l4x704jsjbl4bm"; + editedCabalFile = "1rir55ccx5y377mdl7hfzk2n31nv18mdfxw6a0l2jjw7y0w5kpyi"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -139576,29 +139916,6 @@ self: { }) {}; "moesocks" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring - , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens - , lens-aeson, mtl, network, optparse-applicative, random, stm - , strict, text, time, transformers, unordered-containers - }: - mkDerivation { - pname = "moesocks"; - version = "1.0.0.43"; - sha256 = "1wbxvsisk1aah186xn32sndw8djrk96dpawhsmygxkncn264599f"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson async attoparsec base binary bytestring containers cryptohash - hslogger HsOpenSSL iproute lens lens-aeson mtl network - optparse-applicative random stm strict text time transformers - unordered-containers - ]; - homepage = "https://github.com/nfjinjing/moesocks"; - description = "A functional firewall killer"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "moesocks_1_0_0_44" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens , lens-aeson, mtl, network, optparse-applicative, random, stm @@ -139619,7 +139936,6 @@ self: { homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mohws" = callPackage @@ -139848,6 +140164,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-control_1_0_2_3" = callPackage + ({ mkDerivation, base, stm, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-control"; + version = "1.0.2.3"; + sha256 = "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c"; + libraryHaskellDepends = [ + base stm transformers transformers-base transformers-compat + ]; + homepage = "https://github.com/basvandijk/monad-control"; + description = "Lift control operations, like exception catching, through monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-control-aligned" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat @@ -139880,6 +140213,23 @@ self: { license = "GPL"; }) {}; + "monad-coroutine_0_9_0_4" = callPackage + ({ mkDerivation, base, monad-parallel, transformers + , transformers-compat + }: + mkDerivation { + pname = "monad-coroutine"; + version = "0.9.0.4"; + sha256 = "1rsxzry8qk5229vx4iw4jrzbbc82m80m1nlxlq73k5k20h9gzq0k"; + libraryHaskellDepends = [ + base monad-parallel transformers transformers-compat + ]; + homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine"; + description = "Coroutine monad transformer for suspending and resuming monadic computations"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-dijkstra" = callPackage ({ mkDerivation, base, free, hlint, mtl, psqueues, tasty , tasty-hspec, transformers @@ -140169,6 +140519,27 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "monad-logger-prefix_0_1_8" = callPackage + ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec + , monad-control, monad-logger, mtl, QuickCheck, resourcet, text + , transformers, transformers-base + }: + mkDerivation { + pname = "monad-logger-prefix"; + version = "0.1.8"; + sha256 = "1p8sqynxl898vf2fq5lw8j7r50jrxp8npbsw6sc2mbsi336j79xj"; + libraryHaskellDepends = [ + base exceptions monad-control monad-logger mtl resourcet text + transformers transformers-base + ]; + testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion monad-logger ]; + homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme"; + description = "Add prefixes to your monad-logger output"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-syslog" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog , monad-logger, text, transformers @@ -140287,6 +140658,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-metrics_0_2_1_1" = callPackage + ({ mkDerivation, base, clock, ekg-core, exceptions, hashable + , microlens, mtl, text, transformers, unordered-containers + }: + mkDerivation { + pname = "monad-metrics"; + version = "0.2.1.1"; + sha256 = "11gr6ir4678alscv9m6w33l6nbn0k1xspy4lzlgdqpfq5narl5zy"; + libraryHaskellDepends = [ + base clock ekg-core exceptions hashable microlens mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/sellerlabs/monad-metrics#readme"; + description = "A convenient wrapper around EKG metrics"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-mock" = callPackage ({ mkDerivation, base, constraints, exceptions, haskell-src-exts , haskell-src-meta, hspec, monad-control, mtl, template-haskell @@ -140386,6 +140776,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-parallel_0_7_2_3" = callPackage + ({ mkDerivation, base, parallel, transformers, transformers-compat + }: + mkDerivation { + pname = "monad-parallel"; + version = "0.7.2.3"; + sha256 = "12ahni860pfkdj70f9d0dg2h93gl0d9qav8llcmgh5z7dg1vi3qj"; + libraryHaskellDepends = [ + base parallel transformers transformers-compat + ]; + homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; + description = "Parallel execution of monadic computations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-parallel-progressbar" = callPackage ({ mkDerivation, base, monad-parallel, monadIO , terminal-progress-bar @@ -140852,6 +141258,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monadcryptorandom_0_7_2" = callPackage + ({ mkDerivation, base, bytestring, crypto-api, exceptions, mtl + , tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "monadcryptorandom"; + version = "0.7.2"; + sha256 = "12inwjh1smgrp62hvrca7608vjaff576503xi7ymbkq9szk8rkj9"; + libraryHaskellDepends = [ + base bytestring crypto-api exceptions mtl tagged transformers + transformers-compat + ]; + homepage = "https://github.com/TomMD/monadcryptorandom"; + description = "A monad for using CryptoRandomGen"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monadfibre" = callPackage ({ mkDerivation, base, monadbi }: mkDerivation { @@ -141119,37 +141543,6 @@ self: { }) {}; "mongoDB" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, conduit, conduit-extra, containers - , criterion, cryptohash, data-default-class, hashtables, hspec - , lifted-base, monad-control, mtl, network, nonce, old-locale - , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text - , time, tls, transformers, transformers-base - }: - mkDerivation { - pname = "mongoDB"; - version = "2.3.0.2"; - sha256 = "10gl9116hkjvm12ysgr1pi1vlk4d9jbkxgrcql6qhyvpsgv7s7bd"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring conduit conduit-extra containers cryptohash - data-default-class hashtables lifted-base monad-control mtl network - nonce parsec pureMD5 random random-shuffle resourcet tagged text - time tls transformers transformers-base - ]; - testHaskellDepends = [ base hspec mtl old-locale text time ]; - benchmarkHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers criterion cryptohash hashtables lifted-base - monad-control mtl network nonce parsec random random-shuffle text - transformers-base - ]; - homepage = "https://github.com/mongodb-haskell/mongodb"; - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "mongoDB_2_3_0_4" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, conduit, conduit-extra, containers , criterion, cryptohash, data-default-class, hashtables, hspec @@ -141178,7 +141571,6 @@ self: { homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mongodb-queue" = callPackage @@ -141417,17 +141809,6 @@ self: { }) {}; "monoid-transformer" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "monoid-transformer"; - version = "0.0.3"; - sha256 = "1f06ppvv50w5pacm4bs89zwkydih626cgbd2z6xqbp8cmhg6dj4l"; - libraryHaskellDepends = [ base ]; - description = "Monoid counterparts to some ubiquitous monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monoid-transformer_0_0_4" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { pname = "monoid-transformer"; @@ -141436,7 +141817,6 @@ self: { libraryHaskellDepends = [ base semigroups ]; description = "Monoid counterparts to some ubiquitous monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoidal-containers" = callPackage @@ -141718,38 +142098,6 @@ self: { }) {}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, code-page, containers - , criterion, deepseq, Earley, http-client, http-client-tls - , microlens, microlens-mtl, mtl, optparse-applicative, pipes - , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit - , tasty-quickcheck, text, text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.6.14"; - sha256 = "1wrm982gxm8hg2x8srm5ibp2s8752apsz2ljlldway2n49cf2bsm"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - base code-page optparse-applicative text text-format - ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - benchmarkHaskellDepends = [ base criterion system-filepath text ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_6_15" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, http-client, http-client-tls , microlens, microlens-mtl, mtl, optparse-applicative, pipes @@ -141779,7 +142127,6 @@ self: { benchmarkHaskellDepends = [ base criterion system-filepath text ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mosaico-lib" = callPackage @@ -142403,6 +142750,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mtl_2_2_2" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "mtl"; + version = "2.2.2"; + sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://github.com/haskell/mtl"; + description = "Monad classes, using functional dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mtl-c" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -143889,6 +144249,54 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mxnet;}; + "my-package-testing" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "my-package-testing"; + version = "1.0.6"; + sha256 = "188f5k556z8pxg67l16si99n4h4c408za8n123p3y0c95ixnvr4h"; + revision = "1"; + editedCabalFile = "03x6fh9c0d9l0klv67v3kwy5qf78cmy3qxwvmyz2pmrknc4cmkvs"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs text + ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "my-test-docs" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "my-test-docs"; + version = "1.0.12"; + sha256 = "1q3fzwqyams7748cy8q7adkn93jh4dds83x0ns44n9ca4myjvrxj"; + revision = "1"; + editedCabalFile = "0mzmqcz800pacp1h4qwz6ynjqr7jsjgq3xkrzvxkx7s32gmqkzyn"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs text + ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "myTestlll" = callPackage ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring , Cabal, CCA, containers, deepseq, Euterpea, ghc-prim, HCodecs @@ -144357,7 +144765,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "nakadi-client_0_5_0_0" = callPackage + "nakadi-client_0_5_0_3" = callPackage ({ mkDerivation, aeson, aeson-casing, async, base, bytestring , classy-prelude, conduit, conduit-combinators, conduit-extra , containers, exceptions, fast-logger, hashable, http-client @@ -144370,8 +144778,8 @@ self: { }: mkDerivation { pname = "nakadi-client"; - version = "0.5.0.0"; - sha256 = "10n278iqy8kp6vdx1d5rdlsbsk74m9s0fyi3w1vprrs0va92a06b"; + version = "0.5.0.3"; + sha256 = "0c0jrvvlk3mxwka6b1996gylgkhqqh023wc4vxg98qaaxpy851x4"; libraryHaskellDepends = [ aeson aeson-casing base bytestring conduit conduit-combinators conduit-extra containers exceptions hashable http-client @@ -145809,23 +146217,6 @@ self: { }) {}; "netwire-input-glfw" = callPackage - ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm - }: - mkDerivation { - pname = "netwire-input-glfw"; - version = "0.0.7"; - sha256 = "1rsvhwxrr00qpff7adwiwci5fl6hbv8r8mvxhkq3az235w9pll8g"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers GLFW-b mtl netwire-input stm - ]; - homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; - description = "GLFW instance of netwire-input"; - license = stdenv.lib.licenses.mit; - }) {}; - - "netwire-input-glfw_0_0_8" = callPackage ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm }: mkDerivation { @@ -145840,7 +146231,6 @@ self: { homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input-javascript" = callPackage @@ -146415,8 +146805,8 @@ self: { pname = "network-msgpack-rpc"; version = "0.0.4"; sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r"; - revision = "1"; - editedCabalFile = "0v08258721mv2bih7h03ss0jvjx2b87kclvjn15xrksf93nbrbq2"; + revision = "2"; + editedCabalFile = "0nw2pgyw077ncbmiij99xyy414635vvdmb2das7dkzppsfx47rn3"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra data-default-class data-default-instances-base data-msgpack @@ -147084,20 +147474,6 @@ self: { }) {}; "newtype-generics" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, HUnit, transformers - }: - mkDerivation { - pname = "newtype-generics"; - version = "0.5.1"; - sha256 = "1cm9v5agz6dmqd2ijwl1llgabihk49zjvx0wxrvhlmdfj6b44gr7"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base hspec HUnit ]; - testToolDepends = [ hspec-discover ]; - description = "A typeclass and set of functions for working with newtypes, with generics support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "newtype-generics_0_5_2_1" = callPackage ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit , semigroups, transformers }: @@ -147111,7 +147487,6 @@ self: { benchmarkHaskellDepends = [ base criterion semigroups ]; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "newtype-th" = callPackage @@ -148027,19 +148402,6 @@ self: { }) {}; "non-negative" = callPackage - ({ mkDerivation, base, QuickCheck, utility-ht }: - mkDerivation { - pname = "non-negative"; - version = "0.1.1.2"; - sha256 = "1y5ayazrbw614g61ihilm8vn468dia1cphvsxwm8s0x3iw9gljs6"; - libraryHaskellDepends = [ base QuickCheck utility-ht ]; - testHaskellDepends = [ base QuickCheck utility-ht ]; - homepage = "http://code.haskell.org/~thielema/non-negative/"; - description = "Non-negative numbers"; - license = "GPL"; - }) {}; - - "non-negative_0_1_2" = callPackage ({ mkDerivation, base, QuickCheck, semigroups, utility-ht }: mkDerivation { pname = "non-negative"; @@ -148050,7 +148412,6 @@ self: { homepage = "http://code.haskell.org/~thielema/non-negative/"; description = "Non-negative numbers"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonce" = callPackage @@ -148755,27 +149116,6 @@ self: { }) {}; "numeric-prelude" = callPackage - ({ mkDerivation, array, base, containers, deepseq, non-negative - , parsec, QuickCheck, random, storable-record, utility-ht - }: - mkDerivation { - pname = "numeric-prelude"; - version = "0.4.2"; - sha256 = "1i6qavz3av3dbf70li7yqsh184bl618l1sm9s9ia15srrkzsj9sk"; - revision = "1"; - editedCabalFile = "1qpzdfy4xijb1vfiy0sxinchwg0wkfwfpjbyfvnpf4gz2j5i5gxc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base containers deepseq non-negative parsec QuickCheck random - storable-record utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; - description = "An experimental alternative hierarchy of numeric type classes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "numeric-prelude_0_4_3" = callPackage ({ mkDerivation, array, base, containers, deepseq, non-negative , parsec, QuickCheck, random, semigroups, storable-record , utility-ht @@ -148793,7 +149133,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; description = "An experimental alternative hierarchy of numeric type classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numeric-qq" = callPackage @@ -149282,20 +149621,27 @@ self: { "oauthenticated" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, case-insensitive, crypto-random, cryptohash, either - , exceptions, http-client, http-types, mtl, network, network-uri - , text, time, transformers + , bytestring, case-insensitive, crypto-random, cryptohash + , exceptions, hspec, hspec-expectations, http-client + , http-client-tls, http-types, mtl, network, network-uri, text + , time, transformers }: mkDerivation { pname = "oauthenticated"; - version = "0.1.3.4"; - sha256 = "1l6qir6qnipq8295cljl66mhlws2rrqjvz9nsl7rq2ldqv711bbm"; + version = "0.2.0.0"; + sha256 = "01rfx9zc1d9pwqc66axkrl2bi0jnyw4l39kn0nh4q8j63laszc1h"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive crypto-random cryptohash either exceptions - http-client http-types mtl network network-uri text time - transformers + case-insensitive crypto-random cryptohash exceptions http-client + http-types mtl network network-uri text time transformers ]; + testHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + case-insensitive crypto-random cryptohash exceptions hspec + hspec-expectations http-client http-client-tls http-types mtl + network network-uri text time transformers + ]; + homepage = "https://github.com/tel/oauthenticated.git#readme"; description = "Simple OAuth for http-client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -149684,8 +150030,8 @@ self: { }: mkDerivation { pname = "ogmarkup"; - version = "4.0"; - sha256 = "06bbh2ylxw33hik1k4ykvmb74qkcn1zda1n1m20lzcp2ji37fp8k"; + version = "5.0"; + sha256 = "19lgfgsfkfk51dbjimc45yclxfh7ncmh21gnc6f7dihsyhkdfsx7"; libraryHaskellDepends = [ base megaparsec mtl ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec shakespeare text @@ -149840,6 +150186,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "om-elm" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , http-types, safe, safe-exceptions, template-haskell, text, unix + , wai + }: + mkDerivation { + pname = "om-elm"; + version = "1.0.0.1"; + sha256 = "1fvpsiv5xdc7jamhdsaw2kzm32qrbg7c2b5s5zhhhcd7j4vgn3xq"; + libraryHaskellDepends = [ + base bytestring Cabal containers directory http-types safe + safe-exceptions template-haskell text unix wai + ]; + homepage = "https://github.com/owensmurray/om-elm"; + description = "Haskell utilities for building embedded Elm programs"; + license = stdenv.lib.licenses.mit; + }) {}; + "omaketex" = callPackage ({ mkDerivation, base, optparse-applicative, shakespeare-text , shelly, text @@ -151293,17 +151657,6 @@ self: { }) {}; "optional-args" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "optional-args"; - version = "1.0.1"; - sha256 = "16gxy78r868k8hc88hayclhdkn8chyry08fbf99ipyy1xgb081ll"; - libraryHaskellDepends = [ base ]; - description = "Optional function arguments"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optional-args_1_0_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "optional-args"; @@ -151312,7 +151665,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Optional function arguments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "options" = callPackage @@ -151351,8 +151703,8 @@ self: { }: mkDerivation { pname = "optparse-applicative"; - version = "0.14.0.0"; - sha256 = "06iwp1qsq0gjhnhxwyhdhldwvhlgcik6lx5jxpbb40fispyk4nxm"; + version = "0.14.1.0"; + sha256 = "19q1q1z2mrwqp6r2vp3q46qb2j1awzn7mawpjhp6rk36bhijp07f"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -151362,6 +151714,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-applicative_0_14_2_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, process + , QuickCheck, transformers, transformers-compat + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.14.2.0"; + sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71"; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base bytestring QuickCheck ]; + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-applicative-simple" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base-prelude , optparse-applicative, rerebase, text @@ -151408,6 +151778,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-generic_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , semigroups, system-filepath, text, time, transformers, void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.3.0"; + sha256 = "13rr3hq26dpmbami8vb6d1ig9ywk6jia22sp5dkp6jkfc1c9k4l0"; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative semigroups + system-filepath text time transformers void + ]; + description = "Auto-generate a command-line parser for your datatype"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -152426,6 +152813,8 @@ self: { pname = "pagination"; version = "0.2.1"; sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48"; + revision = "1"; + editedCabalFile = "14sirfxb9qa8g57fxmpphg5hph7kp0lpgwxrmkjlj1x8xwh5x6d5"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; homepage = "https://github.com/mrkkrp/pagination"; @@ -152660,7 +153049,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_14_1_4" = callPackage + "pandoc-citeproc_0_14_1_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -152669,8 +153058,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14.1.4"; - sha256 = "1agc7qh9sfhqy329w0ccbfx081001k93qk9h6br5gx2yqizwbdd0"; + version = "0.14.1.5"; + sha256 = "1jp2pzx2avvcngg6krygsiwszq1nbns5p2bz1v1mlgm2mb6szqi9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -152775,8 +153164,8 @@ self: { }: mkDerivation { pname = "pandoc-emphasize-code"; - version = "0.2.2"; - sha256 = "05vf3fli3glq013c9w9bbjggndfwhjb1rqxqspxyfh8pi14sbj9v"; + version = "0.2.3"; + sha256 = "09jk13binvv6yqpdgkadx54npngn4vbg6z7k2q78cj4ypirbcpl0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154358,18 +154747,6 @@ self: { }) {}; "partial-handler" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "partial-handler"; - version = "1.0.2"; - sha256 = "1wd4dad207ljw4pfcx4v1qx38mbppjdjjwz17gmk2rhlyj8z5sgs"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/nikita-volkov/partial-handler"; - description = "A composable exception handler"; - license = stdenv.lib.licenses.mit; - }) {}; - - "partial-handler_1_0_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "partial-handler"; @@ -154379,7 +154756,6 @@ self: { homepage = "https://github.com/nikita-volkov/partial-handler"; description = "A composable exception handler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-isomorphisms" = callPackage @@ -154430,19 +154806,6 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, doctest, hedgehog }: - mkDerivation { - pname = "partial-semigroup"; - version = "0.3.0.2"; - sha256 = "0r2rhcq73lb18j03h5nk7j6vzv9qxjnw8zsir3zy6cynkv4w35zd"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest hedgehog ]; - homepage = "https://github.com/chris-martin/partial-semigroup"; - description = "A partial binary associative operator"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "partial-semigroup_0_3_0_3" = callPackage ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; @@ -154453,7 +154816,6 @@ self: { homepage = "https://github.com/chris-martin/partial-semigroup"; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup-hedgehog" = callPackage @@ -154762,6 +155124,8 @@ self: { pname = "path-io"; version = "1.3.3"; sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a"; + revision = "1"; + editedCabalFile = "16jfcjpqbzj6jr0sqxq2ys1z9qd2d8xr9k9vyij08ywynmwwvvzm"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -154847,26 +155211,6 @@ self: { }) {}; "pathtype" = callPackage - ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck - , random, tagged, time, transformers, utility-ht - }: - mkDerivation { - pname = "pathtype"; - version = "0.8"; - sha256 = "15vqybkblvf89v83j0ypvmgy506r804wq3mlzqghcai27k8bkqql"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq directory old-time QuickCheck tagged time transformers - utility-ht - ]; - testHaskellDepends = [ base random ]; - homepage = "http://hub.darcs.net/thielema/pathtype/"; - description = "Type-safe replacement for System.FilePath etc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pathtype_0_8_1" = callPackage ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck , random, semigroups, tagged, time, transformers, utility-ht }: @@ -154884,7 +155228,6 @@ self: { homepage = "http://hub.darcs.net/thielema/pathtype/"; description = "Type-safe replacement for System.FilePath etc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pathwalk" = callPackage @@ -155211,6 +155554,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcf-font-embed_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, pcf-font, template-haskell + , vector + }: + mkDerivation { + pname = "pcf-font-embed"; + version = "0.1.2.0"; + sha256 = "0lgx62ig2rvxcv9sgk53pfr8gkfimb1xm6lxpc2rr74mdzp52pf5"; + libraryHaskellDepends = [ + base bytestring pcf-font template-haskell vector + ]; + homepage = "https://github.com/michael-swan/pcf-font-embed"; + description = "Template Haskell for embedding text rendered using PCF fonts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pcg-random" = callPackage ({ mkDerivation, base, bytestring, doctest, entropy, primitive , random @@ -155730,6 +156090,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pem_0_2_3" = callPackage + ({ mkDerivation, base, bytestring, HUnit, memory, mtl, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "pem"; + version = "0.2.3"; + sha256 = "1c8383b5zcwmv88qhfnqcrwpi5md89iqsrfblcdxl8czyvc5x973"; + libraryHaskellDepends = [ base bytestring memory mtl ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://github.com/vincenthz/hs-pem"; + description = "Privacy Enhanced Mail (PEM) format reader and writer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pencil" = callPackage ({ mkDerivation, base, data-default, directory, doctest , edit-distance, feed, filepath, hashable, hsass, mtl, pandoc @@ -156150,6 +156529,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-record_0_6_0_1" = callPackage + ({ mkDerivation, array, base, containers, dlist, names-th + , product-isomorphic, quickcheck-simple, template-haskell + , th-data-compat, transformers + }: + mkDerivation { + pname = "persistable-record"; + version = "0.6.0.1"; + sha256 = "1jjydxzjvkw3jzm968ngj0v531fly0h4f7621fjzgbkdcjfgkgm1"; + libraryHaskellDepends = [ + array base containers dlist names-th product-isomorphic + template-haskell th-data-compat transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, HDBC , persistable-record, relational-query-HDBC, text-postgresql @@ -156701,7 +157100,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-sqlite_2_8_1" = callPackage + "persistent-sqlite_2_8_1_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-logger, old-locale, persistent , persistent-template, resource-pool, resourcet, temporary, text @@ -156709,8 +157108,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.8.1"; - sha256 = "19iqpa99r4s14r2qmimqpv3b8qz3wm9arbkniccrj8bxlw1c8a4d"; + version = "2.8.1.2"; + sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157299,8 +157698,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.21.0"; - sha256 = "190gqa5zi99a9rrazbcg2xmzx5bl304vb95w8z4qilggngq1y7df"; + version = "0.0.22.0"; + sha256 = "0ala51fps5yd1lk47blsbfby6sysnz2v39frmc53ggqzzlsls2q7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -157933,6 +158332,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes_4_3_8" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, semigroups, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.8"; + sha256 = "1wlppz7vlkmbrrvjv6cjrp8x39lhvdqp2sgc9w6hv25y3qirz9wi"; + libraryHaskellDepends = [ + base exceptions mmorph mtl semigroups transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -159238,8 +159661,8 @@ self: { pname = "plan-b"; version = "0.2.1"; sha256 = "038w0y90k7fn13ba5vrpyxa6vjn03lxqdnd2vgki9hmb4idxiakv"; - revision = "1"; - editedCabalFile = "0ci5x3vvwgasy47rxmqk2d1z7qakhh34zwgjbc3gydii2vapd7zh"; + revision = "2"; + editedCabalFile = "03vi68kp16lcly2rv6nq5a64k00hd4a5zvdf8pbz76450fik2c1j"; libraryHaskellDepends = [ base exceptions path path-io transformers ]; @@ -160131,17 +160554,6 @@ self: { }) {}; "poll" = callPackage - ({ mkDerivation, base, enumset, utility-ht }: - mkDerivation { - pname = "poll"; - version = "0.0"; - sha256 = "0v4cyrr506zqvxqbxkncss2pl2j38skl02p1vj6cjxcvlzb2y43p"; - libraryHaskellDepends = [ base enumset utility-ht ]; - description = "Bindings to poll.h"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "poll_0_0_0_1" = callPackage ({ mkDerivation, base, enumset, utility-ht }: mkDerivation { pname = "poll"; @@ -160150,7 +160562,6 @@ self: { libraryHaskellDepends = [ base enumset utility-ht ]; description = "Bindings to poll.h"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "poly-arity" = callPackage @@ -161706,8 +162117,8 @@ self: { }: mkDerivation { pname = "potoki"; - version = "0.7.2"; - sha256 = "10yl08hcfgn0l15hr6n5ga91cla050lys7jyj4w0j3s3c9k2w3gd"; + version = "0.9"; + sha256 = "1sxzxg1dpm3280x5vp47pc6faik9dpfn7qp4pwvbkvwq90l32pv8"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring directory foldl hashable potoki-core profunctors text unagi-chan unordered-containers vector @@ -161716,7 +162127,7 @@ self: { attoparsec QuickCheck quickcheck-instances random rerebase tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/nikita-volkov/potoki"; + homepage = "https://github.com/metrix-ai/potoki"; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -161728,32 +162139,32 @@ self: { }: mkDerivation { pname = "potoki-cereal"; - version = "0.1.3"; - sha256 = "1r7plcki29gr9jx61qjx752zc9zh9yy47kznrs36q7jgjhnj6mqx"; + version = "0.1.4"; + sha256 = "0502ipxxdlmk4akc2fpsij3y91fi6q3rhrlzm3bf4kl5jfddvz7s"; libraryHaskellDepends = [ base base-prelude bytestring cereal potoki potoki-core text ]; - homepage = "https://github.com/nikita-volkov/potoki-cereal"; + homepage = "https://github.com/metrix-ai/potoki-cereal"; description = "Streaming serialization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "potoki-core" = callPackage - ({ mkDerivation, base, deque, profunctors, QuickCheck + ({ mkDerivation, base, profunctors, QuickCheck , quickcheck-instances, rerebase, stm, tasty, tasty-hunit , tasty-quickcheck }: mkDerivation { pname = "potoki-core"; - version = "1.3"; - sha256 = "0z6ld13kmkvamn8y39zqw0z4mkg5wi9mmh7kdav31wy46im03b9l"; - libraryHaskellDepends = [ base deque profunctors stm ]; + version = "1.5.1"; + sha256 = "1c357c5a34k9nd3wjyg246kcc4lfwrrfl01pki2ksdidw9xwclij"; + libraryHaskellDepends = [ base profunctors stm ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/nikita-volkov/potoki-core"; + homepage = "https://github.com/metrix-ai/potoki-core"; description = "Low-level components of \"potoki\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -162022,14 +162433,14 @@ self: { }) {}; "pragmatic-show" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck - , vector-space + ({ mkDerivation, base, containers, tasty, tasty-hunit + , tasty-quickcheck, vector-space }: mkDerivation { pname = "pragmatic-show"; - version = "0.1.1.0"; - sha256 = "0zkvdgghzyarvkx0ggcbpmmcbrkkk9dhbiq6xz4ljvdc9872hya6"; - libraryHaskellDepends = [ base ]; + version = "0.1.2.0"; + sha256 = "1nkwimmnk10p0pnv2hr3mxgfs1r2rjfhiaccmhd68a6279whp6p7"; + libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector-space ]; @@ -162815,10 +163226,8 @@ self: { }: mkDerivation { pname = "prettyprinter-ansi-terminal"; - version = "1.1.1.1"; - sha256 = "1d3sr74c0bd1nzp0cy4ip6mk85cp1v8svh6yhggsd89r0wzkb6nl"; - revision = "1"; - editedCabalFile = "1giafm5d5yjdkm7fxf208a4scsa2z1sh73zwvfrycgrhqp746brf"; + version = "1.1.1.2"; + sha256 = "0ha6vz707qzb5ky7kdsnw2zgphg2dnxrpbrxy8gaw119vwhb9q6k"; libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/quchen/prettyprinter"; @@ -163165,6 +163574,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prints" = callPackage + ({ mkDerivation, base, hscolour, pretty-show, pretty-simple, text + , transformers + }: + mkDerivation { + pname = "prints"; + version = "0.1.0.1"; + sha256 = "09l6kvcpfjafjihcnljnhr0gi5wclbaskqh9hslig5bzldjyd331"; + libraryHaskellDepends = [ + base hscolour pretty-show pretty-simple text transformers + ]; + homepage = "https://github.com/evturn/prints"; + description = "The Artist Formerly Known as Prints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "printxosd" = callPackage ({ mkDerivation, base, xosd }: mkDerivation { @@ -163828,6 +164253,8 @@ self: { pname = "progress-reporting"; version = "1.1.0"; sha256 = "02j1i28hcd54w1j9p0d8xzc1bns7swd8js5f6d6ppikc82hlb9bj"; + revision = "1"; + editedCabalFile = "1a20ziwki29chw069jqrjm2rb64j4sfxbi7xyqxqd6vh9gpwdmm1"; libraryHaskellDepends = [ base deepseq mtl time ]; description = "Functionality for reporting function progress"; license = stdenv.lib.licenses.lgpl3; @@ -164258,8 +164685,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.3.2"; - sha256 = "1jv4yzls8l4blnvmrrbwljx999g92gklpj52pn1r48sh40sqa7l1"; + version = "5.3.3"; + sha256 = "16gj3mc76ld19s58mldx3zsxn9z0xya543906x5hvr1qv6w1sw61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164576,23 +165003,6 @@ self: { }) {}; "protocol-buffers" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string - }: - mkDerivation { - pname = "protocol-buffers"; - version = "2.4.6"; - sha256 = "19709wgz0vcc01hjiyxdf71v9dsz9v910l1328dixpkpjh6iqxls"; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string - ]; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers_2_4_7" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string }: @@ -164607,25 +165017,9 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor" = callPackage - ({ mkDerivation, base, bytestring, containers, protocol-buffers }: - mkDerivation { - pname = "protocol-buffers-descriptor"; - version = "2.4.6"; - sha256 = "1jxjahr10wfsywv4g17i6a1x775zrmmahqjd8lqzggy5axisvx79"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers protocol-buffers - ]; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers-descriptor_2_4_7" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; @@ -164638,7 +165032,6 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor-fork" = callPackage @@ -166301,8 +166694,8 @@ self: { }: mkDerivation { pname = "qr-imager"; - version = "1.0.1.5"; - sha256 = "1csgghcv093g8hmkaxyj2vm0ym28yw37d7crj4rgk8fs8qhr5ib4"; + version = "1.0.1.6"; + sha256 = "0kc69xkqinvwk7hxblxkspnmj422c1pbdig9kvh3r8sj1in0lpmn"; libraryHaskellDepends = [ aeson base bytestring cryptonite directory either haskell-qrencode jose-jwt JuicyPixels microlens optparse-applicative process split @@ -166925,15 +167318,15 @@ self: { }) {}; "quickcheck-classes" = callPackage - ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck - , transformers, vector + ({ mkDerivation, aeson, base, containers, prim-array, primitive + , QuickCheck, transformers, vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.3.2"; - sha256 = "10z65dxm0jply0zbx1kpxpiir3z85c9133hkiqnra6sqz13njdz4"; + version = "0.3.3"; + sha256 = "1czppkc56ny7nvfc11wdv96gng4vln7bkx87sgwlpdkw0q73rc14"; libraryHaskellDepends = [ - aeson base prim-array primitive QuickCheck transformers + aeson base containers prim-array primitive QuickCheck transformers ]; testHaskellDepends = [ aeson base primitive QuickCheck vector ]; homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; @@ -167295,15 +167688,19 @@ self: { }) {}; "quickspec" = callPackage - ({ mkDerivation, array, base, containers, ghc-prim, QuickCheck - , random, spoon, transformers + ({ mkDerivation, base, constraints, containers, data-lens-light + , dlist, QuickCheck, random, reflection, template-haskell + , transformers, twee-lib, uglymemo }: mkDerivation { pname = "quickspec"; - version = "0.9.6"; - sha256 = "0prwzxsrvfqryl75rmma229d4y7ra61vc3d72kyqi4l44ga2ay21"; + version = "2"; + sha256 = "0hdyw114f5skc66v0n0mghcx1ax8gfgilm42h4wqkwzyj6rkiy6r"; + revision = "1"; + editedCabalFile = "1nic3b13khhnykpvynzw7xjsw7ldvc4jfxdbjfj6xxsyig7lk4qb"; libraryHaskellDepends = [ - array base containers ghc-prim QuickCheck random spoon transformers + base constraints containers data-lens-light dlist QuickCheck random + reflection template-haskell transformers twee-lib uglymemo ]; homepage = "https://github.com/nick8325/quickspec"; description = "Equational laws for free!"; @@ -168125,12 +168522,15 @@ self: { }) {}; "rando" = callPackage - ({ mkDerivation, base, tf-random }: + ({ mkDerivation, base, containers, microspec, tf-random, vector }: mkDerivation { pname = "rando"; - version = "0.0.0.1"; - sha256 = "09pra2w97jhayzwws8133xvjnrsb0iqzl3cx676pawnlknc1dkkg"; - libraryHaskellDepends = [ base tf-random ]; + version = "0.0.0.2"; + sha256 = "0c12z3nd9g30chlz3ylcajxjbwm868nnsnlj6xc803gyficw2vdp"; + libraryHaskellDepends = [ base tf-random vector ]; + testHaskellDepends = [ + base containers microspec tf-random vector + ]; description = "Easy-to-use randomness for livecoding"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -169224,6 +169624,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rc" = callPackage + ({ mkDerivation, base, dde, hmatrix, Learning, random, vector }: + mkDerivation { + pname = "rc"; + version = "0.1.0.1"; + sha256 = "0hcivi8lpf8qfsanxqhxbjyrhhkx4aa5lzwgwir0zq08fakbxadm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dde hmatrix Learning random vector + ]; + executableHaskellDepends = [ + base dde hmatrix Learning random vector + ]; + testHaskellDepends = [ base dde hmatrix Learning random vector ]; + homepage = "https://github.com/masterdezign/rc#readme"; + description = "Reservoir Computing, fast RNNs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rclient" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 , network, QuickCheck, split @@ -170463,6 +170883,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "redland" = callPackage + ({ mkDerivation, base, deepseq, raptor2, redland }: + mkDerivation { + pname = "redland"; + version = "0.2.0.1"; + sha256 = "080bp01x6vlfw116zcl75vr7pb753mn8892rkh7aqgaf8ajkhb2c"; + libraryHaskellDepends = [ base deepseq ]; + libraryPkgconfigDepends = [ raptor2 redland ]; + description = "Redland RDF library bindings"; + license = stdenv.lib.licenses.bsd3; + }) {raptor2 = null; redland = null;}; + "redo" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, pureMD5 @@ -171100,6 +171532,8 @@ self: { pname = "refresht"; version = "0.1.1.0"; sha256 = "0gv3ph1j7j9fgysldh0k6yirya6xhdlzlcwv85k18akdq13hnd87"; + revision = "2"; + editedCabalFile = "141phadslw4iy3fc60ny4qmgh6p6s53f4f81577s9ms5y4w45jhr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-default exceptions lens mtl ]; @@ -171486,6 +171920,8 @@ self: { pname = "regex-tdfa"; version = "1.2.2"; sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb"; + revision = "1"; + editedCabalFile = "0m2i94gm6a1m6sn3mj47jbnmjp5ksiqmdn6v4pdr7xsv5a15gfwn"; libraryHaskellDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -173211,6 +173647,8 @@ self: { pname = "resolv"; version = "0.1.1.1"; sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; + revision = "1"; + editedCabalFile = "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -173856,6 +174294,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "retry_0_7_6_1" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, ghc-prim + , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog + , tasty-hunit, time, transformers + }: + mkDerivation { + pname = "retry"; + version = "0.7.6.1"; + sha256 = "052kfbfvadrp2m8l0hnwi4j1jhqcw5m93wl9868863p5bd4w7j82"; + libraryHaskellDepends = [ + base data-default-class exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base data-default-class exceptions ghc-prim hedgehog HUnit mtl + random stm tasty tasty-hedgehog tasty-hunit time transformers + ]; + homepage = "http://github.com/Soostone/retry"; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -174166,39 +174626,6 @@ self: { }) {}; "riak" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary - , blaze-builder, bytestring, containers, criterion - , data-default-class, deepseq, enclosed-exceptions, exceptions - , hashable, HUnit, mersenne-random-pure64, monad-control, mtl - , network, process, protocol-buffers, pureMD5, QuickCheck, random - , resource-pool, riak-protobuf, semigroups, stm, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, time, transformers - , transformers-base, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "riak"; - version = "1.1.2.3"; - sha256 = "1s1ivg8l2k7mg3qd5hvgdbqp7mhczfkrwcmsnybh1yq276hhj15n"; - libraryHaskellDepends = [ - aeson async attoparsec base bifunctors binary blaze-builder - bytestring containers data-default-class deepseq - enclosed-exceptions exceptions hashable mersenne-random-pure64 - monad-control network protocol-buffers pureMD5 random resource-pool - riak-protobuf semigroups stm text time transformers - transformers-base unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default-class HUnit mtl - process QuickCheck riak-protobuf semigroups tasty tasty-hunit - tasty-quickcheck template-haskell text yaml - ]; - benchmarkHaskellDepends = [ base bytestring criterion semigroups ]; - homepage = "http://github.com/riak-haskell-client/riak-haskell-client"; - description = "A Haskell client for the Riak decentralized data store"; - license = "unknown"; - }) {}; - - "riak_1_1_2_4" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary , blaze-builder, bytestring, containers, criterion , data-default-class, deepseq, enclosed-exceptions, exceptions @@ -174229,7 +174656,6 @@ self: { homepage = "http://github.com/riak-haskell-client/riak-haskell-client"; description = "A Haskell client for the Riak decentralized data store"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riak-protobuf" = callPackage @@ -174399,22 +174825,22 @@ self: { "rio" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, hashable, hspec, microlens, mtl, primitive - , text, time, typed-process, unix, unliftio, unordered-containers - , vector + , process, text, time, typed-process, unix, unliftio + , unordered-containers, vector }: mkDerivation { pname = "rio"; - version = "0.0.2.0"; - sha256 = "0iyfbqrgj0kcs72ibd5wm4gr51agvmqr5jg0vhay5srg86wc248l"; + version = "0.0.3.0"; + sha256 = "1mbxd2v0n0hbrmb1xh27snxxp1r8k87g4ijqsp99hnis8vmqmz84"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl primitive text time typed-process unix - unliftio unordered-containers vector + hashable microlens mtl primitive process text time typed-process + unix unliftio unordered-containers vector ]; testHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath - hashable hspec microlens mtl primitive text time typed-process unix - unliftio unordered-containers vector + hashable hspec microlens mtl primitive process text time + typed-process unix unliftio unordered-containers vector ]; homepage = "https://github.com/commercialhaskell/rio#readme"; description = "A standard library for Haskell"; @@ -176277,6 +176703,8 @@ self: { pname = "safe-exceptions"; version = "0.1.7.0"; sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; + revision = "1"; + editedCabalFile = "12rv8mjrchpx9xaw87ph1hccr5hs6mb0g1imxjr8adw45prnvrw4"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -178101,8 +178529,8 @@ self: { pname = "scotty"; version = "0.11.0"; sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; - revision = "8"; - editedCabalFile = "1jjpaiksvdhsmvv6p267w5grkiv4xmd59xsgwhhyhp5v2503p8sn"; + revision = "9"; + editedCabalFile = "0cdvv4qsda5rkdj93400i8n3lzkxmz9xci7i38pri9axmics28qa"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class fail http-types monad-control mtl nats network @@ -178509,8 +178937,8 @@ self: { }: mkDerivation { pname = "scuttlebutt-types"; - version = "0.3.0"; - sha256 = "015pg2y2k0s88wgjjv3h1h8gl3f07lbj2v8s9i1cqk5qzrs7jhrm"; + version = "0.4.0"; + sha256 = "17srdak7xbwwagm3mv7wyqff27yi217a6pjkzl2gz3n5z3h210ri"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptonite ed25519 memory text vector @@ -178600,6 +179028,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; + "sdl2_2_3_0_1" = callPackage + ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 + , StateVar, text, transformers, vector + }: + mkDerivation { + pname = "sdl2"; + version = "2.3.0.1"; + sha256 = "1cyp3afs89xsqn3hxzk1223vpbifr1w2faczqfkii3irdgpqjl6k"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, sdl2 }: mkDerivation { @@ -179116,6 +179565,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "securemem_0_1_10" = callPackage + ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }: + mkDerivation { + pname = "securemem"; + version = "0.1.10"; + sha256 = "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j"; + libraryHaskellDepends = [ + base byteable bytestring ghc-prim memory + ]; + homepage = "https://github.com/vincenthz/hs-securemem"; + description = "abstraction to an auto scrubbing and const time eq, memory chunk"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sednaDBXML" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, containers , iteratee, mtl, sedna, text @@ -179141,6 +179605,8 @@ self: { pname = "selda"; version = "0.1.12"; sha256 = "1pbf141p3j2gj91lz4ilfc75kf2b0mzfnzxpjn220knkzianm2d9"; + revision = "1"; + editedCabalFile = "06j1yv9w46nm5hrs15na1bisv63kkscifq01c8qq66li4vm79l8z"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -179150,6 +179616,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_1_12_1" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers + }: + mkDerivation { + pname = "selda"; + version = "0.1.12.1"; + sha256 = "1iq0fnk17qn74vwl8mjv7zr1y90f3x1hwniy0dmg3h0s5clpcqa9"; + libraryHaskellDepends = [ + base bytestring exceptions hashable mtl psqueues text time + unordered-containers + ]; + homepage = "https://selda.link"; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text @@ -179158,6 +179642,8 @@ self: { pname = "selda-postgresql"; version = "0.1.7.1"; sha256 = "1izc27wdi9ldhjmmhwjw99g8pgbcayldwn65p5lsad173nc2rd22"; + revision = "1"; + editedCabalFile = "0nkhzbkvhfcp9nsq6w45ag2l7w848iw7hfllfian16vfhqc4qpld"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -179166,6 +179652,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-postgresql_0_1_7_2" = callPackage + ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq + , selda, text + }: + mkDerivation { + pname = "selda-postgresql"; + version = "0.1.7.2"; + sha256 = "06z5zrika018433p5l011wxc308zw7l9ilnkgwcykagsnmai4y7z"; + libraryHaskellDepends = [ + base bytestring exceptions postgresql-libpq selda text + ]; + homepage = "https://github.com/valderman/selda"; + description = "PostgreSQL backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-sqlite" = callPackage ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda , text @@ -179174,6 +179677,8 @@ self: { pname = "selda-sqlite"; version = "0.1.6.0"; sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; + revision = "1"; + editedCabalFile = "0yf1n9iaaafnllkb2yi38ncyd3q062g4p7ln9ypb6h8gcym8s8m1"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -179391,8 +179896,8 @@ self: { pname = "semigroupoids"; version = "5.2.2"; sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4"; - revision = "1"; - editedCabalFile = "16pf83y17jbjbqv6rqlz4icdzsv6b10vjci6pf92y7cpizzjw0sy"; + revision = "2"; + editedCabalFile = "1ps5v8c9w39jbcakg4vignza5mr4cjanxwh9y0hslwpm5mhh7326"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -179595,8 +180100,8 @@ self: { }: mkDerivation { pname = "sensei"; - version = "0.3.0"; - sha256 = "0ya5pb7plr3qgh2vh8yqffwcb6alk2k581wv3yfp0zwxpflwppvh"; + version = "0.4.0"; + sha256 = "18p3hrc0av30ri678rgzdarp5m3qpia0y1nc6rb8zzvs0cspmfvd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180051,28 +180556,29 @@ self: { "serokell-util" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , base64-bytestring, bytestring, clock, containers, deepseq - , directory, exceptions, extra, filepath, formatting, hashable + , directory, exceptions, extra, filepath, fmt, formatting, hashable , hspec, hspec-discover, lens, log-warper, monad-control, mtl - , optparse-applicative, parsec, QuickCheck, quickcheck-instances - , safecopy, scientific, semigroups, stm, template-haskell, text - , text-format, time-units, transformers, universum + , o-clock, optparse-applicative, parsec, QuickCheck + , quickcheck-instances, safecopy, scientific, semigroups, stm + , template-haskell, text, text-format, transformers, universum , unordered-containers, vector, yaml }: mkDerivation { pname = "serokell-util"; - version = "0.6.0"; - sha256 = "1821f6hak3wwjradyzy2zb3pfy153l7yc39i5z2mdxn8b4vh4k88"; + version = "0.8.0"; + sha256 = "0v8vy66pbb37w7vaal42w8z0dld93j3d0bfpp3gc8mkmv12gh49p"; libraryHaskellDepends = [ aeson ansi-terminal base base16-bytestring base64-bytestring bytestring clock containers deepseq directory exceptions extra - filepath formatting hashable lens log-warper monad-control mtl - optparse-applicative parsec QuickCheck quickcheck-instances + filepath fmt formatting hashable lens log-warper monad-control mtl + o-clock optparse-applicative parsec QuickCheck quickcheck-instances scientific semigroups stm template-haskell text text-format - time-units transformers universum unordered-containers vector yaml + transformers universum unordered-containers vector yaml ]; testHaskellDepends = [ aeson base bytestring hspec QuickCheck quickcheck-instances - safecopy scientific text text-format unordered-containers vector + safecopy scientific text text-format universum unordered-containers + vector ]; testToolDepends = [ hspec-discover ]; homepage = "https://github.com/serokell/serokell-util"; @@ -180255,10 +180761,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "servant-auth"; - version = "0.3.0.1"; - sha256 = "1nd7wfkkwwpl7iq3d6vx2nizqsxxh5v030rjpy61phhd7jxgmbyb"; + version = "0.3.1.0"; + sha256 = "0fa8r5rwrihsadzv74npb16yfvw3lzn3faajw660n5vxz36l56ia"; libraryHaskellDepends = [ base ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "Authentication combinators for servant"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180272,8 +180778,8 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.3.1.0"; - sha256 = "0kinczwmr32zasjb3f7csbiv865r4vz7yf6ga4j1yk857zx4zdys"; + version = "0.3.2.0"; + sha256 = "1504cdqcq6fzr8f483662xdxcp99fpsxbizva1gqk248ymrxi2i5"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core text @@ -180284,7 +180790,7 @@ self: { servant-server time transformers wai warp ]; testToolDepends = [ hspec-discover ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-client/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -180357,8 +180863,8 @@ self: { }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.8.0"; - sha256 = "1qw0mf3cg8iljynxd7qidxv8m6h41sygh0v6512d3gv6cgkqc5yj"; + version = "0.2.9.0"; + sha256 = "173gmbgyka6hg6hgchkaw96wv4nb7qr3qwypym520k6zi7cn8b9l"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -180368,7 +180874,7 @@ self: { servant-docs template-haskell text ]; testToolDepends = [ hspec-discover ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180420,8 +180926,8 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.3.1.0"; - sha256 = "1mx8yp7nabnh9ymm6sd5xrb0x8qkx075h5pz7i5fd63k2axi8kbb"; + version = "0.3.2.0"; + sha256 = "1ykjjd1lqivavsxdg8akj9vfh4miblslcwdyhlrgz2ci2f31wify"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180441,7 +180947,7 @@ self: { wreq ]; testToolDepends = [ hspec-discover ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180452,8 +180958,8 @@ self: { }: mkDerivation { pname = "servant-auth-swagger"; - version = "0.2.8.0"; - sha256 = "0g2dyjj401qlpmxf0gk6lvqv5qivyxjp9r3navn0r0c9xf0b513r"; + version = "0.2.9.0"; + sha256 = "10vldaywdjshb21ifw418i68i2nnvm0l89plyk7hkf7br2qnfwjc"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -180462,7 +180968,7 @@ self: { swagger2 text ]; testToolDepends = [ hspec-discover ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-swagger/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180677,21 +181183,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-checked-exceptions_1_0_0_0" = callPackage + "servant-checked-exceptions_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob , hspec-wai, http-media, http-types, profunctors, servant - , servant-client, servant-docs, servant-server, tagged, tasty - , tasty-hspec, tasty-hunit, text, wai + , servant-client, servant-client-core, servant-docs, servant-server + , tagged, tasty, tasty-hspec, tasty-hunit, text, wai }: mkDerivation { pname = "servant-checked-exceptions"; - version = "1.0.0.0"; - sha256 = "1kdjhjgk9m6giygvpd2b79qs08phjy72q2bh07f7wxkiwjbkq1k6"; + version = "1.1.0.0"; + sha256 = "1zvpha9czj4pnvdd53qcyl609x3w1hkaqxva7hk68bk65zd296jk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring deepseq http-media http-types profunctors - servant servant-client servant-docs servant-server tagged text wai + servant servant-client servant-client-core servant-docs + servant-server tagged text wai ]; testHaskellDepends = [ base bytestring doctest Glob hspec-wai http-types servant @@ -181117,8 +181624,7 @@ self: { description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {github-webhooks = null;}; + }) {}; "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring @@ -181187,30 +181693,6 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover - , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; - version = "0.9.3.1"; - sha256 = "01an3s6xnjng7vwzha658hcf3n28v99dviindqq0qv7dbrf3r1ri"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat charset lens servant servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - QuickCheck servant text - ]; - testToolDepends = [ hspec-discover ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-js_0_9_3_2" = callPackage ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover , hspec-expectations, language-ecmascript, lens, QuickCheck , servant, servant-foreign, text @@ -181232,7 +181714,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-kotlin" = callPackage @@ -182018,34 +182499,6 @@ self: { }) {}; "servant-swagger-ui" = callPackage - ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring - , directory, file-embed, filepath, http-media, lens, servant - , servant-blaze, servant-server, servant-swagger, swagger2 - , template-haskell, text, transformers, transformers-compat, wai - , wai-app-static, warp - }: - mkDerivation { - pname = "servant-swagger-ui"; - version = "0.2.4.3.4.0"; - sha256 = "1vb1bp7hjjyhb1p6x0j7z2ky05n72qm7zcmwgnsmnqalaxdnsvri"; - revision = "1"; - editedCabalFile = "1bd920kkwyfz4jvy57k026nqdjlxla09hb5z2rfc6y9d5qx05rfk"; - libraryHaskellDepends = [ - base blaze-markup bytestring directory file-embed filepath - http-media servant servant-blaze servant-server servant-swagger - swagger2 template-haskell text transformers transformers-compat - wai-app-static - ]; - testHaskellDepends = [ - aeson base base-compat lens servant servant-server servant-swagger - swagger2 text transformers transformers-compat wai warp - ]; - homepage = "https://github.com/phadej/servant-swagger-ui#readme"; - description = "Servant swagger ui"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger-ui_0_2_5_3_9_1" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring , directory, file-embed, filepath, http-media, lens, servant , servant-blaze, servant-server, servant-swagger, swagger2 @@ -182069,7 +182522,6 @@ self: { homepage = "https://github.com/phadej/servant-swagger-ui#readme"; description = "Servant swagger ui"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-websockets" = callPackage @@ -182252,8 +182704,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.4.0"; - sha256 = "12nwj81hwlqmmr4d0vgi4a5gd2zcnndn5rhkx33b0cflfrqcwyp3"; + version = "0.4.1"; + sha256 = "1r0amp80g3lz31l1hb138dyqfh29nb7f0yq20xzh4hccr600liw1"; libraryHaskellDepends = [ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base bytestring lens text time unix unordered-containers @@ -182563,23 +183015,6 @@ self: { }) {}; "set-cover" = callPackage - ({ mkDerivation, base, containers, enummapset, psqueues, utility-ht - }: - mkDerivation { - pname = "set-cover"; - version = "0.0.8"; - sha256 = "1lcmx9c2bi45v01vr44fm75z3afv221psd3rsk8knkl2dqdklv8q"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers enummapset psqueues utility-ht - ]; - homepage = "http://hub.darcs.net/thielema/set-cover/"; - description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "set-cover_0_0_9" = callPackage ({ mkDerivation, base, containers, enummapset, psqueues, semigroups , utility-ht }: @@ -182595,7 +183030,6 @@ self: { homepage = "http://hub.darcs.net/thielema/set-cover/"; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "set-extra" = callPackage @@ -183138,8 +183572,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.16"; - sha256 = "039b8yrp7nskya30fahzcf8w2rl8jj277hddrcfx3zwbxlcfldcg"; + version = "0.16.3"; + sha256 = "11rgb0lh8q6alr13in7156dwr44rag0ldynbd5wmlg7073q2g8zc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -183163,51 +183597,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "shake_0_16_2" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, directory - , extra, filepath, hashable, js-flot, js-jquery, primitive, process - , QuickCheck, random, time, transformers, unix - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "shake"; - version = "0.16.2"; - sha256 = "07drp370pd794f0lbs2512dhkr3himndafyfngvxad6m4m6nri18"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process random time transformers unix - unordered-containers utf8-string - ]; - executableHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process random time transformers unix - unordered-containers utf8-string - ]; - testHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process QuickCheck random time - transformers unix unordered-containers utf8-string - ]; - homepage = "http://shakebuild.com"; - description = "Build system library, like Make, but more accurate dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hs2ats - , language-ats, lens, shake, shake-ext, text + , language-ats, microlens, shake, shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.5.0.1"; - sha256 = "0gyaysqi2hxa782g34njpsjm6kpxixmqqd7v5pwna5bri9pwykmq"; + version = "1.5.0.6"; + sha256 = "166i9v8d4fdbmriakndwkjgx10c4rags141ky0nw6x2ydziyn7n0"; libraryHaskellDepends = [ - base binary dependency directory hs2ats language-ats lens shake - shake-ext text + base binary dependency directory hs2ats language-ats microlens + shake shake-ext text ]; homepage = "https://github.com/vmchale/shake-ats#readme"; description = "Utilities for building ATS projects with shake"; @@ -183233,15 +183633,16 @@ self: { }) {}; "shake-ext" = callPackage - ({ mkDerivation, base, Cabal, directory, mtl, shake - , template-haskell, text + ({ mkDerivation, base, Cabal, composition-prelude, directory, mtl + , shake, template-haskell, text }: mkDerivation { pname = "shake-ext"; - version = "2.5.0.0"; - sha256 = "0bsl49x7y1mif4h3yp4k8p5n39d410nm0awxdpiwvan9pnz692df"; + version = "2.7.0.0"; + sha256 = "1jv5hcmv29ynr5asc4mpz4kh4ip5gd16b8h5qlcfac2f7m7njbwl"; libraryHaskellDepends = [ - base Cabal directory mtl shake template-haskell text + base Cabal composition-prelude directory mtl shake template-haskell + text ]; homepage = "https://hub.darcs.net/vmchale/shake-ext"; description = "Helper functions for linting with shake"; @@ -183949,8 +184350,8 @@ self: { }: mkDerivation { pname = "shimmer"; - version = "0.1.1"; - sha256 = "10n9dq9445anb2n85xasl1l8qx40p5bnm12xj47n6wbmxhd75fvh"; + version = "0.1.2"; + sha256 = "0d4jllvqkswhxmjczvj2pcfwgdsd8xpvjx60pvw7m06jwslh99dl"; libraryHaskellDepends = [ base bytestring containers filepath haskeline text vector ]; @@ -184119,6 +184520,21 @@ self: { license = "GPL"; }) {}; + "show-combinators" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "show-combinators"; + version = "0.1.0.0"; + sha256 = "11ihjlpa5hgqhcbwcyclldgddppzgdqsz8hx1hqvamchqx3mgi12"; + revision = "1"; + editedCabalFile = "09zd78jap17ralla3833gwv6bwmh93bpjgdshkyf7j06xg2c1mq8"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/Lysxia/show-combinators#readme"; + description = "Combinators to write Show instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "show-please" = callPackage ({ mkDerivation, base, mtl, parsec, template-haskell, th-orphans , time @@ -184141,10 +184557,8 @@ self: { }: mkDerivation { pname = "show-prettyprint"; - version = "0.2"; - sha256 = "14yjffqjkadmb0aw3zf2n1v525vn293rinhmbwby71ch76nij42w"; - revision = "1"; - editedCabalFile = "1hkfq59kpx3p4rgka49l3hvim80xlqf5h3q8f1xb4arysrq3pvi4"; + version = "0.2.0.1"; + sha256 = "0nkp1qjm017j3pmih9qnymi361wq1f45vr2pqi6y3wbspi0gq029"; libraryHaskellDepends = [ ansi-wl-pprint base prettyprinter trifecta ]; @@ -184154,6 +184568,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "show-prettyprint_0_2_0_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter + , trifecta + }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.2.0.2"; + sha256 = "1snkahqn081rnm6qs54hwgc3y2pwgadrvh8a81lw7rl1mfp261kg"; + libraryHaskellDepends = [ + ansi-wl-pprint base prettyprinter trifecta + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/quchen/show-prettyprint#readme"; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -185234,21 +185666,18 @@ self: { }) {}; "simple-vec3" = callPackage - ({ mkDerivation, base, criterion, QuickCheck, tasty - , tasty-quickcheck, tasty-th, vector, vector-th-unbox + ({ mkDerivation, base, criterion, doctest, doctest-discover + , QuickCheck, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "simple-vec3"; - version = "0.3.1"; - sha256 = "0csmwaqb3slvh0bqlh2pcjvl5rswaq92lx5d8glzznn0chxnpns4"; - libraryHaskellDepends = [ base QuickCheck vector vector-th-unbox ]; + version = "0.4"; + sha256 = "13qlnpjl5n6rpvhgn0pdnljx0g7nvjk2xr4mds3nvd93d9ciqcxl"; + libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ - base QuickCheck tasty tasty-quickcheck tasty-th vector - vector-th-unbox - ]; - benchmarkHaskellDepends = [ - base criterion QuickCheck vector vector-th-unbox + base doctest doctest-discover tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion vector ]; homepage = "https://github.com/dzhus/simple-vec3#readme"; description = "Three-dimensional vectors of doubles with basic operations"; license = stdenv.lib.licenses.bsd3; @@ -185528,20 +185957,6 @@ self: { }) {inherit (pkgs.xorg) libXft;}; "singleton-bool" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "singleton-bool"; - version = "0.1.2.0"; - sha256 = "17a49mka1h7cd5jmgd3wm0dr45pwmc5i76xjaq7jcqsk193d1frk"; - revision = "1"; - editedCabalFile = "13x8chqhrlmrsca0018p7z5by3przlr9921yhjc072c8433br586"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/phadej/singleton-bool#readme"; - description = "Type level booleans"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "singleton-bool_0_1_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "singleton-bool"; @@ -185551,7 +185966,6 @@ self: { homepage = "https://github.com/phadej/singleton-bool#readme"; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singleton-dict" = callPackage @@ -186277,21 +186691,27 @@ self: { }) {}; "slate" = callPackage - ({ mkDerivation, base, directory, filepath, optparse-applicative }: + ({ mkDerivation, base, directory, filepath, htoml + , optparse-applicative, process, string-conversions + , unordered-containers + }: mkDerivation { pname = "slate"; - version = "0.4.0.0"; - sha256 = "0j2n2wix01ildnpy6k289j5dlf9i7zbi1yd4k5hdvamwlvibqzjl"; + version = "0.8.0.0"; + sha256 = "096v0aai5c7adpa5y15yscs6w8c7c0vz667a0ibr33m0rmnyiqlm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory filepath optparse-applicative + base directory filepath htoml optparse-applicative process + string-conversions unordered-containers ]; executableHaskellDepends = [ - base directory filepath optparse-applicative + base directory filepath htoml optparse-applicative process + string-conversions unordered-containers ]; testHaskellDepends = [ - base directory filepath optparse-applicative + base directory filepath htoml optparse-applicative process + string-conversions unordered-containers ]; homepage = "https://github.com/evuez/slate#readme"; description = "A note taking CLI tool"; @@ -186466,6 +186886,8 @@ self: { pname = "slug"; version = "0.1.7"; sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp"; + revision = "1"; + editedCabalFile = "0xy0zcrnfpdbkhks15p1g2zxl7zmfb0b5511mfcsvzxl9q8salf6"; libraryHaskellDepends = [ aeson base exceptions http-api-data path-pieces persistent QuickCheck text @@ -186690,6 +187112,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "smcdel" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, base, containers + , criterion, cudd, directory, file-embed, filepath, graphviz, happy + , HasCacBDD, hspec, js-jquery, lens, process, QuickCheck, scotty + , tagged, template-haskell, temporary, text, time + }: + mkDerivation { + pname = "smcdel"; + version = "1.0.0"; + sha256 = "1yi2qw76i9cch1flnqd7gsradkm2gr31i8595rwf11xgvj3r3s3f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers cudd graphviz HasCacBDD lens process + QuickCheck tagged temporary text time + ]; + executableHaskellDepends = [ + ansi-terminal base directory file-embed filepath HasCacBDD + js-jquery process scotty template-haskell text + ]; + executableToolDepends = [ alex happy ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ base containers criterion time ]; + homepage = "https://github.com/jrclogic/SMCDEL"; + description = "Symbolic Model Checking for Dynamic Epistemic Logic"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "sme" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -189156,24 +189606,6 @@ self: { }) {}; "sox" = callPackage - ({ mkDerivation, base, containers, explicit-exception - , extensible-exceptions, process, sample-frame, transformers, unix - , utility-ht - }: - mkDerivation { - pname = "sox"; - version = "0.2.2.7"; - sha256 = "1z6jqrn7n66583pf5gafblh50j82s72w1mx31rj0ii8x70lggkbx"; - libraryHaskellDepends = [ - base containers explicit-exception extensible-exceptions process - sample-frame transformers unix utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Sox"; - description = "Play, write, read, convert audio signals using Sox"; - license = "GPL"; - }) {}; - - "sox_0_2_3" = callPackage ({ mkDerivation, base, containers, explicit-exception , extensible-exceptions, process, sample-frame, semigroups , transformers, unix, utility-ht @@ -189189,7 +189621,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Sox"; description = "Play, write, read, convert audio signals using Sox"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soxlib" = callPackage @@ -189348,23 +189779,23 @@ self: { "sparkle" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, choice , constraints, distributed-closure, filepath, inline-java, jni, jvm - , jvm-streaming, process, regex-tdfa, singletons, streaming, text - , vector, zip-archive + , jvm-streaming, process, regex-tdfa, singletons, streaming + , temporary, text, unix, vector, zip-archive }: mkDerivation { pname = "sparkle"; - version = "0.7.3"; - sha256 = "1wxp0wdmcvkypnayv128f2bgcdh7ka1b6ap7w5743v1gpxzkqb8b"; + version = "0.7.4"; + sha256 = "174rs21fgj43rq3nshzgff6mydi93n26nkcq9cadq0bzcasc2n3q"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal inline-java ]; + setupHaskellDepends = [ base Cabal inline-java jvm-streaming ]; libraryHaskellDepends = [ base binary bytestring choice constraints distributed-closure inline-java jni jvm jvm-streaming singletons streaming text vector ]; executableHaskellDepends = [ - base bytestring filepath process regex-tdfa text zip-archive + base bytestring filepath process regex-tdfa temporary text unix + zip-archive ]; homepage = "http://github.com/tweag/sparkle#readme"; description = "Distributed Apache Spark applications in Haskell"; @@ -189438,29 +189869,6 @@ self: { }) {}; "sparse-linear-algebra" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec - , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck - , scientific, transformers, vector, vector-algorithms - }: - mkDerivation { - pname = "sparse-linear-algebra"; - version = "0.2.9.8"; - sha256 = "19rhcnrlx6nf4yidb119wd3mm4xb5ls99wqk7vdif0cxlpnsycch"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers exceptions hspec mtl primitive QuickCheck - transformers vector vector-algorithms - ]; - testHaskellDepends = [ - base containers exceptions hspec matrix-market-attoparsec mtl - mwc-random primitive QuickCheck scientific - ]; - homepage = "https://github.com/ocramz/sparse-linear-algebra"; - description = "Numerical computation in native Haskell"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "sparse-linear-algebra_0_2_9_9" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck , scientific, transformers, vector, vector-algorithms @@ -189481,7 +189889,6 @@ self: { homepage = "https://github.com/ocramz/sparse-linear-algebra"; description = "Numerical computing in native Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sparsebit" = callPackage @@ -191846,6 +192253,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "starter" = callPackage + ({ mkDerivation, base, fsnotify }: + mkDerivation { + pname = "starter"; + version = "0.1.0"; + sha256 = "1h3c9znrzyymd1bcgwhid6rchf9ai7nxr1ib0y70qzzrmifyh1mn"; + libraryHaskellDepends = [ base fsnotify ]; + homepage = "https://github.com/rkaippully/starter#readme"; + description = "Develop applications without restarts"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "stash" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , hashable, text, vector @@ -193054,20 +193473,6 @@ self: { }) {}; "storable-record" = callPackage - ({ mkDerivation, base, transformers, utility-ht }: - mkDerivation { - pname = "storable-record"; - version = "0.0.3.1"; - sha256 = "1fmdzngikc8bi8bfk04bdd046j3i3v99g5bm2dfn5dz097pcxrbl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base transformers utility-ht ]; - homepage = "http://code.haskell.org/~thielema/storable-record/"; - description = "Elegant definition of Storable instances for records"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "storable-record_0_0_4" = callPackage ({ mkDerivation, base, semigroups, transformers, utility-ht }: mkDerivation { pname = "storable-record"; @@ -193081,7 +193486,6 @@ self: { homepage = "http://code.haskell.org/~thielema/storable-record/"; description = "Elegant definition of Storable instances for records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "storable-static-array" = callPackage @@ -193111,30 +193515,6 @@ self: { }) {}; "storablevector" = callPackage - ({ mkDerivation, base, bytestring, deepseq, non-negative - , QuickCheck, random, sample-frame, syb, transformers, unsafe - , utility-ht - }: - mkDerivation { - pname = "storablevector"; - version = "0.2.12.1"; - sha256 = "0y855kfwksrxspd18ppj7x1zyhbi3ackf4p01wsjal84b8ml1qd2"; - libraryHaskellDepends = [ - base deepseq non-negative QuickCheck syb transformers unsafe - utility-ht - ]; - testHaskellDepends = [ - base bytestring QuickCheck random utility-ht - ]; - benchmarkHaskellDepends = [ - base deepseq sample-frame unsafe utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; - description = "Fast, packed, strict storable arrays with a list interface like ByteString"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "storablevector_0_2_13" = callPackage ({ mkDerivation, base, bytestring, deepseq, non-negative , QuickCheck, random, sample-frame, semigroups, syb, transformers , unsafe, utility-ht @@ -193156,7 +193536,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; description = "Fast, packed, strict storable arrays with a list interface like ByteString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "storablevector-carray" = callPackage @@ -193298,15 +193677,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_15_2" = callPackage + "stratosphere_0_17_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.15.2"; - sha256 = "00mna9w4021a1ydxyysx0wd333hby4sx3fpl1vygmcyjfibwiqmc"; + version = "0.17.0"; + sha256 = "1824fgv3jm25wa3sk53v7j76jpq8kqh9fm3jfpp8hlzwnb57zni9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193705,6 +194084,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "streaming-pcap" = callPackage + ({ mkDerivation, base, bytestring, pcap, streaming, tasty + , tasty-hunit + }: + mkDerivation { + pname = "streaming-pcap"; + version = "1.0.0"; + sha256 = "0xf7a9jpyhypfkjby2mqjv6fc4dhsl420q482nppdw7k65nsi85x"; + libraryHaskellDepends = [ base bytestring pcap streaming ]; + testHaskellDepends = [ + base bytestring pcap streaming tasty tasty-hunit + ]; + homepage = "https://github.com/fosskers/streaming-pcap"; + description = "Stream packets via libpcap"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-png" = callPackage ({ mkDerivation, base, bytestring, cereal, exceptions, JuicyPixels , mmorph, mtl, resourcet, streaming, streaming-bytestring @@ -194113,18 +194509,6 @@ self: { }) {}; "string-class" = callPackage - ({ mkDerivation, base, bytestring, tagged, text }: - mkDerivation { - pname = "string-class"; - version = "0.1.6.5"; - sha256 = "0yi3fagwqkgr8pf6wnl360qikyvfb649qs2y6gp0n7jjw0zc27c2"; - libraryHaskellDepends = [ base bytestring tagged text ]; - homepage = "https://github.com/bairyn/string-class"; - description = "String class library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "string-class_0_1_7_0" = callPackage ({ mkDerivation, base, bytestring, tagged, text }: mkDerivation { pname = "string-class"; @@ -194134,7 +194518,6 @@ self: { homepage = "https://github.com/string-class/string-class"; description = "String class library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-combinators" = callPackage @@ -194337,18 +194720,6 @@ self: { }) {}; "stringbuilder" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: - mkDerivation { - pname = "stringbuilder"; - version = "0.5.0"; - sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - description = "A writer monad for multi-line string literals"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stringbuilder_0_5_1" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "stringbuilder"; @@ -194358,7 +194729,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A writer monad for multi-line string literals"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stringlike" = callPackage @@ -194916,8 +195286,8 @@ self: { }: mkDerivation { pname = "stylish-cabal"; - version = "0.1.0.0"; - sha256 = "131qvb6cdfmxzxvz3mxxnapc5826ybxs62zz439cjz29n1r6p0bd"; + version = "0.2.0.0"; + sha256 = "1ldnr0bpl0iaflng2715j02wfk8ksigzms15v7118860wyw2mvyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195693,6 +196063,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "surjective" = callPackage + ({ mkDerivation, base, lens, mtl, template-haskell }: + mkDerivation { + pname = "surjective"; + version = "0.1.0.0"; + sha256 = "1nhq7lfzsbh9ra1m1n7649q35ch6l1lgm110p1qbxgvv6w6xmz41"; + libraryHaskellDepends = [ base lens mtl template-haskell ]; + homepage = "https://github.com/gelisam/surjective"; + description = "An output coverage checker"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "suspend" = callPackage ({ mkDerivation, base, lifted-base, transformers-base }: mkDerivation { @@ -197025,13 +197407,16 @@ self: { }) {}; "system-filepath" = callPackage - ({ mkDerivation, base, bytestring, chell, chell-quickcheck, deepseq - , QuickCheck, text + ({ mkDerivation, base, bytestring, Cabal, chell, chell-quickcheck + , deepseq, QuickCheck, text }: mkDerivation { pname = "system-filepath"; version = "0.4.14"; sha256 = "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn"; + revision = "1"; + editedCabalFile = "18llfvisghrn9w9yfgacqn51gs50a0lngah3bmg852h0swj7vkp8"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring chell chell-quickcheck QuickCheck text @@ -197057,8 +197442,8 @@ self: { ({ mkDerivation, attoparsec, base, process, text }: mkDerivation { pname = "system-info"; - version = "0.3.0.0"; - sha256 = "05zp1kddydl9fqbhfpkjvxqfi6l9i1qhif5sziz3d0mymnyrzvpp"; + version = "0.4.0.0"; + sha256 = "1sl1m19ia5n8rws49596lipjzx5q3jn9yjqhjlfs4vvh9rc2dnkh"; libraryHaskellDepends = [ attoparsec base process text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -197550,6 +197935,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tabs" = callPackage + ({ mkDerivation, base, filepath, monadlist, mtl, tagged }: + mkDerivation { + pname = "tabs"; + version = "0.1.0.0"; + sha256 = "1188rjlq2s2azbjxwfp40j8aidn3hz2lhmcaghj2ig6n5w2jpg98"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base filepath monadlist mtl tagged ]; + executableHaskellDepends = [ base filepath monadlist mtl tagged ]; + description = "Indents source files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tabular" = callPackage ({ mkDerivation, base, csv, html, mtl }: mkDerivation { @@ -197911,6 +198310,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagsoup_0_14_6" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , process, QuickCheck, text, time + }: + mkDerivation { + pname = "tagsoup"; + version = "0.14.6"; + sha256 = "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb"; + libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring deepseq directory process QuickCheck time + ]; + homepage = "https://github.com/ndmitchell/tagsoup#readme"; + description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagsoup-ht" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , explicit-exception, old-time, tagsoup, transformers, utility-ht @@ -198567,12 +198984,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_0_1_0" = callPackage + "tasty-dejafu_1_0_1_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.0.1.0"; - sha256 = "1japzchg9sxy08rjj9vvr3qxil1bzhn3i3qxr00pf0qpxnd5ssmc"; + version = "1.0.1.1"; + sha256 = "0khdm4v22n86vz3qgv9wi6yfd3yi61br089sxffhfwvr9g3fxjlf"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -198607,6 +199024,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-discover_4_1_5" = callPackage + ({ mkDerivation, base, containers, directory, filepath, Glob + , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-discover"; + version = "4.1.5"; + sha256 = "1v2g0jyfrcv04klxicp1z6p478ppq5l3szkx4f4hjqnim6kg8pgh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath Glob + ]; + executableHaskellDepends = [ + base containers directory filepath Glob + ]; + testHaskellDepends = [ + base containers directory filepath Glob hedgehog tasty + tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + homepage = "https://github.com/lwm/tasty-discover#readme"; + description = "Test discovery for the tasty framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { @@ -198701,25 +199146,6 @@ self: { }) {}; "tasty-hedgehog" = callPackage - ({ mkDerivation, base, hedgehog, tagged, tasty - , tasty-expected-failure - }: - mkDerivation { - pname = "tasty-hedgehog"; - version = "0.1.0.1"; - sha256 = "1sqwj5vzmc2rcr8yh2pqwmkdr11cwf20fv5z4wr5xsp9qnv3bzl1"; - revision = "1"; - editedCabalFile = "1aq46lrx467r3c6i8figzgyhwkg1n34zq9r39j6144mmmmgh2wpz"; - libraryHaskellDepends = [ base hedgehog tagged tasty ]; - testHaskellDepends = [ - base hedgehog tasty tasty-expected-failure - ]; - homepage = "https://github.com/qfpl/tasty-hedgehog"; - description = "Integrates the hedgehog testing library with the tasty testing framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-hedgehog_0_1_0_2" = callPackage ({ mkDerivation, base, hedgehog, tagged, tasty , tasty-expected-failure }: @@ -198734,7 +199160,6 @@ self: { homepage = "https://github.com/qfpl/tasty-hedghog"; description = "Integrates the hedgehog testing library with the tasty testing framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-hspec" = callPackage @@ -201869,16 +202294,16 @@ self: { }) {}; "text1" = callPackage - ({ mkDerivation, base, binary, directory, doctest, filepath, lens - , papa, QuickCheck, semigroups, template-haskell, text + ({ mkDerivation, base, binary, HUnit, lens, QuickCheck, semigroups + , text }: mkDerivation { pname = "text1"; - version = "0.0.5"; - sha256 = "16rz92gvpn1gji6bknilklw397rr118rsdqxysk9wmj10alsxqsp"; - libraryHaskellDepends = [ base binary lens papa semigroups text ]; + version = "0.0.6"; + sha256 = "105y6dbmc3bdbh02v5m6bjsm932d68i262csii1n8kls6rggnfy2"; + libraryHaskellDepends = [ base binary lens semigroups text ]; testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + base HUnit lens QuickCheck semigroups text ]; homepage = "https://github.com/qfpl/text1"; description = "Non-empty values of `Data.Text`."; @@ -202056,6 +202481,8 @@ self: { pname = "th-abstraction"; version = "0.2.6.0"; sha256 = "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5"; + revision = "1"; + editedCabalFile = "0k4s4nbg9jlgaza38842jnzs8s01ig85fzmjgd10k9hl02gc3r44"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -202990,8 +203417,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.8.2.0"; - sha256 = "1qmvrkha68f30kdv8hvdkj25sgsski7rnd6dqmvbhqrn6fpsqm8r"; + version = "0.8.2.1"; + sha256 = "0ky9nsrihiqbg1sizz7yhrif672l1gr5p4nqn9lxcchlf4d2hyl2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -203006,7 +203433,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "threepenny-gui_0_8_2_1" = callPackage + "threepenny-gui_0_8_2_2" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, deepseq, exceptions, file-embed, filepath, hashable , network-uri, safe, snap-core, snap-server, stm, template-haskell @@ -203015,8 +203442,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.8.2.1"; - sha256 = "0ky9nsrihiqbg1sizz7yhrif672l1gr5p4nqn9lxcchlf4d2hyl2"; + version = "0.8.2.2"; + sha256 = "13s6n7pxbmr0j2g5xiqpacfnshqg0jq91y161rmmp3wix4bav6am"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -203564,14 +203991,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_9" = callPackage + "time_1_9_1" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.9"; - sha256 = "13nfiwsh1bq4w9rwmqm1iy9kxwrqbi82qpqlpcd02ywklh21silx"; + version = "1.9.1"; + sha256 = "1nsvkxfm4gvmsmwd88ybpbpbny99b9k9z1f5cdkwlghvr0amg7s7"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -205812,6 +206239,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-compat_0_6_0_6" = callPackage + ({ mkDerivation, base, deriving-compat, ghc-prim, hspec, QuickCheck + , tagged, transformers + }: + mkDerivation { + pname = "transformers-compat"; + version = "0.6.0.6"; + sha256 = "0fdnc8qnm42llp3nyfmg7ij6wscrigb43x3f2w1d38dvjkycyags"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + testHaskellDepends = [ + base deriving-compat hspec QuickCheck tagged transformers + ]; + homepage = "http://github.com/ekmett/transformers-compat/"; + description = "A small compatibility shim for the transformers library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformers-compose" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -207357,8 +207802,8 @@ self: { }: mkDerivation { pname = "twee"; - version = "2.1.1"; - sha256 = "08mhq7yr66hgs6p01wx935xr59pm427qxyz8qd9f00lbgkhjbvzc"; + version = "2.1.3"; + sha256 = "08grsv9x9a289lh5w9vx401zshs6fa31756mdzmac0w9nk92229k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -207376,8 +207821,8 @@ self: { }: mkDerivation { pname = "twee-lib"; - version = "2.1.1"; - sha256 = "00c9qwx27qsljpvvywljssncw805qd2aq8vwcyqqawjcpbyrxf0d"; + version = "2.1.3"; + sha256 = "0yp6qdm189jhapx9y80yq9r97bv2v2w3n7q070i7hzczmg55rjqi"; libraryHaskellDepends = [ base containers dlist ghc-prim pretty primitive transformers vector ]; @@ -209062,28 +209507,6 @@ self: { }) {}; "tzdata" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, HUnit - , test-framework, test-framework-hunit, test-framework-th, unix - , vector - }: - mkDerivation { - pname = "tzdata"; - version = "0.1.20170320.0"; - sha256 = "11ffj8ipcvvsm811w1jm23ry7vrmvj2q487640ic4ghq39dx91is"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers deepseq vector - ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit - test-framework-th unix - ]; - homepage = "https://github.com/nilcons/haskell-tzdata"; - description = "Time zone database (as files and as a module)"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "tzdata_0_1_20180122_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, HUnit , test-framework, test-framework-hunit, test-framework-th, unix , vector @@ -209103,7 +209526,6 @@ self: { homepage = "https://github.com/nilcons/haskell-tzdata"; description = "Time zone database (as files and as a module)"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "u2f" = callPackage @@ -209882,21 +210304,6 @@ self: { }) {}; "unicode" = callPackage - ({ mkDerivation, base, containers, utility-ht }: - mkDerivation { - pname = "unicode"; - version = "0.0"; - sha256 = "0fy89j864dy5dzfj15aavm8bqpv2f51zf42dyjvs50qah3shh5yl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers utility-ht ]; - homepage = "http://code.haskell.org/~thielema/unicode/"; - description = "Construct and transform unicode characters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unicode_0_0_1" = callPackage ({ mkDerivation, base, containers, semigroups, utility-ht }: mkDerivation { pname = "unicode"; @@ -209909,7 +210316,6 @@ self: { homepage = "http://hub.darcs.net/thielema/unicode/"; description = "Construct and transform unicode characters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode-names" = callPackage @@ -210570,21 +210976,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_0_1" = callPackage + "universum_1_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , ghc-prim, hashable, microlens, microlens-mtl, mtl - , safe-exceptions, semigroups, stm, text, text-format, transformers - , type-operators, unordered-containers, utf8-string, vector + , doctest, ghc-prim, Glob, hashable, hedgehog, microlens + , microlens-mtl, mtl, safe-exceptions, semigroups, stm, tasty + , tasty-hedgehog, text, text-format, transformers, type-operators + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.0.1"; - sha256 = "1pa8qnr9px5qfwhpxj15wnqaf5x063ih87mx78fcks95xaqf648k"; + version = "1.1.0"; + sha256 = "0k1gk9dba9f7w852m6y46gq1md3z0w29bgv4qy7xp3pk16h3axhp"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text text-format transformers type-operators unordered-containers utf8-string vector ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; benchmarkHaskellDepends = [ base containers criterion deepseq hashable mtl semigroups text unordered-containers @@ -210739,6 +211150,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-time_0_3_8" = callPackage + ({ mkDerivation, base, binary, bytestring, doctest, hspec + , old-locale, old-time, QuickCheck, time + }: + mkDerivation { + pname = "unix-time"; + version = "0.3.8"; + sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw"; + libraryHaskellDepends = [ base binary bytestring old-time ]; + testHaskellDepends = [ + base bytestring doctest hspec old-locale old-time QuickCheck time + ]; + description = "Unix time parser/formatter and utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unjson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , free, hashable, HUnit, invariant, pretty, primitive, scientific @@ -210746,8 +211174,8 @@ self: { }: mkDerivation { pname = "unjson"; - version = "0.14.1.3"; - sha256 = "18aclqjyqj7428yyal9hj32r290ipd77lnaf176sn8fk42gk5qj3"; + version = "0.15.0.0"; + sha256 = "0ib7y7a4ham90hzy5anrhry7c1w8c847v39ygjj8556pq6j47nyg"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable invariant pretty primitive scientific text time unordered-containers vector @@ -210803,6 +211231,8 @@ self: { pname = "unliftio-core"; version = "0.1.1.0"; sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m"; + revision = "1"; + editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; @@ -211333,6 +211763,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring_0_3_1_1" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, blaze-builder + , bytestring, containers, criterion, deepseq, deepseq-generics + , fail, generics-sop, HUnit, network-uri, QuickCheck + , quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, th-lift-instances + , transformers + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.3.1.1"; + sha256 = "1ysmwf2zqv6kky2656nk6i2azpngzl0rkgy5fab7ja3xhx998y3z"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring containers fail + template-haskell th-lift-instances + ]; + testHaskellDepends = [ + attoparsec base base-compat blaze-builder bytestring containers + generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck transformers + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq deepseq-generics + network-uri + ]; + homepage = "https://github.com/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-bytestring-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { @@ -212222,6 +212683,8 @@ self: { pname = "uuid-crypto"; version = "1.4.0.0"; sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn"; + revision = "2"; + editedCabalFile = "0kw54wnzzxw6hjmj52735x9pya18ccmry2nf4nmlcv89ipb1vmly"; libraryHaskellDepends = [ base binary bytestring cryptoids cryptoids-class cryptoids-types exceptions uuid @@ -212559,15 +213022,15 @@ self: { }) {}; "validation" = callPackage - ({ mkDerivation, base, bifunctors, hedgehog, HUnit, lens, mtl - , semigroupoids, semigroups, transformers + ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens + , semigroupoids, semigroups }: mkDerivation { pname = "validation"; - version = "0.6.2"; - sha256 = "0631g3ffxchgg6hpy8w94a3713plgqp1k45zq85vaxyjg2x5bh7r"; + version = "0.6.3"; + sha256 = "07j4nxah790vbzn0jfkp9lgb4afr8zwi06a0xp5dw0xjdl0qja66"; libraryHaskellDepends = [ - base bifunctors lens mtl semigroupoids semigroups transformers + base bifunctors deepseq lens semigroupoids semigroups ]; testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; homepage = "https://github.com/qfpl/validation"; @@ -212575,6 +213038,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "validation_1" = callPackage + ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens + , semigroupoids, semigroups + }: + mkDerivation { + pname = "validation"; + version = "1"; + sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh"; + libraryHaskellDepends = [ + base bifunctors deepseq lens semigroupoids semigroups + ]; + testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; + homepage = "https://github.com/qfpl/validation"; + description = "A data-type like Either but with an accumulating Applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validations" = callPackage ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -212617,18 +213098,6 @@ self: { }) {}; "validity" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "validity"; - version = "0.4.0.3"; - sha256 = "15vp8qd3fvarwd58i69if87kyc7fmf26qgrvacwnis3xwav9nyvs"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Validity typeclass"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity_0_4_0_4" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "validity"; @@ -212638,7 +213107,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-aeson" = callPackage @@ -212707,18 +213175,6 @@ self: { }) {}; "validity-text" = callPackage - ({ mkDerivation, base, bytestring, text, validity }: - mkDerivation { - pname = "validity-text"; - version = "0.2.0.0"; - sha256 = "1h123s8hbsimd3l05s217lncimfhzvy4xmwqafl4qw9dbmcxnsah"; - libraryHaskellDepends = [ base bytestring text validity ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Validity instances for text"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-text_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { pname = "validity-text"; @@ -212728,7 +213184,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-time" = callPackage @@ -212932,21 +213387,6 @@ self: { }) {}; "vault" = callPackage - ({ mkDerivation, base, containers, hashable, unordered-containers - }: - mkDerivation { - pname = "vault"; - version = "0.3.0.7"; - sha256 = "1w36ldr5iv0yiqbvibm7b1c66hf1ps5rbassz348zmi113d8k4cy"; - libraryHaskellDepends = [ - base containers hashable unordered-containers - ]; - homepage = "https://github.com/HeinrichApfelmus/vault"; - description = "a persistent store for values of arbitrary types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vault_0_3_1_0" = callPackage ({ mkDerivation, base, containers, hashable, semigroups , unordered-containers }: @@ -212960,7 +213400,6 @@ self: { homepage = "https://github.com/HeinrichApfelmus/vault"; description = "a persistent store for values of arbitrary types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vault-tool" = callPackage @@ -214726,6 +215165,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {vulkan = null;}; + "vulkan-api" = callPackage + ({ mkDerivation, base, ghc-prim, vulkan }: + mkDerivation { + pname = "vulkan-api"; + version = "0.1.0.1"; + sha256 = "192bid9aqndn7lh3vdvk2mhqc76z5fw2z4v362n2bjhdaadwipld"; + libraryHaskellDepends = [ base ghc-prim ]; + librarySystemDepends = [ vulkan ]; + homepage = "https://github.com/achirkin/genvulkan#readme"; + description = "Low-level low-overhead vulkan api bindings"; + license = stdenv.lib.licenses.bsd3; + }) {vulkan = null;}; + "wacom-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, Glob, libnotify, process, select, text, udev @@ -215833,8 +216285,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.8.3"; - sha256 = "17ys7ddpfa0sbjh79k240zqk2v7nlh0v7hrgr7kanal3pk7mvwvm"; + version = "0.8.4"; + sha256 = "1yycbkcc7jq8mlv6jslnq2j0w8yhv4859fds34pg2k1fg7ccb1iw"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -217558,8 +218010,8 @@ self: { }: mkDerivation { pname = "webify"; - version = "0.1.8.0"; - sha256 = "031gim7g15ssjj3pzc5nk7r8dsfj35pf3kzjzaxfijklwzj0zj9q"; + version = "0.1.9.0"; + sha256 = "0gfdzxy7qsxpqqrkm3dy37d68xp8nvx0q9189msbfp3x4yalfb1z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -217869,8 +218321,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "1.0"; - sha256 = "1s6xfzv49pism1z4qpid3745w8x06nddifzb9165j2h6n7fivgav"; + version = "1.0.1"; + sha256 = "03dmyfpv5h6l1f5vag3h3v3bn6c1j3335k8rywknnliyglvb6acw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -219343,8 +219795,8 @@ self: { }: mkDerivation { pname = "wrecker-ui"; - version = "3.1.1.0"; - sha256 = "0lsgbjn4fcvk5qaldhlskyz3vq9g6w7an0sqbvndx7r1hvpaznrh"; + version = "3.3.1.0"; + sha256 = "08xlf26c45nir84ayss6zsjimabwa17yk55hzrdl1li9448wq89p"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -220879,21 +221331,6 @@ self: { }) {}; "xml-basic" = callPackage - ({ mkDerivation, base, containers, data-accessor - , explicit-exception, utility-ht - }: - mkDerivation { - pname = "xml-basic"; - version = "0.1.2"; - sha256 = "1s8415gj65zm6mbbrmkav92zkwi0q8mf892ajc2qz9hfmhxab27q"; - libraryHaskellDepends = [ - base containers data-accessor explicit-exception utility-ht - ]; - description = "Basics for XML/HTML representation and processing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xml-basic_0_1_3" = callPackage ({ mkDerivation, base, containers, data-accessor , explicit-exception, semigroups, utility-ht }: @@ -220907,7 +221344,6 @@ self: { ]; description = "Basics for XML/HTML representation and processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-catalog" = callPackage @@ -221555,8 +221991,8 @@ self: { }: mkDerivation { pname = "xmlbf"; - version = "0.2"; - sha256 = "1jzh5xz4l3va58mqz11bh5ysavlr17jh7qd74qcqbmz2bsfav136"; + version = "0.3"; + sha256 = "0zvv7ajwj45wsm751951i37ncn2lh73d8h5vqhladi2g14pi9yjb"; libraryHaskellDepends = [ base bytestring containers text transformers unordered-containers ]; @@ -221576,8 +222012,8 @@ self: { }: mkDerivation { pname = "xmlbf-xeno"; - version = "0.1"; - sha256 = "0xg7v4jqrh2qnnh6cxqlaaq6ss0vav7182gm92bm6lw0pb9mj5lq"; + version = "0.1.1"; + sha256 = "0cnxcw1sh92ljcpla2j7pg0md8yj7j48jgjlsn0f9ha0j90lw73c"; libraryHaskellDepends = [ base bytestring html-entities text unordered-containers xeno xmlbf ]; @@ -221598,8 +222034,8 @@ self: { }: mkDerivation { pname = "xmlbf-xmlhtml"; - version = "0.1"; - sha256 = "1f8q83jy45nqxmwmw6i47dq3v350cdlrz6c8w6r7dgsczgyda6vd"; + version = "0.1.1"; + sha256 = "0x8fr4dqa1i3ylwh98r69xavrfgl2i97s9iili14wpqap0pg8aa4"; libraryHaskellDepends = [ base bytestring html-entities text unordered-containers xmlbf xmlhtml @@ -221934,8 +222370,8 @@ self: { }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.1.6"; - sha256 = "1im97p6g7c7gvcm9an7nzv9k7yipvd5yv39zfgr26q7vnr6hj4dq"; + version = "0.1.1.8"; + sha256 = "17w7hj4bgz1xkirj9dwgkbif4vpqvjnp5g2dvjna7qg5rw2hk3zj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222832,17 +223268,17 @@ self: { "yampa-sdl2" = callPackage ({ mkDerivation, base, colour, linear, sdl2, sdl2-gfx, StateVar - , text, Yampa + , stm, text, Yampa }: mkDerivation { pname = "yampa-sdl2"; - version = "0.0.1.1"; - sha256 = "0p162kaznv4mk8x3zvkb7vnjwsqn8gydblpxijqsjgzc3qbi5mwq"; + version = "0.0.3.1"; + sha256 = "07wz2473i9z5rxpi6mb1m19fdps7fxl50hbp60b8ihbf2mck1br7"; libraryHaskellDepends = [ - base colour linear sdl2 sdl2-gfx StateVar text Yampa + base colour linear sdl2 sdl2-gfx StateVar stm text Yampa ]; testHaskellDepends = [ - base colour linear sdl2 sdl2-gfx StateVar text Yampa + base colour linear sdl2 sdl2-gfx StateVar stm text Yampa ]; homepage = "https://github.com/Simre1/YampaSDL2#readme"; description = "Yampa and SDL2 made easy"; @@ -223196,8 +223632,8 @@ self: { }: mkDerivation { pname = "yesod-alerts"; - version = "0.1.1.0"; - sha256 = "15vzc9ajq3jwmqfs9x4snp7msnj4gn15wh4qxm7dl4r12ha2rass"; + version = "0.1.2.0"; + sha256 = "0vqlkcb2q3wz6hp6ay6gj41vwlmq4x7flfbgq36ygnwwxjkwhllf"; libraryHaskellDepends = [ alerts base blaze-html blaze-markup safe text yesod-core ]; @@ -223497,6 +223933,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth-hashdb_1_7" = callPackage + ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers + , hspec, http-conduit, http-types, monad-logger, network-uri + , persistent, persistent-sqlite, resourcet, text + , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core + , yesod-form, yesod-persistent, yesod-test + }: + mkDerivation { + pname = "yesod-auth-hashdb"; + version = "1.7"; + sha256 = "072g8c2phhgphj0469qg9chbninxwjkigy2pzhfl51zbm50skfb5"; + libraryHaskellDepends = [ + aeson base bytestring persistent text yesod-auth yesod-core + yesod-form yesod-persistent + ]; + testHaskellDepends = [ + aeson base basic-prelude bytestring containers hspec http-conduit + http-types monad-logger network-uri persistent-sqlite resourcet + text unordered-containers wai-extra yesod yesod-auth yesod-core + yesod-test + ]; + homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; + description = "Authentication plugin for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-hmac-keccak" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, mtl , persistent, random, shakespeare, text, yesod-auth, yesod-core @@ -224471,8 +224934,8 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.12.0"; - sha256 = "0hqpshgjx3agci4wxgzi6v3s8y0q5d4x18gkqlf204a3fynm0fmh"; + version = "0.12.2"; + sha256 = "0bakc1znfqpjmm2yw7sd1gsqkq47bpr3alz6d2fp280qdxjb7hsx"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare text xss-sanitize yesod-core yesod-form @@ -225216,7 +225679,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-test_1_6_1" = callPackage + "yesod-test_1_6_2" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, conduit, containers , cookie, hspec, hspec-core, html-conduit, http-types, HUnit @@ -225226,8 +225689,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.1"; - sha256 = "1lwckkbm5i0fj8ixa396v7h683kdvbmxdrwc62y3qbi7hlz2iars"; + version = "1.6.2"; + sha256 = "172m7nafq8w1j3cm6p110vlxzy14y6pgm8ica357b1qn0wvzd39x"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive conduit containers cookie hspec-core html-conduit @@ -225236,7 +225699,7 @@ self: { ]; testHaskellDepends = [ base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai xml-conduit yesod-core yesod-form + unliftio wai wai-extra xml-conduit yesod-core yesod-form ]; homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; @@ -226115,8 +226578,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.6"; - sha256 = "059mbh2x4i521kg99b2mmgvc2rwbid641ilzc14ri7ym7ljkw1mv"; + version = "0.6.0.1"; + sha256 = "03x6f5zvmgppr1hkg0lxrapgnlk9s7i974d1gzscs1nvsi426bqb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -226131,18 +226594,15 @@ self: { }) {}; "yu-auth" = callPackage - ({ mkDerivation, base, cryptonite, hspec, hspec-wai, memory - , MonadRandom, random, wai, yesod-core, yesod-test, yu-utils + ({ mkDerivation, base, cryptonite, memory, MonadRandom, random + , yu-utils }: mkDerivation { pname = "yu-auth"; - version = "0.1.0.0"; - sha256 = "139gbrwzbp9zyx8klqvp07lh1fngs6i17xbrrnkssr85q12s79f9"; + version = "0.1.1.10"; + sha256 = "165m0ppp60gh5c6wlyjbvqlsh5gbpr0xz173ivkprjalxivr4r6j"; libraryHaskellDepends = [ base cryptonite memory yu-utils ]; - testHaskellDepends = [ - base hspec hspec-wai MonadRandom random wai yesod-core yesod-test - yu-utils - ]; + testHaskellDepends = [ base MonadRandom random yu-utils ]; homepage = "https://github.com/Qinka/Yu"; description = "Auth module for Yu"; license = stdenv.lib.licenses.gpl3; @@ -226152,8 +226612,8 @@ self: { ({ mkDerivation, base, blaze-markup, hspec, yu-auth, yu-utils }: mkDerivation { pname = "yu-core"; - version = "0.1.0.0"; - sha256 = "1ly4vasf70lm8wns2s8daxd0hpnyjs1cc6vklafk6vvk6g2a01p1"; + version = "0.1.1.2"; + sha256 = "17wdvwa6hs38asvsysv2g0xzjc654479c0229hggpyq17flfzwjs"; libraryHaskellDepends = [ base yu-auth yu-utils ]; testHaskellDepends = [ base blaze-markup hspec yu-utils ]; homepage = "https://github.com/Qinka/Yu"; @@ -226166,8 +226626,8 @@ self: { ({ mkDerivation, base, cmdargs, yaml, yu-auth, yu-core, yu-utils }: mkDerivation { pname = "yu-launch"; - version = "0.1.0.6"; - sha256 = "0a4ckivwzgp46a8m68qal5mhblw4k84xnmlsi8701j6n5nmhsxzi"; + version = "0.1.1.0"; + sha256 = "0nh40iy79m6jc4z5x773sra7i6jr21w80809vbh5xvjhg9l4aym8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -226185,8 +226645,8 @@ self: { }: mkDerivation { pname = "yu-tool"; - version = "0.1.0.0"; - sha256 = "181xqiwzhwaglgj9j307apdzmai5hk1dlrfl8njzy584rsrqjlqx"; + version = "0.1.1.30"; + sha256 = "00pkw78pfwl089608y6ambw522v6qgnp7fgky98jdb9p5kbv6nyi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -226199,19 +226659,20 @@ self: { "yu-utils" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , cmdargs, conduit, fast-logger, gitrev, http-types, monad-control - , monad-logger, mongoDB, mtl, network, parsec, resource-pool - , shakespeare, signal, template-haskell, text, time, transformers - , wai, wai-extra, wai-logger, warp, xml-hamlet, yesod-core + , cmdargs, conduit, exceptions, fast-logger, gitrev, http-types + , monad-control, monad-logger, mongoDB, mtl, network, parsec + , resource-pool, shakespeare, signal, template-haskell, text, time + , transformers, wai, wai-extra, wai-logger, warp, xml-hamlet + , yesod-core }: mkDerivation { pname = "yu-utils"; - version = "0.1.0.0"; - sha256 = "0sr03639mb49s0s2wkl642x9fhvm5qjrrvpqgf08jay5ph6l51g6"; + version = "0.1.1.0"; + sha256 = "1njmfs0m1xj5vwqj8qmhblnnzqwdjxxf732bdinp4x9wv7x68vz6"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring cmdargs conduit - fast-logger gitrev http-types monad-control monad-logger mongoDB - mtl network parsec resource-pool shakespeare signal + exceptions fast-logger gitrev http-types monad-control monad-logger + mongoDB mtl network parsec resource-pool shakespeare signal template-haskell text time transformers wai wai-extra wai-logger warp xml-hamlet yesod-core ]; @@ -226790,8 +227251,8 @@ self: { pname = "zip"; version = "0.2.0"; sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr"; - revision = "1"; - editedCabalFile = "1lq4v58kq4mwqczbdly4xnhg0pwsn4a5jmsdm38l2svri3by1hbb"; + revision = "2"; + editedCabalFile = "0vwbgpk6arp1hfndsm9n0f91yhagyqa0byiwvpl77gbiirbzrlwj"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath monad-control @@ -226818,6 +227279,8 @@ self: { pname = "zip"; version = "1.0.0"; sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9"; + revision = "1"; + editedCabalFile = "0yplpja4gbfr8lkwvv5q8lx9bia2dzm178hyhlmw1s2hniqjxzkn"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest directory dlist exceptions filepath @@ -226835,39 +227298,14 @@ self: { }) {}; "zip-archive" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, unzip, zip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.3.2.2"; - sha256 = "1xyabamc3670r8qjwpyfxcbsxhsnzy6i9n5zx58maq830lwp2m9c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory filepath HUnit old-time process temporary - time unix - ]; - testToolDepends = [ unzip zip ]; - homepage = "http://github.com/jgm/zip-archive"; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) unzip; inherit (pkgs) zip;}; - - "zip-archive_0_3_2_3" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty , process, temporary, text, time, unix, unzip, zlib }: mkDerivation { pname = "zip-archive"; - version = "0.3.2.3"; - sha256 = "1b3zll9j3w57kxnng09c5xcj0d18ldj9i3f8qks4kyyrsgyviw9x"; + version = "0.3.2.4"; + sha256 = "119p7f9dbims5swf23czyg4r4p0sjmgwfh042bpxw54d9p9jwq90"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -226883,7 +227321,6 @@ self: { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) unzip;}; "zip-conduit" = callPackage diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 2c628eff5622..2a96c66dced5 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -145,18 +145,21 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callHackage = name: version: self.callPackage (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: args: - overrideCabal (self.callPackage (haskellSrc2nix { + callCabal2nix = name: src: args: let + filter = path: type: + pkgs.lib.hasSuffix "${name}.cabal" path || + baseNameOf path == "package.yaml"; + expr = haskellSrc2nix { inherit name; - src = pkgs.lib.cleanSourceWith - { src = if pkgs.lib.canCleanSource src - then src - else pkgs.safeDiscardStringContext src; - filter = path: type: - pkgs.lib.hasSuffix "${name}.cabal" path || - pkgs.lib.hasSuffix "package.yaml" path; - }; - }) args) (_: { inherit src; }); + src = if pkgs.lib.canCleanSource src + then pkgs.lib.cleanSourceWith { inherit src filter; } + else src; + }; + in overrideCabal (self.callPackage expr args) (orig: { + inherit src; + preConfigure = + "# Generated from ${expr}\n${orig.preConfigure or ""}"; + }); # : { root : Path # , source-overrides : Defaulted (Either Path VersionNumber) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 16734c184eb8..14b9a78af46e 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -3,11 +3,11 @@ sbcl }: let hashes = { - "7.4" = "04jb789nks9llwysxz1zw9pq1dh0j39b5fcmivcc4bq9v9cga2l1"; + "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; }; in stdenv.mkDerivation rec { name = "acl2-${version}"; - version = "7.4"; + version = "8.0"; src = fetchFromGitHub { owner = "acl2-devel"; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 2608388e1526..01348c753484 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="angelscript"; - version = "2.31.2"; + version = "2.32.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "1cl1yg36ad4wq0vks4xg0hv7iyvq6yzsd4y1jng5qdf8qybq02qc"; + sha256 = "0675hza06v3grxyqfy70gzm57idmbbm7qvi6bg5vf8m6mpw757dl"; }; buildInputs = [ unzip diff --git a/pkgs/development/interpreters/dhall/default.nix b/pkgs/development/interpreters/dhall/default.nix new file mode 100644 index 000000000000..8e1df36e4127 --- /dev/null +++ b/pkgs/development/interpreters/dhall/default.nix @@ -0,0 +1,18 @@ +{ haskell, haskellPackages, stdenvNoCC }: + +let + static = haskell.lib.justStaticExecutables haskellPackages.dhall; + +in static.overrideAttrs (old: { + passthru = old.passthru or {} // { + prelude = stdenvNoCC.mkDerivation { + name = "dhall-prelude"; + inherit (old) src; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + mkdir $out + cp -r Prelude/* $out/ + ''; + }; + }; +}) diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index 673a4b6e51bb..32e5bb6b3234 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.6.0"; - sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx"; + version = "1.6.2"; + sha256 = "18f5afmvra78y0x73bfnwbddlyqfndyaj1h8n1ybj32w4nvy96y7"; minimumOTPVersion = "18"; } diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index dff3c1b201fb..ea3974525a96 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "joker-${version}"; - version = "0.8.7"; + version = "0.8.9"; goPackagePath = "github.com/candid82/joker"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1cmvja8qdrrzacdfn944f22mdg8177qkxfrb10ykq59c2yp1xn01"; + sha256 = "0ph5f3vc6x1qfh3zn3va2xqx3axv1i2ywbhxayk58p55fxblj5c9"; }; preBuild = "go generate ./..."; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 2224a13ba7c0..b9cc38ee68a3 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.1.13.0"; + version = "9.1.16.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "021rmm5c18js569i4z6vj1bb193j4nska43jfiqz5hisc936c5cx"; + sha256 = "0nj8v4dcg4jj0z3fk661v6mzrgg4613xr0k9xzzsz81jkqsjnb6r"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 14a4bac47f62..f7324fc6d01a 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc }: +{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc, fetchpatch }: with lib; @@ -133,10 +133,19 @@ let sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; }; - nativeBuildInputs = [ buildPackages.stdenv.cc ]; + # https://github.com/arsv/perl-cross/issues/60 + perl-cross-gcc7-patch = fetchpatch { + url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch"; + sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810"; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; postUnpack = '' unpackFile ${perl-cross-src} + cd perl-cross-* + patch -Np1 -i ${perl-cross-gcc7-patch} + cd .. cp -R perl-cross-${crossVersion}/* perl-${version}/ ''; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 6940485788e9..13d77bbfb029 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -343,8 +343,8 @@ in { }; php70 = generic { - version = "7.0.27"; - sha256 = "0ca174kp2l3fjcp8z0mqnkbjfhijjzz7rs7bkzg1qk2cpdijbylr"; + version = "7.0.28"; + sha256 = "0zrw0saqlfv60f3nmff7288wqfhdsfiqns4ys3ii0drzc6s92m5f"; }; php71 = generic { @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.2"; - sha256 = "1vjaixm4f7rz9vz1yrlzmn9rpp01vd7b74m83qjg4wblw5caqhgq"; + version = "7.2.3"; + sha256 = "14mzsp6ysjgc7f6vl0z0j996qf8n75yh0aga121dsr571fn5lwsa"; }; } diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 75c7c64e324d..4992ea04f110 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,61 +1,52 @@ -{ stdenv, fetchurl, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: -stdenv.mkDerivation rec { - version = "52.2.1gnome1"; +let + version = "52.6.0"; +in stdenv.mkDerivation rec { name = "spidermonkey-${version}"; - # the release notes point to some guys home directory, see - # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 - # probably it would be more ideal to pull a particular tag/revision - # from the mercurial repo src = fetchurl { - url = "mirror://gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${version}.tar.gz"; - sha256 = "1bxhz724s1ch1c0kdlzlg9ylhg1mk8kbhdgfkax53fyvn51pjs9i"; + url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; + sha256 = "0hhyd4ni4jja7jd687dm0csi1jcjxahf918zbjzr8njz655djz2q"; }; buildInputs = [ readline icu zlib nspr ]; nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + patches = [ + # needed to build gnome3.gjs + (fetchpatch { + name = "mozjs52-disable-mozglue.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be; + sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0"; + }) + ]; preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out export PYTHON="${python2.interpreter}" + + cd js/src + + autoconf ''; configureFlags = [ - "--enable-threadsafe" "--with-system-nspr" "--with-system-zlib" "--with-system-icu" "--with-intl-api" "--enable-readline" - - # enabling these because they're wanted by 0ad. They may or may - # not be good defaults for other uses. - "--enable-gcgenerational" "--enable-shared-js" ]; - # This addresses some build system bug. It's quite likely to be safe - # to re-enable parallel builds if the source revision changes. enableParallelBuilding = true; - postFixup = '' - # The headers are symlinks to a directory that doesn't get put - # into $out, so they end up broken. Fix that by just resolving the - # symlinks. - for i in $(find $out -type l); do - cp --remove-destination "$(readlink "$i")" "$i"; - done - ''; - meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = https://developer.mozilla.org/en/SpiderMonkey; - # TODO: MPL/GPL/LGPL tri-license. - + license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 19abfe1cea27..13184ad50e86 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.8.1"; + version = "3.9.1"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "1y8yb20k3lvj7c93qz2srrkvfv175n4n7p3qj89w0dp085mj0qmw"; + sha256 = "150fgnjcmb06r3pa3mbsvb4iwnqlimjwdxgbs6p55zz6g8wbln7a"; }; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 42988e334b07..230a7e64dff3 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.4.3"; + version = "6.4.6"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "07dvpi3abmjvg7m0aak4x82aj8cvw5zl2cqj525wd3fl6y0pn3mq"; + sha256 = "0xvdwk2505s615fgsy6g33ncxx70vszqspx0bg6lm8hfd3hb4qyj"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index a185f19a9a16..bcf819702da9 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "alembic-${version}"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "00r6d8xk2sq5hdl5lp14nhyh1b2d68fxpzbm69fk6iq2f2gv0iqv"; + sha256 = "1p5zd9kdwnrwg604bq79ianc5bw6mx6i5d7yc4r11xrbphlc9m1g"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index dc5de2b382a1..1ccfa85591f4 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib -, gtk_doc, libarchive, gobjectIntrospection, libxslt, pngquant +, gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant , sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42 -, libuuid, json_glib, meson, gperf, ninja +, libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { name = "appstream-glib-0.7.6"; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson pkgconfig ninja gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 + meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 ]; buildInputs = [ glib gettext sqlite libsoup - gcab attr acl libuuid json_glib + gcab attr acl libuuid json-glib libarchive gobjectIntrospection gperf ]; propagatedBuildInputs = [ gtk3 ]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 0d42ff9c680d..a5ca79c0d82e 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "8.300.0"; + version = "8.400.0"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "0g6wcfrmb2hndz995wrlc80v6d39mhxf26lmycaqv5bjfq050ic5"; + sha256 = "16yxhn904ll48879vmycv84rja28im0mrcfgb03nm7bs8lpvrdjw"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 52c3a5f8c076..86f35d7f578e 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi -, intltool, dbus_glib, at_spi2_core, libSM }: +, intltool, dbus-glib, at-spi2-core, libSM }: stdenv.mkDerivation rec { versionMajor = "2.26"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi - dbus_glib at_spi2_core libSM ]; + dbus-glib at-spi2-core libSM ]; meta = with stdenv.lib; { platforms = platforms.unix; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 1743faafa687..b717101b3e13 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus_glib +{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ]; buildInputs = [ - python popt dbus_glib + python popt dbus-glib libX11 xextproto libSM libICE libXtst libXi ]; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix new file mode 100644 index 000000000000..8b787855c4de --- /dev/null +++ b/pkgs/development/libraries/avro-c/default.nix @@ -0,0 +1,30 @@ +{ stdenv, bash, cmake, fetchurl, pkgconfig, jansson, zlib }: + +let + version = "1.8.2"; +in stdenv.mkDerivation rec { + name = "avro-c-${version}"; + + src = fetchurl { + url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; + sha256 = "03pixl345kkpn1jds03rpdcwjabi41rgdzi8f7y93gcg5cmrhfa6"; + }; + + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ jansson zlib ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A C library which implements parts of the Avro Specification"; + homepage = https://avro.apache.org/; + license = licenses.asl20; + maintainers = with maintainers; [ lblasc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index f7788eb93cb3..be4cf809f0c5 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.42"; + name = "babl-0.1.44"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "1wc7fyj9bfqfiwf1w33g3vv3wcl18pd9cxr9fc0iy391szrsynb8"; + sha256 = "0zfy1jrwdp4ja2f1rqa2m46vx6nilm73f72d4d1c8d65vshgsqzl"; }; doCheck = true; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 0f899e4324c1..9ec27d3e9ebc 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -3,11 +3,11 @@ let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in stdenv.mkDerivation rec { - name = "boolstuff-0.1.15"; + name = "boolstuff-0.1.16"; src = fetchurl { url = "${baseurl}/${name}.tar.gz"; - sha256 = "1mzw4368hqw0b6xr01yqcbs9jk9ma3qq9hk3iqxmkiwqqxgirgln"; + sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 6c20f4d6c910..116216d500e2 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "catch-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch"; rev = "v${version}"; - sha256 = "0v9yw7ydvhydp78hh7cmaif4h73k5qxqpm1g7xn8i882i3s84s2s"; + sha256 = "0hkcmycvyyazzi9dywnyiipnmbx399iirh5xk5g957c8zl0505kd"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 3292c8e353fe..f30485f60cf9 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, +, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib, gobjectIntrospection, gtk3 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection libxcb + atk json-glib gobjectIntrospection libxcb ]; configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 301b245a9f54..9933d1034af8 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "4.2.1"; + version = "4.2.3"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "0hy8yxb22siimq0pf6jq6kdp9lvi5f6al1xd12c9i1jyajhp1lhk"; + sha256 = "1yjs25ra5s8zs0rhk50w3f1rrrl80hhq784lwdhh1m3risk740sa"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index b9b8d8fbd750..176b05126b2b 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp_av, gupnp_dlna, libsoup, makeWrapper }: +{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup, makeWrapper }: stdenv.mkDerivation rec { name = "dleyna-renderer"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp_av gupnp_dlna libsoup ]; + buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; preFixup = '' wrapProgram "$out/libexec/dleyna-renderer-service" \ diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 8668cff644ed..d36e665bd85d 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp_av, gupnp_dlna, libsoup }: +{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }: stdenv.mkDerivation rec { name = "dleyna-server"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp_av gupnp_dlna libsoup ]; + buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; preFixup = '' wrapProgram "$out/libexec/dleyna-server-service" \ diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index bb150da67996..53ec9949f170 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "19.8"; + version = "19.9"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0ras4dl1ws9f9680bi8wg0mnbqvrpn0l2xl5lrvq3jvnijb3cz9i"; + sha256 = "0lc54r928j9dg7f2wn25m887z24d31wrc14v2hn6aknp1z084lrc"; }; postPatch = '' diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 47c165c1bad1..c656220f7609 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "double-conversion-${version}"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b"; + sha256 = "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index fe14a1b2b77c..80c3f7b100e1 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -1,18 +1,26 @@ +# To use this package with a CMake and pkg-config build: +# pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp) +# add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { name = "easyloggingpp-${version}"; - version = "9.95.0"; + version = "9.96.0"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "0gzmznw6ffag9x55lixxffy6x7mvb7691x0md4q9rbh88zkws7kq"; + sha256 = "134arh13rksfsxa80h6xw104458ihzp1mpblz5sprx5gxkq7yqfv"; }; + nativeBuildInputs = [cmake]; buildInputs = [gtest]; - cmakeFlags = [ "-Dtest=ON" "-Dbuild_static_lib=ON"]; + cmakeFlags = [ "-Dtest=ON" ]; NIX_CFLAGS_COMPILE = "-std=c++11" + stdenv.lib.optionalString stdenv.isLinux " -pthread"; + postInstall = '' + mkdir -p $out/include + cp ../src/easylogging++.cc $out/include + ''; meta = { description = "C++ logging library"; homepage = https://muflihun.github.io/easyloggingpp/; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 651878182dc1..eb197d117202 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "0kiff19gk0w7ij0kx5ydqpsmdq499ylxxxq79lrgss218jy49aqq"; + sha256 = "0pzibd3vdqmqsqsnfir6q66p6f3cmr9hrrixzpfhf7k62vv9y1ha"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix new file mode 100644 index 000000000000..5287db756094 --- /dev/null +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: + +stdenv.mkDerivation { + name = "elementary-cmake-modules"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "cmake-modules"; + rev = "319ec5336e9f05f3f22b886cc2053ef3d4b6599e"; + sha256 = "191hhvdxyqvh9axzndaqld7vrmv7xkn0czks908zhb2zpjhv9rby"; + }; + + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake" + ''; + + propagatedBuildInputs = [ cmake pkgconfig ]; + + setupHook = ./setup-hook.sh; + + meta = with lib; { + platforms = platforms.linux ++ platforms.darwin; + homepage = https://github.com/elementary/cmake-modules; + license = licenses.gpl3Plus; + maintainers = [ maintainers.samdroid-apps ]; + }; +} diff --git a/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh b/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh new file mode 100644 index 000000000000..6408ac471577 --- /dev/null +++ b/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh @@ -0,0 +1,4 @@ +_elementaryCMakeEnvHook() { + cmakeFlagsArray+=(-DCMAKE_MODULE_PATH=@out@/lib/cmake) +} +addEnvHooks "$targetOffset" _elementaryCMakeEnvHook diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index b486a327466d..96f4af3226b4 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { - name = "exempi-2.4.2"; + name = "exempi-2.4.4"; src = fetchurl { url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; - sha256 = "1v665fc7x0yi7x6lzskvd8bd2anf7951svn2vd5384dblmgv43av"; + sha256 = "1c1xxiw9lazdaz4zvrnvcy9pif9l1wib7zy91m48i7a4bnf9mmd2"; }; configureFlags = [ diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 034738813395..ebb581bdbccd 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base -, gst-python, gupnp_igd +, gst-python, gupnp-igd , gst-plugins-good, gst-plugins-bad, gst-libav }: @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb"; }; - buildInputs = [ libnice python pygobject2 gupnp_igd libnice ]; + buildInputs = [ libnice python pygobject2 gupnp-igd libnice ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index add520558ba9..fb74c4ff4d24 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "flatbuffers-${version}"; - version = "1.4.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "0jsqk49h521d5h4c9gk39a8968g6rcd6520a8knbfc7ssc4028y0"; + sha256 = "1qq8qbv8wkiiizj8s984f17bsbjsrhbs9q1nw1yjgrw0grcxlsi9"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index dd16ebd5c886..6745bc1ecf5f 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gbenchmark-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "1gld3zdxgc0c0466qvnsi70h2ksx8qprjrx008rypdhzp6660m48"; + sha256 = "1qx2dp7y0haj6wfbbfw8hx8sxb8ww0igdfrmmaaxfl0vhckylrxh"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 38c1b6197a5f..9c4296b23864 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -5,7 +5,7 @@ let ver_maj = "2.36"; ver_min = "7"; # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which apparently requires access to shared_mime_info files during runtime. + # which apparently requires access to shared-mime-info files during runtime. in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 2bb773a17b8f..03f6054791e4 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw +, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw , libwebp, gnome3 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libraw libwebp gnome3.gexiv2 ]; - propagatedBuildInputs = [ glib json_glib babl ]; # for gegl-3.0.pc + propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ]; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 483ee39c2da1..66aa3b4a2188 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip -, dbus, dbus_glib, modemmanager, avahi, glib_networking, wrapGAppsHook +{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json-glib, libsoup, geoip +, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook }: with stdenv.lib; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { ]; buildInputs = libintlOrEmpty ++ - [ glib json_glib libsoup geoip - dbus dbus_glib avahi + [ glib json-glib libsoup geoip + dbus dbus-glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; - propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ]; preConfigure = '' substituteInPlace configure --replace "-Werror" "" diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index ff65ca97eb74..bf0af502d017 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, - libxslt, glib_networking }: +{ stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2, + libxslt, glib-networking }: stdenv.mkDerivation rec { name = "geoclue-0.12.0"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ]; + buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ]; - propagatedBuildInputs = [dbus glib dbus_glib]; + propagatedBuildInputs = [dbus glib dbus-glib]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index d93430ac1f51..cb8138dc115e 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; - postPatch = '' + postConfigure = '' find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 87f3c78a82e8..1c4abe46f510 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy -, gsettings_desktop_schemas }: +, gsettings-desktop-schemas }: let ver_maj = "2.54"; @@ -15,14 +15,19 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + configureFlags = if stdenv.isDarwin then "--without-ca-certificates" + else "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + + LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; preBuild = '' sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) ''; nativeBuildInputs = [ pkgconfig intltool ]; - propagatedBuildInputs = [ glib gnutls libproxy gsettings_desktop_schemas ]; + propagatedBuildInputs = [ glib gnutls libproxy gsettings-desktop-schemas ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; doCheck = false; # tests need to access the certificates (among other things) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f68bd1380052..5d60cf5e633a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -4,7 +4,7 @@ , utillinuxMinimal ? null # this is just for tests (not in closure of any regular package) -, coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false +, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false }: with stdenv.lib; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre ] ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount - ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; + ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; nativeBuildInputs = [ pkgconfig gettext perl python ]; @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" - export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" + export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" diff --git a/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch b/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch index 1b3590db4fdd..39312951fcf9 100644 --- a/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch +++ b/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch @@ -9,8 +9,8 @@ diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c +open_locale_archive (void) +{ + int fd = -1; -+ char *versioned_path = getenv ("LOCAL_ARCHIVE_2_27"); -+ char *path = getenv ("LOCAL_ARCHIVE"); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); + if (versioned_path) + fd = __open_nocancel (versioned_path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + if (path && fd < 0) @@ -54,8 +54,8 @@ diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/l +open_locale_archive (void) +{ + int fd = -1; -+ char *versioned_path = getenv ("LOCAL_ARCHIVE_2_27"); -+ char *path = getenv ("LOCAL_ARCHIVE"); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); + if (versioned_path) + fd = open64 (versioned_path, O_RDONLY); + if (path && fd < 0) @@ -92,8 +92,8 @@ diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/progra +open_locale_archive (const char * archivefname, int flags) +{ + int fd = -1; -+ char *versioned_path = getenv ("LOCAL_ARCHIVE_2_27"); -+ char *path = getenv ("LOCAL_ARCHIVE"); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); + if (versioned_path) + fd = open64 (versioned_path, flags); + if (path && fd < 0) diff --git a/pkgs/development/libraries/glm/0954.nix b/pkgs/development/libraries/glm/0954.nix deleted file mode 100644 index 4eb3497b0392..000000000000 --- a/pkgs/development/libraries/glm/0954.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "glm-0.9.5.4"; - - src = fetchurl { - url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "0v14xssysy3q1h2mga6rqlz722mwbis4rrx76zmvhjqh17qh4l62"; - }; - - buildInputs = [ unzip ]; - - outputs = [ "out" "doc" ]; - - installPhase = '' - mkdir -p "$out/include" - cp -r glm "$out/include" - - mkdir -p "$doc/share/doc/glm" - cp -r doc/* "$doc/share/doc/glm" - ''; - - meta = with stdenv.lib; { - description = "OpenGL Mathematics library for C++"; - longDescription = '' - OpenGL Mathematics (GLM) is a header only C++ mathematics library for - graphics software based on the OpenGL Shading Language (GLSL) - specification and released under the MIT license. - ''; - homepage = http://glm.g-truc.net/; - license = licenses.mit; - branch = "0.9.5.4"; - platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - }; -} diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 904727ceae63..803f08a7a11c 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake }: +{ stdenv, fetchurl, fetchzip, cmake }: stdenv.mkDerivation rec { version = "0.9.8.5"; @@ -15,9 +15,16 @@ stdenv.mkDerivation rec { cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ]; + # fetch newer version of platform.h which correctly supports gcc 7.3 + gcc7PlatformPatch = fetchurl { + url = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h"; + sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw"; + }; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}' + cp ${gcc7PlatformPatch} glm/simd/platform.h ''; postInstall = '' diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 6691928c021e..a46abe3b4f7c 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=\${out}" - "CC=gcc" - "AS=as" - "LD=ld" - "AR=ar" - "RANLIB=ranlib" - "OBJCOPY=objcopy" - ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm"; + "CC=${stdenv.cc.targetPrefix}gcc" + "AS=${stdenv.cc.targetPrefix}as" + "LD=${stdenv.cc.targetPrefix}ld" + "AR=${stdenv.cc.targetPrefix}ar" + "RANLIB=${stdenv.cc.targetPrefix}ranlib" + "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm" + ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64"; meta = with stdenv.lib; { description = "GNU EFI development toolchain"; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index e7e0672490d0..472ec83fb02c 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv +, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake , yacc, texinfo @@ -52,7 +52,7 @@ stdenv.mkDerivation { # systemkey-args.h. enableParallelBuilding = false; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp + buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp autogen gperftools gperf gettext automake yacc texinfo ] ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index d2947cd7c6b5..8769584a9f21 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv +, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring , unbound, dns-root-data, gettext @@ -40,7 +40,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ] + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional stdenv.isDarwin gettext ++ lib.optional (tpmSupport && stdenv.isLinux) trousers diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix new file mode 100644 index 000000000000..026f58079f6d --- /dev/null +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobjectIntrospection, python2, gtk3, cairo, glib }: + +let + version = "2.0.4"; +in stdenv.mkDerivation rec { + name = "goocanvas-${version}"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz"; + sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; + }; + + nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; + buildInputs = [ gtk3 cairo glib ]; + + configureFlags = [ + "--disable-python" + ]; + + meta = with stdenv.lib; { + description = "Canvas widget for GTK+ based on the the Cairo 2D library"; + homepage = https://wiki.gnome.org/Projects/GooCanvas; + license = licenses.lgpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index c033140d8dc3..69ade8899195 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -35,9 +35,13 @@ stdenv.mkDerivation rec { a real live maintainer, or some actual wide use. ''; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; + # TODO: Fix Cocoa build. The problem was ARC, which might be related to too + # old version of Apple SDK's. + configureFlags = optional stdenv.isDarwin "--disable-cocoa"; + patchPhase = '' sed -i 's/openjpeg-2.2/openjpeg-${openJpegVersion}/' ext/openjpeg/* ''; @@ -58,7 +62,7 @@ stdenv.mkDerivation rec { openjpeg libopus librsvg fluidsynth libvdpau libwebp xvidcore gnutls mesa - mjpegtools libgme openssl x265 libxml2 + libgme openssl x265 libxml2 ] ++ libintlOrEmpty ++ optional faacSupport faac @@ -67,7 +71,9 @@ stdenv.mkDerivation rec { ++ optional stdenv.isLinux wayland # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin - ++ optional (!stdenv.isDarwin) wildmidi; + ++ optional (!stdenv.isDarwin) wildmidi + # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin + ++ optional (!stdenv.isDarwin) mjpegtools; LDFLAGS = optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 3aa8eb886d79..cdaa88ce350f 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python , gst-plugins-base, orc , a52dec, libcdio, libdvdread -, lame, libmad, libmpeg2, x264, libintlOrEmpty +, lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc a52dec libcdio libdvdread - lame libmad libmpeg2 x264 + lame libmad libmpeg2 x264 mpg123 ] ++ libintlOrEmpty; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 47eeb3d32843..1cb5e4f968ef 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base -, python, gobjectIntrospection, json_glib +, python, gobjectIntrospection, json-glib }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python json_glib + python json-glib ]; propagatedBuildInputs = [ gstreamer gst-plugins-base ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 4c377c735717..742106ed695d 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xorg, epoxy, json_glib, libxkbcommon, gmp +, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection +, xorg, epoxy, json-glib, libxkbcommon, gmp , waylandSupport ? stdenv.isLinux, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ libxkbcommon epoxy json_glib ]; + buildInputs = [ libxkbcommon epoxy json-glib ]; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk gnome3.gsettings_desktop_schemas + [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optionals waylandSupport [ wayland wayland-protocols ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index f9ce0aa4b81e..0171a4b6833b 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gtk-mac-integration-2.0.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobjectIntrospection ]; buildInputs = [ glib ]; propagatedBuildInputs = [ gtk ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 15e7e736e0c6..22fc6cc19760 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { samba libmtp libcap polkit # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - libsoup libgnome_keyring gconf gcr + libsoup libgnome-keyring gconf gcr # ToDo: not working and probably useless until gnome3 from x-updates ]); diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 37c00f3e2aa8..f30ec1872bae 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip }: +{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: let @@ -168,6 +168,42 @@ let }; }; + mkDictFromJ3e = + { shortName, shortDescription, dictFileName }: + stdenv.mkDerivation rec { + name = "hunspell-dict-${shortName}-j3e-${version}"; + version = "20161207"; + + src = fetchurl { + url = "https://j3e.de/ispell/igerman98/dict/igerman98-${version}.tar.bz2"; + sha256 = "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p"; + }; + + buildInputs = [ ispell perl hunspell ]; + + phases = ["unpackPhase" "installPhase"]; + installPhase = '' + patchShebangs bin + make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic + # hunspell dicts + install -dm755 "$out/share/hunspell" + install -m644 hunspell/${dictFileName}.dic "$out/share/hunspell/" + install -m644 hunspell/${dictFileName}.aff "$out/share/hunspell/" + # myspell dicts symlinks + install -dm755 "$out/share/myspell/dicts" + ln -sv "$out/share/hunspell/${dictFileName}.dic" "$out/share/myspell/dicts/" + ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" + ''; + + meta = with stdenv.lib; { + homepage = https://www.j3e.de/ispell/igerman98/index_en.html; + description = shortDescription; + license = with licenses; [ gpl2 gpl3 ]; + maintainers = with maintainers; [ timor ]; + platforms = platforms.all; + }; + }; + in { /* ENGLISH */ @@ -427,4 +463,24 @@ in { }) ]; }; + + /* GERMAN */ + + de-de = mkDictFromJ3e { + shortName = "de-de"; + shortDescription = "German (Germany)"; + dictFileName = "de_DE"; + }; + + de-at = mkDictFromJ3e { + shortName = "de-at"; + shortDescription = "German (Austria)"; + dictFileName = "de_AT"; + }; + + de-ch = mkDictFromJ3e { + shortName = "de-ch"; + shortDescription = "German (Switzerland)"; + dictFileName = "de_CH"; + }; } diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix index e5b80f4b2700..f7763ba49da1 100644 --- a/pkgs/development/libraries/icu/58.nix +++ b/pkgs/development/libraries/icu/58.nix @@ -1,4 +1,4 @@ -args @ { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +fetchurl: let keywordFix = fetchurl { url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; @@ -11,4 +11,4 @@ import ./base.nix { sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; patches = [ keywordFix ]; patchFlags = "-p4"; -} args +} diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 2c8392c8bac8..87551ee6ee03 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,66 +1,95 @@ { version, sha256, patches ? [], patchFlags ? "" }: -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames + # Cross-compiled icu4c requires a build-root of a native compile +, buildRootOnly ? false, nativeBuildRoot, buildPlatform, hostPlatform +}: let pname = "icu4c"; + + baseAttrs = { + src = fetchurl { + url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; + inherit sha256; + }; + + postUnpack = '' + sourceRoot=''${sourceRoot}/source + echo Source root reset to ''${sourceRoot} + ''; + + # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 + postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") + then "substituteInPlace i18n/digitlst.cpp --replace '' ''" + else null; # won't find locale_t on darwin + + inherit patchFlags patches; + + preConfigure = '' + sed -i -e "s|/bin/sh|${stdenv.shell}|" configure + + # $(includedir) is different from $(prefix)/include due to multiple outputs + sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in + '' + stdenv.lib.optionalString stdenv.isArm '' + # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch + sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux + ''; + + configureFlags = "--disable-debug" + + stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath" + + stdenv.lib.optionalString (buildPlatform != hostPlatform) " --with-cross-build=${nativeBuildRoot}"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Unicode and globalization support library"; + homepage = http://site.icu-project.org/; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; + }; + }; + + realAttrs = baseAttrs // { + name = pname + "-" + version; + + outputs = [ "out" "dev" ]; + outputBin = "dev"; + + # FIXME: This fixes dylib references in the dylibs themselves, but + # not in the programs in $out/bin. + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + # remove dependency on bootstrap-tools in early stdenv build + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc + '' + '' + substituteInPlace "$dev/bin/icu-config" \ + --replace \''${pkglibdir}/Makefile.inc "$dev/lib/icu/Makefile.inc" + ''; + + postFixup = ''moveToOutput lib/icu "$dev" ''; + }; + + buildRootOnlyAttrs = baseAttrs // { + name = pname + "-build-root-" + version; + + preConfigure = baseAttrs.preConfigure + '' + mkdir build + cd build + configureScript=../configure + ''; + + postBuild = '' + cd .. + mv build $out + echo "Doing build-root only, exiting now" >&2 + exit 0 + ''; + }; + + attrs = if buildRootOnly + then buildRootOnlyAttrs + else realAttrs; in -stdenv.mkDerivation { - name = pname + "-" + version; - - src = fetchurl { - url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" - + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - inherit sha256; - }; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; - - # FIXME: This fixes dylib references in the dylibs themselves, but - # not in the programs in $out/bin. - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - postUnpack = '' - sourceRoot=''${sourceRoot}/source - echo Source root reset to ''${sourceRoot} - ''; - - # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 - postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") - then "substituteInPlace i18n/digitlst.cpp --replace '' ''" - else null; # won't find locale_t on darwin - - inherit patchFlags patches; - - preConfigure = '' - sed -i -e "s|/bin/sh|${stdenv.shell}|" configure - - # $(includedir) is different from $(prefix)/include due to multiple outputs - sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + stdenv.lib.optionalString stdenv.isArm '' - # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch - sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux - ''; - - configureFlags = "--disable-debug" + - stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath"; - - # remove dependency on bootstrap-tools in early stdenv build - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc - '' + '' - substituteInPlace "$dev/bin/icu-config" \ - --replace \''${pkglibdir}/Makefile.inc "$dev/lib/icu/Makefile.inc" - ''; - - postFixup = ''moveToOutput lib/icu "$dev" ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Unicode and globalization support library"; - homepage = http://site.icu-project.org/; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.all; - }; -} +stdenv.mkDerivation attrs diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index b4fea7c1fa4a..36b637c62bb2 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, json_glib +, glib, dbus-glib, json-glib , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - glib dbus_glib json_glib + glib dbus-glib json-glib gtk2 libindicator-gtk2 libdbusmenu-gtk2 libappindicator-gtk2 ]; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 03afd6f1e878..3d7c20691ab5 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, json_glib +, glib, dbus-glib, json-glib , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: with lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - glib dbus_glib json_glib + glib dbus-glib json-glib gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3 ]; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 18ea6370634d..1c62d79ed328 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { name = "jsoncpp-${version}"; - version = "1.8.0"; + version = "1.8.4"; src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "1lg22zrjnl10x1bw0wfz72xd2kfbzynyggk8vdwd89mp1g8xjl9d"; + sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm"; }; /* During darwin bootstrap, we have a cp that doesn't understand the diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 6658e4dca100..cd5f2163dd95 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, writeScript, extra-cmake-modules, - qtbase, qttools, shared_mime_info + qtbase, qttools, shared-mime-info }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttools shared_mime_info ]; + buildInputs = [ qttools shared-mime-info ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 3ac4f4dc2688..356e6537a4fd 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -2,7 +2,7 @@ mkDerivation, lib, copyPathsToStore, bison, extra-cmake-modules, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, - qtbase, shared_mime_info, + qtbase, shared-mime-info, }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { kcrash kdbusaddons ki18n kwindowsystem qtbase ]; propagatedBuildInputs = [ kconfig kcoreaddons ]; - propagatedUserEnvPkgs = [ shared_mime_info ]; # for kbuildsycoca5 + propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5 patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 5ce1b8ec13cc..5110908e0f27 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk_doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool gnome3.gnome_common gtk_doc gnome3.gtk3 + autoconf automake libtool gnome3.gnome-common gtk-doc gnome3.gtk3 python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2 ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index f4158f7edbb4..cf4b85043bb2 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk_doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool gnome3.gnome_common gtk_doc + autoconf automake libtool gnome3.gnome-common gtk-doc libX11 libXext libXrender gobjectIntrospection gtk3 ]; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 09001b6a6f08..acd0d35a5f08 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk_doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: +{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ autoconf automake glib gobjectIntrospection gtk_doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; + buildInputs = [ autoconf automake glib gobjectIntrospection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; configurePhase = '' ./configure --with-pkg-config=$PKG_CONFIG_PATH \ diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index be033c3860cf..44d527e1304b 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { - sha256 = "1pcbfgq9khlcvxjsqpdshjskwljzawryzps0ickazwm7l3m7hrln"; + sha256 = "0whlyzz0imv4lm69xkwhcd6jzh3s0rzlqjmwimbqz96p4771ivpd"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 31dfe6085ee1..7de72ed73a65 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "libHX-3.21"; + name = "libHX-3.22"; src = fetchurl { - url = "mirror://sourceforge/libhx/libHX/3.21/${name}.tar.xz"; - sha256 = "0wcr6kbhsw6v4js7q4p7fhli37c39dv1rryjf768rkwshl2z8f6v"; + url = "mirror://sourceforge/libhx/libHX/3.22/${name}.tar.xz"; + sha256 = "18w39j528lyg2026dr11f2xxxphy91cg870nx182wbd8cjlqf86c"; }; patches = []; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 71a28085541d..187e06239c10 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libabw-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; - sha256 = "0zi1zj4fpxgpglbbb5n1kg3dmhqq5rpf46lli89r5daavp19iing"; + sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"; }; # Boost 1.59 compatability fix diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 70d0e9faf845..4bb806b91d8a 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, autoconf, automake, glib -, gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: +, gtk-doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: let version = "1.23"; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib libxml2 libxslt sqlite ]; - nativeBuildInputs = [ autoconf automake gtk_doc libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake gtk-doc libtool pkgconfig ]; postPatch = '' NOCONFIGURE=1 ./autogen.sh diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 7ebd14b51f52..6c87588fd3d7 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, gtkVersion +, glib, dbus-glib, gtkVersion , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null , python2Packages, gobjectIntrospection, vala @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { else [ gtk3 libdbusmenu-gtk3 ]; buildInputs = [ - glib dbus_glib + glib dbus-glib python pygobject2 pygtk gobjectIntrospection vala ] ++ (if gtkVersion == "2" then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index 81e32ab2c931..b81eba5252f8 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, dbus-glib }: stdenv.mkDerivation rec { name = "libaudclient-3.5-rc2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus_glib ]; + buildInputs = [ glib dbus-glib ]; meta = with stdenv.lib; { description = "Legacy D-Bus client library for Audacious"; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index a427bd99dd58..54fb89df0451 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libbap-${version}"; - version = "master-2017-02-08"; + version = "master-2018-03-01"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "b3da5bd5cdb3d646015ccdeb886b5ea8fd85a108"; - sha256 = "0cwfyfpxbi9bm4kkpamyd7mgsm5b6j1rh217fqb5gi05wg45rkbb"; + rev = "bd125c379a784d4265c2ddcf1f6e34bde2e568d4"; + sha256 = "0dp90djyjc262v1b1cw5irp424a8394y86fyprdk8z741wg56m3v"; }; nativeBuildInputs = [ autoreconfHook which ]; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 018239a3e778..ac508908e8f2 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,8 +1,10 @@ -{ stdenv -, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-raw +{ stdenv, buildPackages +, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison , libiberty, zlib }: +let inherit (buildPackages.buildPackages) binutils-raw; in + stdenv.mkDerivation rec { name = "libbfd-${version}"; inherit (binutils-raw.bintools) version src; diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 28a6aee67c1e..f3c58baf5a11 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libbson-${version}"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "libbson"; rev = version; - sha256 = "1bd9z07q3faq5k4521d9inv0j836w6hrsd0vj2sapjlq8jmqgslg"; + sha256 = "1dlmcqsb43269z4pa3xmqb1gf1jsji82sk5yyibq0ndhk326iyck"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f49c449f9ea3..76977b745197 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libburn-${version}"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "0wbh49s3az3sfpai09z1zdgynq7wnwrk31v5589033274nmzldlx"; + sha256 = "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index f7596b9c702b..6817d1a888cc 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }: stdenv.mkDerivation rec { - name = "libcdio-0.93"; + name = "libcdio-2.0.0"; src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.bz2"; - sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; + sha256 = "0jr8ppdm80c533nzmrpz3iffnpc6nhvsria1di9f4jg1l19a03fd"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libcddb ncurses help2man ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - # Disabled because one test (check_paranoia.sh) fails. - #doCheck = true; + # Disabled due to several spurious test failures. + # doCheck = true; meta = with stdenv.lib; { description = "A library for OS-independent CD-ROM and CD image access"; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 514a1fa85343..9f60e724ac42 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite -, clutter_gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: +, clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: stdenv.mkDerivation rec { major = "0.12"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gobjectIntrospection ]; - propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ]; + propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ]; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index 0521ae8a0400..d3ef799ef605 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ name = "libchewing-${version}"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/chewing/libchewing/releases/download/v${version}/libchewing-${version}.tar.bz2"; - sha256 = "1j5g5j4w6yp73k03pmsq9n2r0p458hqriq0sd5kisj9xrssbynp5"; + sha256 = "0aqp2vqgxczydpn7pxi7r6xf3l1hgl710f0gbi1k8q7s2lscc24p"; }; buildInputs = [ sqlite ]; diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index 1ef550238d15..d92492eb7f8c 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "libconfuse-${version}"; - version = "3.0"; + version = "3.2.1"; src = fetchFromGitHub { - sha256 = "0021768bxqdxn84yaipncgi64889zrhc0r4ifmlfxirwq101dgr5"; + sha256 = "1pb74wpg1cxz9hpp0p8i1qq6anaq06mh4xljd8dllm653fxvbjdz"; rev = "v${version}"; repo = "libconfuse"; owner = "martinh"; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 2fccee0160b3..fb0c2e789f36 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.7.6"; + version = "2.8.4"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "13g7r0mcmrj37mihj6g1x1ckpaps659c4qwnw3ixrg7p5mb3p41f"; + sha256 = "0i5kmv8grsnh2igvlkgjr8lz3h3yrxh82yxbbdsjfpslv61l0gpi"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 57b56c372339..fc0221b93889 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.18.3"; + version = "3.19.1"; name = "libdap-${version}"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "0azjf4gjqvp1fdf1wb3s98x52zfy4viq1m3j9lggaidldfinmv8c"; + sha256 = "0gnki93z3kkzp65x7n1kancy7bd503j4qja5fhzvm1gkmi5l65aj"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index c7a6fcc58748..220cc5a2eeb4 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, intltool -, glib, dbus_glib, json_glib -, gobjectIntrospection, vala_0_38, gnome_doc_utils +, glib, dbus-glib, json-glib +, gobjectIntrospection, vala_0_38, gnome-doc-utils , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: with lib; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - glib dbus_glib json_glib - gobjectIntrospection vala_0_38 gnome_doc_utils + glib dbus-glib json-glib + gobjectIntrospection vala_0_38 gnome-doc-utils ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index 8281036e7491..6a4078f92cf3 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.2.4"; name = "libebur128-${version}"; src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; rev = "v${version}"; - sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm"; + sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index c6482842cacd..513a4dc3d384 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libffcall-${version}"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz"; - sha256 = "0v0rh3vawb8z5q40fs3kr2f9zp06n2fq4rr2ww4562nr96sd5aj1"; + sha256 = "0iwcad6w78jp84vd6xaz5fwqm84n3cb42bdf5m5cj5xzpa5zp4d0"; }; enableParallelBuilding = false; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 1339be451c29..50cf8526c362 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false -, buildPlatform, hostPlatform +, buildPlatform, hostPlatform, autoreconfHook }: stdenv.mkDerivation rec { @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580"; sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2"; }) + ++ stdenv.lib.optional hostPlatform.isRiscV (fetchpatch { + name = "riscv-support.patch"; + url = https://github.com/sorear/libffi-riscv/commit/e46492e8bb1695a19bc1053ed869e6c2bab02ff2.patch; + sha256 = "1vl1vbvdkigs617kckxvj8j4m2cwg62kxm1clav1w5rnw9afxg0y"; + }) ++ stdenv.lib.optionals stdenv.isMips [ (fetchpatch { name = "0001-mips-Use-compiler-internal-define-for-linux.patch"; @@ -37,6 +42,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional doCheck dejagnu; + nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook; + configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 84e3517835e3..3b27ffc6d386 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.11.2"; + version = "0.12.1"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "0wl42yxrha633dbh1vcbhrpsd7sv4zwskbmlpx549ygnzi39krcn"; + sha256 = "1gbqm42dd0m3fvqz3bk53889479dvn8679zp6ba8a9q2br2wkvv0"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 2f499d3af87f..fff760c55191 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; + configureFlags = [ "--with-async-mode" ]; + + # allow async mode. from ubuntu. see: + # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff + patchPhase = '' + substituteInPlace ./src/ftdi.c \ + --replace "ifdef USB_CLASS_PTP" "if 0" + ''; meta = { description = "A library to talk to FTDI chips using libusb"; diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix index 9e0510debd02..dec9676d5729 100644 --- a/pkgs/development/libraries/libgap/default.nix +++ b/pkgs/development/libraries/libgap/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gmp}: stdenv.mkDerivation rec { name = "libgap-${version}"; - version = "4.8.3"; + version = "4.8.6"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "http://mirrors.mit.edu/sage/spkg/upstream/libgap/libgap-${version}.tar.gz"; - sha256 = "0ng4wlw7bj63spf4vkdp43v3ja1fp782lxzdsyf51x26z21idrsq"; + sha256 = "1h5fx5a55857w583ql7ly2jl49qyx9mvs7j5abys00ra9gzrpn5v"; }; buildInputs = [gmp]; meta = { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 45564d64861d..a02aefb0a742 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap +, buildPackages +}: assert enableCapabilities -> stdenv.isLinux; @@ -19,10 +21,19 @@ stdenv.mkDerivation rec { # The build enables -O2 by default for everything else. hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + depsBuildBuild = stdenv.lib.optional stdenv.isCross buildPackages.stdenv.cc; + buildInputs = [ libgpgerror ] ++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optional enableCapabilities libcap; + preConfigure = if stdenv.isCross then '' + # This is intentional: gpg-error-config is a shell script that will work during the build + mkdir -p "$NIX_BUILD_TOP"/bin + ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin" + export PATH="$NIX_BUILD_TOP/bin:$PATH" + '' else null; + # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' diff --git a/pkgs/development/libraries/libgee/0.6.nix b/pkgs/development/libraries/libgee/0.6.nix deleted file mode 100644 index 51487b41573f..000000000000 --- a/pkgs/development/libraries/libgee/0.6.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib }: - -let - ver_maj = "0.6"; - ver_min = "8"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6"; - }; - - buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - homepage = http://live.gnome.org/Libgee; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/libgee/0.8.nix b/pkgs/development/libraries/libgee/0.8.nix deleted file mode 100644 index 747cb9d4b237..000000000000 --- a/pkgs/development/libraries/libgee/0.8.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib }: - -let - ver_maj = "0.8"; - ver_min = "6"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1mp3bfghc8qh2v8h2pfhksda22mgy2d5ygm1jr3bir544nr8i4fg"; - }; - - buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - homepage = http://live.gnome.org/Libgee; - maintainers = with maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 7bd551e70d56..8961afcd6207 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perl, perlXMLParser, - autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo + autoreconfHook, intltool, gtk-doc, docbook_xsl, xauth, sudo }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook intltool gtk_doc docbook_xsl wrapGAppsHook + pkgconfig autoreconfHook intltool gtk-doc docbook_xsl wrapGAppsHook ]; buildInputs = [ gtk2 gnome2.GConf libstartup_notification - gnome3.libgnome_keyring libgtop gnome2.libglade perl perlXMLParser + gnome3.libgnome-keyring libgtop gnome2.libglade perl perlXMLParser ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index e6cb62330c4e..5c5824a9930c 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,6 +1,21 @@ -{ stdenv, buildPackages, fetchurl, gettext }: +{ stdenv, buildPackages, fetchurl, gettext +, hostPlatform, genPosixLockObjOnly ? false +}: let + genPosixLockObjOnlyAttrs = stdenv.lib.optionalAttrs genPosixLockObjOnly { + buildPhase = '' + cd src + make gen-posix-lock-obj + ''; -stdenv.mkDerivation rec { + installPhase = '' + mkdir -p $out/bin + install -m755 gen-posix-lock-obj $out/bin + ''; + + outputs = [ "out" ]; + outputBin = "out"; + }; +in stdenv.mkDerivation (rec { name = "libgpg-error-${version}"; version = "1.27"; @@ -9,6 +24,8 @@ stdenv.mkDerivation rec { sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg"; }; + patches = if hostPlatform.isRiscV then ./riscv.patch else null; + postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' @@ -49,4 +66,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = [ maintainers.fuuzetsu maintainers.vrthra ]; }; -} +} // genPosixLockObjOnlyAttrs) diff --git a/pkgs/development/libraries/libgpg-error/riscv.patch b/pkgs/development/libraries/libgpg-error/riscv.patch new file mode 100644 index 000000000000..afc3b9993a43 --- /dev/null +++ b/pkgs/development/libraries/libgpg-error/riscv.patch @@ -0,0 +1,54 @@ +commit b3e9ec5626d474c58e683a41d09576297d4acd3d +Author: Shea Levy +Date: Sat Feb 24 21:12:44 2018 -0500 + + syscfg: Add lock-obj-pub file for riscv64-unknown-linux-gnu. + + * src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h: new. + * src/Makefile.am (lock_obj_pub): Add it. + + Signed-off-by: Shea Levy + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4446612..5a8cc43 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -65,6 +65,7 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ ++ syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ + syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ +diff --git a/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h +new file mode 100644 +index 0000000..8aab9d6 +--- /dev/null ++++ b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h +@@ -0,0 +1,25 @@ ++## lock-obj-pub.riscv64-unknown-linux-gnu.h ++## File created by gen-posix-lock-obj - DO NOT EDIT ++## To be included by mkheader into gpg-error.h ++ ++typedef struct ++{ ++ long _vers; ++ union { ++ volatile char _priv[40]; ++ long _x_align; ++ long *_xp_align; ++ } u; ++} gpgrt_lock_t; ++ ++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0}}} ++## ++## Local Variables: ++## mode: c ++## buffer-read-only: t ++## End: ++## diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index c498871956a8..9c0ea4a3a73e 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "gphoto"; repo = "libgphoto2"; rev = "${meta.tag}"; - sha256 = "0chwnw3d2d1k8g4xidzkpy9f3ci30yz7yvxq1mipp2rbndl1y2am"; + sha256 = "1svbpmxqm56pqkv0rxhlyk4vw7mjgjz8zz4p669qvmw630082yj9"; }; patches = []; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.12"; - tag = "libgphoto2-2_5_12-release"; + version = "2.5.16"; + tag = "libgphoto2-2_5_16-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix index eaf2eb170956..e29b3ed89dea 100644 --- a/pkgs/development/libraries/libgsystem/default.nix +++ b/pkgs/development/libraries/libgsystem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection , glib, attr, systemd }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - autoreconfHook pkgconfig gtk_doc gobjectIntrospection + autoreconfHook pkgconfig gtk-doc gobjectIntrospection ]; propagatedBuildInputs = [ glib attr systemd ]; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index e659b31d9745..d7d0fbe8094d 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -9,16 +9,16 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.36.3"; + version = "1.38.0"; appliance = fetchurl { - url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz"; - sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125"; + url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz"; + sha256 = "05481qxgidakga871yb5rgpyci2jaxmplmkh6y79anfh5m19nzhy"; }; src = fetchurl { - url = "http://libguestfs.org/download/1.36-stable/libguestfs-${version}.tar.gz"; - sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m"; + url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; + sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3"; }; nativeBuildInputs = [ pkgconfig ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # some scripts hardcore /usr/bin/env which is not available in the build env patchShebangs . ''; - configureFlags = [ "--disable-appliance" "--disable-daemon" ] + configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ] ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index c3405148242c..f5bdb2069d99 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, valadoc -, gnome3, glib, json_glib, libarchive, libsoup, gobjectIntrospection }: +, gnome3, glib, json-glib, libarchive, libsoup, gobjectIntrospection }: stdenv.mkDerivation rec { major = "0.6"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ]; - buildInputs = [ glib gnome3.libgee json_glib libsoup libarchive ]; + buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; mesonFlags = "-Denable_valadoc=true"; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 6608a3393b12..516e6bbbe88c 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gcc, staticBuild ? false }: +{ stdenv, buildPackages, fetchurl, staticBuild ? false }: + +let inherit (buildPackages.buildPackages) gcc; in stdenv.mkDerivation rec { name = "libiberty-${gcc.cc.version}"; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 21abf7f8c079..b55fc18cb69b 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,5 +1,6 @@ { fetchurl, stdenv, lib , buildPlatform, hostPlatform +, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt }: # assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross @@ -19,14 +20,8 @@ stdenv.mkDerivation rec { sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h ''; - configureFlags = - lib.optional stdenv.isFreeBSD "--with-pic"; - - crossAttrs = { - # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW). - dontStrip = true; - dontCrossStrip = true; - }; + configureFlags = lib.optional stdenv.isFreeBSD "--with-pic" + ++ lib.optional enableStatic "--enable-static"; meta = { description = "An iconv(3) implementation"; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 9c7e48f8f6a8..445a505b68c8 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -2,9 +2,9 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, libdbusmenu-glib +, glib, dbus-glib, libdbusmenu-glib , gtkVersion, gtk2 ? null, gtk3 ? null -, pythonPackages, gobjectIntrospection, vala, gnome_doc_utils +, pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: @@ -24,10 +24,10 @@ in stdenv.mkDerivation rec { sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21"; }; - nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome_doc_utils ]; + nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ]; buildInputs = [ - glib dbus_glib libdbusmenu-glib + glib dbus-glib libdbusmenu-glib python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 835c7d6f2262..9bbb8f0e129d 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -12,10 +12,10 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.6.5"; + name = "libinfinity-0.7.1"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1idsxb6rz4i55g3vi2sv7hmm57psbccpb57yc4jgphaq6ydgqsr6"; + sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 267d3097c997..738c11161955 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }: stdenv.mkDerivation rec { - name = "libiodbc-3.52.8"; + name = "libiodbc-3.52.12"; src = fetchurl { url = "mirror://sourceforge/iodbc/${name}.tar.gz"; - sha256 = "16hjb6fcval85gnkgkxfhw4c5h3pgf86awyh8p2bhnnvzc0ma5hq"; + sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index e113d62c5f7d..6e7764176091 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisoburn-${version}"; - version = "1.4.4"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "1mn2dwkwdrdcjnd59czxali7r5nlxdx92clyxnsfpmw20f9s20kv"; + sha256 = "19d53j17pn18vfxxqqlqwam5lm21ljyp8nai5434068g7x3m1kwi"; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index a0205fb234ca..d0217a908b9f 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisofs-${version}"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "02m5g6lbmmkh2xc5xzq5zaf3ma6v31gls66aj886b3cq9qw0paql"; + sha256 = "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw"; }; buildInputs = [ attr zlib ]; diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index eac919612f0b..ed595505fae1 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libivykis-${version}"; - version = "0.41"; + version = "0.42.1"; src = fetchurl { url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; - sha256 = "1igk3svf36i5xgb6ipc507xpj6zjm4xi9j1j2cdqaachllwlb4rc"; + sha256 = "0c90cfpxipw2m8i3ajr7vy7lb8gvcz2kh5n8sd542zphr4na8whq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index 4667a6e76014..dd852e1de85a 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "liblogging-1.0.5"; + name = "liblogging-1.0.6"; src = fetchurl { url = "http://download.rsyslog.com/liblogging/${name}.tar.gz"; - sha256 = "02w94j344q0ywlj4mdf9fnzwggdsn3j1yn43sdlsddvr29lw239i"; + sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix index ec306e0f7c34..dfc2402a7ec6 100644 --- a/pkgs/development/libraries/libltc/default.nix +++ b/pkgs/development/libraries/libltc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libltc-1.1.4"; + name = "libltc-1.3.0"; src = fetchurl { - url = https://github.com/x42/libltc/releases/download/v1.1.4/libltc-1.1.4.tar.gz; - sha256 = "0xas0zbi11nhq15al6cxn0iwa563s6fcz01hw0np1clh25h4773x"; + url = https://github.com/x42/libltc/releases/download/v1.3.0/libltc-1.3.0.tar.gz; + sha256 = "0p7fgp44i9d1lrgbk5zj3sm5yzavx428zn36xb3bl7y65c2xxcda"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 9355c43642a4..f1b15a91ccac 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmaxminddb-${version}"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${name}.tar.gz"; - sha256 = "0dxdyw6sxxmpzk2a96qp323r5kdmw7vm6m0l5a8gr52gf7nmks0z"; + sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index 8951017a4b5c..2da8e5ebf738 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libmd"; - version = "0.0.0"; + version = "1.0.0"; src = fetchurl { url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "121s73pgbqsnmy6xblbrkj9y44c5zzzpf2hcmh6zvcvg4dk26gzx"; + sha256 = "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 25a597ea4daf..7999cc1dff4d 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 = "17.10"; + version = "17.12"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "00m1b4m37c9lm16yhh63p5pidg2sr3qvsw36672lklmcv3y1ic30"; + sha256 = "0lm4454ynp0msgqm3s0mnxqxql6i1ank35jvff5swnaxvwsbp0ml"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index f6a816ef96f6..10bd7af7fadd 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmodbus-3.0.6"; + name = "libmodbus-3.1.4"; src = fetchurl { url = "http://libmodbus.org/releases/${name}.tar.gz"; - sha256 = "1dkijjv3dq0c5vc5z5f1awm8dlssbwg6ivsnvih22pkm1zqn6v84"; + sha256 = "0drnil8bzd4n4qb0wv3ilm9zvypxvwmzd65w96d6kfm7x6q65j68"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 9cac26bf2be1..dca80bbbe881 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.1.13"; + name = "libmtp-1.1.14"; src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "0h3dv9py5mmvxhfxmkr8ky4s80hgq3d66cmrfnnnlcdwpwpy0kj9"; + sha256 = "1s0jyhypxmj0j8s003ba1n74x63h1rw8am9q4z2ip3xyjvid65rq"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 897a769b014d..42bcf5b64740 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , libtool, pkgconfig, automake, autoconf, intltool -, glib, gobjectIntrospection, gtk2, gtk_doc -, clutter, clutter_gtk +, glib, gobjectIntrospection, gtk2, gtk-doc +, clutter, clutter-gtk }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { automake autoconf libtool intltool gobjectIntrospection glib - gtk2 gtk_doc clutter clutter_gtk + gtk2 gtk-doc clutter clutter-gtk ]; # patch to resolve GL errors diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 7e9ae1608d2b..c7967c3fb6fc 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1, gnutls }: +{ stdenv, fetchurl, pkgconfig, glib, gupnp-igd, gst_all_1, gnutls }: stdenv.mkDerivation rec { name = "libnice-0.1.14"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; - propagatedBuildInputs = [ glib gupnp_igd ]; + propagatedBuildInputs = [ glib gupnp-igd ]; meta = { homepage = https://nice.freedesktop.org/wiki/; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 77c049949564..1c8f33d82f72 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.10"; + name = "libofx-0.9.12"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "15gnbh4mszfxk70srdcjkdykk7dbhzqxi3pxgh48a9zg8i4nmqjl"; + sha256 = "0wvkgffq9qjhjrggg8r1nbhmw65j3lcl4y4cdpmmkrqiz9ia0py1"; }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index a0924e791e3b..0175e21bbc72 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk_doc, docbook_xsl +{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig vala intltool gobjectIntrospection gtk_doc docbook_xsl + pkgconfig vala intltool gobjectIntrospection gtk-doc docbook_xsl ] ++ stdenv.lib.optionals doCheck checkInputs; checkInputs = [ check curl perl ]; buildInputs = [ glib libsoup libxml2 libxslt ]; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 34b09d45044d..a74d838e2eb6 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.8.0"; + version = "4.9.0"; name = "libpfm-${version}"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; - sha256 = "0s6gcvrhj2h928cqc8399189annif7yl74k6wda446r0fdx7i4wi"; + sha256 = "1qp4g4n6dw42p2w5rkwzdb7ynk8h7g5vg01ybpmvxncgwa7bw3yv"; }; installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index b1100d00f3e0..f5c92e11c357 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu +{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk-doc, icu , libxslt, pkgconfig, python2 }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ icu libxslt ]; - nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl gtk-doc pkgconfig python2 ]; postPatch = '' substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index b19008449abe..cb30a890f401 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -2,11 +2,11 @@ pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { - name = "libpst-0.6.70"; + name = "libpst-0.6.71"; src = fetchurl { url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "1m378vxh1sf9ry8k11x773xpy5f6cab5gkzqglz0jp9hc431r60r"; + sha256 = "130nksrwgi3ih32si5alvxwzd5kmlg8yi7p03w0h7w9r3b90i4pv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 89b71c1855da..cdc2a6570022 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "036f284bssvavyz6pgpcdafvxa59h2wdrh8xl7nmxxnw9v7n2n7l"; + sha256 = "0bam1xvw4n5sm3g4kmggz2aha34xaw64kw15wl2lbkd2yzdjdm4l"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index d65fdc833960..ebe765a0d0d4 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.5.6"; + version = "0.5.7"; name = "libre-${version}"; src = fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "0sfz5c7b05crahblanrrvwca092qaqzhjkbkva58jbqnmlk9h4d3"; + sha256 = "0f8h224xfzvnb2ngvhxz8gzxqjlkkfr6d0nj8zqivzr81ihibk2x"; }; buildInputs = [ zlib openssl ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index adc00b56a287..5db5d2b59651 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.12"; + name = "librelp-1.2.14"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "1mvvxqfsfg96rb6xv3fw7mcsqmyfnsb74sc53gnhpcpp4h2p6m83"; + sha256 = "0marms2np729ck0x0hsj1bdmi0ly57pl7pfspwrqld9n8cd29xhi"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index c74a7981458d..5b3beda1eb8b 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "librep-${version}"; - version = "0.92.6"; + version = "0.92.7"; sourceName = "librep_${version}"; src = fetchurl { url = "http://download.tuxfamily.org/librep/${sourceName}.tar.xz"; - sha256 = "1k6c0hmyzxh8459r790slh9vv9vwy9d7w3nlmrqypbx9mk855hgy"; + sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 0ad02c190c11..e1c50bee75ab 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.4.8"; + version = "3.4.9"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "0gq0mg42sq2nxiv25fh37frlr0iyqamh7shv83qixnqklqpkfi13"; + sha256 = "0f4mj91zzdzah7fxkdg3dnrimk9ip7czl4g26f32zgifz1nrqgjs"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 75438e00570e..a116e2c0babd 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc +{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc , libgcrypt, gobjectIntrospection, vala_0_38 }: let version = "0.18.5"; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 5e36d0688694..521391b1bef8 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, libtool, gettext, pkgconfig, - vala, gnome_common, gobjectIntrospection, - libgee, json_glib, skk-dicts }: + vala, gnome-common, gobjectIntrospection, + libgee, json-glib, skk-dicts }: stdenv.mkDerivation rec { name = "libskk-${version}"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ skk-dicts ]; - nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool gettext pkgconfig ]; - propagatedBuildInputs = [ libgee json_glib ]; + nativeBuildInputs = [ vala gnome-common gobjectIntrospection libtool gettext pkgconfig ]; + propagatedBuildInputs = [ libgee json-glib ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 480891e98af9..f775316a2a01 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.23"; + rev = "0.6.32"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "08ba7yx0br421lk6zf5mp0yl6nznkmc2vbka20qwm2lx5f0a25xg"; + sha256 = "0gqvnnc1s5n0yj82ia6w2wjhhn8hpl6wm4lki2kzvjqjgla45fnq"; }; cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index e8d48bf668b3..b67e41a0dc6e 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection +, gnomeSupport ? true, libgnome-keyring3, sqlite, glib-networking, gobjectIntrospection , valaSupport ? true, vala_0_38 , libintlOrEmpty , intltool, python }: @@ -37,10 +37,10 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals valaSupport [ vala_0_38 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] - ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ]; - passthru.propagatedUserEnvPackages = [ glib_networking.out ]; + ++ stdenv.lib.optionals gnomeSupport [ libgnome-keyring3 ]; + passthru.propagatedUserEnvPackages = [ glib-networking.out ]; - # glib_networking is a runtime dependency, not a compile-time dependency + # glib-networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check" + " --enable-vala=${if valaSupport then "yes" else "no"}" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 660d7e16310f..fe0acbfc538d 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "1.8.1"; in +let version = "1.8.5"; in stdenv.mkDerivation rec { name = "libspatialindex-${version}"; src = fetchurl { url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; - sha256 = "1ay1kxn4baccd0cqx466v7fn8c8gcfbhlnd5mbdnd7s4aw0ix88j"; + sha256 = "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 429cc5d9f180..7261fb7b6b74 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libtermkey-${version}"; - version = "0.19"; + version = "0.20"; src = fetchzip { url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz"; - sha256 = "0v85h0zacd5lqwkykl2ms4009x8mfidzb6jr4dsq4gh7kwm54w56"; + sha256 = "1i5a2zangq61ba1vdkag34ig5g4gzccldccdbcmqmk93saa6lkbx"; }; makeFlags = [ "PREFIX=$(out)" ] diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 46f3a982b0c7..e30f699f103d 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libtomcrypt-${version}"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "https://github.com/libtom/libtomcrypt/releases/download/v${version}/crypt-${version}.tar.xz"; - sha256 = "0ymqi0zf5gzn8pq4mnylwgg6pskml2v1p9rsjrqspyja65mgb7fs"; + sha256 = "053z0jzyvf6c9929phlh2p0ybx289s34g7nii5hnjigxzcs3mhap"; }; nativeBuildInputs = [ libtool ]; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index a742be3c1e4d..16fca9ce3d39 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libsodium libmsgpack ncurses + libsodium libmsgpack ncurses libconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus libvpx diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index b0066fa75f22..1a4f16046fc1 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, dbus, dbus_glib, gtk3, gobjectIntrospection +, dbus, dbus-glib, gtk3, gobjectIntrospection , gtkdoc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus dbus_glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; + buildInputs = [ dbus dbus-glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { homepage = https://wiki.gnome.org/Attic/LibUnique; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 1bef76836542..2bb53dd2b97f 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }: stdenv.mkDerivation rec { name = "libunique-1.1.6"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ++ [ ./gcc7-bug.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk2 dbus_glib ]; + buildInputs = [ glib gtk2 dbus-glib ]; # don't make deprecated usages hard errors preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 0c88f9871041..aa106baf8152 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.10.1"; name = "liburcu-${version}"; src = fetchurl { url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "19iq7985rhvbrj99hlmbyq2wjrkhssvigh5454mhaprn3c7jaj6r"; + sha256 = "01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw"; }; nativeBuildInputs = stdenv.lib.optional doCheck perl; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 98f3ea1679cb..fa35f7546f56 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libwebsockets-${version}"; - version = "2.3.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; - sha256 = "1hv2b5r6sg42xnqhm4ysjvyiz3cqpfmwaqm33vpbx0k7arj4ixvy"; + sha256 = "0d3xqdq3hpk5l9cg4dqkba6jm6620y6knqqywya703662spmj2xw"; }; buildInputs = [ cmake openssl zlib libuv ]; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 57dfe34132f5..9d262910e14f 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { - name = "libwpg-0.3.0"; + name = "libwpg-0.3.2"; src = fetchurl { url = "mirror://sourceforge/libwpg/${name}.tar.xz"; - sha256 = "097jx8a638fwwfrzf6v29r1yhc34rq9526py7wf0ck2z4fcr2w3g"; + sha256 = "0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp"; }; buildInputs = [ libwpd zlib librevenge ]; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 37ff9d098c5c..84748d601a64 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.3"; + version = "0.4.8"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.bz2"; - sha256 = "0v1a0hj96i4jhb5833336s4zcslzb6md5cnmnrvgywx8cmw40c0c"; + sha256 = "163gdqaanqfs767aj6zdzagqldngn8i7f0hbmhhxlxr0wmvx6c9q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 68f8c44a8ec8..7ed2d2fd6300 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "libxcomp-${version}"; - version = "3.5.0.32"; + version = "3.5.0.33"; src = fetchurl { - sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm"; + sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74"; url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index e20aa514aa2a..6050a7080df9 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libzmf"; - version = "0.0.1"; + version = "0.0.2"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz"; - sha256 = "0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga"; + sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; }; buildInputs = [boost icu libpng librevenge zlib cppunit]; diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index e0f84f5080df..5d63dd770664 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -2,14 +2,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD let - version = "2016.02.09"; + version = "2018.02.12"; in stdenv.mkDerivation { name = "live555-${version}"; src = fetchurl { # the upstream doesn't provide a stable URL url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"; - sha256 = "02z2f8z5cy0ajnh9pgar40lsxdknfw5cbyw52138hxnpr6adrvak"; + sha256 = "08860q07hfiln44d6qaasmfalf4hb9na5jsfd4yps6jn4r54xxwx"; }; postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles" diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 96cbbb770b4c..d2918c87f335 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "log4cpp-1.1.1"; + name = "log4cpp-1.1.3"; src = fetchurl { url = "mirror://sourceforge/log4cpp/${name}.tar.gz"; - sha256 = "1l5yz5rfzzv6g3ynrj14mxfsk08cp5h1ssr7d74hjs0accrg7arm"; + sha256 = "07gmr3jyaf2239n9sp6h7hwdz1pv7b7aka8n06gmr2fnlmaymfrc"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index a490aa1e4451..c92b6a4e7287 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glib, pkgconfig, libfm-extra }: -let name = "menu-cache-1.0.2"; +let name = "menu-cache-1.1.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "1m8j40npykfcfqs43kc0fmksal2jfmfi8lnb3mq3xy1lvvrfv0vg"; + sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 6eee8df5a23e..59700669ba7c 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,28 +6,15 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.4.1"; + version = "6.6.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w"; + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; }; - patches = [ - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; - }) - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; - }) - ]; - buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 makeWrapper movit pkgconfig sox diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 7111a78381d1..27f7cf31cbf2 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate +{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg , fftw, vid-stab, opencv3, ladspa-sdk }: @@ -7,24 +7,14 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.4.1"; + version = "6.6.0"; - src = fetchurl { - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47"; + src = fetchFromGitHub { + owner = "mltframework"; + repo = "mlt"; + rev = "v${version}"; + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; }; - patches = [ - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; - }) - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; - }) - ]; buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index c7d65f156b8b..cfb02ddbf9dd 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }: stdenv.mkDerivation rec { - name = "msilbc-2.0.3"; + name = "msilbc-2.1.2"; src = fetchurl { url = "mirror://savannah/linphone/plugins/sources/${name}.tar.gz"; - sha256 = "125yadpc0w1q84839dadin3ahs0gxxfas0zmc4c18mjmf58dmm7d"; + sha256 = "07j02y994ybh274fp7ydjvi76h34y2c34ndwjpjfcwwr03b48cfp"; }; propagatedBuildInputs = [ ilbc mediastreamer ]; diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 6c0e633459bf..99c9c5f16001 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.1.2"; name = "nanomsg-${version}"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nanomsg"; rev = version; - sha256 = "1iqlmvz5k8m4srb120g3kfkmm1w2p16hyxmx2asvihd21j285fmw"; + sha256 = "1zvs91afsg61azfv5fldv84gnhf76w3yndkdvpvaprlacxbxdvf5"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index d63536e75f06..f8a35e41cd61 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -3,6 +3,8 @@ , abiVersion , mouseSupport ? false , unicode ? true +, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt +, withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt , gpm @@ -36,6 +38,8 @@ stdenv.mkDerivation rec { "--enable-pc-files" "--enable-symlinks" ] ++ lib.optional unicode "--enable-widec" + ++ lib.optional enableStatic "--enable-static" + ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5"; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 5ce30b039696..af01c23fe1a8 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "opencollada-${version}"; - version = "1.6.59"; + version = "1.6.62"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCOLLADA"; rev = "v${version}"; - sha256 = "0gpjvzcfyilb96x5ywajxgkw42ipwp4my36z9cq686bd9vpp3q0g"; + sha256 = "0bqki6sdvxsp9drzj87ma6n7m98az9pr0vyxhgw8b8b9knk8c48r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index c5f79b8613ec..9b5f2c7097ae 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.2"; name = "opencsg-${version}"; src = fetchurl { url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz"; - sha256 = "13c73jxadm27h7spdh3qj1v6rnn81v4xwqlv5a6k72pv9kjnpd7c"; + sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr"; }; buildInputs = [mesa freeglut glew libXmu libXext libX11]; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 356e1e336ac2..ff3ac3b03635 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl, fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 -, caffe, glog, boost, google-gflags, protobuf +, glog, boost, google-gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -12,12 +12,12 @@ , enableJPEG2K ? true, jasper , enableEigen ? true, eigen , enableOpenblas ? true, openblas +, enableContrib ? true , enableCuda ? (config.cudaSupport or false), cudatoolkit , enableUnfree ? false , enableIpp ? false -, enableContrib ? false , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 @@ -188,7 +188,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib pcre hdf5 glog boost google-gflags protobuf ] - ++ lib.optional (!stdenv.isDarwin) caffe ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 @@ -222,11 +221,16 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + # Configure can't find the library without this. + OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; + cmakeFlags = [ "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" + "-DBUILD_TESTS=OFF" + "-DBUILD_PERF_TESTS=OFF" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) (opencvFlag "JASPER" enableJPEG2K) @@ -238,15 +242,15 @@ stdenv.mkDerivation rec { (opencvFlag "CUBLAS" enableCuda) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" - ] - ++ lib.optionals stdenv.isDarwin [ - "-DWITH_OPENCL=OFF" - "-DWITH_LAPACK=OFF" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + ] ++ lib.optionals stdenv.isDarwin [ + "-DWITH_OPENCL=OFF" + "-DWITH_LAPACK=OFF" - # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. - "-DBUILD_opencv_dnn_modern=OFF" - ]; + # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. + "-DBUILD_opencv_dnn_modern=OFF" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 75d2b090e711..528c19aea5b5 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.3.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "0karj37f0zq39w0ip8ahrjr6lcrrn9jd6bpzylp1m92jzs8pfki8"; + sha256 = "0zkxvs3vdlc4yzhfi2jh02bsnhh50fbfigqhnkmbx69lssnkyr05"; }; buildInputs = [ diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 91899ad8da43..a78a584a4a52 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation rec { "-DNO_EXAMPLES=1" "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" - ] ++ lib.optional cudaSupport "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30"; + ] ++ lib.optionals cudaSupport [ + "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 63c882076b9d..febba5d5703f 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobjectIntrospection ] ++ (with gnome3; [ - gnome_common gtk libsoup + gnome-common gtk libsoup ]); meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 4f93ed562115..16a987f15e20 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -3,28 +3,26 @@ stdenv.mkDerivation rec { name = "partio-${version}"; - version = "1.1.0"; + version = "2018-03-01"; src = fetchFromGitHub { owner = "wdas"; repo = "partio"; - rev = "v${version}"; - sha256 = "0z7n5ay21ca7g7xb80v6jmr96x9k7vm7zawawvmx71yj32rg1n34"; + rev = "8b6ea0d20f1ab77cd7f18390999251e60932de4a"; + sha256 = "16sdj103v02l2dgq9y9cna9jakafabz9jxzdxsd737ir6wn10ksb"; }; outputs = [ "dev" "out" "lib" ]; - buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; + nativeBuildInputs = [ unzip cmake doxygen ]; + buildInputs = [ freeglut mesa zlib swig python xorg.libXi xorg.libXmu ]; enableParallelBuilding = true; buildPhase = '' - sed 's/ADD_LIBRARY (partio /ADD_LIBRARY (partio SHARED /' -i ../src/lib/CMakeLists.txt - CXXFLAGS="-std=c++11" cmake . make partio mkdir $dev - mkdir -p $lib/lib mkdir $out ''; @@ -32,19 +30,16 @@ stdenv.mkDerivation rec # Sexpr support installPhase = '' - mkdir $dev/lib - mkdir -p $dev/include/partio - - mv lib/libpartio.so $lib/lib - - mv ../src/lib/* $dev/include/partio + make install prefix=$out + mkdir $dev/include/partio + mv $dev/include/*.h $dev/include/partio ''; meta = with stdenv.lib; { description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; homepage = "https://www.disneyanimation.com/technology/partio.html"; license = licenses.bsd3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.guibou ]; }; } diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 407be5c5e4a4..f3ba8a4a6ff6 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j"; + sha256 = "0wr2mmmf5rlvcc6xgdagafm6vb5g6ifvrjc7kd86gs9jip32p29i"; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 94074f6dcb45..eca2807ce153 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pythia-${version}"; - version = "8.219"; + version = "8.226"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "13fhphddl0jir8jyjvj6a9qz14wiv02q9lby8mcdyv8gsw0ir8hy"; + sha256 = "1jfjkq78d1llrrm2k5pgsl92a5z8af9rx3n83rzv28lxrqdjix4g"; }; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 7989eb518c78..63db874d8480 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thepeg-${version}"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "1082n4q036sah5r4asyl3hpcyc05cymg40dnk3jsdjgv2v0vvc71"; + sha256 = "0jbz70ax05w3lpjvz71fnfz35rcjp0jry1nyjpa662714xd6f3va"; }; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 3bd94c977e84..304d5baa3aad 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,10 +1,14 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind , glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xlibs -, sbc, SDL2 +, sbc, SDL2, makeFontsConf, freefont_ttf }: let - version = "0.1.8"; + version = "0.1.9"; + + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; in stdenv.mkDerivation rec { name = "pipewire-${version}"; @@ -12,7 +16,7 @@ in stdenv.mkDerivation rec { owner = "PipeWire"; repo = "pipewire"; rev = version; - sha256 = "1nim8d1lsf6yxk97piwmsz686w84b09lk6cagbyjr9m3k2hwybqn"; + sha256 = "0r9mgwbggnnijhdz49fnv0qdka364xn1h8yml2jakyqpfrm3i2nm"; }; outputs = [ "out" "dev" "doc" ]; @@ -34,8 +38,9 @@ in stdenv.mkDerivation rec { "-Denable_gstreamer=true" ]; + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + doCheck = true; - checkPhase = "meson test"; meta = with stdenv.lib; { description = "Server and user space API to deal with multimedia pipelines"; diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 407559137370..ae232cd531f9 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "poco-${version}"; - version = "1.7.8"; + version = "1.8.1"; src = fetchurl { url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz"; - sha256 = "17y6kvj4qdpb3p1im8n9qfylfh4bd2xsvbpn24jv97x7f146nhjf"; + sha256 = "1pg48kk0354vsc6j2wnrk893l5xcsr3bjmkgykd3harcnvfqs7l8"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 6bf9bcb954c1..ef865529805f 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam , intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl -, docbook_xml_dtd_412, gtk_doc +, docbook_xml_dtd_412, gtk-doc , useSystemd ? stdenv.isLinux, systemd }: @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ gtk_doc pkgconfig autoreconfHook intltool gobjectIntrospection ] + [ gtk-doc pkgconfig autoreconfHook intltool gobjectIntrospection ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = [ glib expat pam spidermonkey_17 gobjectIntrospection ] diff --git a/pkgs/development/libraries/postgis/2.3.nix b/pkgs/development/libraries/postgis/2.3.nix new file mode 100644 index 000000000000..8e6218a0d561 --- /dev/null +++ b/pkgs/development/libraries/postgis/2.3.nix @@ -0,0 +1,102 @@ +{ fetchurl +, stdenv +, perl +, libxml2 +, postgresql +, geos +, proj +, flex +, gdal +, json_c +, pkgconfig +, file +}: + + /* + + ### NixOS - usage: + ================== + + services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ]; + + + ### important Postgis implementation details: + ============================================= + + Postgis provides a shared library implementing many operations. They are + exposed to the Postgres SQL interpreter by special SQL queries eg: + + CREATE FUNCTION [...] + AS '[..]liblwgeom', 'lwhistogram2d_in' LANGUAGE 'C' IMMUTABLE STRICT; -- WITH (isstrict); + + where liblwgeom is the shared library. + Postgis < 1.5 used absolute paths, in NixOS $libdir is always used. + + Thus if you want to use postgresql dumps which were created by non NixOS + systems you have to adopt the library path. + + + ### TODO: + ========= + the bin commands to have gtk gui: + */ + + +let + version = "2.3.1"; + sha256 = "0xd21h2k6x3i1b3z6pgm3pmkfpxm6irxd5wbx68acjndjgd6p3ac"; +in stdenv.mkDerivation rec { + name = "postgis-${version}"; + + src = fetchurl { + url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; + inherit sha256; + }; + + # don't pass these vars to the builder + removeAttrs = ["sql_comments" "sql_srcs"]; + + # create aliases for all commands adding version information + postInstall = '' + sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) + + for prog in $out/bin/*; do # */ + ln -s $prog $prog-${version} + done + + cp -r doc $out + ''; + + buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; + + sql_comments = "postgis_comments.sql"; + + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + + # postgis config directory assumes /include /lib from the same root for json-c library + NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + + dontDisableStatic = true; + preConfigure = '' + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" + ''; + postConfigure = '' + sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; + s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/loader/Makefile"; + sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/scripts/python/Makefile"; + ''; + + meta = with stdenv.lib; { + description = "Geographic Objects for PostgreSQL"; + homepage = http://postgis.refractions.net; + license = licenses.gpl2; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index bdf537f4375e..582ebc05176b 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -1,11 +1,23 @@ -args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, proj, flex, gdal, json_c, pkgconfig, file, ...}: +{ fetchurl +, stdenv +, perl +, libxml2 +, postgresql +, geos +, proj +, flex +, gdal +, json_c +, pkgconfig +, file +}: /* ### NixOS - usage: ================== - services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_3_1 ]; + services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ]; ### important Postgis implementation details: @@ -31,108 +43,60 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p let - pgDerivationBase = composableDerivation.composableDerivation {} ( fix : + version = "2.4.0"; + sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29"; +in stdenv.mkDerivation rec { + name = "postgis-${version}"; - let version = fix.fixed.version; in { + src = fetchurl { + url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; + inherit sha256; + }; - name = "postgis-${version}"; + # don't pass these vars to the builder + removeAttrs = ["sql_comments" "sql_srcs"]; - src = fetchurl { - url = "http://postgis.refractions.net/download/postgis-${fix.fixed.version}.tar.gz"; - inherit (fix.fixed) sha256; - }; + # create aliases for all commands adding version information + postInstall = '' + sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) - # don't pass these vars to the builder - removeAttrs = ["hash" "sql_comments" "sql_srcs"]; + for prog in $out/bin/*; do # */ + ln -s $prog $prog-${version} + done - preConfigure = '' - configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin" - makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" - ''; + cp -r doc $out + ''; - # create aliases for all commands adding version information - postInstall = '' + buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; - sql_srcs=$(for sql in ${builtins.toString fix.fixed.sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) + sql_comments = "postgis_comments.sql"; - for prog in $out/bin/*; do # */ - ln -s $prog $prog-${version} - done + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - cp -r doc $out - ''; - - buildInputs = [libxml2 postgresql geos proj perl]; - - sql_comments = "postgis_comments.sql"; - - meta = { - description = "Geographic Objects for PostgreSQL"; - homepage = http://postgis.refractions.net; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; - }; - }); - - pgDerivationBaseNewer = pgDerivationBase.merge (fix: { - src = fetchurl { - url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString fix.fixed.version}.tar.gz"; - inherit (fix.fixed) sha256; - }; - }); - -in rec { - - v_2_3_1 = pgDerivationBaseNewer.merge ( fix : { - version = "2.3.1"; - sha256 = "0xd21h2k6x3i1b3z6pgm3pmkfpxm6irxd5wbx68acjndjgd6p3ac"; - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - builtInputs = [gdal json_c pkgconfig]; - - # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; - - dontDisableStatic = true; - preConfigure = '' - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" - ''; - postConfigure = '' - sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/scripts/python/Makefile"; - ''; - }); - - v_2_4_0 = pgDerivationBaseNewer.merge ( fix : { - version = "2.4.0"; - sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29"; - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - builtInputs = [gdal json_c pkgconfig]; - - # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; - - dontDisableStatic = true; - preConfigure = '' - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" - ''; - postConfigure = '' - sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/scripts/python/Makefile"; - ''; - }); + # postgis config directory assumes /include /lib from the same root for json-c library + NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + dontDisableStatic = true; + preConfigure = '' + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" + ''; + postConfigure = '' + sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; + s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/loader/Makefile"; + sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/scripts/python/Makefile"; + ''; + meta = with stdenv.lib; { + description = "Geographic Objects for PostgreSQL"; + homepage = http://postgis.refractions.net; + license = licenses.gpl2; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 0ea58e6c434f..ee27d89f5635 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }: stdenv.mkDerivation rec { - name = "qca-qt5-2.1.1"; + name = "qca-qt5-2.1.3"; src = fetchurl { - url = "http://download.kde.org/stable/qca/2.1.1/src/qca-2.1.1.tar.xz"; - sha256 = "10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm"; + url = "http://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz"; + sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"; }; buildInputs = [ openssl qtbase ]; diff --git a/pkgs/development/libraries/qt-5/5.10/fetch.sh b/pkgs/development/libraries/qt-5/5.10/fetch.sh index 849e76d616df..4770644ae4e9 100644 --- a/pkgs/development/libraries/qt-5/5.10/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.10/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.0/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase.patch b/pkgs/development/libraries/qt-5/5.10/qtbase.patch index b79ce9fc3568..286dea2178b1 100644 --- a/pkgs/development/libraries/qt-5/5.10/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.10/qtbase.patch @@ -261,14 +261,13 @@ index 55c74aad66..0bbc8718eb 100644 set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index e645ba5803..a0e5c68b7e 100644 +index 50a1ec6764..d6368b769e 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -24,166 +24,3 @@ qt { - } +@@ -25,188 +25,3 @@ qt { } } -- + -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. -!no_default_rpath { @@ -291,6 +290,29 @@ index e645ba5803..a0e5c68b7e 100644 -} - -macx-xcode { +- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO +- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ +- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO +- else: \ +- qmake_pkginfo_typeinfo.value = "????" +- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo +- +- !isEmpty(VERSION) { +- l = $$split(VERSION, '.') 0 0 # make sure there are at least three +- VER_MAJ = $$member(l, 0, 0) +- VER_MIN = $$member(l, 1, 1) +- VER_PAT = $$member(l, 2, 2) +- unset(l) +- +- qmake_full_version.name = QMAKE_FULL_VERSION +- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} +- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version +- +- qmake_short_version.name = QMAKE_SHORT_VERSION +- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} +- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version +- } +- - !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { - debug_information_format.name = DEBUG_INFORMATION_FORMAT - debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT @@ -432,10 +454,10 @@ index e645ba5803..a0e5c68b7e 100644 - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 44636f2288..3b01424e67 100644 +index f1a4ca77b2..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,56 +1,2 @@ +@@ -1,67 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) - @@ -492,6 +514,17 @@ index 44636f2288..3b01424e67 100644 -# feature, which allows Xcode to choose the Qt libraries to link to -# at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +- +-xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP +-xcode_copy_phase_strip_setting.value = NO +-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting +- +-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER +-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX +-isEmpty(xcode_product_bundle_identifier_setting.value): \ +- xcode_product_bundle_identifier_setting.value = "com.yourcompany" +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" +-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index 3f6dc076ca..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf @@ -676,10 +709,10 @@ index 72dde61a40..f891a2baed 100644 INSTALLS += inst_qch_docs diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 668669e4cd..eb4840a0aa 100644 +index c9ce926b1a..f00868a031 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -82,7 +82,7 @@ sourcefiles += \ +@@ -88,7 +88,7 @@ sourcefiles += \ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -765,7 +798,7 @@ index 90d84cc535..387481bfc6 100644 INSTALLS += privpritarget } diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 62e1b69fde..abd63123f9 100644 +index 14fc5f9a94..2a0f2cd27f 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { @@ -851,10 +884,10 @@ index 706304cf34..546420f6ad 100644 set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 609e52d9d2..f0f29ce61f 100644 +index 3814894630..3c6468277c 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2580,6 +2580,15 @@ QStringList QCoreApplication::libraryPaths() +@@ -2601,6 +2601,15 @@ QStringList QCoreApplication::libraryPaths() QStringList *app_libpaths = new QStringList; coreappdata()->app_libpaths.reset(app_libpaths); @@ -871,7 +904,7 @@ index 609e52d9d2..f0f29ce61f 100644 if (!libPathEnv.isEmpty()) { QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index bcc1285472..a77eb472a3 100644 +index 6a5df6272a..a6136ca4cd 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; @@ -969,10 +1002,10 @@ index 07869efd7d..fb4183bada 100644 set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp -index 1da00813ce..0bf877afcb 100644 +index ce1ec6442a..4f75655abe 100644 --- a/src/network/kernel/qdnslookup_unix.cpp +++ b/src/network/kernel/qdnslookup_unix.cpp -@@ -92,7 +92,7 @@ static bool resolveLibraryInternal() +@@ -95,7 +95,7 @@ static bool resolveLibraryInternal() if (!lib.load()) #endif { @@ -1013,10 +1046,10 @@ index b5a0a5bbeb..6c20305f4d 100644 QString TableGenerator::findComposeFile() diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index 3bc8590d36..2a78fde518 100644 +index a59dc15b0e..a13ee89b5a 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) +@@ -584,7 +584,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) #if QT_CONFIG(library) extern const QString qt_gl_library_name(); // QLibrary lib(qt_gl_library_name()); diff --git a/pkgs/development/libraries/qt-5/5.10/srcs.nix b/pkgs/development/libraries/qt-5/5.10/srcs.nix index 5369169aa67f..025c7aa44e13 100644 --- a/pkgs/development/libraries/qt-5/5.10/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.10/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qt3d-everywhere-src-5.10.0.tar.xz"; - sha256 = "1arlplfpqdk0qki7bs1pp16y9cwa0awn071p551jg4y74xr7wi8j"; - name = "qt3d-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qt3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "0fvb346xhiyc0csxcvs5ifwkzs9wnza54vvsw6dvyax76qjv87q4"; + name = "qt3d-everywhere-src-5.10.1.tar.xz"; }; }; qtactiveqt = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtactiveqt-everywhere-src-5.10.0.tar.xz"; - sha256 = "0x6nbi5hlbr1pncbd8zzkwmqi04gcy64q3bjy5w45rg6zws41mzr"; - name = "qtactiveqt-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtactiveqt-everywhere-src-5.10.1.tar.xz"; + sha256 = "1r4i72i1pl9xnmcx8rr8g48fmym8mxs28pkg1nl302xi6izan8ch"; + name = "qtactiveqt-everywhere-src-5.10.1.tar.xz"; }; }; qtandroidextras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtandroidextras-everywhere-src-5.10.0.tar.xz"; - sha256 = "1ifb49px86abaf4znmlis9wyyxq132nlgj3fyqppbx1sranikygk"; - name = "qtandroidextras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtandroidextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "03jmf7gw4abn5gj92b1ns0k75bbi4wycbc4bbb7c9mngzkv3nzkn"; + name = "qtandroidextras-everywhere-src-5.10.1.tar.xz"; }; }; qtbase = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtbase-everywhere-src-5.10.0.tar.xz"; - sha256 = "0qpp56cbw1sfz5ayhj2mskb07cl6jd1ijayg29y624qa6b6phmgx"; - name = "qtbase-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz"; + sha256 = "0sd9cn3ywkjfswddcxhbfplkwk8snqld752q5laaapdakhc0wrnq"; + name = "qtbase-everywhere-src-5.10.1.tar.xz"; }; }; qtcanvas3d = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcanvas3d-everywhere-src-5.10.0.tar.xz"; - sha256 = "11r98mdxy833kcnywlsjrfaqhax7m3b6yhb56072qvr30rpn52fj"; - name = "qtcanvas3d-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcanvas3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "1h5hpjwdyp824r2ajmaqjcshra06yfzz7dp991h4kf54da79m0ny"; + name = "qtcanvas3d-everywhere-src-5.10.1.tar.xz"; }; }; qtcharts = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcharts-everywhere-src-5.10.0.tar.xz"; - sha256 = "1vri3f7wyg84w6j84452g8h2p7sk7k01r0xszpn4klv7hi52rkhj"; - name = "qtcharts-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz"; + sha256 = "1j8y683ainri9ma44ky6q87pjs1d794znb2wfsrbplixyxxmf3ag"; + name = "qtcharts-everywhere-src-5.10.1.tar.xz"; }; }; qtconnectivity = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtconnectivity-everywhere-src-5.10.0.tar.xz"; - sha256 = "19k9n6gzrbg0sbgyhhcl5gv0d4b2gjwmz5966gn6b424fblf4grf"; - name = "qtconnectivity-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtconnectivity-everywhere-src-5.10.1.tar.xz"; + sha256 = "1j9ydlkwz3039yslaizz923h0qbszm4z2sqspk28wr8rd3f22a35"; + name = "qtconnectivity-everywhere-src-5.10.1.tar.xz"; }; }; qtdatavis3d = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdatavis3d-everywhere-src-5.10.0.tar.xz"; - sha256 = "06363x449k7wkqrd7c0y6b5vqlpwssnkl0g5s1bhp8lkl3bw81lj"; - name = "qtdatavis3d-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdatavis3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "0ny8j689jm2fghklzw894yc5hjqa23yf395yv17yvwi72kpiz0b3"; + name = "qtdatavis3d-everywhere-src-5.10.1.tar.xz"; }; }; qtdeclarative = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdeclarative-everywhere-src-5.10.0.tar.xz"; - sha256 = "07kicxzbwiqwkg1x2k6447rwzvzn31cv1yyggc1m8r84lny4vjsw"; - name = "qtdeclarative-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdeclarative-everywhere-src-5.10.1.tar.xz"; + sha256 = "0lwmg1qan886czzkzi4px36mqxlqiw0acrsa9kqcddg5pi8yvy9s"; + name = "qtdeclarative-everywhere-src-5.10.1.tar.xz"; }; }; qtdoc = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdoc-everywhere-src-5.10.0.tar.xz"; - sha256 = "01z4ikqrnnx9mzf5pvk4i2lqks4xai32fs9qqbqnsp0qrrcb1jfn"; - name = "qtdoc-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdoc-everywhere-src-5.10.1.tar.xz"; + sha256 = "1gl62acr346jrcfxla8vxlczf706a3md52zc0zaqbjw9rf2bgnqq"; + name = "qtdoc-everywhere-src-5.10.1.tar.xz"; }; }; qtgamepad = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgamepad-everywhere-src-5.10.0.tar.xz"; - sha256 = "1rl77rsfgs69cdv75nfjp9w66mndwi211wix5cwl46d7i3wm0xak"; - name = "qtgamepad-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgamepad-everywhere-src-5.10.1.tar.xz"; + sha256 = "1xs6adpnv5ymdmb7kcbvcc0vx2lp6wqz53pzr9amyzbgyl0jiiw5"; + name = "qtgamepad-everywhere-src-5.10.1.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgraphicaleffects-everywhere-src-5.10.0.tar.xz"; - sha256 = "0c2y0ixxncn5xslpxciigq1gfaxd3n7wkcf14k4iy5i15w8nkfcp"; - name = "qtgraphicaleffects-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgraphicaleffects-everywhere-src-5.10.1.tar.xz"; + sha256 = "0zw4n6s42w70r45gjg66ad0s9dpxil6wmwwrivshnqvrnlqhcfrz"; + name = "qtgraphicaleffects-everywhere-src-5.10.1.tar.xz"; }; }; qtimageformats = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtimageformats-everywhere-src-5.10.0.tar.xz"; - sha256 = "1z7lnw85apzf6ph3dgnbb6py17qzpgww92kz31n6vbv5z62bigwi"; - name = "qtimageformats-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtimageformats-everywhere-src-5.10.1.tar.xz"; + sha256 = "10x248s4a6ij18awkdskk3g7zfw6gwyj63l2jr803blyfyibl118"; + name = "qtimageformats-everywhere-src-5.10.1.tar.xz"; }; }; qtlocation = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtlocation-everywhere-src-5.10.0.tar.xz"; - sha256 = "1iw5m9v5p6l6mivjvj7g1macpqf2n21mg4wg0hza36dwrz3wwkfq"; - name = "qtlocation-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtlocation-everywhere-src-5.10.1.tar.xz"; + sha256 = "1jbjzl6gwxy4n43x6m55b86vkdpjvwyvw7xsxg4a40f72xaw0p2y"; + name = "qtlocation-everywhere-src-5.10.1.tar.xz"; }; }; qtmacextras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmacextras-everywhere-src-5.10.0.tar.xz"; - sha256 = "08n8na36j9c15hvicqfs7h915m2av5xd5v0azf7660z0q9lk9zb3"; - name = "qtmacextras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmacextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "1jkzizsa8nr1dp5n9p81s6ylnqfh0vqwz8l72632fg68x229jfn7"; + name = "qtmacextras-everywhere-src-5.10.1.tar.xz"; }; }; qtmultimedia = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmultimedia-everywhere-src-5.10.0.tar.xz"; - sha256 = "0vw0i5jgn4q63g5ijwwrb6835qdaxcw7sfcjffbqfbdwqgyk70q0"; - name = "qtmultimedia-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmultimedia-everywhere-src-5.10.1.tar.xz"; + sha256 = "0j9nq8s2kzfc7zqs253pixqwd5xjv2cbqyik5lgvi9p5bq0riym1"; + name = "qtmultimedia-everywhere-src-5.10.1.tar.xz"; }; }; qtnetworkauth = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtnetworkauth-everywhere-src-5.10.0.tar.xz"; - sha256 = "1lnqi1qpy9j5pi2lcmdihf81lspxv6hgdg5jmbqqdqxwzblgpnpc"; - name = "qtnetworkauth-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtnetworkauth-everywhere-src-5.10.1.tar.xz"; + sha256 = "1p6wnma2nygqbjhrbiijjgkc8jq6lkdmq6xaxcgdh8ynkcqiq8wp"; + name = "qtnetworkauth-everywhere-src-5.10.1.tar.xz"; }; }; qtpurchasing = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtpurchasing-everywhere-src-5.10.0.tar.xz"; - sha256 = "0mkxslc8qc6sclpngllby3bb86qq5csrsz0xrc14nwmbkhwksxwc"; - name = "qtpurchasing-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtpurchasing-everywhere-src-5.10.1.tar.xz"; + sha256 = "090gmxy5bp44rirl5yrb1ryn97z37ri4fmmclh9z7c4dvnmr2d3j"; + name = "qtpurchasing-everywhere-src-5.10.1.tar.xz"; }; }; qtquickcontrols = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols-everywhere-src-5.10.0.tar.xz"; - sha256 = "0ab19raip9828br21qqaglr4y0kqmxix882r13sfxlnm4ivyycx1"; - name = "qtquickcontrols-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols-everywhere-src-5.10.1.tar.xz"; + sha256 = "1dw22sk2x5bk2mix06w8dv1b05dyq0gx088aqvdz18y67ncs2cfj"; + name = "qtquickcontrols-everywhere-src-5.10.1.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols2-everywhere-src-5.10.0.tar.xz"; - sha256 = "18d1b5aivaqgs1px61glkyclkky60xd7yzy1vwa1f89sg8j711w1"; - name = "qtquickcontrols2-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols2-everywhere-src-5.10.1.tar.xz"; + sha256 = "0jk01vgzc78w45q8kys1hwri3jx0hzx5vxivzmv8nh8yj0dlmijx"; + name = "qtquickcontrols2-everywhere-src-5.10.1.tar.xz"; }; }; qtremoteobjects = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtremoteobjects-everywhere-src-5.10.0.tar.xz"; - sha256 = "01bf1ykqxb4d8wz58vxy15yj4jsaqhi258k05dhy7ygdvfgscdnz"; - name = "qtremoteobjects-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtremoteobjects-everywhere-src-5.10.1.tar.xz"; + sha256 = "052fa27rv4b9h6qbldrq013zxb69ysgmqnxbyv9c48s2ra50pnp9"; + name = "qtremoteobjects-everywhere-src-5.10.1.tar.xz"; }; }; qtscript = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscript-everywhere-src-5.10.0.tar.xz"; - sha256 = "1z6a14x9yj0p2znc0vny8y4zkdvm5fp42rnisnf9rynakkqg5wkc"; - name = "qtscript-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscript-everywhere-src-5.10.1.tar.xz"; + sha256 = "0bakr5xcxc6j6l78fyazh7sgcz2hwf2g8k60jb9307qzrgvqlqg0"; + name = "qtscript-everywhere-src-5.10.1.tar.xz"; }; }; qtscxml = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscxml-everywhere-src-5.10.0.tar.xz"; - sha256 = "142qysd5s706r62gap62s89xm7334i1ys29dqsp09av9n7b1kfsb"; - name = "qtscxml-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscxml-everywhere-src-5.10.1.tar.xz"; + sha256 = "00v1n86pyw9cm320qa2fpazvkfi6czd027x60k2g2sprwh0x4hhb"; + name = "qtscxml-everywhere-src-5.10.1.tar.xz"; }; }; qtsensors = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsensors-everywhere-src-5.10.0.tar.xz"; - sha256 = "0w9rzqc0hva4521i5j298lrsvys3jqddmqd80cxj9nsvnapwb66d"; - name = "qtsensors-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsensors-everywhere-src-5.10.1.tar.xz"; + sha256 = "15jw2r6snhwi26b4ajp7m89l89kaf1j0kgqds4wjpksk1rngf3dv"; + name = "qtsensors-everywhere-src-5.10.1.tar.xz"; }; }; qtserialbus = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialbus-everywhere-src-5.10.0.tar.xz"; - sha256 = "06rr0191zy5yxqzxiv0c6dvshncjg8kdc33lszk41pajv624fn9z"; - name = "qtserialbus-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialbus-everywhere-src-5.10.1.tar.xz"; + sha256 = "0mr2j86mk1fm9z5iba3kav651231j9jv0805q8716h7ia1ws2l06"; + name = "qtserialbus-everywhere-src-5.10.1.tar.xz"; }; }; qtserialport = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialport-everywhere-src-5.10.0.tar.xz"; - sha256 = "0mqlhdp20jl6agv58mszznsikmi1dflhalkpfbgpiafjzzczx075"; - name = "qtserialport-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialport-everywhere-src-5.10.1.tar.xz"; + sha256 = "17ja368ggl9aak64r8sqzx34j2i8zv7z60bkhncynrgipc9wpr08"; + name = "qtserialport-everywhere-src-5.10.1.tar.xz"; }; }; qtspeech = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtspeech-everywhere-src-5.10.0.tar.xz"; - sha256 = "1hashidb33f1215f0azjby1lh8iw7v2bvxp08mqvdk02jld9w5br"; - name = "qtspeech-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtspeech-everywhere-src-5.10.1.tar.xz"; + sha256 = "07clcy3bslq4fk7xb6cqlfsz5frhmy41hzpajdqjwj9h6dvmqxw5"; + name = "qtspeech-everywhere-src-5.10.1.tar.xz"; }; }; qtsvg = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsvg-everywhere-src-5.10.0.tar.xz"; - sha256 = "1c77wnpzjz4wwic5if876y5v1n44v2g2nhjmcs25cc8awz5afaja"; - name = "qtsvg-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz"; + sha256 = "0nkz3kxclk7s95fnh8xgljahk131mwb8pjllgp7n70ycmc20rq00"; + name = "qtsvg-everywhere-src-5.10.1.tar.xz"; }; }; qttools = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttools-everywhere-src-5.10.0.tar.xz"; - sha256 = "0cpybii2yznk6gwaa2cz83rk3cpzzm6l4wvn4n2xwdbrgdsdrx8z"; - name = "qttools-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz"; + sha256 = "0lwa0i6zspcrii0ak1dyxacif1fkv2vhmdp3dmp7af71bwg49spi"; + name = "qttools-everywhere-src-5.10.1.tar.xz"; }; }; qttranslations = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttranslations-everywhere-src-5.10.0.tar.xz"; - sha256 = "1gmrisf08nsrni7fyjlz5ggfgfzzkjpq3g7l2hc6vq5g04vbskgc"; - name = "qttranslations-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz"; + sha256 = "1za34rvn3bhzi4mxqm9lghdhaqcxpsi6xa61dfbhpc047l788v8z"; + name = "qttranslations-everywhere-src-5.10.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz"; - sha256 = "0mqb9sgvq7djd2lz4q4p6p9f0c23cfhk447zx4axvv1mldjxsb9c"; - name = "qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz"; + sha256 = "0bnmhy0kibvyra0i15qzwc9195s8wpfhg5gk0d6rfwd5d07gj6a3"; + name = "qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz"; }; }; qtwayland = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwayland-everywhere-src-5.10.0.tar.xz"; - sha256 = "14sb0227rzqzf5z8dz8b9nzkk5rwq6hrfxifz603iy4mdijzjmsn"; - name = "qtwayland-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwayland-everywhere-src-5.10.1.tar.xz"; + sha256 = "0mk3p8pkfia3z7v7phk0qdyzd1zkfpk92c995g851p5wbqx699zm"; + name = "qtwayland-everywhere-src-5.10.1.tar.xz"; }; }; qtwebchannel = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebchannel-everywhere-src-5.10.0.tar.xz"; - sha256 = "18rml5xyb9chz8wrfamsgx4z32kkjbk1rc47ynvhn49mcbf2897j"; - name = "qtwebchannel-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebchannel-everywhere-src-5.10.1.tar.xz"; + sha256 = "0r1p1ar4xh7g7lzi564hgw1ng5xkim4mkpgq29ymjlmhxjgl8b62"; + name = "qtwebchannel-everywhere-src-5.10.1.tar.xz"; }; }; qtwebengine = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebengine-everywhere-src-5.10.0.tar.xz"; - sha256 = "1yb7jpydxg0dwdrx0iv7i5dq4wb9ld1iff8zpjdj8yl4xy4mkgx8"; - name = "qtwebengine-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebengine-everywhere-src-5.10.1.tar.xz"; + sha256 = "1ph1pinxn0dp44zall9gihbgziira4zpynixacm4ldd85f6lyr0j"; + name = "qtwebengine-everywhere-src-5.10.1.tar.xz"; }; }; qtwebglplugin = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebglplugin-everywhere-src-5.10.0.tar.xz"; - sha256 = "0hgwb5lll3275knnj3ms04y1n0i6gph9kac2246ixmcq8sc7a2k7"; - name = "qtwebglplugin-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebglplugin-everywhere-src-5.10.1.tar.xz"; + sha256 = "1hdzymwai5f6agkn4hz32aq5fjv2lqdac285fwrlk5gsff0j0yal"; + name = "qtwebglplugin-everywhere-src-5.10.1.tar.xz"; }; }; qtwebsockets = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebsockets-everywhere-src-5.10.0.tar.xz"; - sha256 = "00wlyhw7h2axyhinksfm912jfa3n73szxdccz5dlir8742i0zaqp"; - name = "qtwebsockets-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebsockets-everywhere-src-5.10.1.tar.xz"; + sha256 = "1sjkml5kqigvyxrkv5b7x1cy69d69dzma40yfg72vr7zal4pkkvf"; + name = "qtwebsockets-everywhere-src-5.10.1.tar.xz"; }; }; qtwebview = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebview-everywhere-src-5.10.0.tar.xz"; - sha256 = "1955fkc7a22d7a0y2n7kz7r1md56v2s5qvyb3h68szs60zjnk3xa"; - name = "qtwebview-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebview-everywhere-src-5.10.1.tar.xz"; + sha256 = "110mwc423cq1bwdz0vv78cjprzy03xawxnxhfcs4138gssfj0n0b"; + name = "qtwebview-everywhere-src-5.10.1.tar.xz"; }; }; qtwinextras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwinextras-everywhere-src-5.10.0.tar.xz"; - sha256 = "1mx5qihmh3awqcr9k3z2chxz8273bi5ha90v7f4fqr2vk3g6w4yd"; - name = "qtwinextras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "05w9n8kry1mg3i14i4m98gm5hf20mlwxbagbk9xk11xykbm1wh0j"; + name = "qtwinextras-everywhere-src-5.10.1.tar.xz"; }; }; qtx11extras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtx11extras-everywhere-src-5.10.0.tar.xz"; - sha256 = "11jp0a40jqwcdq7isyip4f4mq2d58c9fx1kvg9g71m92n52ffyfb"; - name = "qtx11extras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtx11extras-everywhere-src-5.10.1.tar.xz"; + sha256 = "1d4pvisxbcyb7ljl1lh2zg72kw44h9kk14l0xmvajb8bslgkg2n3"; + name = "qtx11extras-everywhere-src-5.10.1.tar.xz"; }; }; qtxmlpatterns = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtxmlpatterns-everywhere-src-5.10.0.tar.xz"; - sha256 = "1hq3sbimbhaiw570d2cd84jhki0n2jw2x2s7iq92m53y4akbr2mh"; - name = "qtxmlpatterns-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtxmlpatterns-everywhere-src-5.10.1.tar.xz"; + sha256 = "1zp9smsfdqyfiarxs7r8kfr7yq68cdn7biddwl36cybax6fgbpiw"; + name = "qtxmlpatterns-everywhere-src-5.10.1.tar.xz"; }; }; qtwebkit = { diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index f1d9026b5f92..bddda1dff552 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "range-v3-${version}"; - version = "2017-01-30"; + version = "0.3.5"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; - rev = "bab29767cce120e11872d79a2537bc6f0be76963"; - sha256 = "0kncpxms3f0nmn6jppp484244xq15d9298g3h3nlm1wvq8ib1jhi"; + rev = version; + sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp"; }; - dontBuild = true; - installPhase = '' - mkdir -p $out/include - mv include/ $out/ - ''; + nativeBuildInputs = [ cmake ]; + + doCheck = true; + checkTarget = "test"; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Experimental range library for C++11/14/17"; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index ff017279dc64..bb43a49235bd 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rdkafka-${version}"; - version = "0.9.5"; + version = "0.11.3"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "0yp8vmj3yc564hcmhx46ssyn8qayywnsrg4wg67qk6jw967qgwsn"; + sha256 = "17ghq0kzk2fdpxhr40xgg3s0p0n0gkvd0d85c6jsww3mj8v5xd14"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index cabd89dc9350..7faee7e69a2e 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, geos, libspatialite }: stdenv.mkDerivation rec { - name = "readosm-1.0.0b"; + name = "readosm-1.1.0"; src = fetchurl { url = "http://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; - sha256 = "042pv31smc7l6y111rvp0hza5sw86wa8ldg2jyq78xgwzcbhszpd"; + sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; }; buildInputs = [ expat zlib geos libspatialite ]; diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 4ec06d68a329..fff1d6498361 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "resolv_wrapper-1.1.3"; + name = "resolv_wrapper-1.1.5"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1h76155pnmd3pqxfyi00q0fg6v45ad9dhnjsqcsbzg18s626wyad"; + sha256 = "0v5hw5ipq2rrpraf4ck4r9w9xihmgwzkpf5wgppz7gc52fmgv2g9"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index b37a9bc04c39..562942f230fb 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "5.10.2"; + version = "5.10.3"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${version}"; - sha256 = "00qnd56v4qyzxg0b3ya3flf2jhbbfaibj1y53bd5ciaw3af6zxnd"; + sha256 = "19d8i8map8qz639mhflmxc0w9gp78fvkq1l46y5s6b5imwh0w7xq"; }; nativeBuildInputs = [ which perl ]; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index d6e55e7bf73c..f5715157531e 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -40,6 +40,6 @@ in version = "7.0.5"; cudatoolkit = cudatoolkit9; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "1a3e076447d5b9860c73d9bebe7087ffcb7b0c8814fd1e506096435a2ad9ab0e"; + sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y"; }; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 567ee7853f88..f694f72f22b6 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ipopt-${version}"; - version = "3.12.8"; + version = "3.12.9"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "1lyhgashyk2wswv0z2qnkxng32pim80kzf9jfgxi07wl09x753w1"; + sha256 = "1fqdjgxh6l1xjvw1ffma7lg92xqg0l8sj02y0zqvbfnx8i47qs9a"; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index c4deccff5b7e..1d692f6316ff 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,41 +1,24 @@ -{ stdenv, fetchFromGitHub -, gcc5, eject, cudatoolkit -}: +{ callPackage, cudatoolkit8, cudatoolkit9 }: -stdenv.mkDerivation rec { - name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; - version = "1.3.4-1"; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "nccl"; - rev = "v${version}"; - sha256 = "0fvnrfn572lc6i2a3xyhbifm53ivcrr46z6cqr3b0bwb1iq79m7q"; +let + generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { + inherit (args) cudatoolkit; }; - nativeBuildInputs = [ - gcc5 - eject - ]; +in - propagatedBuildInputs = [ - cudatoolkit - ]; +{ + nccl_cudatoolkit8 = generic rec { + version = "2.1.4"; + cudatoolkit = cudatoolkit8; + srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; + sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi"; + }; - makeFlags = [ - "PREFIX=$(out)" - "CUDA_HOME=${cudatoolkit}" - "CUDA_LIB=${cudatoolkit.lib}/lib" - ]; - - meta = with stdenv.lib; { - description = '' - NVIDIA Collective Communications Library. - Multi-GPU and multi-node collective communication primitives. - ''; - homepage = https://developer.nvidia.com/nccl; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ hyphon81 ]; + nccl_cudatoolkit9 = generic rec { + version = "2.1.4"; + cudatoolkit = cudatoolkit9; + srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; + sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p"; }; } diff --git a/pkgs/development/libraries/science/math/nccl/generic.nix b/pkgs/development/libraries/science/math/nccl/generic.nix new file mode 100644 index 000000000000..aa04d75b078b --- /dev/null +++ b/pkgs/development/libraries/science/math/nccl/generic.nix @@ -0,0 +1,57 @@ +{ version +, srcName +, sha256 +}: + +{ stdenv +, lib +, requireFile +, cudatoolkit +}: + +stdenv.mkDerivation rec { + name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; + + inherit version; + + src = requireFile rec { + name = srcName; + inherit sha256; + message = '' + This nix expression requires that ${name} is already part of the store. + Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the NCCL library + at https://developer.nvidia.com/nccl, and run the following command in the download directory: + nix-prefetch-url file://${name} + ''; + }; + + unpackCmd = "tar xJf $src"; + + installPhase = '' + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + } + fixRunPath lib/libnccl.so + + mkdir -p $out + cp -a include $out/include + cp -a lib $out/lib + ''; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + passthru = { + inherit cudatoolkit; + }; + + meta = with stdenv.lib; { + description = "Multi-GPU and multi-node collective communication primitives that are performance optimized for NVIDIA GPUs"; + homepage = https://developer.nvidia.com/nccl; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index 989ad27055fa..3a4c5a784385 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gfortran }: stdenv.mkDerivation { - name = "openspecfun-0.4"; + name = "openspecfun-0.5.3"; src = fetchurl { - url = "https://github.com/JuliaLang/openspecfun/archive/v0.4.tar.gz"; - sha256 = "0nsa3jjmlhcqkw5ba5ypbn3n0c8b6lc22zzlxnmxkxi9shhdx65z"; + url = "https://github.com/JuliaLang/openspecfun/archive/v0.5.3.tar.gz"; + sha256 = "1rs1bv8jq751fv9vq79890wqf9xlbjc7lvz3ighzyfczbyjcf18m"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index bc5527a8e970..efedbe725af1 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "petsc-${version}"; - version = "3.7.6"; + version = "3.8.3"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "0jfl35lrhzvv982z6h1v5rcp39g0x16ca43rm9dx91wm6i8y13iw"; + sha256 = "1b1yr93g6df8kx10ri2y26bp3l3w3jv10r80krnarbvyjgnw7y81"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index b481bd0cf651..3234d1bb89bf 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, proj }: stdenv.mkDerivation rec { - name = "shapelib-1.4.0"; + name = "shapelib-1.4.1"; src = fetchurl { url = "http://download.osgeo.org/shapelib/${name}.tar.gz"; - sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y"; + sha256 = "1cr3b5jfglwisbyzj7fnxp9xysqad0fcmcqvqaja6qap6qblijd4"; }; buildInputs = [ proj ]; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 4db4a07b4e56..6d0ca4c1d675 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.1.5"; + name = "socket_wrapper-1.1.9"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "01gn21kbicwfn3vlnnir8c11z2g54b532bj3qrpdrhgrcm3ifi45"; + sha256 = "1d7bbr4j1ybq2dm6q3f6ncv36qqxyjygq4z1q0hvadlcaw7pj79c"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 729967ea1b7f..c338d6762a4d 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pName = "soundtouch"; - name = "${pName}-1.9.2"; + name = "${pName}-2.0.0"; src = fetchurl { url = "http://www.surina.net/soundtouch/${name}.tar.gz"; - sha256 = "04y5l56yn4jvwpv9mn1p3m2vi5kdym9xpdac8pmhwhl13r8qdsya"; + sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j"; }; buildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 080dbc4510dd..01b766351c27 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1 +{ stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , gtk3, epoxy }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ - spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection + spice-protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy ]; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index c8e98d3d28ed..1ab76340cc7c 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama -, libjpeg, zlib, spice_protocol, python, pyparsing, glib, cyrus_sasl +, libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl , lz4 }: with stdenv.lib; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libXrandr libXfixes libXrender libXext libXinerama python pyparsing glib cyrus_sasl lz4 ]; - nativeBuildInputs = [ pkgconfig spice_protocol ]; + nativeBuildInputs = [ pkgconfig spice-protocol ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index c1f624f8744d..ed19814be34a 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { name = "sqlcipher-${version}"; - version = "3.4.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "1lwc2m21sax3pnjfqddldbpbwr3b51s91fxz7dd7hf6ly8swnsvp"; + sha256 = "168wb6fvyap7y8j86fb3xl5rd4wmhiq0dxvx9wxwi5kwm1j4vn1a"; }; buildInputs = [ readline ncurses openssl tcl ]; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 8a8680a498a0..fd9ab5a2036d 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, libiconv }: stdenv.mkDerivation rec { - name = "stfl-0.22"; + name = "stfl-0.24"; src = fetchurl { url = "http://www.clifford.at/stfl/${name}.tar.gz"; - sha256 = "062lqlf3qhp8bcapbpc0k3wym7x6ngncql8jmx5x06p6679szp9d"; + sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl"; }; buildInputs = [ ncurses libiconv ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { DESTDIR=$out prefix=\"\" make install # some programs rely on libstfl.so.0 to be present, so link it - ln -s $out/lib/libstfl.so.0.22 $out/lib/libstfl.so.0 + ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0 ''; meta = { diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index 276b279fc09e..a92c7b74ebf7 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tclap-1.2.1"; + name = "tclap-1.2.2"; src = fetchurl { url = "mirror://sourceforge/tclap/${name}.tar.gz"; - sha256 = "1fzf7l1wvlhxnpwi15jvvfizn836s7r0r8vckgbqk2lyf7ihz7wz"; + sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; }; meta = { diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 75b811df30c3..6ffbe5dc60c5 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tcllib-${version}"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; - sha256 = "05dmrk9qsryah2n17z6z85dj9l9lfyvnsd7faw0p9bs1pp5pwrkj"; + sha256 = "173abxaazdmf210v651708ab6h7xhskvd52krxk6ifam337qgzh1"; }; passthru = { diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 7ccd98856f62..d372c61dbe28 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tdb-1.3.11"; + name = "tdb-1.3.15"; src = fetchurl { url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "0i1l38h0vyck6zkcj4fn2l03spadlmyr1qa1xpdp9dy2ccbm3s1r"; + sha256 = "0a37jhpij8wr4f4pjqdlwnffy2l6a2vkqdpz1bqxj6v06cwbz8dl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index aed08435a149..41308a7ef4ec 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, telepathy_glib, farstream, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, telepathy-glib, farstream, dbus-glib }: stdenv.mkDerivation rec { name = "${pname}-0.6.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g"; }; - propagatedBuildInputs = [ dbus_glib telepathy_glib farstream ]; + propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; nativeBuildInputs = [ pkgconfig ]; meta = { diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index fffe677f6a71..df5c76abd7cd 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt +{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt , gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings"; LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [dbus_glib glib gobjectIntrospection]; + propagatedBuildInputs = [dbus-glib glib gobjectIntrospection]; nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38; buildInputs = [ glibcLocales python2 ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 18888df5c52b..90dd47c11e2f 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus_glib, dbus_daemon -, telepathy_farstream, telepathy_glib, fetchpatch }: +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon +, telepathy-farstream, telepathy-glib, fetchpatch }: let inherit (python2Packages) python dbus-python; @@ -12,8 +12,8 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig python ]; - propagatedBuildInputs = [ qtbase telepathy_farstream telepathy_glib ]; - buildInputs = [ dbus_glib ]; + propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; + buildInputs = [ dbus-glib ]; checkInputs = [ dbus_daemon dbus-python ]; patches = [ diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 2982d33e9962..c5c064142db0 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.30"; + name = "tevent-0.9.35"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "1gccqiibf6ia129xhqrg18anax3sxwfbwm8h4pvsga3ndxg931ap"; + sha256 = "1s8nbkmqz8dzdlsd6qynhvyl05pw93r151f3i2kgjfpbck9ak8r5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 55855d05d16e..45e5174ed573 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "thrift-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; - sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292"; + sha256 = "1hk0zb9289gf920rdl0clmwqx6kvygz92nj01lqrhd2arfv3ibf4"; }; #enableParallelBuilding = true; problems on hydra diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 26c040721bdf..377ceba59e70 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, autoconf, gtk_doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }: +{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }: stdenv.mkDerivation rec { version="0.5.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf gtk_doc automake libtool glib libsoup gobjectIntrospection ]; + buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobjectIntrospection ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 9a2f6eb203a1..ccd876dfefbd 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "uid_wrapper-1.2.0"; + name = "uid_wrapper-1.2.4"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0sfznk53kmz9m3rxwbv4pwwqs4bw3kr917y4n53h5jaxjym0m4c0"; + sha256 = "1yjhrm3rcyiykkrgpifmig117mzjxrms75kp8gpp8022f59zcq1w"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index fdf882ce817e..a0936310c42f 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchFromGitHub, autoreconfHook -, pkgconfig, glib, systemd, libgudev, vala }: +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk-doc +, pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { - name = "umockdev"; - version = "0.8.13"; + name = "umockdev-${version}"; + version = "0.11"; src = fetchFromGitHub { owner = "martinpitt"; repo = "umockdev"; rev = version; - sha256 ="0bw2dpshlgbdwg5mhq4j22z474llpqix8pxii63r2bk5nhjc537k"; + sha256 ="1gpk2f03nad4qv084hx7549d68cqc1xibxm0ncanafm5xjz1hp55"; }; - buildInputs = [ glib systemd libgudev vala ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib systemd libgudev ]; + nativeBuildInputs = [ automake autoconf libtool gtk-doc pkgconfig vala ]; - ### docs/gtk-doc.make not found - prePatch = '' - sed -i 's|include $(top_srcdir)/docs/gtk-doc.make||g' docs/reference/Makefile.am - sed -i 's|+=|=|g' docs/reference/Makefile.am - ''; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; meta = with stdenv.lib; { description = "Mock hardware devices for creating unit tests"; diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 97cffbf0f75b..90a28df6a15a 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "unittest-cpp-${version}"; - version = "1.6.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "unittest-cpp"; repo = "unittest-cpp"; rev = "v${version}"; - sha256 = "1sva2bm90z4vmwwvp0af82f7p4sdq5j2jjqzhs2ppihdkggn62d1"; + sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"; }; buildInputs = [cmake]; diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 99ab8a056162..7d59866d0431 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unixODBC-${version}"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; - sha256 = "0f8y88rcc2akjvjv5y66yx7k0ms9h1s0vbcfy25j93didflhj59f"; + sha256 = "0ns93daph4wmk92d7m2w48x0yki4m1yznxnn97p1ldn6bkh742bn"; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 1dbbcf798c9f..e2a2af615b88 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "Vc-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "119sm0kldr5j163ff04fra35420cvpj040hs7n0mnfbcgyx4nxq9"; + sha256 = "0y4riz2kiw6a9w2zydj6x0vhy2qc9v17wspq3n2q88nbas72yd2m"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index e93f071aefac..48ad33424f60 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libcdio, libxml2, popt }: +{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt }: -stdenv.mkDerivation { - name = "vcdimager-0.7.24"; +stdenv.mkDerivation rec { + name = "vcdimager-2.0.1"; src = fetchurl { - url = mirror://gnu/vcdimager/vcdimager-0.7.24.tar.gz; - sha256 = "1526jxynslg07i50v3c3afhc8swbd4si8y6s8m3h1wrz6mkplp87"; + url = "mirror://gnu/vcdimager/${name}.tar.gz"; + sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7"; }; nativeBuildInputs = [ pkgconfig ]; @@ -14,9 +14,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ libcdio ]; - meta = { + meta = with lib; { homepage = http://www.gnu.org/software/vcdimager/; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = stdenv.lib.platforms.gnu; # random choice + platforms = platforms.gnu; # random choice + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.18.nix index d3e3163a8afe..a79ef3439166 100644 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls -, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit +, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at-spi2-core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit , libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite , enableGtk2Plugins ? false, gtk2 ? null @@ -88,8 +88,8 @@ stdenv.mkDerivation rec { buildInputs = libintlOrEmpty ++ [ libwebp enchant libnotify gnutls pcre nettle libidn - libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core ] ++ optional enableGeoLocation geoclue2 ++ optional enableGtk2Plugins gtk2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index fdbef27705e8..fa65a14121fc 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "0bjfzpgj50cd27lfz6vry9bdz0f0kvgq8plqdbhlk7kjp32nm2bv"; + sha256 = "0mvq7ifcpckfrg0zzcxqfbrv08pnz4a8g2z2j3s9h3cwns9ipn6h"; }; outputs = [ "out" "dev" "doc" "lib" ]; diff --git a/pkgs/development/libraries/zeitgeist/dbus_glib.patch b/pkgs/development/libraries/zeitgeist/dbus_glib.patch deleted file mode 100644 index 872ea0db31b8..000000000000 --- a/pkgs/development/libraries/zeitgeist/dbus_glib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac 2014-01-27 22:45:42.000000000 +0100 -+++ configure.ac.new 2014-05-02 17:25:45.813491239 +0200 -@@ -151,6 +151,7 @@ - gio-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED -+ dbus-glib-1 - json-glib-1.0 >= $JSON_GLIB_REQUIRED" - - AC_ARG_ENABLE([datahub], diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 3c50de6cc6b7..33cf5dd4af84 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38 -, intltool, libtool, dbus_libs, telepathy_glib -, gtk3, json_glib, librdf_raptor2, dbus_glib +{ stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38 +, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib +, gtk3, json-glib, librdf_raptor2, dbus-glib , pythonSupport ? true, python2Packages }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.0.1"; name = "zeitgeist-${version}"; src = fetchgit { url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist"; rev = "v${version}"; - sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8"; + sha256 = "1lgqcqr5h9ba751b7ajp7h2w1bb5qza2w3k1f95j3ab15p7q0q44"; }; - configureScript = "./autogen.sh"; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; - nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ]; - buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib - gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ]; + buildInputs = [ + glib sqlite dbus_libs telepathy-glib dbus-glib + gtk3 json-glib librdf_raptor2 python2Packages.rdflib + ]; prePatch = "patchShebangs ."; - patches = [ ./dbus_glib.patch ]; - - patchFlags = [ "-p0" ]; - enableParallelBuilding = true; - postFixup = '' - '' + stdenv.lib.optionalString pythonSupport '' + postFixup = stdenv.lib.optionalString pythonSupport '' moveToOutput lib/${python2Packages.python.libPrefix} "$py" ''; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 00973350e185..f67964748dca 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.7"; + version = "2.7.4"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1jvx3a523mzkc54rrjab9kz66kc6q1snry9ymwmsx7rrd3kv3j6m"; + sha256 = "1gpmf6algpl1g1z891jfnsici84scg2cq1kj4v90glgik9z99mci"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 522d2c252684..65fb6e615f5f 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -13,7 +13,7 @@ shift export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS test -n "$NIX_LISP_LD_LIBRARY_PATH" && - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$NIX_LISP_LD_LIBRARY_PATH" declare -a NIX_LISP_FINAL_PARAMETERS; diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index b13ddf8357f4..390e0e061128 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -33,7 +33,7 @@ let test -n "$LD_LIBRARY_PATH" && echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script" test -n "$NIX_LISP_LD_LIBRARY_PATH" && - echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':')'" >> "$path_config_script" + echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':' | sed -e 's/:$//')'" >> "$path_config_script" echo "fi" >> "$path_config_script" ''; deployLaunchScript = '' @@ -43,7 +43,7 @@ let chmod a+x "$launch_script" echo "#! /bin/sh" >> "$launch_script" echo "source '$config_script'" >> "$launch_script" - echo "export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" + echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" ''; moveAsdFiles = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix new file mode 100644 index 000000000000..6dbff1d6e56c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -0,0 +1,49 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''buildnode-xhtml''; + version = ''buildnode-20170403-git''; + + description = ''Tool for building up an xml dom of an excel spreadsheet nicely.''; + + deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; + sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + }; + + packageName = "buildnode-xhtml"; + + asdFilesToKeep = ["buildnode-xhtml.asd"]; + overrides = x: x; +} +/* (SYSTEM buildnode-xhtml DESCRIPTION + Tool for building up an xml dom of an excel spreadsheet nicely. SHA256 + 1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6 URL + http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz + MD5 b917f0d6c20489febbef0d5b954c350d NAME buildnode-xhtml FILENAME + buildnode-xhtml DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode FILENAME buildnode) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME puri FILENAME puri) + (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank) + (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop + closure-common closure-html collectors cxml cxml-dom cxml-klacks cxml-test + cxml-xml flexi-streams iterate puri split-sequence swank symbol-munger + trivial-features trivial-gray-streams) + VERSION buildnode-20170403-git SIBLINGS + (buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix new file mode 100644 index 000000000000..ecc1634bfce0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -0,0 +1,50 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''buildnode''; + version = ''20170403-git''; + + parasites = [ "buildnode-test" ]; + + description = ''Tool for building up an xml dom nicely.''; + + deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; + sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + }; + + packageName = "buildnode"; + + asdFilesToKeep = ["buildnode.asd"]; + overrides = x: x; +} +/* (SYSTEM buildnode DESCRIPTION Tool for building up an xml dom nicely. SHA256 + 1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6 URL + http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz + MD5 b917f0d6c20489febbef0d5b954c350d NAME buildnode FILENAME buildnode DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode-xhtml FILENAME buildnode-xhtml) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) + (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode + closer-mop closure-common closure-html collectors cxml cxml-dom + cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri + split-sequence swank symbol-munger trivial-features trivial-gray-streams) + VERSION 20170403-git SIBLINGS + (buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml + buildnode-xul) + PARASITES (buildnode-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix new file mode 100644 index 000000000000..d1ce782e7f84 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-html5-parser''; + version = ''20171019-git''; + + description = ''A HTML5 parser for Common Lisp''; + + deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz''; + sha256 = ''0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98''; + }; + + packageName = "cl-html5-parser"; + + asdFilesToKeep = ["cl-html5-parser.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-html5-parser DESCRIPTION A HTML5 parser for Common Lisp SHA256 + 0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98 URL + http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz + MD5 c4a18ac20668c9aef723954fb901c16b NAME cl-html5-parser FILENAME + cl-html5-parser DEPS + ((NAME cl-ppcre FILENAME cl-ppcre) + (NAME flexi-streams FILENAME flexi-streams) + (NAME string-case FILENAME string-case) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES (cl-ppcre flexi-streams string-case trivial-gray-streams) + VERSION 20171019-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 572e3eb4cb38..3ca67723925e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -5,7 +5,7 @@ rec { description = ''Common Lisp smtp client.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl+ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz''; @@ -23,7 +23,7 @@ rec { MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl+ssl) + (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME flexi-streams FILENAME flexi-streams) (NAME split-sequence FILENAME split-sequence) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix similarity index 97% rename from pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix rename to pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 0243709f3fe1..99aa768c8dfc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,6 +1,6 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl+ssl''; + baseName = ''cl_plus_ssl''; version = ''cl+ssl-20171227-git''; parasites = [ "openssl-1.1.0" ]; @@ -22,7 +22,7 @@ rec { /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4 URL http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz - MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl+ssl DEPS + MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl_plus_ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix new file mode 100644 index 000000000000..7375b8dd7094 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''collectors''; + version = ''20161204-git''; + + parasites = [ "collectors-test" ]; + + description = ''A library providing various collector type macros + pulled from arnesi into its own library and stripped of dependencies''; + + deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz''; + sha256 = ''0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf''; + }; + + packageName = "collectors"; + + asdFilesToKeep = ["collectors.asd"]; + overrides = x: x; +} +/* (SYSTEM collectors DESCRIPTION + A library providing various collector type macros + pulled from arnesi into its own library and stripped of dependencies + SHA256 0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf URL + http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz + MD5 59c8c885a8e512d4f09e73d3e0c97b1f NAME collectors FILENAME collectors + DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME symbol-munger FILENAME symbol-munger)) + DEPENDENCIES (alexandria closer-mop iterate lisp-unit2 symbol-munger) + VERSION 20161204-git SIBLINGS NIL PARASITES (collectors-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix new file mode 100644 index 000000000000..2ad018e5549c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -0,0 +1,52 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''css-selectors''; + version = ''20160628-git''; + + parasites = [ "css-selectors-test" ]; + + description = ''An implementation of css selectors''; + + deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; + sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + }; + + packageName = "css-selectors"; + + asdFilesToKeep = ["css-selectors.asd"]; + overrides = x: x; +} +/* (SYSTEM css-selectors DESCRIPTION An implementation of css selectors SHA256 + 0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL + http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz + MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors FILENAME + css-selectors DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode FILENAME buildnode) + (NAME buildnode-xhtml FILENAME buildnode-xhtml) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) + (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME yacc FILENAME yacc)) + DEPENDENCIES + (alexandria babel buildnode buildnode-xhtml cl-interpol cl-ppcre cl-unicode + closer-mop closure-common closure-html collectors cxml cxml-dom + cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri + split-sequence swank symbol-munger trivial-features trivial-gray-streams + yacc) + VERSION 20160628-git SIBLINGS (css-selectors-simple-tree css-selectors-stp) + PARASITES (css-selectors-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index d6885fc58d8c..f03a95d27b1f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -5,7 +5,7 @@ rec { description = ''Yet another HTTP client for Common Lisp''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz''; @@ -25,7 +25,7 @@ rec { (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) (NAME cl-utilities FILENAME cl-utilities) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index 44ce34a2cb33..95162ffc99a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -5,7 +5,7 @@ rec { description = ''Full-featured http/https client based on usocket''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz''; @@ -24,7 +24,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 6a103b5ac1c5..611ef77256fa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -10,7 +10,7 @@ rec { simple framework for user-defined handlers and can be extended through subclassing.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz''; @@ -34,7 +34,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-who FILENAME cl-who) (NAME cxml-stp FILENAME cxml-stp) (NAME drakma FILENAME drakma) (NAME flexi-streams FILENAME flexi-streams) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix index da9fe306276f..a913cdbe521c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -5,7 +5,7 @@ rec { description = ''Load data into PostgreSQL''; - deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-finalizers" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."salza2" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; + deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-finalizers" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."salza2" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz''; @@ -28,7 +28,7 @@ rec { (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-containers FILENAME cl-containers) (NAME cl-csv FILENAME cl-csv) (NAME cl-fad FILENAME cl-fad) (NAME cl-interpol FILENAME cl-interpol) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix index 356c7ff68642..de24a5984960 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -5,7 +5,7 @@ rec { description = ''MySQL Native Driver''; - deps = [ args."alexandria" args."asdf-finalizers" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."cl+ssl" args."flexi-streams" args."ironclad" args."list-of" args."nibbles" args."salza2" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."asdf-finalizers" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."cl_plus_ssl" args."flexi-streams" args."ironclad" args."list-of" args."nibbles" args."salza2" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz''; @@ -26,7 +26,8 @@ rec { (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME cl+ssl FILENAME cl+ssl) (NAME flexi-streams FILENAME flexi-streams) + (NAME cl+ssl FILENAME cl_plus_ssl) + (NAME flexi-streams FILENAME flexi-streams) (NAME ironclad FILENAME ironclad) (NAME list-of FILENAME list-of) (NAME nibbles FILENAME nibbles) (NAME salza2 FILENAME salza2) (NAME split-sequence FILENAME split-sequence) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix new file mode 100644 index 000000000000..7f5cc1e048de --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''string-case''; + version = ''20151218-git''; + + description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz''; + sha256 = ''0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw''; + }; + + packageName = "string-case"; + + asdFilesToKeep = ["string-case.asd"]; + overrides = x: x; +} +/* (SYSTEM string-case DESCRIPTION + string-case is a macro that generates specialised decision trees to dispatch on string equality + SHA256 0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw URL + http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz + MD5 fb747ba1276f0173f875876425b1acc3 NAME string-case FILENAME string-case + DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix new file mode 100644 index 000000000000..4c88e839bdab --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''xembed''; + version = ''clx-20120909-git''; + + description = ''''; + + deps = [ args."clx" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz''; + sha256 = ''06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb''; + }; + + packageName = "xembed"; + + asdFilesToKeep = ["xembed.asd"]; + overrides = x: x; +} +/* (SYSTEM xembed DESCRIPTION NIL SHA256 + 06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb URL + http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz + MD5 4270362697093017ac0243b71e3576f9 NAME xembed FILENAME xembed DEPS + ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20120909-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 9a7fb3e5d1b8..0c12f169cf7b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -46,7 +46,7 @@ in cxml = skipBuildPhase; wookie = addNativeLibs (with pkgs; [libuv openssl]); lev = addNativeLibs [pkgs.libev]; - "cl+ssl" = addNativeLibs [pkgs.openssl]; + cl_plus_ssl = addNativeLibs [pkgs.openssl]; cl-colors = skipBuildPhase; cl-libuv = addNativeLibs [pkgs.libuv]; cl-async-ssl = addNativeLibs [pkgs.openssl]; @@ -154,4 +154,8 @@ $out/lib/common-lisp/query-fs" ]; asdFilesToKeep = x.asdFilesToKeep ++ ["simple-date.asd"]; }; + buildnode = x: { + deps = pkgs.lib.filter (x: x.name != quicklisp-to-nix-packages.buildnode-xhtml.name) x.deps; + parasites = pkgs.lib.filter (x: x!= "buildnode-test") x.parasites; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index ebf09c43a0e0..b133c3009ae6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -21,11 +21,13 @@ cl-base64 cl-cli cl-colors cl-cookie +cl-csv cl-dbi cl-emb cl-fuse cl-fuse-meta-fs cl-html-parse +cl-html5-parser cl-json cl-l10n cl-libuv @@ -55,8 +57,10 @@ cl-vectors cl-who clx clx-truetype +xembed command-line-arguments css-lite +css-selectors cxml dbd-mysql dbd-postgres diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index e931c12f1e72..8ea7d4700bd6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,34 +6,9 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; - "symbol-munger" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."symbol-munger" or (x: {})) - (import ./quicklisp-to-nix-output/symbol-munger.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "iterate" = quicklisp-to-nix-packages."iterate"; - })); - - "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres"; - "lisp-unit2" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lisp-unit2" or (x: {})) - (import ./quicklisp-to-nix-output/lisp-unit2.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; - })); - - "moptilities" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."moptilities" or (x: {})) @@ -54,14 +29,6 @@ let quicklisp-to-nix-packages = rec { })); - "yacc" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."yacc" or (x: {})) - (import ./quicklisp-to-nix-output/yacc.nix { - inherit fetchurl; - })); - - "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; @@ -135,7 +102,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "list-of" = quicklisp-to-nix-packages."list-of"; @@ -280,32 +247,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-interpol" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-interpol" or (x: {})) - (import ./quicklisp-to-nix-output/cl-interpol.nix { - inherit fetchurl; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - })); - - - "cl-csv" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-csv" or (x: {})) - (import ./quicklisp-to-nix-output/cl-csv.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; - })); - - "cl-containers" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-containers" or (x: {})) @@ -425,14 +366,6 @@ let quicklisp-to-nix-packages = rec { })); - "swank" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."swank" or (x: {})) - (import ./quicklisp-to-nix-output/swank.nix { - inherit fetchurl; - })); - - "rfc2388" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rfc2388" or (x: {})) @@ -524,6 +457,108 @@ let quicklisp-to-nix-packages = rec { })); + "yacc" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."yacc" or (x: {})) + (import ./quicklisp-to-nix-output/yacc.nix { + inherit fetchurl; + })); + + + "symbol-munger" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."symbol-munger" or (x: {})) + (import ./quicklisp-to-nix-output/symbol-munger.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + + "swank" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."swank" or (x: {})) + (import ./quicklisp-to-nix-output/swank.nix { + inherit fetchurl; + })); + + + "collectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."collectors" or (x: {})) + (import ./quicklisp-to-nix-output/collectors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + })); + + + "buildnode-xhtml" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."buildnode-xhtml" or (x: {})) + (import ./quicklisp-to-nix-output/buildnode-xhtml.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode" = quicklisp-to-nix-packages."buildnode"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "buildnode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."buildnode" or (x: {})) + (import ./quicklisp-to-nix-output/buildnode.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode-xhtml" = quicklisp-to-nix-packages."buildnode-xhtml"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "zpb-ttf" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."zpb-ttf" or (x: {})) @@ -689,6 +724,14 @@ let quicklisp-to-nix-packages = rec { })); + "string-case" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."string-case" or (x: {})) + (import ./quicklisp-to-nix-output/string-case.nix { + inherit fetchurl; + })); + + "pcall-queue" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."pcall-queue" or (x: {})) @@ -716,6 +759,32 @@ let quicklisp-to-nix-packages = rec { })); + "lisp-unit2" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lisp-unit2" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-unit2.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + })); + + + "cl-interpol" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-interpol" or (x: {})) + (import ./quicklisp-to-nix-output/cl-interpol.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + })); + + "lift" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lift" or (x: {})) @@ -1236,7 +1305,7 @@ let quicklisp-to-nix-packages = rec { "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-containers" = quicklisp-to-nix-packages."cl-containers"; "cl-csv" = quicklisp-to-nix-packages."cl-csv"; @@ -1490,7 +1559,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; @@ -1660,7 +1729,7 @@ let quicklisp-to-nix-packages = rec { "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; @@ -1694,7 +1763,7 @@ let quicklisp-to-nix-packages = rec { "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; @@ -1801,6 +1870,40 @@ let quicklisp-to-nix-packages = rec { })); + "css-selectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."css-selectors" or (x: {})) + (import ./quicklisp-to-nix-output/css-selectors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode" = quicklisp-to-nix-packages."buildnode"; + "buildnode-xhtml" = quicklisp-to-nix-packages."buildnode-xhtml"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + "css-lite" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."css-lite" or (x: {})) @@ -1817,6 +1920,15 @@ let quicklisp-to-nix-packages = rec { })); + "xembed" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."xembed" or (x: {})) + (import ./quicklisp-to-nix-output/xembed.nix { + inherit fetchurl; + "clx" = quicklisp-to-nix-packages."clx"; + })); + + "clx-truetype" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clx-truetype" or (x: {})) @@ -1941,10 +2053,10 @@ let quicklisp-to-nix-packages = rec { })); - "cl+ssl" = buildLispPackage + "cl_plus_ssl" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl+ssl" or (x: {})) - (import ./quicklisp-to-nix-output/cl+ssl.nix { + (qlOverrides."cl_plus_ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; @@ -2021,7 +2133,7 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; @@ -2171,6 +2283,18 @@ let quicklisp-to-nix-packages = rec { })); + "cl-html5-parser" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-html5-parser" or (x: {})) + (import ./quicklisp-to-nix-output/cl-html5-parser.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "string-case" = quicklisp-to-nix-packages."string-case"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "cl-html-parse" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-html-parse" or (x: {})) @@ -2245,6 +2369,21 @@ let quicklisp-to-nix-packages = rec { })); + "cl-csv" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-csv" or (x: {})) + (import ./quicklisp-to-nix-output/cl-csv.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + })); + + "cl-cookie" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-cookie" or (x: {})) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp index 63d6f3305194..3824a04826f1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -55,6 +55,7 @@ (#\\ "_backslash_") (#\_ "__") (#\. "_dot_") + (#\+ "_plus_") (t x))))) (defvar *system-info-bin* diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 7152d0b9e360..091ae06ab910 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -1,4 +1,4 @@ -lua: +{ lua, writeText }: { buildInputs ? [], disabled ? false, ... } @ attrs: @@ -19,5 +19,36 @@ else { name = "lua${lua.luaversion}-" + attrs.name; buildInputs = buildInputs ++ [ lua ]; + + setupHook = writeText "setup-hook.sh" '' + # check for lua/clua modules and don't add duplicates + + addLuaLibPath() { + local package_path="$1/share/lua/${lua.luaversion}" + if [[ ! -d $package_path ]]; then return; fi + if [[ $LUA_PATH = *"$package_path"* ]]; then return; fi + + if [[ -z $LUA_PATH ]]; then + export LUA_PATH="$package_path/?.lua" + else + export LUA_PATH="$LUA_PATH;$package_path/?.lua" + fi + } + + addLuaLibCPath() { + local package_cpath="$1/lib/lua/${lua.luaversion}" + if [[ ! -d $package_cpath ]]; then return; fi + if [[ $LUA_CPATH = *"$package_cpath"* ]]; then return; fi + + if [[ -z $LUA_CPATH ]]; then + export LUA_CPATH="$package_cpath/?.so" + else + export LUA_CPATH="$LUA_CPATH;$package_cpath/?.so" + fi + } + + addEnvHooks "$hostOffset" addLuaLibPath + addEnvHooks "$hostOffset" addLuaLibCPath + ''; } ) diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix index 2fd8c2d39c4e..0826b83ed199 100644 --- a/pkgs/development/misc/avr/binutils/default.nix +++ b/pkgs/development/misc/avr/binutils/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - version = "2.26"; + version = "2.30"; in stdenv.mkDerivation { name = "avr-binutils-${version}"; src = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "1ngc2h3knhiw8s22l8y6afycfaxr5grviqy7mwvm4bsl14cf9b62"; + sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; }; configureFlags = "--target=avr --enable-languages=c,c++"; diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix new file mode 100644 index 000000000000..19fc0dc812d8 --- /dev/null +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -0,0 +1,82 @@ +{ lib, hostPlatform, targetPlatform +, makeWrapper +, runCommand, wrapBintoolsWith, wrapCCWith +, buildAndroidndk, androidndk, targetAndroidndkPkgs +}: + +let + # Mapping from a platform to information needed to unpack NDK stuff for that + # platform. + # + # N.B. The Android NDK uses slightly different LLVM-style platform triples + # than we do. We don't just use theirs because ours are less ambiguous and + # some builds need that clarity. + ndkInfoFun = { config, ... }: { + "x86_64-unknown-linux-gnu" = { + double = "linux-x86_64"; + }; + "arm-unknown-linux-androideabi" = { + arch = "arm"; + triple = "arm-linux-androideabi"; + gccVer = "4.8"; + }; + "aarch64-unknown-linux-android" = { + arch = "arm64"; + triple = "aarch64-linux-android"; + gccVer = "4.9"; + }; + }.${config} or + (throw "Android NDK doesn't support ${config}, as far as we know"); + + hostInfo = ndkInfoFun hostPlatform; + targetInfo = ndkInfoFun targetPlatform; + +in + +rec { + # Misc tools + binaries = let + ndkBinDir = + "${androidndk}/libexec/${androidndk.name}/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin"; + in runCommand "ndk-gcc-binutils" { + isGNU = true; # for cc-wrapper + nativeBuildInputs = [ makeWrapper ]; + propgatedBuildInputs = [ androidndk ]; + } '' + mkdir -p $out/bin + for prog in ${ndkBinDir}/${targetInfo.triple}-*; do + prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//') + ln -s $prog $out/bin/${targetPlatform.config}-$prog_suffix + done + ''; + + binutils = wrapBintoolsWith { + bintools = binaries; + libc = targetAndroidndkPkgs.libraries; + }; + + gcc = wrapCCWith { + cc = binaries; + bintools = binutils; + libc = targetAndroidndkPkgs.libraries; + extraBuildCommands = + # GCC 4.9 is the first relase with "-fstack-protector" + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") '' + sed -E \ + -i $out/nix-support/add-hardening.sh \ + -e 's|(-fstack-protector)-strong|\1|g' + ''; + }; + + # Bionic lib C and other libraries. + # + # We use androidndk from the previous stage, else we waste time or get cycles + # cross-compiling packages to wrap incorrectly wrap binaries we don't include + # anyways. + libraries = { + name = "bionic-prebuilt"; + type = "derivation"; + outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-21/arch-${hostInfo.arch}/usr/"; + drvPath = throw "fake derivation, build ${buildAndroidndk} to use"; + }; +} diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 8ef58471d6a0..81ec5732b9a2 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { phases = "buildPhase"; - buildInputs = [ p7zip makeWrapper ]; + nativeBuildInputs = [ p7zip makeWrapper ]; buildCommand = let bin_path = "$out/bin"; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index ccf22d6b9536..271a18e4ee06 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { phases = "buildPhase"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = let bin_path = "$out/bin"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 470fb31b03b0..c053712302dd 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,10 +1,12 @@ -{pkgs, pkgs_i686, includeSources ? true}: +{ buildPackages, pkgs, pkgs_i686, targetPackages +, includeSources ? true +}: rec { platformTools = import ./platform-tools.nix { - inherit (pkgs) stdenv fetchurl unzip zlib; + inherit buildPackages pkgs; }; - + buildTools = import ./build-tools.nix { inherit (pkgs) stdenv fetchurl unzip zlib file; stdenv_32bit = pkgs_i686.stdenv; @@ -12,11 +14,11 @@ rec { ncurses_32bit = pkgs_i686.ncurses5; ncurses = pkgs.ncurses5; }; - + support = import ./support.nix { inherit (pkgs) stdenv fetchurl unzip; }; - + supportRepository = import ./support-repository.nix { inherit (pkgs) stdenv fetchurl unzip; }; @@ -47,18 +49,18 @@ rec { inherit (pkgs) stdenv fetchurl unzip makeWrapper; inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; - + inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources; - + stdenv_32bit = pkgs_i686.stdenv; }; - + androidsdk_2_1 = androidsdk { platformVersions = [ "7" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_2_2 = androidsdk { platformVersions = [ "8" ]; abiVersions = [ "armeabi-v7a" ]; @@ -70,49 +72,49 @@ rec { abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_3_0 = androidsdk { platformVersions = [ "11" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_3_1 = androidsdk { platformVersions = [ "12" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_3_2 = androidsdk { platformVersions = [ "13" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_0 = androidsdk { platformVersions = [ "14" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_0_3 = androidsdk { platformVersions = [ "15" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_1 = androidsdk { platformVersions = [ "16" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_2 = androidsdk { platformVersions = [ "17" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_3 = androidsdk { platformVersions = [ "18" ]; abiVersions = [ "armeabi-v7a" "x86" ]; @@ -152,7 +154,7 @@ rec { useExtraSupportLibs = true; useGooglePlayServices = true; }; - + androidsdk_6_0 = androidsdk { platformVersions = [ "23" ]; abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; @@ -214,24 +216,45 @@ rec { }; androidndk = import ./androidndk.nix { - inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; - inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit (buildPackages) + p7zip makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses lib + coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; androidndk_r8e = import ./androidndk_r8e.nix { - inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper; - inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses lib + coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; - + buildApp = import ./build-app.nix { inherit (pkgs) stdenv jdk ant gnumake gawk file which; inherit androidsdk androidndk; }; - + emulateApp = import ./emulate-app.nix { inherit (pkgs) stdenv; inherit androidsdk; }; + + androidndkPkgs = import ./androidndk-pkgs.nix { + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + lib hostPlatform targetPlatform + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk; + inherit androidndk; + targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs; + }; } diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index fe75655c02bd..f5e579942846 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,4 +1,9 @@ -{stdenv, zlib, fetchurl, unzip}: +{ buildPackages, pkgs }: + +let + inherit (buildPackages) fetchurl unzip; + inherit (pkgs) stdenv zlib; +in stdenv.mkDerivation rec { version = "26.0.2"; @@ -42,5 +47,5 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; } diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix new file mode 100644 index 000000000000..9cee1c9e5dee --- /dev/null +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip, bzip2, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "imgpatchtools-${version}"; + version = "0.3"; + + src = fetchzip { + url = "https://github.com/erfanoabdi/imgpatchtools/archive/${version}.tar.gz"; + sha256 = "1cwp1hfhip252dz0mbkhrsrkws6m15k359n4amw2vfnglnls8czd"; + }; + + buildInputs = [ bzip2 openssl zlib ]; + + installPhase = "install -Dt $out/bin bin/*"; + + meta = with stdenv.lib; { + description = "Tools to manipulate Android OTA archives"; + longDescription = '' + This package is useful for Android development. In particular, it can be + used to extract ext4 /system image from Android distribution ZIP archives + such as those distributed by LineageOS and Replicant, via BlockImageUpdate + utility. It also includes other, related, but arguably more advanced tools + for OTA manipulation. + ''; + homepage = https://github.com/erfanoabdi/imgpatchtools; + license = licenses.gpl3; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix deleted file mode 100644 index e5892ee616d6..000000000000 --- a/pkgs/development/node-packages/composition-v4.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; - }; -in -import ./node-packages-v4.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} \ No newline at end of file diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 4232324f3502..fa4d7268f01e 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! +# This file has been generated by node2nix 1.5.2. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index cb8e6ee8adfe..a83df852ce29 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! +# This file has been generated by node2nix 1.5.2. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix deleted file mode 100644 index 7546b2e34ce9..000000000000 --- a/pkgs/development/node-packages/default-v4.nix +++ /dev/null @@ -1,12 +0,0 @@ -{pkgs, system, nodejs, stdenv}: - -let - nodePackages = import ./composition-v4.nix { - inherit pkgs system nodejs; - }; -in -nodePackages // { - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); -} diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 5ce63dd882fe..c3aa741ef806 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -2,6 +2,5 @@ #! nix-shell -i bash -p nodePackages.node2nix rm -f node-env.nix -node2nix -i node-packages-v4.json -o node-packages-v4.nix -c composition-v4.nix node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix diff --git a/pkgs/development/node-packages/node-packages-v4.json b/pkgs/development/node-packages/node-packages-v4.json deleted file mode 100644 index b1349773a73d..000000000000 --- a/pkgs/development/node-packages/node-packages-v4.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - "coffee-script" -, "grunt-cli" -, "gulp" -, "node-gyp" -, "node-inspector" -, "node-pre-gyp" -, "npm" -] diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix deleted file mode 100644 index 9db719716472..000000000000 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ /dev/null @@ -1,6292 +0,0 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = { - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; - }; - }; - "accepts-1.3.4" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; - sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; - }; - }; - "after-0.8.2" = { - name = "after"; - packageName = "after"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; - sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; - }; - }; - "ajv-4.11.8" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; - }; - }; - "ajv-5.5.2" = { - name = "ajv"; - packageName = "ajv"; - version = "5.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; - }; - }; - "ansi-gray-0.1.1" = { - name = "ansi-gray"; - packageName = "ansi-gray"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"; - sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "ansi-wrap-0.1.0" = { - name = "ansi-wrap"; - packageName = "ansi-wrap"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; - sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; - }; - }; - "aproba-1.2.0" = { - name = "aproba"; - packageName = "aproba"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; - }; - }; - "archy-1.0.0" = { - name = "archy"; - packageName = "archy"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; - sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; - }; - }; - "are-we-there-yet-1.1.4" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; - sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; - }; - }; - "arr-diff-4.0.0" = { - name = "arr-diff"; - packageName = "arr-diff"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; - sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; - }; - }; - "arr-flatten-1.1.0" = { - name = "arr-flatten"; - packageName = "arr-flatten"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; - }; - }; - "arr-union-3.1.0" = { - name = "arr-union"; - packageName = "arr-union"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; - sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; - }; - }; - "array-differ-1.0.0" = { - name = "array-differ"; - packageName = "array-differ"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; - sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; - }; - }; - "array-each-1.0.1" = { - name = "array-each"; - packageName = "array-each"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; - sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; - }; - }; - "array-find-index-1.0.2" = { - name = "array-find-index"; - packageName = "array-find-index"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; - sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; - }; - }; - "array-slice-1.1.0" = { - name = "array-slice"; - packageName = "array-slice"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; - sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7"; - }; - }; - "array-uniq-1.0.3" = { - name = "array-uniq"; - packageName = "array-uniq"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; - sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; - }; - }; - "array-unique-0.3.2" = { - name = "array-unique"; - packageName = "array-unique"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; - sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; - }; - }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; - }; - }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; - "assign-symbols-1.0.0" = { - name = "assign-symbols"; - packageName = "assign-symbols"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; - sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; - }; - }; - "atob-2.0.3" = { - name = "atob"; - packageName = "atob"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"; - sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d"; - }; - }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; - }; - }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; - }; - }; - "aws4-1.6.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; - }; - }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - }; - "base-0.11.2" = { - name = "base"; - packageName = "base"; - version = "0.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; - sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; - }; - }; - "base64-js-0.0.8" = { - name = "base64-js"; - packageName = "base64-js"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; - sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; - }; - }; - "bcrypt-pbkdf-1.0.1" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; - }; - }; - "beeper-1.1.1" = { - name = "beeper"; - packageName = "beeper"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; - sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; - }; - }; - "biased-opener-0.2.8" = { - name = "biased-opener"; - packageName = "biased-opener"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/biased-opener/-/biased-opener-0.2.8.tgz"; - sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; - }; - }; - "big-integer-1.6.26" = { - name = "big-integer"; - packageName = "big-integer"; - version = "1.6.26"; - src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.26.tgz"; - sha1 = "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8"; - }; - }; - "block-stream-0.0.9" = { - name = "block-stream"; - packageName = "block-stream"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; - sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; - }; - }; - "body-parser-1.18.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; - sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; - }; - }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - }; - "boom-4.3.1" = { - name = "boom"; - packageName = "boom"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; - sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; - }; - }; - "boom-5.2.0" = { - name = "boom"; - packageName = "boom"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; - sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; - }; - }; - "bplist-parser-0.1.1" = { - name = "bplist-parser"; - packageName = "bplist-parser"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz"; - sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; - }; - }; - "brace-expansion-1.1.8" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; - }; - }; - "braces-2.3.0" = { - name = "braces"; - packageName = "braces"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz"; - sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; - }; - }; - "browser-launcher2-0.4.6" = { - name = "browser-launcher2"; - packageName = "browser-launcher2"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz"; - sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; - }; - }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; - }; - }; - "cache-base-1.0.1" = { - name = "cache-base"; - packageName = "cache-base"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; - }; - }; - "camelcase-2.1.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; - sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; - }; - }; - "camelcase-keys-2.1.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; - sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; - }; - }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "class-utils-0.3.6" = { - name = "class-utils"; - packageName = "class-utils"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; - }; - }; - "cliui-3.2.0" = { - name = "cliui"; - packageName = "cliui"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; - }; - }; - "clone-0.2.0" = { - name = "clone"; - packageName = "clone"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; - sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; - }; - }; - "clone-1.0.3" = { - name = "clone"; - packageName = "clone"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz"; - sha1 = "298d7e2231660f40c003c2ed3140decf3f53085f"; - }; - }; - "clone-stats-0.0.1" = { - name = "clone-stats"; - packageName = "clone-stats"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"; - sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; - }; - }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - }; - "collection-visit-1.0.0" = { - name = "collection-visit"; - packageName = "collection-visit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; - sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; - }; - }; - "color-support-1.1.3" = { - name = "color-support"; - packageName = "color-support"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; - sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a"; - }; - }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "console-control-strings-1.1.0" = { - name = "console-control-strings"; - packageName = "console-control-strings"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; - }; - }; - "content-disposition-0.5.2" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; - }; - }; - "content-type-1.0.4" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; - }; - }; - "cookie-0.3.1" = { - name = "cookie"; - packageName = "cookie"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; - sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; - }; - }; - "copy-descriptor-0.1.1" = { - name = "copy-descriptor"; - packageName = "copy-descriptor"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; - sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - }; - "cryptiles-3.1.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; - sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; - }; - }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "dateformat-2.2.0" = { - name = "dateformat"; - packageName = "dateformat"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"; - sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "decode-uri-component-0.2.0" = { - name = "decode-uri-component"; - packageName = "decode-uri-component"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; - }; - }; - "deep-extend-0.4.2" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; - sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; - }; - }; - "default-browser-id-1.0.4" = { - name = "default-browser-id"; - packageName = "default-browser-id"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.4.tgz"; - sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a"; - }; - }; - "defaults-1.0.3" = { - name = "defaults"; - packageName = "defaults"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; - }; - }; - "define-property-0.2.5" = { - name = "define-property"; - packageName = "define-property"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; - sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; - }; - }; - "define-property-1.0.0" = { - name = "define-property"; - packageName = "define-property"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; - sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; - "delegates-1.0.0" = { - name = "delegates"; - packageName = "delegates"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; - }; - }; - "depd-1.1.1" = { - name = "depd"; - packageName = "depd"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; - sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; - }; - }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; - }; - }; - "deprecated-0.0.1" = { - name = "deprecated"; - packageName = "deprecated"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"; - sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; - }; - }; - "destroy-1.0.4" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; - }; - }; - "detect-file-1.0.0" = { - name = "detect-file"; - packageName = "detect-file"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; - sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; - }; - }; - "detect-libc-1.0.3" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; - }; - }; - "duplexer2-0.0.2" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; - sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; - }; - }; - "ecc-jsbn-0.1.1" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; - }; - }; - "encodeurl-1.0.2" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; - }; - }; - "end-of-stream-0.1.5" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz"; - sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; - }; - }; - "error-ex-1.3.1" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; - sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; - }; - }; - "expand-brackets-2.1.4" = { - name = "expand-brackets"; - packageName = "expand-brackets"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; - sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; - }; - }; - "expand-tilde-2.0.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; - }; - }; - "express-4.16.2" = { - name = "express"; - packageName = "express"; - version = "4.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.2.tgz"; - sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"; - }; - }; - "extend-3.0.1" = { - name = "extend"; - packageName = "extend"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; - }; - }; - "extend-shallow-2.0.1" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; - }; - }; - "extend-shallow-3.0.2" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; - }; - }; - "extglob-2.0.4" = { - name = "extglob"; - packageName = "extglob"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; - sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; - }; - }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - }; - "fancy-log-1.3.2" = { - name = "fancy-log"; - packageName = "fancy-log"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz"; - sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; - }; - }; - "fast-deep-equal-1.0.0" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; - sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; - }; - }; - "fast-json-stable-stringify-2.0.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; - }; - }; - "fill-range-4.0.0" = { - name = "fill-range"; - packageName = "fill-range"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; - sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; - }; - }; - "finalhandler-1.1.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; - sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; - }; - }; - "find-index-0.1.1" = { - name = "find-index"; - packageName = "find-index"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"; - sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; - }; - }; - "find-up-1.1.2" = { - name = "find-up"; - packageName = "find-up"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; - }; - }; - "findup-sync-0.3.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"; - sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; - }; - }; - "findup-sync-2.0.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; - sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; - }; - }; - "fined-1.1.0" = { - name = "fined"; - packageName = "fined"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; - sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; - }; - }; - "first-chunk-stream-1.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; - sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; - }; - }; - "flagged-respawn-1.0.0" = { - name = "flagged-respawn"; - packageName = "flagged-respawn"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; - sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; - }; - }; - "for-in-1.0.2" = { - name = "for-in"; - packageName = "for-in"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; - }; - }; - "for-own-1.0.0" = { - name = "for-own"; - packageName = "for-own"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"; - sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-2.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; - sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; - }; - }; - "form-data-2.3.1" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; - sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; - }; - }; - "forwarded-0.1.2" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; - }; - }; - "fragment-cache-0.2.1" = { - name = "fragment-cache"; - packageName = "fragment-cache"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; - sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "fstream-1.0.11" = { - name = "fstream"; - packageName = "fstream"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; - sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; - }; - }; - "fstream-ignore-1.0.5" = { - name = "fstream-ignore"; - packageName = "fstream-ignore"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; - sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; - }; - }; - "gauge-2.7.4" = { - name = "gauge"; - packageName = "gauge"; - version = "2.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; - }; - }; - "gaze-0.5.2" = { - name = "gaze"; - packageName = "gaze"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"; - sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - }; - "get-value-2.0.6" = { - name = "get-value"; - packageName = "get-value"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; - sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; - }; - }; - "glob-3.1.21" = { - name = "glob"; - packageName = "glob"; - version = "3.1.21"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; - sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; - }; - }; - "glob-4.5.3" = { - name = "glob"; - packageName = "glob"; - version = "4.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; - sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; - }; - }; - "glob-5.0.15" = { - name = "glob"; - packageName = "glob"; - version = "5.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; - sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; - }; - }; - "glob-7.1.2" = { - name = "glob"; - packageName = "glob"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; - }; - }; - "glob-stream-3.1.18" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "3.1.18"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; - sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; - }; - }; - "glob-watcher-0.0.6" = { - name = "glob-watcher"; - packageName = "glob-watcher"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"; - sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; - }; - }; - "glob2base-0.0.12" = { - name = "glob2base"; - packageName = "glob2base"; - version = "0.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; - sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; - }; - }; - "global-modules-1.0.0" = { - name = "global-modules"; - packageName = "global-modules"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; - sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; - }; - }; - "global-prefix-1.0.2" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; - sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; - }; - }; - "globule-0.1.0" = { - name = "globule"; - packageName = "globule"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz"; - sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; - }; - }; - "glogg-1.0.1" = { - name = "glogg"; - packageName = "glogg"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz"; - sha512 = "0vr9sdx0f84b9s5vy72ralm494844c0p9kqqgcvy25gcn9abv57y7hwwafdsswc3z283v8bqa50j8gp740dd4biyngi5f15p9f2lxna"; - }; - }; - "graceful-fs-1.2.3" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }; - }; - "graceful-fs-3.0.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "3.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz"; - sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; - }; - }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; - }; - }; - "grunt-known-options-1.1.0" = { - name = "grunt-known-options"; - packageName = "grunt-known-options"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; - sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; - }; - }; - "gulp-util-3.0.8" = { - name = "gulp-util"; - packageName = "gulp-util"; - version = "3.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"; - sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; - }; - }; - "gulplog-1.0.0" = { - name = "gulplog"; - packageName = "gulplog"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"; - sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; - }; - }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; - }; - }; - "har-schema-2.0.0" = { - name = "har-schema"; - packageName = "har-schema"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; - }; - }; - "har-validator-5.0.3" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "has-gulplog-0.1.0" = { - name = "has-gulplog"; - packageName = "has-gulplog"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"; - sha1 = "6414c82913697da51590397dafb12f22967811ce"; - }; - }; - "has-unicode-2.0.1" = { - name = "has-unicode"; - packageName = "has-unicode"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; - }; - }; - "has-value-0.3.1" = { - name = "has-value"; - packageName = "has-value"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; - sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; - }; - }; - "has-value-1.0.0" = { - name = "has-value"; - packageName = "has-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; - sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; - }; - }; - "has-values-0.1.4" = { - name = "has-values"; - packageName = "has-values"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; - sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; - }; - }; - "has-values-1.0.0" = { - name = "has-values"; - packageName = "has-values"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; - sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; - }; - }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; - }; - }; - "hawk-6.0.2" = { - name = "hawk"; - packageName = "hawk"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; - sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; - }; - }; - "headless-0.1.7" = { - name = "headless"; - packageName = "headless"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/headless/-/headless-0.1.7.tgz"; - sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8"; - }; - }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - }; - "hoek-4.2.0" = { - name = "hoek"; - packageName = "hoek"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; - sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; - }; - }; - "homedir-polyfill-1.0.1" = { - name = "homedir-polyfill"; - packageName = "homedir-polyfill"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; - }; - }; - "hosted-git-info-2.5.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; - }; - }; - "http-errors-1.6.2" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; - sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; - }; - }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; - }; - }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - }; - "iconv-lite-0.4.19" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; - }; - }; - "indent-string-2.1.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "inherits-1.0.2" = { - name = "inherits"; - packageName = "inherits"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; - sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "ini-1.3.5" = { - name = "ini"; - packageName = "ini"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; - }; - }; - "interpret-1.1.0" = { - name = "interpret"; - packageName = "interpret"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; - sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; - }; - }; - "invert-kv-1.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - }; - "ipaddr.js-1.5.2" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz"; - sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0"; - }; - }; - "is-absolute-1.0.0" = { - name = "is-absolute"; - packageName = "is-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; - sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl"; - }; - }; - "is-accessor-descriptor-0.1.6" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; - }; - }; - "is-accessor-descriptor-1.0.0" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - }; - "is-buffer-1.1.6" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; - }; - }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; - "is-data-descriptor-0.1.4" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; - }; - }; - "is-data-descriptor-1.0.0" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; - }; - }; - "is-descriptor-0.1.6" = { - name = "is-descriptor"; - packageName = "is-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; - }; - }; - "is-descriptor-1.0.2" = { - name = "is-descriptor"; - packageName = "is-descriptor"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; - }; - }; - "is-extendable-0.1.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; - }; - }; - "is-extendable-1.0.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; - }; - }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - }; - "is-glob-3.1.0" = { - name = "is-glob"; - packageName = "is-glob"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; - }; - }; - "is-number-3.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; - }; - }; - "is-odd-1.0.0" = { - name = "is-odd"; - packageName = "is-odd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz"; - sha1 = "3b8a932eb028b3775c39bb09e91767accdb69088"; - }; - }; - "is-plain-object-2.0.4" = { - name = "is-plain-object"; - packageName = "is-plain-object"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; - }; - }; - "is-relative-1.0.0" = { - name = "is-relative"; - packageName = "is-relative"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; - sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb"; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; - "is-unc-path-1.0.0" = { - name = "is-unc-path"; - packageName = "is-unc-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"; - sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; - }; - }; - "is-utf8-0.2.1" = { - name = "is-utf8"; - packageName = "is-utf8"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; - sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; - }; - }; - "is-windows-1.0.1" = { - name = "is-windows"; - packageName = "is-windows"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; - sha1 = "310db70f742d259a16a369202b51af84233310d9"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; - }; - }; - "isobject-2.1.0" = { - name = "isobject"; - packageName = "isobject"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; - }; - }; - "isobject-3.0.1" = { - name = "isobject"; - packageName = "isobject"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "json-schema-traverse-0.3.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; - }; - }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; - }; - }; - "jsprim-1.4.1" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - }; - "kind-of-4.0.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; - }; - }; - "kind-of-5.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; - }; - }; - "kind-of-6.0.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; - sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk"; - }; - }; - "lazy-cache-2.0.2" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; - sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; - }; - }; - "lcid-1.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - }; - "liftoff-2.5.0" = { - name = "liftoff"; - packageName = "liftoff"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz"; - sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; - }; - }; - "load-json-file-1.1.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; - }; - }; - "lodash-1.0.2" = { - name = "lodash"; - packageName = "lodash"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; - sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; - }; - }; - "lodash-2.4.2" = { - name = "lodash"; - packageName = "lodash"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; - }; - }; - "lodash-3.10.1" = { - name = "lodash"; - packageName = "lodash"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; - sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; - }; - }; - "lodash._basecopy-3.0.1" = { - name = "lodash._basecopy"; - packageName = "lodash._basecopy"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; - sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; - }; - }; - "lodash._basetostring-3.0.1" = { - name = "lodash._basetostring"; - packageName = "lodash._basetostring"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"; - sha1 = "d1861d877f824a52f669832dcaf3ee15566a07d5"; - }; - }; - "lodash._basevalues-3.0.0" = { - name = "lodash._basevalues"; - packageName = "lodash._basevalues"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; - sha1 = "5b775762802bde3d3297503e26300820fdf661b7"; - }; - }; - "lodash._getnative-3.9.1" = { - name = "lodash._getnative"; - packageName = "lodash._getnative"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; - }; - }; - "lodash._isiterateecall-3.0.9" = { - name = "lodash._isiterateecall"; - packageName = "lodash._isiterateecall"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; - sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; - }; - }; - "lodash._reescape-3.0.0" = { - name = "lodash._reescape"; - packageName = "lodash._reescape"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; - sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"; - }; - }; - "lodash._reevaluate-3.0.0" = { - name = "lodash._reevaluate"; - packageName = "lodash._reevaluate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; - sha1 = "58bc74c40664953ae0b124d806996daca431e2ed"; - }; - }; - "lodash._reinterpolate-3.0.0" = { - name = "lodash._reinterpolate"; - packageName = "lodash._reinterpolate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; - sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; - }; - }; - "lodash._root-3.0.1" = { - name = "lodash._root"; - packageName = "lodash._root"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; - sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; - }; - }; - "lodash.escape-3.2.0" = { - name = "lodash.escape"; - packageName = "lodash.escape"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"; - sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; - }; - }; - "lodash.isarguments-3.1.0" = { - name = "lodash.isarguments"; - packageName = "lodash.isarguments"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; - }; - }; - "lodash.isarray-3.0.4" = { - name = "lodash.isarray"; - packageName = "lodash.isarray"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; - sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; - }; - }; - "lodash.keys-3.1.2" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"; - sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; - }; - }; - "lodash.restparam-3.6.1" = { - name = "lodash.restparam"; - packageName = "lodash.restparam"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"; - sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; - }; - }; - "lodash.template-3.6.2" = { - name = "lodash.template"; - packageName = "lodash.template"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"; - sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f"; - }; - }; - "lodash.templatesettings-3.1.1" = { - name = "lodash.templatesettings"; - packageName = "lodash.templatesettings"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"; - sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5"; - }; - }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; - }; - }; - "lru-cache-2.7.3" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; - sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; - }; - }; - "make-iterator-1.0.0" = { - name = "make-iterator"; - packageName = "make-iterator"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz"; - sha1 = "57bef5dc85d23923ba23767324d8e8f8f3d9694b"; - }; - }; - "map-cache-0.2.2" = { - name = "map-cache"; - packageName = "map-cache"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - }; - "map-visit-1.0.0" = { - name = "map-visit"; - packageName = "map-visit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; - sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - }; - "meow-3.7.0" = { - name = "meow"; - packageName = "meow"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; - sha1 = "72cb668b425228290abbfa856892587308a801fb"; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - }; - "micromatch-3.1.5" = { - name = "micromatch"; - packageName = "micromatch"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.5.tgz"; - sha512 = "2y22i8yrib7vcgpfcm5sq9g4fh4wxrn0f3z017vdbkvybvywa1axl3kym81k9ad6h3d4jmqkqyahcaj2c5qy5wpa17kvbyhnfn6sjya"; - }; - }; - "mime-1.4.1" = { - name = "mime"; - packageName = "mime"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; - }; - }; - "mime-db-1.30.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; - sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; - }; - }; - "mime-types-2.1.17" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.17"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; - sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; - }; - }; - "minimatch-0.2.14" = { - name = "minimatch"; - packageName = "minimatch"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }; - }; - "minimatch-2.0.10" = { - name = "minimatch"; - packageName = "minimatch"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; - sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; - }; - }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "mixin-deep-1.3.0" = { - name = "mixin-deep"; - packageName = "mixin-deep"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz"; - sha512 = "016isy937hd503fn41ivc4j267cr1brp7f65waxkk2ijslc1gyh7r815xk4g27cjrgjzydwqbpwk5yj4nyjj085n3l5k2vsi2z841kn"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; - "multipipe-0.1.2" = { - name = "multipipe"; - packageName = "multipipe"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"; - sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; - }; - }; - "nan-2.8.0" = { - name = "nan"; - packageName = "nan"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; - sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; - }; - }; - "nanomatch-1.2.7" = { - name = "nanomatch"; - packageName = "nanomatch"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz"; - sha512 = "2m4xaq739s2r5bvh287d8zm8af9mxa706z1a7ila48yhvkspi4iimwyg0id1cl327i7kqssrcnc2nwdc2qw8s83xwqg3bmfgjr5v6gz"; - }; - }; - "natives-1.1.1" = { - name = "natives"; - packageName = "natives"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; - sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; - }; - }; - "negotiator-0.6.1" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; - }; - }; - "node-pre-gyp-0.6.39" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.39"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; - }; - }; - "nopt-3.0.6" = { - name = "nopt"; - packageName = "nopt"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; - sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; - }; - }; - "nopt-4.0.1" = { - name = "nopt"; - packageName = "nopt"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; - }; - }; - "normalize-package-data-2.4.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; - }; - }; - "npmlog-4.1.2" = { - name = "npmlog"; - packageName = "npmlog"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; - }; - }; - "object-assign-3.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; - sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; - "object-copy-0.1.0" = { - name = "object-copy"; - packageName = "object-copy"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; - sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; - }; - }; - "object-visit-1.0.1" = { - name = "object-visit"; - packageName = "object-visit"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; - sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; - }; - }; - "object.defaults-1.1.0" = { - name = "object.defaults"; - packageName = "object.defaults"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; - sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; - }; - }; - "object.map-1.0.1" = { - name = "object.map"; - packageName = "object.map"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; - sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; - }; - }; - "object.pick-1.3.0" = { - name = "object.pick"; - packageName = "object.pick"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; - }; - }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; - }; - }; - "once-1.3.3" = { - name = "once"; - packageName = "once"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "options-0.0.6" = { - name = "options"; - packageName = "options"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; - }; - }; - "orchestrator-0.3.8" = { - name = "orchestrator"; - packageName = "orchestrator"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; - sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; - }; - }; - "ordered-read-streams-0.1.0" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; - sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; - }; - }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "os-locale-1.4.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; - sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; - "osenv-0.1.4" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; - }; - }; - "parse-filepath-1.0.2" = { - name = "parse-filepath"; - packageName = "parse-filepath"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; - sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; - }; - }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - }; - "parse-passwd-1.0.0" = { - name = "parse-passwd"; - packageName = "parse-passwd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; - }; - }; - "parseurl-1.3.2" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; - sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; - }; - }; - "pascalcase-0.1.1" = { - name = "pascalcase"; - packageName = "pascalcase"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; - }; - }; - "path-exists-2.1.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "path-parse-1.0.5" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; - }; - }; - "path-root-0.1.1" = { - name = "path-root"; - packageName = "path-root"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"; - sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; - }; - }; - "path-root-regex-0.1.2" = { - name = "path-root-regex"; - packageName = "path-root-regex"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"; - sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; - }; - }; - "path-type-1.1.0" = { - name = "path-type"; - packageName = "path-type"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; - }; - }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; - }; - }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; - }; - }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; - "plist-1.2.0" = { - name = "plist"; - packageName = "plist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz"; - sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; - }; - }; - "posix-character-classes-0.1.1" = { - name = "posix-character-classes"; - packageName = "posix-character-classes"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; - sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; - }; - }; - "pretty-hrtime-1.0.3" = { - name = "pretty-hrtime"; - packageName = "pretty-hrtime"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; - sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; - }; - }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "proxy-addr-2.0.2" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz"; - sha1 = "6571504f47bb988ec8180253f85dd7e14952bdec"; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; - "qs-6.4.0" = { - name = "qs"; - packageName = "qs"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; - }; - }; - "qs-6.5.1" = { - name = "qs"; - packageName = "qs"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; - }; - }; - "range-parser-1.2.0" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; - sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; - }; - }; - "raw-body-2.3.2" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; - sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; - }; - }; - "rc-1.2.4" = { - name = "rc"; - packageName = "rc"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; - sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; - }; - }; - "read-pkg-1.1.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; - }; - }; - "read-pkg-up-1.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; - }; - }; - "readable-stream-1.0.34" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.0.34"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; - sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "readable-stream-2.3.3" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; - sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; - }; - }; - "rechoir-0.6.2" = { - name = "rechoir"; - packageName = "rechoir"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; - sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; - }; - }; - "redent-1.0.0" = { - name = "redent"; - packageName = "redent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; - }; - }; - "regex-not-1.0.0" = { - name = "regex-not"; - packageName = "regex-not"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz"; - sha1 = "42f83e39771622df826b02af176525d6a5f157f9"; - }; - }; - "repeat-element-1.1.2" = { - name = "repeat-element"; - packageName = "repeat-element"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; - sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; - "replace-ext-0.0.1" = { - name = "replace-ext"; - packageName = "replace-ext"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; - sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; - }; - }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; - }; - }; - "request-2.83.0" = { - name = "request"; - packageName = "request"; - version = "2.83.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; - }; - }; - "resolve-1.1.7" = { - name = "resolve"; - packageName = "resolve"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; - }; - }; - "resolve-1.5.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; - sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; - }; - }; - "resolve-dir-1.0.1" = { - name = "resolve-dir"; - packageName = "resolve-dir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; - sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; - }; - }; - "resolve-url-0.2.1" = { - name = "resolve-url"; - packageName = "resolve-url"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; - sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; - }; - }; - "rimraf-2.2.8" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }; - }; - "rimraf-2.6.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; - }; - }; - "safe-buffer-5.1.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; - }; - }; - "semver-4.3.6" = { - name = "semver"; - packageName = "semver"; - version = "4.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; - sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; - }; - }; - "semver-5.3.0" = { - name = "semver"; - packageName = "semver"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; - }; - }; - "semver-5.5.0" = { - name = "semver"; - packageName = "semver"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; - sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; - }; - }; - "send-0.16.1" = { - name = "send"; - packageName = "send"; - version = "0.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.16.1.tgz"; - sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j"; - }; - }; - "sequencify-0.0.7" = { - name = "sequencify"; - packageName = "sequencify"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"; - sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; - }; - }; - "serve-favicon-2.4.5" = { - name = "serve-favicon"; - packageName = "serve-favicon"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz"; - sha512 = "2gn8a5l0hh655cxq2cvvar6k1hl8cpmagplavx6svjiz9kmi968nwbzhpc2fvpcpmsfqb8s5jjq0gvn8vwwc2lx3cj57ckbcf3prcdk"; - }; - }; - "serve-static-1.13.1" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz"; - sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5"; - }; - }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; - }; - }; - "set-getter-0.1.0" = { - name = "set-getter"; - packageName = "set-getter"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; - sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; - }; - }; - "set-value-0.4.3" = { - name = "set-value"; - packageName = "set-value"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; - sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; - }; - }; - "set-value-2.0.0" = { - name = "set-value"; - packageName = "set-value"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; - sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7"; - }; - }; - "setprototypeof-1.0.3" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; - sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; - }; - }; - "setprototypeof-1.1.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; - }; - }; - "sigmund-1.0.1" = { - name = "sigmund"; - packageName = "sigmund"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; - }; - }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; - }; - }; - "snapdragon-0.8.1" = { - name = "snapdragon"; - packageName = "snapdragon"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz"; - sha1 = "e12b5487faded3e3dea0ac91e9400bf75b401370"; - }; - }; - "snapdragon-node-2.1.1" = { - name = "snapdragon-node"; - packageName = "snapdragon-node"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; - }; - }; - "snapdragon-util-3.0.1" = { - name = "snapdragon-util"; - packageName = "snapdragon-util"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; - }; - }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - }; - "sntp-2.1.0" = { - name = "sntp"; - packageName = "sntp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; - sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; - }; - }; - "source-map-0.5.7" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; - }; - }; - "source-map-resolve-0.5.1" = { - name = "source-map-resolve"; - packageName = "source-map-resolve"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz"; - sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh"; - }; - }; - "source-map-url-0.4.0" = { - name = "source-map-url"; - packageName = "source-map-url"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; - }; - }; - "sparkles-1.0.0" = { - name = "sparkles"; - packageName = "sparkles"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"; - sha1 = "1acbbfb592436d10bbe8f785b7cc6f82815012c3"; - }; - }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; - }; - }; - "spdx-expression-parse-1.0.4" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; - }; - }; - "spdx-license-ids-1.2.2" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; - }; - }; - "split-string-3.1.0" = { - name = "split-string"; - packageName = "split-string"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; - sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; - }; - }; - "sshpk-1.13.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; - sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; - }; - }; - "static-extend-0.1.2" = { - name = "static-extend"; - packageName = "static-extend"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; - sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; - }; - }; - "statuses-1.3.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; - sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; - }; - }; - "stream-consume-0.1.0" = { - name = "stream-consume"; - packageName = "stream-consume"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"; - sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"; - }; - }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; - "string_decoder-1.0.3" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "strip-bom-1.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"; - sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794"; - }; - }; - "strip-bom-2.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; - }; - }; - "strip-indent-1.0.1" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; - }; - }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; - }; - }; - "strong-data-uri-1.0.4" = { - name = "strong-data-uri"; - packageName = "strong-data-uri"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.4.tgz"; - sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "tar-2.2.1" = { - name = "tar"; - packageName = "tar"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; - sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; - }; - }; - "tar-pack-3.4.1" = { - name = "tar-pack"; - packageName = "tar-pack"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; - sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; - }; - }; - "through2-0.6.5" = { - name = "through2"; - packageName = "through2"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"; - sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; - }; - }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; - }; - }; - "tildify-1.2.0" = { - name = "tildify"; - packageName = "tildify"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz"; - sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; - }; - }; - "time-stamp-1.1.0" = { - name = "time-stamp"; - packageName = "time-stamp"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"; - sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; - }; - }; - "to-object-path-0.3.0" = { - name = "to-object-path"; - packageName = "to-object-path"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; - sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; - }; - }; - "to-regex-3.0.1" = { - name = "to-regex"; - packageName = "to-regex"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz"; - sha1 = "15358bee4a2c83bd76377ba1dc049d0f18837aae"; - }; - }; - "to-regex-range-2.1.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; - }; - }; - "tough-cookie-2.3.3" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; - }; - }; - "trim-newlines-1.0.0" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; - }; - }; - "truncate-1.0.5" = { - name = "truncate"; - packageName = "truncate"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz"; - sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28"; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - }; - "type-is-1.6.15" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.15"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; - sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; - }; - }; - "uid-0.0.2" = { - name = "uid"; - packageName = "uid"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz"; - sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; - }; - }; - "uid-number-0.0.6" = { - name = "uid-number"; - packageName = "uid-number"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; - sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; - }; - }; - "ultron-1.0.2" = { - name = "ultron"; - packageName = "ultron"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; - }; - }; - "unc-path-regex-0.1.2" = { - name = "unc-path-regex"; - packageName = "unc-path-regex"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; - }; - }; - "union-value-1.0.0" = { - name = "union-value"; - packageName = "union-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; - sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; - }; - }; - "unique-stream-1.0.0" = { - name = "unique-stream"; - packageName = "unique-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"; - sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - }; - "unset-value-1.0.0" = { - name = "unset-value"; - packageName = "unset-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; - sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; - }; - }; - "untildify-2.1.0" = { - name = "untildify"; - packageName = "untildify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz"; - sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; - }; - }; - "urix-0.1.0" = { - name = "urix"; - packageName = "urix"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; - sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; - }; - }; - "use-2.0.2" = { - name = "use"; - packageName = "use"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-2.0.2.tgz"; - sha1 = "ae28a0d72f93bf22422a18a2e379993112dec8e8"; - }; - }; - "user-home-1.1.1" = { - name = "user-home"; - packageName = "user-home"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; - sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; - }; - }; - "uuid-3.2.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; - sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; - }; - }; - "v8-debug-1.0.1" = { - name = "v8-debug"; - packageName = "v8-debug"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz"; - sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe"; - }; - }; - "v8-profiler-5.7.0" = { - name = "v8-profiler"; - packageName = "v8-profiler"; - version = "5.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz"; - sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d"; - }; - }; - "v8flags-2.1.1" = { - name = "v8flags"; - packageName = "v8flags"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz"; - sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; - }; - }; - "validate-npm-package-license-3.0.1" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; - }; - }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - }; - "vinyl-0.4.6" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; - sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; - }; - }; - "vinyl-0.5.3" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"; - sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; - }; - }; - "vinyl-fs-0.3.14" = { - name = "vinyl-fs"; - packageName = "vinyl-fs"; - version = "0.3.14"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz"; - sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; - }; - }; - "which-1.3.0" = { - name = "which"; - packageName = "which"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; - sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; - }; - }; - "wide-align-1.1.2" = { - name = "wide-align"; - packageName = "wide-align"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"; - sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; - }; - }; - "win-detect-browsers-1.0.2" = { - name = "win-detect-browsers"; - packageName = "win-detect-browsers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz"; - sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0"; - }; - }; - "window-size-0.1.4" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; - sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; - }; - }; - "wrap-ansi-2.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "ws-1.1.5" = { - name = "ws"; - packageName = "ws"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; - sha512 = "3iv2yz706h7wyg563jsfjdykkkxs8j49vz60r6qx5by0npfhs98rgc114kdqs15sc52mldscc22bkfpkrs08cwlqaxx8lfdjn5alwm3"; - }; - }; - "x-default-browser-0.3.1" = { - name = "x-default-browser"; - packageName = "x-default-browser"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.1.tgz"; - sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; - }; - }; - "xmlbuilder-4.0.0" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz"; - sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; - }; - }; - "xmldom-0.1.27" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.27"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"; - sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; - }; - }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; - }; - }; - "y18n-3.2.1" = { - name = "y18n"; - packageName = "y18n"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; - }; - }; - "yargs-1.3.3" = { - name = "yargs"; - packageName = "yargs"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; - sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; - }; - }; - "yargs-3.32.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.32.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; - sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; - }; - }; - }; -in -{ - coffee-script = nodeEnv.buildNodePackage { - name = "coffee-script"; - packageName = "coffee-script"; - version = "1.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - grunt-cli = nodeEnv.buildNodePackage { - name = "grunt-cli"; - packageName = "grunt-cli"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz"; - sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; - }; - dependencies = [ - (sources."findup-sync-0.3.0" // { - dependencies = [ - (sources."glob-5.0.15" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - ]; - }) - sources."grunt-known-options-1.1.0" - (sources."nopt-3.0.6" // { - dependencies = [ - sources."abbrev-1.1.1" - ]; - }) - sources."resolve-1.1.7" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The grunt command line interface"; - homepage = "https://github.com/gruntjs/grunt-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - gulp = nodeEnv.buildNodePackage { - name = "gulp"; - packageName = "gulp"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; - sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; - }; - dependencies = [ - sources."archy-1.0.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - sources."deprecated-0.0.1" - (sources."gulp-util-3.0.8" // { - dependencies = [ - sources."array-differ-1.0.0" - sources."array-uniq-1.0.3" - sources."beeper-1.1.1" - sources."dateformat-2.2.0" - (sources."fancy-log-1.3.2" // { - dependencies = [ - (sources."ansi-gray-0.1.1" // { - dependencies = [ - sources."ansi-wrap-0.1.0" - ]; - }) - sources."color-support-1.1.3" - sources."time-stamp-1.1.0" - ]; - }) - (sources."gulplog-1.0.0" // { - dependencies = [ - (sources."glogg-1.0.1" // { - dependencies = [ - sources."sparkles-1.0.0" - ]; - }) - ]; - }) - (sources."has-gulplog-0.1.0" // { - dependencies = [ - sources."sparkles-1.0.0" - ]; - }) - sources."lodash._reescape-3.0.0" - sources."lodash._reevaluate-3.0.0" - sources."lodash._reinterpolate-3.0.0" - (sources."lodash.template-3.6.2" // { - dependencies = [ - sources."lodash._basecopy-3.0.1" - sources."lodash._basetostring-3.0.1" - sources."lodash._basevalues-3.0.0" - sources."lodash._isiterateecall-3.0.9" - (sources."lodash.escape-3.2.0" // { - dependencies = [ - sources."lodash._root-3.0.1" - ]; - }) - (sources."lodash.keys-3.1.2" // { - dependencies = [ - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - ]; - }) - sources."lodash.restparam-3.6.1" - sources."lodash.templatesettings-3.1.1" - ]; - }) - (sources."multipipe-0.1.2" // { - dependencies = [ - (sources."duplexer2-0.0.2" // { - dependencies = [ - (sources."readable-stream-1.1.14" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - ]; - }) - ]; - }) - sources."object-assign-3.0.0" - sources."replace-ext-0.0.1" - (sources."through2-2.0.3" // { - dependencies = [ - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."xtend-4.0.1" - ]; - }) - (sources."vinyl-0.5.3" // { - dependencies = [ - sources."clone-1.0.3" - sources."clone-stats-0.0.1" - ]; - }) - ]; - }) - sources."interpret-1.1.0" - (sources."liftoff-2.5.0" // { - dependencies = [ - sources."extend-3.0.1" - (sources."findup-sync-2.0.0" // { - dependencies = [ - sources."detect-file-1.0.0" - (sources."is-glob-3.1.0" // { - dependencies = [ - sources."is-extglob-2.1.1" - ]; - }) - (sources."micromatch-3.1.5" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - (sources."braces-2.3.0" // { - dependencies = [ - sources."arr-flatten-1.1.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."repeat-string-1.6.1" - sources."to-regex-range-2.1.1" - ]; - }) - sources."isobject-3.0.1" - sources."repeat-element-1.1.2" - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - (sources."split-string-3.1.0" // { - dependencies = [ - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."assign-symbols-1.0.0" - sources."is-extendable-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."define-property-1.0.0" // { - dependencies = [ - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."is-accessor-descriptor-1.0.0" - sources."is-data-descriptor-1.0.0" - ]; - }) - ]; - }) - (sources."extend-shallow-2.0.1" // { - dependencies = [ - sources."is-extendable-0.1.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - (sources."expand-brackets-2.1.4" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - (sources."define-property-0.2.5" // { - dependencies = [ - (sources."is-descriptor-0.1.6" // { - dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" - ]; - }) - ]; - }) - sources."posix-character-classes-0.1.1" - ]; - }) - ]; - }) - (sources."fragment-cache-0.2.1" // { - dependencies = [ - sources."map-cache-0.2.2" - ]; - }) - sources."kind-of-6.0.2" - (sources."nanomatch-1.2.7" // { - dependencies = [ - (sources."is-odd-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - sources."kind-of-5.1.0" - ]; - }) - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."regex-not-1.0.0" - (sources."snapdragon-0.8.1" // { - dependencies = [ - (sources."base-0.11.2" // { - dependencies = [ - (sources."cache-base-1.0.1" // { - dependencies = [ - (sources."collection-visit-1.0.0" // { - dependencies = [ - sources."map-visit-1.0.0" - sources."object-visit-1.0.1" - ]; - }) - sources."get-value-2.0.6" - (sources."has-value-1.0.0" // { - dependencies = [ - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."kind-of-4.0.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - (sources."set-value-2.0.0" // { - dependencies = [ - sources."is-extendable-0.1.1" - (sources."split-string-3.1.0" // { - dependencies = [ - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."assign-symbols-1.0.0" - sources."is-extendable-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."to-object-path-0.3.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."union-value-1.0.0" // { - dependencies = [ - sources."arr-union-3.1.0" - sources."is-extendable-0.1.1" - sources."set-value-0.4.3" - ]; - }) - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."has-values-0.1.4" - (sources."isobject-2.1.0" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."arr-union-3.1.0" - (sources."define-property-0.2.5" // { - dependencies = [ - (sources."is-descriptor-0.1.6" // { - dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" - ]; - }) - ]; - }) - (sources."static-extend-0.1.2" // { - dependencies = [ - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."copy-descriptor-0.1.1" - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - sources."component-emitter-1.2.1" - (sources."define-property-1.0.0" // { - dependencies = [ - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."is-accessor-descriptor-1.0.0" - sources."is-data-descriptor-1.0.0" - ]; - }) - ]; - }) - sources."isobject-3.0.1" - (sources."mixin-deep-1.3.0" // { - dependencies = [ - sources."for-in-1.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."pascalcase-0.1.1" - ]; - }) - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - (sources."define-property-0.2.5" // { - dependencies = [ - (sources."is-descriptor-0.1.6" // { - dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" - ]; - }) - ]; - }) - sources."map-cache-0.2.2" - sources."source-map-0.5.7" - (sources."source-map-resolve-0.5.1" // { - dependencies = [ - sources."atob-2.0.3" - sources."decode-uri-component-0.2.0" - sources."resolve-url-0.2.1" - sources."source-map-url-0.4.0" - sources."urix-0.1.0" - ]; - }) - (sources."use-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - (sources."lazy-cache-2.0.2" // { - dependencies = [ - (sources."set-getter-0.1.0" // { - dependencies = [ - (sources."to-object-path-0.3.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."to-regex-3.0.1" // { - dependencies = [ - (sources."define-property-0.2.5" // { - dependencies = [ - (sources."is-descriptor-0.1.6" // { - dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."resolve-dir-1.0.1" // { - dependencies = [ - (sources."expand-tilde-2.0.2" // { - dependencies = [ - (sources."homedir-polyfill-1.0.1" // { - dependencies = [ - sources."parse-passwd-1.0.0" - ]; - }) - ]; - }) - (sources."global-modules-1.0.0" // { - dependencies = [ - (sources."global-prefix-1.0.2" // { - dependencies = [ - (sources."homedir-polyfill-1.0.1" // { - dependencies = [ - sources."parse-passwd-1.0.0" - ]; - }) - sources."ini-1.3.5" - (sources."which-1.3.0" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - ]; - }) - sources."is-windows-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."fined-1.1.0" // { - dependencies = [ - (sources."expand-tilde-2.0.2" // { - dependencies = [ - (sources."homedir-polyfill-1.0.1" // { - dependencies = [ - sources."parse-passwd-1.0.0" - ]; - }) - ]; - }) - (sources."object.defaults-1.1.0" // { - dependencies = [ - sources."array-each-1.0.1" - sources."array-slice-1.1.0" - (sources."for-own-1.0.0" // { - dependencies = [ - sources."for-in-1.0.2" - ]; - }) - sources."isobject-3.0.1" - ]; - }) - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."parse-filepath-1.0.2" // { - dependencies = [ - (sources."is-absolute-1.0.0" // { - dependencies = [ - (sources."is-relative-1.0.0" // { - dependencies = [ - (sources."is-unc-path-1.0.0" // { - dependencies = [ - sources."unc-path-regex-0.1.2" - ]; - }) - ]; - }) - sources."is-windows-1.0.1" - ]; - }) - sources."map-cache-0.2.2" - (sources."path-root-0.1.1" // { - dependencies = [ - sources."path-root-regex-0.1.2" - ]; - }) - ]; - }) - ]; - }) - sources."flagged-respawn-1.0.0" - (sources."is-plain-object-2.0.4" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."object.map-1.0.1" // { - dependencies = [ - (sources."for-own-1.0.0" // { - dependencies = [ - sources."for-in-1.0.2" - ]; - }) - (sources."make-iterator-1.0.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - sources."rechoir-0.6.2" - (sources."resolve-1.5.0" // { - dependencies = [ - sources."path-parse-1.0.5" - ]; - }) - ]; - }) - sources."minimist-1.2.0" - (sources."orchestrator-0.3.8" // { - dependencies = [ - (sources."end-of-stream-0.1.5" // { - dependencies = [ - (sources."once-1.3.3" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - sources."sequencify-0.0.7" - sources."stream-consume-0.1.0" - ]; - }) - sources."pretty-hrtime-1.0.3" - sources."semver-4.3.6" - (sources."tildify-1.2.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - (sources."v8flags-2.1.1" // { - dependencies = [ - sources."user-home-1.1.1" - ]; - }) - (sources."vinyl-fs-0.3.14" // { - dependencies = [ - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.3" - ]; - }) - (sources."glob-stream-3.1.18" // { - dependencies = [ - (sources."glob-4.5.3" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - (sources."glob2base-0.0.12" // { - dependencies = [ - sources."find-index-0.1.1" - ]; - }) - (sources."minimatch-2.0.10" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - sources."ordered-read-streams-0.1.0" - sources."unique-stream-1.0.0" - ]; - }) - (sources."glob-watcher-0.0.6" // { - dependencies = [ - (sources."gaze-0.5.2" // { - dependencies = [ - (sources."globule-0.1.0" // { - dependencies = [ - (sources."glob-3.1.21" // { - dependencies = [ - sources."graceful-fs-1.2.3" - sources."inherits-1.0.2" - ]; - }) - sources."lodash-1.0.2" - (sources."minimatch-0.2.14" // { - dependencies = [ - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."graceful-fs-3.0.11" // { - dependencies = [ - sources."natives-1.1.1" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."strip-bom-1.0.0" // { - dependencies = [ - sources."first-chunk-stream-1.0.0" - sources."is-utf8-0.2.1" - ]; - }) - (sources."through2-0.6.5" // { - dependencies = [ - (sources."readable-stream-1.0.34" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - sources."xtend-4.0.1" - ]; - }) - (sources."vinyl-0.4.6" // { - dependencies = [ - sources."clone-0.2.0" - sources."clone-stats-0.0.1" - ]; - }) - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The streaming build system"; - homepage = http://gulpjs.com/; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - node-gyp = nodeEnv.buildNodePackage { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; - sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; - }; - dependencies = [ - (sources."fstream-1.0.11" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - sources."graceful-fs-4.1.11" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-3.0.6" // { - dependencies = [ - sources."abbrev-1.1.1" - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - (sources."request-2.83.0" // { - dependencies = [ - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.3.1" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-5.0.3" // { - dependencies = [ - (sources."ajv-5.5.2" // { - dependencies = [ - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - ]; - }) - sources."har-schema-2.0.0" - ]; - }) - (sources."hawk-6.0.2" // { - dependencies = [ - sources."boom-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."hoek-4.2.0" - sources."sntp-2.1.0" - ]; - }) - (sources."http-signature-1.2.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."bcrypt-pbkdf-1.0.1" - sources."dashdash-1.14.1" - sources."ecc-jsbn-0.1.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."qs-6.5.1" - sources."safe-buffer-5.1.1" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.2.1" - ]; - }) - sources."rimraf-2.6.2" - sources."semver-5.3.0" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - sources."inherits-2.0.3" - ]; - }) - (sources."which-1.3.0" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js native addon build tool"; - homepage = "https://github.com/nodejs/node-gyp#readme"; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - node-inspector = nodeEnv.buildNodePackage { - name = "node-inspector"; - packageName = "node-inspector"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.1.tgz"; - sha1 = "e7851eb973f380543c058db564a9812055eac640"; - }; - dependencies = [ - sources."async-0.9.2" - (sources."biased-opener-0.2.8" // { - dependencies = [ - (sources."browser-launcher2-0.4.6" // { - dependencies = [ - sources."headless-0.1.7" - sources."lodash-2.4.2" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - (sources."plist-1.2.0" // { - dependencies = [ - sources."base64-js-0.0.8" - sources."util-deprecate-1.0.2" - (sources."xmlbuilder-4.0.0" // { - dependencies = [ - sources."lodash-3.10.1" - ]; - }) - sources."xmldom-0.1.27" - ]; - }) - sources."rimraf-2.2.8" - sources."uid-0.0.2" - (sources."win-detect-browsers-1.0.2" // { - dependencies = [ - sources."after-0.8.2" - sources."xtend-4.0.1" - sources."yargs-1.3.3" - ]; - }) - ]; - }) - sources."minimist-1.2.0" - (sources."x-default-browser-0.3.1" // { - dependencies = [ - (sources."default-browser-id-1.0.4" // { - dependencies = [ - (sources."bplist-parser-0.1.1" // { - dependencies = [ - sources."big-integer-1.6.26" - ]; - }) - (sources."meow-3.7.0" // { - dependencies = [ - (sources."camelcase-keys-2.1.0" // { - dependencies = [ - sources."camelcase-2.1.1" - ]; - }) - sources."decamelize-1.2.0" - (sources."loud-rejection-1.6.0" // { - dependencies = [ - (sources."currently-unhandled-0.4.1" // { - dependencies = [ - sources."array-find-index-1.0.2" - ]; - }) - sources."signal-exit-3.0.2" - ]; - }) - sources."map-obj-1.0.1" - (sources."normalize-package-data-2.4.0" // { - dependencies = [ - sources."hosted-git-info-2.5.0" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - (sources."validate-npm-package-license-3.0.1" // { - dependencies = [ - (sources."spdx-correct-1.0.2" // { - dependencies = [ - sources."spdx-license-ids-1.2.2" - ]; - }) - sources."spdx-expression-parse-1.0.4" - ]; - }) - ]; - }) - sources."object-assign-4.1.1" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."read-pkg-1.1.0" // { - dependencies = [ - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.1" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - ]; - }) - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."redent-1.0.0" // { - dependencies = [ - (sources."indent-string-2.1.0" // { - dependencies = [ - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."strip-indent-1.0.1" // { - dependencies = [ - sources."get-stdin-4.0.1" - ]; - }) - ]; - }) - sources."trim-newlines-1.0.0" - ]; - }) - (sources."untildify-2.1.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - (sources."express-4.16.2" // { - dependencies = [ - (sources."accepts-1.3.4" // { - dependencies = [ - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."negotiator-0.6.1" - ]; - }) - sources."array-flatten-1.1.1" - (sources."body-parser-1.18.2" // { - dependencies = [ - sources."bytes-3.0.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."unpipe-1.0.0" - ]; - }) - ]; - }) - sources."content-disposition-0.5.2" - sources."content-type-1.0.4" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."depd-1.1.2" - sources."encodeurl-1.0.2" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - (sources."finalhandler-1.1.0" // { - dependencies = [ - sources."unpipe-1.0.0" - ]; - }) - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - (sources."proxy-addr-2.0.2" // { - dependencies = [ - sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" - ]; - }) - sources."qs-6.5.1" - sources."range-parser-1.2.0" - sources."safe-buffer-5.1.1" - (sources."send-0.16.1" // { - dependencies = [ - sources."destroy-1.0.4" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" - ]; - }) - sources."mime-1.4.1" - sources."ms-2.0.0" - ]; - }) - sources."serve-static-1.13.1" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" - (sources."type-is-1.6.15" // { - dependencies = [ - sources."media-typer-0.3.0" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - ]; - }) - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - ]; - }) - (sources."glob-5.0.15" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - sources."path-is-absolute-1.0.1" - (sources."rc-1.2.4" // { - dependencies = [ - sources."deep-extend-0.4.2" - sources."ini-1.3.5" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."semver-4.3.6" - (sources."serve-favicon-2.4.5" // { - dependencies = [ - sources."etag-1.8.1" - sources."fresh-0.5.2" - sources."ms-2.0.0" - sources."parseurl-1.3.2" - sources."safe-buffer-5.1.1" - ]; - }) - (sources."strong-data-uri-1.0.4" // { - dependencies = [ - sources."truncate-1.0.5" - ]; - }) - (sources."v8-debug-1.0.1" // { - dependencies = [ - sources."nan-2.8.0" - (sources."node-pre-gyp-0.6.39" // { - dependencies = [ - sources."detect-libc-1.0.3" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."hoek-2.16.3" - sources."sntp-1.0.9" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-4.0.1" // { - dependencies = [ - sources."abbrev-1.1.1" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.8" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."dashdash-1.14.1" - sources."ecc-jsbn-0.1.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."safe-buffer-5.1.1" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.2.1" - ]; - }) - (sources."rimraf-2.6.2" // { - dependencies = [ - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - ]; - }) - sources."semver-5.5.0" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - sources."inherits-2.0.3" - ]; - }) - (sources."tar-pack-3.4.1" // { - dependencies = [ - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."uid-number-0.0.6" - ]; - }) - ]; - }) - ]; - }) - (sources."v8-profiler-5.7.0" // { - dependencies = [ - sources."nan-2.8.0" - (sources."node-pre-gyp-0.6.39" // { - dependencies = [ - sources."detect-libc-1.0.3" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."hoek-2.16.3" - sources."sntp-1.0.9" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-4.0.1" // { - dependencies = [ - sources."abbrev-1.1.1" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.8" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."dashdash-1.14.1" - sources."ecc-jsbn-0.1.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."safe-buffer-5.1.1" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.2.1" - ]; - }) - (sources."rimraf-2.6.2" // { - dependencies = [ - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - ]; - }) - sources."semver-5.5.0" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - sources."inherits-2.0.3" - ]; - }) - (sources."tar-pack-3.4.1" // { - dependencies = [ - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."uid-number-0.0.6" - ]; - }) - ]; - }) - ]; - }) - (sources."which-1.3.0" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - (sources."ws-1.1.5" // { - dependencies = [ - sources."options-0.0.6" - sources."ultron-1.0.2" - ]; - }) - (sources."yargs-3.32.0" // { - dependencies = [ - sources."camelcase-2.1.1" - (sources."cliui-3.2.0" // { - dependencies = [ - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wrap-ansi-2.1.0" - ]; - }) - sources."decamelize-1.2.0" - (sources."os-locale-1.4.0" // { - dependencies = [ - (sources."lcid-1.0.0" // { - dependencies = [ - sources."invert-kv-1.0.0" - ]; - }) - ]; - }) - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - ]; - }) - sources."window-size-0.1.4" - sources."y18n-3.2.1" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; - }; - production = true; - bypassCache = false; - }; - node-pre-gyp = nodeEnv.buildNodePackage { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.39"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; - }; - dependencies = [ - sources."detect-libc-1.0.3" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."hoek-2.16.3" - sources."sntp-1.0.9" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-4.0.1" // { - dependencies = [ - sources."abbrev-1.1.1" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."rc-1.2.4" // { - dependencies = [ - sources."deep-extend-0.4.2" - sources."ini-1.3.5" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.8" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."dashdash-1.14.1" - sources."ecc-jsbn-0.1.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."safe-buffer-5.1.1" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.2.1" - ]; - }) - (sources."rimraf-2.6.2" // { - dependencies = [ - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - ]; - }) - sources."semver-5.5.0" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - sources."inherits-2.0.3" - ]; - }) - (sources."tar-pack-3.4.1" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."uid-number-0.0.6" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js native addon binary install tool"; - homepage = "https://github.com/mapbox/node-pre-gyp#readme"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = false; - }; - npm = nodeEnv.buildNodePackage { - name = "npm"; - packageName = "npm"; - version = "5.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; - sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "a package manager for JavaScript"; - homepage = https://docs.npmjs.com/; - license = "Artistic-2.0"; - }; - production = true; - bypassCache = false; - }; -} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 90f5fd309d00..ebea0df1362d 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! +# This file has been generated by node2nix 1.5.2. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -49,6 +49,33 @@ let sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q"; }; }; + "@types/babel-types-7.0.1" = { + name = "_at_types_slash_babel-types"; + packageName = "@types/babel-types"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.1.tgz"; + sha512 = "3bsk1lhqbj6zdrzkmzf9yjr2v77nlaqq1rzsjq8n56k8n0fl3fyxpcanxm3h5yqm6zzfi8qdmdxf5hrvrmg3kwbdspii3kb9y9hwiqj"; + }; + }; + "@types/babylon-6.16.2" = { + name = "_at_types_slash_babylon"; + packageName = "@types/babylon"; + version = "6.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz"; + sha512 = "3nps6llkag9z58iv9mkg13c2b35ba57z1dmis7900x1dkd09svfn0haxwcgsp4v9xmnqb95v40h3ki4w3xnv68cajsnfscgm7ip56zq"; + }; + }; + "@types/caseless-0.12.1" = { + name = "_at_types_slash_caseless"; + packageName = "@types/caseless"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz"; + sha512 = "3ygc8335my77k11wjf0wihzqfsv4fxyfrvb730sx8ab3phx3wc8g4pg3g84h497ipvzk7i9gnwnzrkg68zm6df6wi59y7hdgrmlq68n"; + }; + }; "@types/form-data-2.2.1" = { name = "_at_types_slash_form-data"; packageName = "@types/form-data"; @@ -58,31 +85,31 @@ let sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "@types/node-8.5.9" = { + "@types/node-8.9.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.5.9"; + version = "8.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz"; - sha512 = "2j38fqqziiv6m51w16lz6lgivrkycvn4nwch7sdpg32hbl5kv5m2ngg4y4jrf0v1s7iryi5gyh9729b8l1p48cf9hf0gj567h13grxk"; + url = "https://registry.npmjs.org/@types/node/-/node-8.9.4.tgz"; + sha512 = "0fc7dnkm8mxih1kx7dpxdjp9432wwn2hj9k3rs6ipmyac7x4d73kjxhkinlv9wzmzpxkz8n0cp6zykl8nvb4ksh3gycwhm7mbgw6avm"; }; }; - "@types/node-9.3.0" = { + "@types/node-9.4.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.3.0"; + version = "9.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz"; - sha512 = "0mhmzddyv8rhkha7ibpbsa5dfygzaa90438aqzpg9w7d31n093a7spx2zg4zfki4qrab71xrfb381hmqajn826cnrw9kc7kv2y5zl60"; + url = "https://registry.npmjs.org/@types/node/-/node-9.4.6.tgz"; + sha512 = "08j600qycq8wmra6zn9jvh2ifnkr90s08rcv3spjqc03mjapfm4bz009cm6xfqd7ipbsm7q6ymxccdnlw4gbyd3lyh21a4npqnjsd89"; }; }; - "@types/request-2.0.13" = { + "@types/request-2.47.0" = { name = "_at_types_slash_request"; packageName = "@types/request"; - version = "2.0.13"; + version = "2.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.0.13.tgz"; - sha512 = "3gbwnwgvm7d4jwixg004j635l89kvd2vll1wkv0rdlz5v8biqwnmgfg67nbj3lccvn4rhbalwpkrgvqz66j0n3d20fs02xyxr0z8x80"; + url = "https://registry.npmjs.org/@types/request/-/request-2.47.0.tgz"; + sha512 = "3jk7nawc1yb26ykdlv3mk1bmdpq2an6krskfj4x46kc9ka9r11ixrivg5zwcm451wlarry8dk36mick3d68w0c85i177ymghzkcr9gw"; }; }; "@types/tough-cookie-2.3.2" = { @@ -103,13 +130,13 @@ let sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; }; }; - "@zeit/check-updates-1.0.5" = { + "@zeit/check-updates-1.1.0" = { name = "_at_zeit_slash_check-updates"; packageName = "@zeit/check-updates"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zeit/check-updates/-/check-updates-1.0.5.tgz"; - sha512 = "3a4h5bdrpjkv8rjvyafqf9b3wnyynzi3gisz92k37c35nvawlicsdv4svwnsxfqvhjhqn3lab6rjmkkivvdijr41vm3r048pp5dm1s0"; + url = "https://registry.npmjs.org/@zeit/check-updates/-/check-updates-1.1.0.tgz"; + sha512 = "0pg9y2fssdvfwq19ih2w4fwma8qw3anxlsbqrzncywxl30j65k2bwwlp2djz5brkz27xixcrx9g9gx9blszhbaz0pv5xmghrw33700y"; }; }; "CSSselect-0.4.1" = { @@ -274,13 +301,13 @@ let sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; - "acorn-5.3.0" = { + "acorn-5.5.0" = { name = "acorn"; packageName = "acorn"; - version = "5.3.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz"; - sha512 = "197zp88clmmxjyvhahqv32kv07q825hf87facxaq8qmvb1swfqnpyy4398dl56sr2fa44f7gjpzzlwy1szqzwww6746y3kmwb6gxs31"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.5.0.tgz"; + sha512 = "3zaj6p3hwrmg5i65dg7q0kk9224w6fd404k830k922wn3mn4x95c48zrmgg4n85xigg904syrzbh5nca94aaf4anfjpjm9vbpfgkfba"; }; }; "acorn-dynamic-import-2.0.2" = { @@ -292,6 +319,15 @@ let sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; }; }; + "acorn-dynamic-import-3.0.0" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz"; + sha512 = "1d15axgran5kql29v8hk39yifs5zcg7rkffakv4nd3k49jpbzxh030nbsh9q31gnw8n3rfmwpmsq7rq9k9sk2p2l14wk2i5kzqramfd"; + }; + }; "acorn-globals-1.0.9" = { name = "acorn-globals"; packageName = "acorn-globals"; @@ -319,6 +355,15 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; + "acorn-node-1.3.0" = { + name = "acorn-node"; + packageName = "acorn-node"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz"; + sha512 = "0pxd0cjsh0kdh8nxcpm000fcsgwmr8b13gyxkac8yxzz9a5wblqka5crksicnx8mqwy499k1jryr83bjzb3355xikgs5mfxgpigkwvr"; + }; + }; "active-x-obfuscator-0.0.1" = { name = "active-x-obfuscator"; packageName = "active-x-obfuscator"; @@ -382,22 +427,22 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-0.33.0" = { + "addons-linter-0.35.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "0.33.0"; + version = "0.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.33.0.tgz"; - sha1 = "0b2a75a6650e743fe22a34ec7cfd4647fd062efc"; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.35.0.tgz"; + sha1 = "85872cce58983ff339ced297dbff486c02ecd336"; }; }; - "addr-to-ip-port-1.4.2" = { + "addr-to-ip-port-1.4.3" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.2.tgz"; - sha1 = "7e46ff1f26b7a9f5e33fd839d57aef6303b4c692"; + url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.3.tgz"; + sha512 = "0cjsq4lq001pd9nr0j7lc41vxyrf0x9qpaq8d8989n1grjzzbv8vjdq9l607ab8pgfh1qkx0vhgva4wsnfndkb2c955f04jq8dx78gq"; }; }; "address-1.0.3" = { @@ -535,6 +580,15 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; + "ajv-6.2.0" = { + name = "ajv"; + packageName = "ajv"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.2.0.tgz"; + sha1 = "afac295bbaa0152449e522742e4547c1ae9328d2"; + }; + }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -553,6 +607,24 @@ let sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; + "ajv-keywords-3.1.0" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz"; + sha1 = "ac2b27939c543e95d2c06e7f7f5c27be4aa543be"; + }; + }; + "ajv-merge-patch-3.0.0" = { + name = "ajv-merge-patch"; + packageName = "ajv-merge-patch"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-merge-patch/-/ajv-merge-patch-3.0.0.tgz"; + sha1 = "76f071e391f419fe9fe3fea7e920a1ad824b2b61"; + }; + }; "aliasify-2.1.0" = { name = "aliasify"; packageName = "aliasify"; @@ -922,6 +994,15 @@ let sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; }; }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + }; + }; "argparse-1.0.4" = { name = "argparse"; packageName = "argparse"; @@ -931,15 +1012,6 @@ let sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; - "argparse-1.0.9" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; - sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; - }; - }; "args-3.0.8" = { name = "args"; packageName = "args"; @@ -1246,13 +1318,13 @@ let sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "asn1.js-4.9.2" = { + "asn1.js-4.10.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.9.2"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz"; - sha512 = "071d32h5646ddyfxvmm0yd0xc320zh2cdsjal4hs8cs0hgn9dpq7k9c9ndlhjq3y93nlawkinm99znqvp0cxx61ic7qy4nn7d5arwvg"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; }; }; "assert-1.4.1" = { @@ -1318,13 +1390,13 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-types-0.10.1" = { + "ast-types-0.11.2" = { name = "ast-types"; packageName = "ast-types"; - version = "0.10.1"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.10.1.tgz"; - sha512 = "2wjsah372x6rjrrsq3bv915lccq4pjpyk4b0vb7kmc87ab5yjgac4rab0qclh6brhhyv95mbyy1k5sijfyx36676darz57k6gsgx3ji"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.2.tgz"; + sha512 = "1mfcrhzn37ray5i3fizrfm5gr1zijv6k1gy370v62smzd6j8d3irphhma9cs9kij7nwkgh5v60q53bfivpm2sscfxbdms9ywiqakgv8"; }; }; "ast-types-0.9.6" = { @@ -1525,13 +1597,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.187.0" = { + "aws-sdk-2.203.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.187.0"; + version = "2.203.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.187.0.tgz"; - sha1 = "04cb9a333d39c09753bf3ff63ec065b32b00db18"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.203.0.tgz"; + sha1 = "7573c1274a4350bd5d78a6db93c9eeab40940acb"; }; }; "aws-sign-0.2.0" = { @@ -1957,13 +2029,13 @@ let sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; }; }; - "babel-generator-6.26.0" = { + "babel-generator-6.26.1" = { name = "babel-generator"; packageName = "babel-generator"; - version = "6.26.0"; + version = "6.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz"; - sha1 = "ac1ae20070b79f6e3ca1d3269613053774f20dc5"; + url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz"; + sha512 = "2jfjq7ggb0ygyzxg3vw248iq0iw2v00janjva1bf3l322k4zjcx9hvq9qqy67gxxyl2igw1asxfgp769hd5229pc70kwri9l1iz09qz"; }; }; "babel-helper-builder-react-jsx-6.26.0" = { @@ -2236,13 +2308,13 @@ let sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; }; }; - "base64-js-1.2.1" = { + "base64-js-1.2.3" = { name = "base64-js"; packageName = "base64-js"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz"; - sha512 = "0dhi66vsajfcm04s11xqklh5lj3abs4ncnl8h3689964aqam3ps9spmc454hz94rz3x1x5l1ad03jrba67mq9zc9vq9a1gchma581bp"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz"; + sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j"; }; }; "base64-url-1.2.1" = { @@ -2650,13 +2722,13 @@ let sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; }; }; - "blob-to-buffer-1.2.6" = { + "blob-to-buffer-1.2.7" = { name = "blob-to-buffer"; packageName = "blob-to-buffer"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.6.tgz"; - sha1 = "089ac264c686b73ead6c539a484a8003bfbb2033"; + url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.7.tgz"; + sha512 = "3vjm0x8c1iv48p266p8s61kwfyvi089npgmwb8zf69yyqrwfixxis0rsgsfrzizl22wzmf0azbxsxqb132nx2q8fjjcgqf7bi2kl593"; }; }; "block-stream-0.0.9" = { @@ -2758,15 +2830,6 @@ let sha1 = "c08cf330c3358e151016a05746f13f029c97fa97"; }; }; - "body-parser-1.17.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz"; - sha1 = "f8892abc8f9e627d42aedafbca66bf5ab99104ee"; - }; - }; "body-parser-1.18.2" = { name = "body-parser"; packageName = "body-parser"; @@ -2938,13 +3001,13 @@ let sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; }; }; - "brace-expansion-1.1.8" = { + "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.8"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; "braces-0.1.5" = { @@ -2965,13 +3028,13 @@ let sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; }; }; - "braces-2.3.0" = { + "braces-2.3.1" = { name = "braces"; packageName = "braces"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz"; - sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; + url = "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz"; + sha512 = "2fpcx8h100fhpaffr6mh5ysp6dv06nl5xkii807fw0c603i15sg3wsxmj63fdn4apxdnn8an2ks883mvrdsv7mfryhfxg1pf1h6bvj8"; }; }; "broadway-0.3.6" = { @@ -3001,13 +3064,13 @@ let sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; }; }; - "browser-pack-6.0.3" = { + "browser-pack-6.0.4" = { name = "browser-pack"; packageName = "browser-pack"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.3.tgz"; - sha512 = "3rbr2j80zl8099hjgsqkizp276cg4q60zjkd481fvnj66k8gmm5w0wbvvqdzpsipgaa3xxsypcr3ryjw1sk2vgzr2hw6pzwr5i933r6"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz"; + sha512 = "0ylgxzrsxs25v3c4mz5ggqawb8k3xb39ialqlflk1nadfk8wrig2g2ipkpnw6bf9zhdhmigkwqbbl8yssibcb6fgnbbqfgsnfgnz123"; }; }; "browser-resolve-1.11.2" = { @@ -3172,13 +3235,13 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; - "buffer-5.0.8" = { + "buffer-5.1.0" = { name = "buffer"; packageName = "buffer"; - version = "5.0.8"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.8.tgz"; - sha512 = "0capij8lgps5fzc5hikkkdsn58lmzfdpni7v2m0ham5r67q24kln1spwz4dnk3nh6zkiqmgz0cqnq591pms1pkkv8prvksd2m1f6yy5"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; + sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2"; }; }; "buffer-alloc-unsafe-1.0.0" = { @@ -3505,6 +3568,15 @@ let sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; }; }; + "cacache-10.0.4" = { + name = "cacache"; + packageName = "cacache"; + version = "10.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz"; + sha512 = "0f1zwi8bbiia995410m24xljd0ra0vk579q7rk48p7mrq9nbilx3qa2rnp7hjdwnvx28zfad0rfdcwyq3blzkb3rk8b9yl77crp960f"; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -3676,13 +3748,13 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "camelo-1.1.11" = { - name = "camelo"; - packageName = "camelo"; - version = "1.1.11"; + "camelcase-keys-4.2.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelo/-/camelo-1.1.11.tgz"; - sha512 = "39qf2hdriyb5zn5bc62wgj59whx06nmzij9yylv0mrjnivgpqg2z3ksxl035nn35lnavi1b20qi062l41xah3b3nnbw42dh6b4qk34i"; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz"; + sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; "capture-stack-trace-1.0.0" = { @@ -3838,6 +3910,15 @@ let sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; }; }; + "chalk-2.3.1" = { + name = "chalk"; + packageName = "chalk"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; + sha512 = "3m0k6j50aridlrk1q8kf3cd1vcj6qcg2nx5yk8d0196hmw0c4a6y1h315p24l34yz0chfrcrkrsr12cixccfp5q7caw5803z6hkhia1"; + }; + }; "character-entities-1.2.1" = { name = "character-entities"; packageName = "character-entities"; @@ -3964,13 +4045,13 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; - "chokidar-2.0.0" = { + "chokidar-2.0.2" = { name = "chokidar"; packageName = "chokidar"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.0.tgz"; - sha512 = "01y5j8xkkzlzc4yzh4f8gbshbs6i3hb4wlz5nd48xcmm3vmawah9jj052km463v3d2vqx9kbrnxvjw2fkcbdxw0sg33ksclzlvc419s"; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz"; + sha512 = "1kncf65ax274b43r63m0bfbap3j5ah7dn86niqwpzzw6ilvpc7yy0fan14k584lw8ycf4nl78n5gv3bpyr4jrk5j3v441ragk1qfzcp"; }; }; "chownr-0.0.2" = { @@ -3991,6 +4072,15 @@ let sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; }; }; + "chrome-trace-event-0.1.2" = { + name = "chrome-trace-event"; + packageName = "chrome-trace-event"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz"; + sha1 = "90f36885d5345a50621332f0717b595883d5d982"; + }; + }; "chromecast-player-0.2.3" = { name = "chromecast-player"; packageName = "chromecast-player"; @@ -4252,13 +4342,13 @@ let sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; - "clipboardy-1.2.2" = { + "clipboardy-1.2.3" = { name = "clipboardy"; packageName = "clipboardy"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.2.tgz"; - sha512 = "2pq14hxz6w4k5yvndrm1fv3iyscdqf5c4nja421gl2661didzh80r08zddd84zny94831qs44biamjhvwmqh40pfy3pjv3vwl2ap8np"; + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz"; + sha512 = "0j60cwp5vpc7v13m0d5rgh6h5jf6yxnywfb1wgbdn7lalklrr5ncvfkkqk6xj7b046bl2jabfqifk3yl6agd93ixfmywif2xfc4hqyr"; }; }; "clite-0.3.0" = { @@ -4360,6 +4450,15 @@ let sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb"; }; }; + "clone-buffer-1.0.0" = { + name = "clone-buffer"; + packageName = "clone-buffer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz"; + sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58"; + }; + }; "clone-deep-0.3.0" = { name = "clone-deep"; packageName = "clone-deep"; @@ -4396,6 +4495,24 @@ let sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; }; }; + "clone-stats-1.0.0" = { + name = "clone-stats"; + packageName = "clone-stats"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz"; + sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; + }; + }; + "cloneable-readable-1.0.0" = { + name = "cloneable-readable"; + packageName = "cloneable-readable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz"; + sha1 = "a6290d413f217a61232f95e458ff38418cfb0117"; + }; + }; "cmd-shim-2.0.2" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -4648,13 +4765,13 @@ let sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "combined-stream-1.0.5" = { + "combined-stream-1.0.6" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; "command-join-2.0.0" = { @@ -4738,15 +4855,6 @@ let sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; }; }; - "commander-2.12.2" = { - name = "commander"; - packageName = "commander"; - version = "2.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz"; - sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84"; - }; - }; "commander-2.13.0" = { name = "commander"; packageName = "commander"; @@ -4756,6 +4864,15 @@ let sha512 = "1h27ar13gbld2jk6wk84irqmyz6ya6b4dzmxb6nq8azyi48iq8pqqyq90jwzxqb3i7j167y5fpiys6v7vvjzhm8bbd8rya1kzgr4nri"; }; }; + "commander-2.14.1" = { + name = "commander"; + packageName = "commander"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; + sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; + }; + }; "commander-2.6.0" = { name = "commander"; packageName = "commander"; @@ -4801,6 +4918,15 @@ let sha512 = "0jx2cncv7x5ms1gg2vks5bhxi9c5jbwymfk42dzmp9vrxrmhrl9vaw4wsh4lvf65shxmq1v8f8s0i3rkyk2x8mrfpq2m30famkgv24f"; }; }; + "commondir-1.0.1" = { + name = "commondir"; + packageName = "commondir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + }; "commoner-0.10.8" = { name = "commoner"; packageName = "commoner"; @@ -4873,13 +4999,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compressible-2.0.12" = { + "compressible-2.0.13" = { name = "compressible"; packageName = "compressible"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz"; - sha1 = "c59a5c99db76767e9876500e271ef63b3493bd66"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz"; + sha1 = "0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"; }; }; "compression-1.5.2" = { @@ -4891,13 +5017,13 @@ let sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; }; }; - "compression-1.7.1" = { + "compression-1.7.2" = { name = "compression"; packageName = "compression"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz"; - sha1 = "eff2603efc2e22cf86f35d2eb93589f9875373db"; + url = "https://registry.npmjs.org/compression/-/compression-1.7.2.tgz"; + sha1 = "aaffbcd6aaf854b44ebb280353d5ad1651f59a69"; }; }; "concat-map-0.0.1" = { @@ -5044,13 +5170,13 @@ let sha1 = "6d30d7a63c7f170857a6b3aa6b363d973dca588e"; }; }; - "connect-3.6.5" = { + "connect-3.6.6" = { name = "connect"; packageName = "connect"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz"; - sha1 = "fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"; + sha1 = "09eff6c55af7236e137135a72574858b6786f524"; }; }; "connect-busboy-0.0.2" = { @@ -5152,13 +5278,13 @@ let sha1 = "4b945d9937907bcd98ee575122c3817516544141"; }; }; - "constantinople-3.1.0" = { + "constantinople-3.1.2" = { name = "constantinople"; packageName = "constantinople"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz"; - sha1 = "7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"; + url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz"; + sha512 = "2xnhrmlbkfpcvckxxrl0hjp6qhhqv1p7c6pwxgqp1g0sa5q5cc514xn48g9x8kqj7g1imzciwgb2msbhvhn0w0v92mb7105l43drqy9"; }; }; "constants-browserify-1.0.0" = { @@ -5243,85 +5369,85 @@ let sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; }; }; - "conventional-changelog-1.1.7" = { + "conventional-changelog-1.1.17" = { name = "conventional-changelog"; packageName = "conventional-changelog"; - version = "1.1.7"; + version = "1.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.7.tgz"; - sha1 = "9151a62b1d8edb2d82711dabf5b7cf71041f82b1"; + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.17.tgz"; + sha512 = "325x3h1qn2q1cg3x4dlia7sjanlv2qsj9c0nq8pzvr5fcwmg9qmf3am30bk4c4yjikyvfgpsvnp8rrh937bywd5y4d410hwfn1hbwhn"; }; }; - "conventional-changelog-angular-1.6.0" = { + "conventional-changelog-angular-1.6.6" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "1.6.0"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.0.tgz"; - sha1 = "0a26a071f2c9fcfcf2b86ba0cfbf6e6301b75bfa"; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz"; + sha512 = "0v02kj8l2ji18jmcgjqa0nqsfn4h9jklgy4g9brf1ppm0n8344in3xpmyc5y06i5k3jjxl8sv90cndh2fbg4fhn0wr1ric258ajgr5j"; }; }; - "conventional-changelog-atom-0.1.2" = { + "conventional-changelog-atom-0.2.4" = { name = "conventional-changelog-atom"; packageName = "conventional-changelog-atom"; - version = "0.1.2"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.2.tgz"; - sha1 = "12595ad5267a6937c34cf900281b1c65198a4c63"; + url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz"; + sha512 = "2b43fd5cpi069hsmfswl320lnpnvahmqmnrc9csk6qv0dq72nfj0jzafmbv5gsb3ds2ssr29lswwky61shy3n9hbxshq0qw3in6ds73"; }; }; - "conventional-changelog-cli-1.3.5" = { + "conventional-changelog-cli-1.3.15" = { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; - version = "1.3.5"; + version = "1.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.5.tgz"; - sha1 = "46c51496216b7406588883defa6fac589e9bb31e"; + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.15.tgz"; + sha512 = "0b9w7fp4mrgs12s4hznwzp79m9lza4fsygvdyma6qnd53h699jscc7h6jwlhdf398h5rpf91y2x0gl38fxfb9ydicshmvy5qdsgc4yh"; }; }; - "conventional-changelog-codemirror-0.2.1" = { + "conventional-changelog-codemirror-0.3.4" = { name = "conventional-changelog-codemirror"; packageName = "conventional-changelog-codemirror"; - version = "0.2.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.1.tgz"; - sha1 = "299a4f7147baf350e6c8158fc54954a291c5cc09"; + url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz"; + sha512 = "33091h0zm06gdwhcqi5c3xvcjl6fw8cj3wvis9hyl5gix1vl2wd2pifymgp7rag6dbyzilb0g5q3ak29dcsrdzizqzibk8m0hdfkkph"; }; }; - "conventional-changelog-core-1.9.5" = { + "conventional-changelog-core-2.0.5" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "1.9.5"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.5.tgz"; - sha1 = "5db7566dad7c0cb75daf47fbb2976f7bf9928c1d"; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz"; + sha512 = "1agyx5rj0lbrky9ndhha25la98lh2h1lyli2r4r27r1p0pr48niwg04al4whnvcldh0592fmyrdgf8vqqp5n6xz3df43j6dkpnnrzcl"; }; }; - "conventional-changelog-ember-0.2.10" = { + "conventional-changelog-ember-0.3.6" = { name = "conventional-changelog-ember"; packageName = "conventional-changelog-ember"; - version = "0.2.10"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.10.tgz"; - sha512 = "04s2g1mkzbpbklqj81q25j87vxl4ggq0x9n7nyry9771cyawn7007wridq4hnhd4qa5vvz5lnslwvj7aliwi78l3vw2dvlhxrj4241c"; + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz"; + sha512 = "24dx0snmkfhr4qi7vdq0aywjw9k23x68kaqh0gn92lca7j1268zbzr6vf00izx5g86kkjihlzgsgx8piyy1mnimn9nk7bj8pv2ka4w4"; }; }; - "conventional-changelog-eslint-0.2.1" = { + "conventional-changelog-eslint-1.0.4" = { name = "conventional-changelog-eslint"; packageName = "conventional-changelog-eslint"; - version = "0.2.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.1.tgz"; - sha1 = "2c2a11beb216f80649ba72834180293b687c0662"; + url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.4.tgz"; + sha512 = "3zk9p0rc8xns93flvpc0lnyfqdyv48yc3m2z71da07gj8fbmbrxs0px30xnlqzdwmbcz86i9fksxrcnqq9mhlwcfkwyzma396n4cxpp"; }; }; - "conventional-changelog-express-0.2.1" = { + "conventional-changelog-express-0.3.4" = { name = "conventional-changelog-express"; packageName = "conventional-changelog-express"; - version = "0.2.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.1.tgz"; - sha1 = "838d9e1e6c9099703b150b9c19aa2d781742bd6c"; + url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz"; + sha512 = "3w3pm3dqwn8bj29809j0ivybw8vn2grnz486h9bm4kk9bn4849k9pxiqmx2ifpqf09hdl17fjk1xw320zz33wnvjzx78kbrpmpi9r9k"; }; }; "conventional-changelog-jquery-0.1.0" = { @@ -5342,49 +5468,58 @@ let sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"; }; }; - "conventional-changelog-jshint-0.2.1" = { + "conventional-changelog-jshint-0.3.4" = { name = "conventional-changelog-jshint"; packageName = "conventional-changelog-jshint"; - version = "0.2.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.1.tgz"; - sha1 = "86139bb3ac99899f2b177e9617e09b37d99bcf3a"; + url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz"; + sha512 = "0lzbgx3x2bfchxp8p4ppjavnp4yywjks3486yrxanq3skq0x5g4wnbhcf2viwm167mhn3aiawxygsxql5ww8md1xzssdrqb730fmnh9"; }; }; - "conventional-changelog-writer-2.0.3" = { + "conventional-changelog-preset-loader-1.1.6" = { + name = "conventional-changelog-preset-loader"; + packageName = "conventional-changelog-preset-loader"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz"; + sha512 = "12qk33piqbilkyrvin1vsjzp5pcvs7sschn5jry272r1hnv3x0jrwb1dlnik8vpp3zqai6n70h4ls55q2ch5n13a6g25c1hvhzwhqy9"; + }; + }; + "conventional-changelog-writer-3.0.4" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "2.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.3.tgz"; - sha512 = "1nchhqyp5qmrwqn9yxrkn8zjhlk1ph5jgnky26lzkrd1j4lh2n93602xw1zm6gv7qg48r61qzk5qh74v480nx4q7d8zilfb8pnn2kfq"; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz"; + sha512 = "1ryw2mmza9y6bk5hs2ivhvp9p5hq7hhydhis2880w41dajr193zvccwhglp7js7j435d3i2d38i5aikydqg2r4jdc7753w4d22zyiqi"; }; }; - "conventional-commits-filter-1.1.1" = { + "conventional-commits-filter-1.1.5" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "1.1.1"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.1.tgz"; - sha512 = "0jrsm3hlyq0a425d320l1rghxmmb621r0bcvlsfbdichzbyimflwn7wz1mhw62kdnr3wxskdpaq11f5qpdsz5g2d5f7ha4d4jvrl33d"; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz"; + sha512 = "0dw3vksvzwig2hiiw1kky2p424136r2faa941bkcdy3ljhp7mgd9i8pz3vdccw23v51z7vhh1dkw7wg363qxg9kvcxr2lgwp1cgwgcs"; }; }; - "conventional-commits-parser-2.1.0" = { + "conventional-commits-parser-2.1.5" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "2.1.0"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.0.tgz"; - sha512 = "0mnckb77dj8jk9xspzh6q0kaybc5wyb2ny94qgnvbj5f1yjnk7s2sak86b0h3dhrfk4y9nncwfjpvsg8iyiary68sdbwrbl4gkz9h7h"; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz"; + sha512 = "2nb2s8hrbv3sl19xzz9x5pqgmm4kimrsaqlzs8xa2wzr0zg68090xnlq5ifcbmcm47fg5l9m63kkri248idzrvz2y689y3jbbmhz84d"; }; }; - "conventional-recommended-bump-1.1.0" = { + "conventional-recommended-bump-1.2.1" = { name = "conventional-recommended-bump"; packageName = "conventional-recommended-bump"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.1.0.tgz"; - sha512 = "3gh833x8hqmnxfmacs3ryrb2gh3y397ddkiwisv6g3dfz6j617i1fm22yq3r83y40pidmf1n77qzvwmbx4ws7jn4yydfxypi6fhgbaq"; + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz"; + sha512 = "3irsgzxrhc2s4y4mlq7vmrvrhn74kpda34sn2ladm98q4gy88l7dpqxs8xf6lxm4sai5qqwzxk1gzlrfgvsrmfzzvmxk0hi77lcd650"; }; }; "convert-source-map-1.1.3" = { @@ -5549,6 +5684,15 @@ let sha1 = "7c8a615f5481c61ab9f16c833731bcb8f663b99b"; }; }; + "copy-concurrently-1.0.5" = { + name = "copy-concurrently"; + packageName = "copy-concurrently"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz"; + }; + }; "copy-descriptor-0.1.1" = { name = "copy-descriptor"; packageName = "copy-descriptor"; @@ -5657,15 +5801,6 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "cors-2.8.3" = { - name = "cors"; - packageName = "cors"; - version = "2.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; - sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; - }; - }; "cors-2.8.4" = { name = "cors"; packageName = "cors"; @@ -5783,13 +5918,13 @@ let sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; }; }; - "cron-1.2.1" = { + "cron-1.3.0" = { name = "cron"; packageName = "cron"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz"; - sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; + url = "https://registry.npmjs.org/cron/-/cron-1.3.0.tgz"; + sha512 = "3iq9zg5plipbybssrb38lhlqdp1p4mbrmvp92zc477z9ck9k90dnxwgssjzb2a572g801q3c75mwy5hmx1ccmiqf5in6ck0k7n8bx1b"; }; }; "cross-spawn-4.0.0" = { @@ -6143,6 +6278,15 @@ let sha1 = "1bcfa56b081448cdb5e12bfc1bfad34b47fba8f3"; }; }; + "cyclist-0.2.2" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; + sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + }; + }; "d-1.0.0" = { name = "d"; packageName = "d"; @@ -6269,13 +6413,13 @@ let sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; }; }; - "dat-node-3.5.6" = { + "dat-node-3.5.8" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.6.tgz"; - sha512 = "17i7n2n3bappi34pnv2240cr5baawf2ab8wf22bmlxx4xkcb5g0z24ycz542fsx8myn4fyjgfgdhwbv44f5sz1c4z7i7g4q3ah9n7zh"; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.8.tgz"; + sha512 = "3j28p80dwmic3g00asmcpgiv3sh3s8023x1023g7bm534h1ai8i2zryivx95gc22is64k9mynmqr2g0ny25xp1f7h1cbc25klizg8dc"; }; }; "dat-registry-4.0.0" = { @@ -6287,22 +6431,22 @@ let sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; }; }; - "dat-secret-storage-4.0.0" = { + "dat-secret-storage-4.0.1" = { name = "dat-secret-storage"; packageName = "dat-secret-storage"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.0.tgz"; - sha1 = "01b219a5bc1619efc0f58122a3c6cebb1eb8b40a"; + url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.1.tgz"; + sha512 = "3ad9x7n3qxivrj03fsa8ll3i511ivclnyrv1421zklnmskkxxi2d2fykb1kx1sbwdyx35167a7k4mbw63jhxxaz6r54hpd9fad5wj05"; }; }; - "dat-storage-1.0.3" = { + "dat-storage-1.0.4" = { name = "dat-storage"; packageName = "dat-storage"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.3.tgz"; - sha512 = "1n7gszxdkchx0bilz4phnanzmw00fkljwm9rl0z7cndi94xrb6pkzczh6x137xn62j9p7yp6nz24a82q8llsrlk3c1pwvn269cdx97a"; + url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz"; + sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; "dat-swarm-defaults-1.0.0" = { @@ -6350,15 +6494,6 @@ let sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; }; }; - "dateformat-1.0.12" = { - name = "dateformat"; - packageName = "dateformat"; - version = "1.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; - sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; - }; - }; "dateformat-1.0.2-1.2.3" = { name = "dateformat"; packageName = "dateformat"; @@ -6377,6 +6512,15 @@ let sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; }; }; + "dateformat-3.0.3" = { + name = "dateformat"; + packageName = "dateformat"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"; + sha512 = "3fxpn11cnyqcz25h9krfrpnra9zi1zri0l4f42a89acybqgj6dyr6p0lskcjffahiwxxmmc0zvgalnlk2wa74b764cm7pd5si78884g"; + }; + }; "datland-swarm-defaults-1.0.2" = { name = "datland-swarm-defaults"; packageName = "datland-swarm-defaults"; @@ -6476,24 +6620,6 @@ let sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; - "debug-2.6.3" = { - name = "debug"; - packageName = "debug"; - version = "2.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; - sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; - }; - }; - "debug-2.6.7" = { - name = "debug"; - packageName = "debug"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; - sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; - }; - }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -6530,6 +6656,15 @@ let sha512 = "0zc3slyk7cc9xjfcnw3nk2d1vkq4kxrjalavqgp3zykbgnp5v12xcs47kr436k0izbzyxhkrdww94p5g1lcmzcdqncc9p0mqzk6jji2"; }; }; + "decamelize-keys-1.1.0" = { + name = "decamelize-keys"; + packageName = "decamelize-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; + }; + }; "decode-uri-component-0.2.0" = { name = "decode-uri-component"; packageName = "decode-uri-component"; @@ -6647,6 +6782,15 @@ let sha512 = "2sylzgq5rwi12ac5y4fbvyyhs128zlcrp1q1i0bkp27fvlg60hr1slxzckk22x2rzgmwsqqlvzyylm9v0gwzbsbprd3c1mg78c396gp"; }; }; + "deepmerge-2.0.1" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.1.tgz"; + sha512 = "2qww1m640drvrkcyijaky5kpzdg7pqixb2qk3ms5r99p9ch6isv8a6h0yqwypsw42d1hlg3v7v1x4x7cy0v10pn87cms9vaqa4g10sl"; + }; + }; "default-browser-id-1.0.4" = { name = "default-browser-id"; packageName = "default-browser-id"; @@ -6710,6 +6854,15 @@ let sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; }; }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; + }; + }; "defined-0.0.0" = { name = "defined"; packageName = "defined"; @@ -7304,13 +7457,13 @@ let sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; }; }; - "domutils-1.6.2" = { + "domutils-1.7.0" = { name = "domutils"; packageName = "domutils"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz"; - sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; + url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; + sha512 = "076s2v293f9jixaddq6qmjc76y3z0kqddmjb4nclydp23y0jzpg6f7h32j6adilfdjxwwhxkclrhc1vn7rbsidvzcq32dkzq9fpc1rf"; }; }; "dot-prop-3.0.0" = { @@ -7466,13 +7619,13 @@ let sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1"; }; }; - "editions-1.3.3" = { + "editions-1.3.4" = { name = "editions"; packageName = "editions"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz"; - sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; + url = "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz"; + sha512 = "196fp42k8j9d8cmi0sqjj6wfqcr7y0c9zcrfv1bcs38ipkn78ivg3xl2f33x3hfiqnyp3gb5y7ndkgqpw433jn5rb43qq37dkxahdl3"; }; }; "editor-1.0.0" = { @@ -7602,24 +7755,6 @@ let sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932"; }; }; - "emojic-1.1.14" = { - name = "emojic"; - packageName = "emojic"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/emojic/-/emojic-1.1.14.tgz"; - sha512 = "0j0wbbcyvx0qklz7xvqbv2w2n2vqzq5vhyv3jrnsvb775c0zr2bh7m3k7mh0aw6i4rbmgf8x6rw7bfvgzsh5hvlgj01w61xfml89b4z"; - }; - }; - "emojilib-2.2.12" = { - name = "emojilib"; - packageName = "emojilib"; - version = "2.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/emojilib/-/emojilib-2.2.12.tgz"; - sha512 = "2z6nk0nin1cmj81c54pxjyxgpa61d0g61sdn3swykk4j8n8mnba95m1s1cpjcr4wr96jhgyal1z4swd8pcazzp3a50msqir0vj4vcwq"; - }; - }; "emojis-list-2.1.0" = { name = "emojis-list"; packageName = "emojis-list"; @@ -7710,13 +7845,13 @@ let sha512 = "3ff3a0anvy48mmpay3jkzlrjvxmlclq823j8jmjfdhy48xpz1syz44bwr13zdh161x1vqzsclgwb6gvgrn9vymvq98qihrdr4hxcl4g"; }; }; - "engine.io-3.1.4" = { + "engine.io-3.1.5" = { name = "engine.io"; packageName = "engine.io"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.4.tgz"; - sha1 = "3d0211b70a552ce841ffc7da8627b301a9a4162e"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz"; + sha512 = "1qcg5b143cxb4gxa9jpj51c8q9ihwb0sscwqicgwrghmfg8y2phqjzhlaxjsrd6z8h1mpsxzy00s54w9lx6vd27f1mj9iqqk6ya4khg"; }; }; "engine.io-client-1.3.1" = { @@ -7737,13 +7872,13 @@ let sha512 = "1kfc2cmjw891x0i9cm9alm93db5s40h3n4a3zcpjha7nrvz0s7ggzpp2x2v8zmnhp9278amjdm0j5lfkn3qxan7nanzhl4m4wgy1101"; }; }; - "engine.io-client-3.1.4" = { + "engine.io-client-3.1.5" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz"; - sha1 = "4fcf1370b47163bd2ce9be2733972430350d4ea1"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.5.tgz"; + sha512 = "3ld2inpqkyy451a7lpf8kmaf76zrj9a50yg28z1d1znhnnj40g3cnrcq93690lknhb6mjv0k1nav2cbqx2p3aqqhmav7kippy0nzzs6"; }; }; "engine.io-parser-1.0.6" = { @@ -7791,6 +7926,15 @@ let sha1 = "0421e339fd71419b3da13d129b3979040230476e"; }; }; + "enhanced-resolve-4.0.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz"; + sha512 = "3r1f41kk9dzckpghscy0q2j6qzmzckbv4mc83y5d4kxg2r458wgsimljpr0ycx6pvg8sjwwdhh8750h1wrl3m54svaqf6pncvmpz34f"; + }; + }; "ensure-posix-path-1.0.2" = { name = "ensure-posix-path"; packageName = "ensure-posix-path"; @@ -7845,13 +7989,13 @@ let sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; }; }; - "errno-0.1.6" = { + "errno-0.1.7" = { name = "errno"; packageName = "errno"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz"; - sha512 = "0vny3xisd56kx193rhv6vpccjxlajjn9ss5wk96l1ya8zbpkwbjrrgrm9wpfm3xc8apx8z9xb0kjkw0y5qnc6gy1hf2qsas79093hr2"; + url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; + sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; }; }; "error-7.0.2" = { @@ -7908,13 +8052,13 @@ let sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; }; }; - "es5-ext-0.10.38" = { + "es5-ext-0.10.39" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.38"; + version = "0.10.39"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.38.tgz"; - sha512 = "0m7d1yd67hb93gsxv7790h9ayxg3pwf3vgih9v2kxqvsg073wim7jgwf3z57lksdczxnqv2d8gm4mfk4b29f6rc27a7c09vz9w348wc"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz"; + sha512 = "3k07fsn3x64wphzrvb5bhv4r8drmvranrh43j8pn7rsnpyk8pia81vy1d4g3ix0ami3xs4crqxpanxff9dwfk7czrl4m5y72dk9fmh2"; }; }; "es5-ext-0.8.2" = { @@ -8097,13 +8241,13 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; - "escodegen-1.9.0" = { + "escodegen-1.9.1" = { name = "escodegen"; packageName = "escodegen"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz"; - sha512 = "0il8dp1bh3n1am3xx5pazmpjb5m8wzdn9xg1lgh4j8axvsy8v24i1171c04qafx0j4xsaq76j29ljq2srf4i3kdl3qbrn9psjy1hhxz"; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz"; + sha512 = "3nl4jbvigqc5ax1f35b601vlca4fa4ghr27wfglgrmv7h5pssnkh7px0vjh8wzrkjvx8bw7c71b0axc307akkjd1vkl2nj0acxy657a"; }; }; "escope-3.6.0" = { @@ -8133,13 +8277,13 @@ let sha512 = "3l1j4qy0gqa8rkwpdsmkkbqcmbx23ym8h64d1bbj5i5ds5ks0g91myldzp0y25r6b3ba9646hy4i2jiad2jmm8h68z89i2larkvyhyc"; }; }; - "eslint-4.16.0" = { + "eslint-4.18.1" = { name = "eslint"; packageName = "eslint"; - version = "4.16.0"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz"; - sha512 = "330nda1zwh0sqsxsfmlmhbg903gz6n9n4zy870gc2k95wrg1bc7jysfyn98nk2bd8p821xszpygp1vs1i7csapxfb3q2dp1n3hxamb1"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.18.1.tgz"; + sha512 = "21i792qmqdz7dzm68ncjf4q3bi3c5kb1q103hkdp868mm9p7gd153hjzsq70mfyfx0vrjzna8x734xmpkp9himw32svf7j24jjrzx40"; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -8169,13 +8313,13 @@ let sha512 = "02hr99x8cnc80p9hn5si7mngqpzvvjkxmdv8sch68z0qpqwjdlx3j1w6d9rhr6wgcnqf1mrxyji8wvfddbf7xr13z2nzihv29gvyfdb"; }; }; - "espree-3.5.2" = { + "espree-3.5.3" = { name = "espree"; packageName = "espree"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz"; - sha512 = "04mnrkdqs32w98h9sfkn9i9zkyqj69sz2q1kxpnmsryjnfd9jrpqqlwrik73a80mdz86xckbr7vayw1dwkxhhnbvs4zciqsiiwlm9xi"; + url = "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz"; + sha512 = "1cv3w3jgkm5sdaszxn172lhwgwr13w7sw75hmigqppmr9n2xx761r5cm32xhhg25ws8h00iy746qka5l85nm6sx5qci8iyfj00fsbb7"; }; }; "esprima-1.0.4" = { @@ -8232,13 +8376,13 @@ let sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; }; }; - "esrecurse-4.2.0" = { + "esrecurse-4.2.1" = { name = "esrecurse"; packageName = "esrecurse"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz"; - sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; + sha512 = "06zyknk70y80n428x20wvjqy5822wgz2yaxzw387njnz3ar6ixzjcxzr2jsl8wrm0m9jpa4ysbcr9znpk6gbkqd7wby084zxw3l317b"; }; }; "estraverse-1.9.3" = { @@ -8394,13 +8538,13 @@ let sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; }; }; - "eventemitter3-3.0.0" = { + "eventemitter3-3.0.1" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.0.tgz"; - sha512 = "0jijxlrlxb3vf5xqxibisd132qzlh9ag6ckxgvz791d4rqrzvzc2mzzn86jx1bgbsym1wi0pgm017i4rd5m84g1d38n56zqvh5g2r7b"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.1.tgz"; + sha512 = "0c5685grn5npm90n22lw5hjz93ga3ffc3j6jk5rs4sz0w7ymwj942v3w94ikkgxpvxj7mfawsdrczwad0b7srbkynbwac7xvsxqzq20"; }; }; "events-1.1.1" = { @@ -8412,6 +8556,15 @@ let sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; }; }; + "events-2.0.0" = { + name = "events"; + packageName = "events"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-2.0.0.tgz"; + sha512 = "1r878as79mx3xg56nvjxxbryqa8lqn8xmiqi1xqfx2vjygnfaf15h5l658a9ikfr1bhc6ygxny8jr8ddjxpzlh6y443rxv08di3kwxg"; + }; + }; "events.node-0.4.9" = { name = "events.node"; packageName = "events.node"; @@ -8619,15 +8772,6 @@ let sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; }; }; - "express-4.15.3" = { - name = "express"; - packageName = "express"; - version = "4.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; - sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; - }; - }; "express-4.16.2" = { name = "express"; packageName = "express"; @@ -8682,15 +8826,6 @@ let sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; }; }; - "express-session-1.15.2" = { - name = "express-session"; - packageName = "express-session"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; - sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; - }; - }; "express-session-1.15.6" = { name = "express-session"; packageName = "express-session"; @@ -8808,6 +8943,15 @@ let sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1"; }; }; + "extract-text-webpack-plugin-3.0.2" = { + name = "extract-text-webpack-plugin"; + packageName = "extract-text-webpack-plugin"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz"; + sha512 = "10rc4hfyzf8n5b30q0fpawnbnr1cs33mmrz9466hhcxjzlz7ys44zbsr5kbvr1jn5nivcr91nmfhpq2mqi1wxmr19zsnimri5kwppvf"; + }; + }; "extract-zip-1.5.0" = { name = "extract-zip"; packageName = "extract-zip"; @@ -8889,13 +9033,13 @@ let sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; }; }; - "fast-deep-equal-1.0.0" = { + "fast-deep-equal-1.1.0" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; - sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; + sha1 = "c053477817c86b51daa853c81e059b733d023614"; }; }; "fast-diff-1.1.2" = { @@ -8925,6 +9069,15 @@ let sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; }; }; + "fast-json-patch-1.2.2" = { + name = "fast-json-patch"; + packageName = "fast-json-patch"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-1.2.2.tgz"; + sha1 = "d377d97c6911dbdd2a1c80bfacda048a4f83bbf9"; + }; + }; "fast-json-patch-2.0.6" = { name = "fast-json-patch"; packageName = "fast-json-patch"; @@ -9087,13 +9240,13 @@ let sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; }; }; - "filesize-3.5.11" = { + "filesize-3.6.0" = { name = "filesize"; packageName = "filesize"; - version = "3.5.11"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz"; - sha512 = "3bg35im21jf6dhyrcajczdjl3rjm5mphdhansyfbpzm067vv3jp91n43nrzxf8q6nx3b5vkn2my1rskyp4pmg91xzdq01lawyifazk4"; + url = "https://registry.npmjs.org/filesize/-/filesize-3.6.0.tgz"; + sha512 = "1vldkz70kikg8b3ac8l686hm1aplkwqmllm9lg32cvy50hqzcqhari8pl2c41zsvl3bpzzfv7v8db0j91c0qd9vx8wz4w2nhsv9d4w3"; }; }; "fill-range-2.2.3" = { @@ -9177,6 +9330,15 @@ let sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; }; }; + "find-cache-dir-1.0.0" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz"; + sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f"; + }; + }; "find-elm-dependencies-1.0.2" = { name = "find-elm-dependencies"; packageName = "find-elm-dependencies"; @@ -9402,6 +9564,15 @@ let sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; }; }; + "flush-write-stream-1.0.2" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; + sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; + }; + }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -9420,13 +9591,13 @@ let sha1 = "8e34298cbd2e176f254effec75a1c78cc849fd37"; }; }; - "follow-redirects-1.2.4" = { + "follow-redirects-1.3.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.2.4"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz"; - sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.3.0.tgz"; + sha1 = "f684871fc116d2e329fda55ef67687f4fabc905c"; }; }; "follow-redirects-1.4.1" = { @@ -9573,13 +9744,13 @@ let sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; - "form-data-2.3.1" = { + "form-data-2.3.2" = { name = "form-data"; packageName = "form-data"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; - sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; + sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; "formidable-1.0.11" = { @@ -9672,15 +9843,6 @@ let sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; }; }; - "fresh-0.5.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz"; - sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"; - }; - }; "fresh-0.5.2" = { name = "fresh"; packageName = "fresh"; @@ -9816,6 +9978,15 @@ let sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416"; }; }; + "fs-write-stream-atomic-1.0.10" = { + name = "fs-write-stream-atomic"; + packageName = "fs-write-stream-atomic"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + }; "fs.extra-1.3.2" = { name = "fs.extra"; packageName = "fs.extra"; @@ -10131,13 +10302,13 @@ let sha1 = "2c5a6638d893934b9b55037d0ad82cb7004b2679"; }; }; - "git-raw-commits-1.3.0" = { + "git-raw-commits-1.3.4" = { name = "git-raw-commits"; packageName = "git-raw-commits"; - version = "1.3.0"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.0.tgz"; - sha1 = "0bc8596e90d5ffe736f7f5546bd2d12f73abaac6"; + url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.4.tgz"; + sha512 = "0yfkxk071bahnzw2h5ip6qb7mq76psfwiqs232gkzr91hc55kqw57pjn33j04h3xiwvgrikl20mbccisi006rxyh0lwfvj7bkivwwqv"; }; }; "git-remote-origin-url-2.0.0" = { @@ -10158,13 +10329,13 @@ let sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; }; }; - "git-semver-tags-1.2.3" = { + "git-semver-tags-1.3.4" = { name = "git-semver-tags"; packageName = "git-semver-tags"; - version = "1.2.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.3.tgz"; - sha1 = "188b453882bf9d7a23afd31baba537dab7388d5d"; + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.4.tgz"; + sha512 = "0hhdj4992a96ys5i9k6pjbn99wwsabb92drxr0s7vzxyxlpydrvjzbb4rwdnsd0rm7h92420yr2f3khpakkp6ivgg09fp9hhgprkvax"; }; }; "gitconfiglocal-1.0.0" = { @@ -10429,13 +10600,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "globals-11.2.0" = { + "globals-11.3.0" = { name = "globals"; packageName = "globals"; - version = "11.2.0"; + version = "11.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.2.0.tgz"; - sha512 = "0ad39906l0grsfy2953m3c6jkhbwakd89vbqprzz9g0cafvikzfcp5azqch3zm8pmyhc29sbbcfgnays990jvwmq9xgw8vv7m7bnc24"; + url = "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz"; + sha512 = "1vlgbj6gcsd9dshs7xldhg92zd62r3w51jf9x80qnn0y4llbl2ji5sl7ibmv7ysr0iv8hzid151n8zxhyi84rlnczysjhb6v4l5qjlj"; }; }; "globals-9.18.0" = { @@ -10528,13 +10699,13 @@ let sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3"; }; }; - "got-8.0.3" = { + "got-8.2.0" = { name = "got"; packageName = "got"; - version = "8.0.3"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.0.3.tgz"; - sha512 = "2bglci1j77rvr4z2klmnr6d2qfqk0f60nm1myj9m0g2rzh7pd68hzki9nm8f5dpaxqr98ncjbd4rfzw75j35nvsfcyb2i1l9jjailak"; + url = "https://registry.npmjs.org/got/-/got-8.2.0.tgz"; + sha512 = "01g5s6aqp4ikmpwhqvw4j7c4n4fq3v7nqaszr9kvwrx801gxzb70b3qx0pqsir2hqw2a7jfd1ja6v577hmmnblvz7c0h8spkal9s9l2"; }; }; "graceful-fs-1.2.3" = { @@ -10834,6 +11005,15 @@ let sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; "has-gulplog-0.1.0" = { name = "has-gulplog"; packageName = "has-gulplog"; @@ -10843,13 +11023,13 @@ let sha1 = "6414c82913697da51590397dafb12f22967811ce"; }; }; - "has-symbol-support-x-1.4.1" = { + "has-symbol-support-x-1.4.2" = { name = "has-symbol-support-x"; packageName = "has-symbol-support-x"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz"; - sha512 = "0qgqbqmrlx51w4ixcln9ljr5hs2jj8fvryq7i8cg9a739p7y2c5z8wpplp9jhnfn4a3xn6li2b2npmhfm2x80khm9di3vllyyv9wii6"; + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; + sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; }; }; "has-symbols-1.0.0" = { @@ -11113,13 +11293,13 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "hoek-4.2.0" = { + "hoek-4.2.1" = { name = "hoek"; packageName = "hoek"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; - sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; + url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; + sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; }; }; "hogan.js-3.0.2" = { @@ -11293,13 +11473,13 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "http-parser-js-0.4.9" = { + "http-parser-js-0.4.10" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.4.9"; + version = "0.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz"; - sha1 = "ea1a04fb64adff0242e9974f297dd4c3cad271e1"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz"; + sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; }; }; "http-proxy-1.0.2" = { @@ -11464,13 +11644,13 @@ let sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; }; }; - "hypercore-6.12.0" = { + "hypercore-6.12.2" = { name = "hypercore"; packageName = "hypercore"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.0.tgz"; - sha512 = "00xsmbx8jcjzsibwwgknlpjvndb7zv6jdxik5skqnbizbdssvcwa2r5a7gd1cf7mpr2827067sxqqca9fmmknjnin2vvm16yb1pn5g8"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.2.tgz"; + sha512 = "1s7l8r5bpiialz194g5kryp5bpcg8n0x0l7jfgynjiimi3pyn0lkcijijk20g5ibagfzi3jnrlyh1jp9ywbrys5inbwl83ra7a6qbr6"; }; }; "hypercore-protocol-6.5.2" = { @@ -11482,13 +11662,13 @@ let sha512 = "03l77nma8ga06ywa469jzqgc13hjk9bg3w2cv95g3fwnqy2fvz8qpczcih65jscvk0ira5kpm3sk2vqh2whzzvnm19jlqrzi78v80n3"; }; }; - "hyperdrive-9.12.2" = { + "hyperdrive-9.12.3" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.12.2"; + version = "9.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.2.tgz"; - sha512 = "133iwkp8w88awfxffdjjfxl2wsrj99cdw1p2rvbv65q7mgficva14skid7vsd55r750lrvg0wbmlz0h4m44w6ypd7cvpb4hjvb2f815"; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.3.tgz"; + sha512 = "3w0ia766bacphqzgyjhiwbppgdja61vlz2xp6x710dk4pn6570gag3w5xa8rfivh2lvig8v2ics3bkdlm9cmq9kpzjgwzm19a089fb3"; }; }; "hyperdrive-http-4.2.2" = { @@ -11500,13 +11680,13 @@ let sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn"; }; }; - "hyperdrive-network-speed-2.0.1" = { + "hyperdrive-network-speed-2.1.0" = { name = "hyperdrive-network-speed"; packageName = "hyperdrive-network-speed"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.0.1.tgz"; - sha1 = "40daf82e31b9d753f2ae6dfaf0818661ed24fe15"; + url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.1.0.tgz"; + sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296"; }; }; "i-0.3.6" = { @@ -11590,6 +11770,15 @@ let sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; }; }; + "iferr-0.1.5" = { + name = "iferr"; + packageName = "iferr"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + }; "ignore-3.3.7" = { name = "ignore"; packageName = "ignore"; @@ -11932,13 +12121,13 @@ let sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; }; }; - "invariant-2.2.2" = { + "invariant-2.2.3" = { name = "invariant"; packageName = "invariant"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; - sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.3.tgz"; + sha512 = "2s1gvqa56gnq2pkh0yy5ch3pb69dkwxr6myw9r3cc1c55xnrpiwzgc90ns4n9lij9slw0aayzm95k3x3rfrv0m7dnikq39hx0ylz7pd"; }; }; "invert-kv-1.0.0" = { @@ -11995,22 +12184,13 @@ let sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; }; }; - "ipaddr.js-1.5.2" = { + "ipaddr.js-1.6.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz"; - sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0"; - }; - }; - "ipaddr.js-1.5.4" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.4.tgz"; - sha1 = "962263d9d26132956fc5c630b638a30d3cdffc14"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz"; + sha1 = "e3fa357b773da619f26e95f049d055c72796f86b"; }; }; "irc-replies-2.0.1" = { @@ -12247,15 +12427,6 @@ let sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; }; }; - "is-expression-2.1.0" = { - name = "is-expression"; - packageName = "is-expression"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-expression/-/is-expression-2.1.0.tgz"; - sha1 = "91be9d47debcfef077977e9722be6dcfb4465ef0"; - }; - }; "is-expression-3.0.0" = { name = "is-expression"; packageName = "is-expression"; @@ -12382,13 +12553,22 @@ let sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; }; }; - "is-my-json-valid-2.17.1" = { + "is-my-ip-valid-1.0.0" = { + name = "is-my-ip-valid"; + packageName = "is-my-ip-valid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; + sha512 = "1lnwwykigbkg3yqmr61cyiplxfdvpchcsi1fz67jwn55gvdrl597jpsd6jds205gjkn8c3zxbqmppmf3danpj0rrla7ffnicmwpys42"; + }; + }; + "is-my-json-valid-2.17.2" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.17.1"; + version = "2.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz"; - sha512 = "2qkjhj6i3y40j35y8k722kklm1j8dfwk9506csa3vxr16vv7125v8jzpmkl551gsif98bzn205yj3sb99xi1i4bd6p5a1m81wvj2sa3"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz"; + sha512 = "29bla4943cs5dks8f307ykpgk5gihgjy158h8nspcxia85gb1lwaxpqywisr7621spdp8j5p4vd3zhfl2csdlihy06w9017b2r42610"; }; }; "is-negated-glob-1.0.0" = { @@ -12436,6 +12616,15 @@ let sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; }; }; + "is-number-4.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"; + sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd"; + }; + }; "is-obj-1.0.1" = { name = "is-obj"; packageName = "is-obj"; @@ -12454,13 +12643,13 @@ let sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; }; }; - "is-odd-1.0.0" = { + "is-odd-2.0.0" = { name = "is-odd"; packageName = "is-odd"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz"; - sha1 = "3b8a932eb028b3775c39bb09e91767accdb69088"; + url = "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz"; + sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r"; }; }; "is-path-cwd-1.0.0" = { @@ -12760,13 +12949,13 @@ let sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; }; }; - "is-windows-1.0.1" = { + "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; - sha1 = "310db70f742d259a16a369202b51af84233310d9"; + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; }; }; "is-wsl-1.1.0" = { @@ -12895,15 +13084,6 @@ let sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad"; }; }; - "iterate-object-1.3.2" = { - name = "iterate-object"; - packageName = "iterate-object"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iterate-object/-/iterate-object-1.3.2.tgz"; - sha1 = "24ec15affa5d0039e8839695a21c2cae1f45b66b"; - }; - }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -12931,13 +13111,13 @@ let sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; }; }; - "jaeger-client-3.7.0" = { + "jaeger-client-3.9.1" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.7.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.7.0.tgz"; - sha1 = "65ec79e33fc6aaeb5acf36064d08acf4ec47da96"; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.9.1.tgz"; + sha1 = "27a7954cf390e279ba9ad503cfed01ce171b15a1"; }; }; "jed-1.1.1" = { @@ -13048,15 +13228,6 @@ let sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; }; - "js-yaml-3.8.4" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; - sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; - }; - }; "js2xmlparser-1.0.0" = { name = "js2xmlparser"; packageName = "js2xmlparser"; @@ -13129,6 +13300,15 @@ let sha512 = "3iwy9jwca9hg6h1k7cmcdlsygn2qzjv7w72fsrfjfpdrcyd4xc5fb11sf664rvnzrfmz24f19kvi3qawif4n63lggvpg5pv73qfrcs0"; }; }; + "json-merge-patch-0.2.3" = { + name = "json-merge-patch"; + packageName = "json-merge-patch"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-merge-patch/-/json-merge-patch-0.2.3.tgz"; + sha1 = "fa2c6b5af87da77bae2966a589d52e23ed81fe40"; + }; + }; "json-parse-better-errors-1.0.1" = { name = "json-parse-better-errors"; packageName = "json-parse-better-errors"; @@ -13273,13 +13453,13 @@ let sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; - "jsonata-1.2.6" = { + "jsonata-1.5.0" = { name = "jsonata"; packageName = "jsonata"; - version = "1.2.6"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz"; - sha512 = "3bpyhs9imacbmpq0r7l65qvkx0dfnx92qz5vm59i983h2xvw2yrr1934i979accigkr33b65n51m5zx73glbi3pwl8n6zm5b3y74a8a"; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.0.tgz"; + sha512 = "3qb6rsslbqqrl7gna4xl2gsjqf8z5q4imysdp2plnqyr2q43hplwga22di8qv2q9dr1jgd4pgcbsdn23qcg9adsj0ml0b99dg8r7kq5"; }; }; "jsonfile-1.0.1" = { @@ -13895,13 +14075,13 @@ let sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5"; }; }; - "level-post-1.0.5" = { + "level-post-1.0.7" = { name = "level-post"; packageName = "level-post"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/level-post/-/level-post-1.0.5.tgz"; - sha1 = "2a66390409bf6a1621a444bab6f016444cc9802c"; + url = "https://registry.npmjs.org/level-post/-/level-post-1.0.7.tgz"; + sha512 = "1xwlwdkqryzw8bd0ywmjnlrcd85c88hrcf8r245377p52cwvgcrjsajg5w8zpx1d236v6043v4c3a29lcbyqmxqmh7apl9lhhdjlrix"; }; }; "level-sublevel-6.6.1" = { @@ -14210,13 +14390,13 @@ let sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432"; }; }; - "lodash-4.17.4" = { + "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; - version = "4.17.4"; + version = "4.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; + sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; "lodash-4.2.1" = { @@ -14543,13 +14723,22 @@ let sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; - "lodash.isfunction-3.0.8" = { + "lodash.isfunction-3.0.9" = { name = "lodash.isfunction"; packageName = "lodash.isfunction"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.8.tgz"; - sha1 = "4db709fc81bc4a8fd7127a458a5346c5cdce2c6b"; + url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"; + sha512 = "0ki8njk33gc8ayf2vmnx2jrfdapwckm7dx2z4zn1ik07hwgwx5zb3fsi9mlamhg6rnj1qlvfwsbg2074x19x8gq60615fbr7lvdfah2"; + }; + }; + "lodash.isplainobject-4.0.6" = { + name = "lodash.isplainobject"; + packageName = "lodash.isplainobject"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; }; }; "lodash.isstring-4.0.1" = { @@ -14588,22 +14777,22 @@ let sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "lodash.merge-4.6.0" = { + "lodash.merge-4.6.1" = { name = "lodash.merge"; packageName = "lodash.merge"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz"; - sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5"; + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz"; + sha512 = "0lv358i7xyg1hn90fk3xzih5kmj1zlmr759g0hh9fa7npbik629q8h5jd2lvjnrm76ciz92k0yn5z6vcqdbgws1zzsrqzw7ixmk7rh0"; }; }; - "lodash.mergewith-4.6.0" = { + "lodash.mergewith-4.6.1" = { name = "lodash.mergewith"; packageName = "lodash.mergewith"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz"; - sha1 = "150cf0a16791f5903b8891eab154609274bdea55"; + url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz"; + sha512 = "1swsfrcjr7yv5bkxi47mfjyrl5c8d2c8s4m01qpnffgnjnl9mbri6i9ys9gvwq0drsqszzrmq0rlglmc6c17h8a0r22n86qwfpkjv3r"; }; }; "lodash.once-4.1.1" = { @@ -14786,13 +14975,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-2.5.2" = { + "log4js-2.5.3" = { name = "log4js"; packageName = "log4js"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-2.5.2.tgz"; - sha512 = "3cr4zy75cf74ajn55xnidbz0m4848yyjyc2zrhlyksjdi0hsp0skwkq8ipgpahwfz1b7zlr9zg1blapz0nsn3h8kmz5w2cz036n2rij"; + url = "https://registry.npmjs.org/log4js/-/log4js-2.5.3.tgz"; + sha512 = "29zsw029b55hq8a7c5hrqwf4ka97sai18wn4vpxhzgg61jisclhcxlfm4m219iz3j3kqfkyb3k76dmwvqm2ivk6b4iavd2q7jjymgv0"; }; }; "loggly-1.1.1" = { @@ -14804,13 +14993,13 @@ let sha1 = "0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"; }; }; - "lokijs-1.5.1" = { + "lokijs-1.5.2" = { name = "lokijs"; packageName = "lokijs"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.1.tgz"; - sha512 = "1pi08ry0a4zvg7mqj14gl0vacka95k77bbvljmcf25whxxbkh2rprsxpd8pv6frqh4ix6vslk44silx83sk65xhaw7ia2zssf0vngiy"; + url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.2.tgz"; + sha1 = "75d43df21232f1d5479d191a69b6ebf61754a873"; }; }; "long-2.4.0" = { @@ -14939,15 +15128,6 @@ let sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; }; }; - "lru-cache-2.2.4" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; - sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d"; - }; - }; "lru-cache-2.5.2" = { name = "lru-cache"; packageName = "lru-cache"; @@ -15119,22 +15299,22 @@ let sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; }; }; - "make-dir-1.1.0" = { + "make-dir-1.2.0" = { name = "make-dir"; packageName = "make-dir"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz"; - sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh"; + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz"; + sha512 = "0ivb7kryzyklvicp8a0lsq56pzjmvycb6bs4d0239q9ygcrs8ylx94q57fgxq3vqvzzs9v3ldl5m1jkxfvfaxh5p8lgb0qchmmh1mb8"; }; }; - "make-error-1.3.2" = { + "make-error-1.3.4" = { name = "make-error"; packageName = "make-error"; - version = "1.3.2"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz"; - sha512 = "1sw30dxbwvv9pa0871cyshryjqam7d0pl4m1f6zww2r81qv3sgmx5qz7aimhz2xhxlihy9fglnwc1sy7hwfbfwcvg2n4mbrk7gxmnlp"; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz"; + sha512 = "3m1bilfa38sjf09x439iz2050vhi5790qcxx11nwr51wygfiazbghxbaqznmhamij5vh6zv83s7kgjx0va77996dmighm2apgjrndnh"; }; }; "make-error-cause-1.2.2" = { @@ -15173,6 +15353,15 @@ let sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; }; }; + "map-obj-2.0.0" = { + name = "map-obj"; + packageName = "map-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz"; + sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; + }; + }; "map-stream-0.1.0" = { name = "map-stream"; packageName = "map-stream"; @@ -15200,13 +15389,13 @@ let sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; }; }; - "markdown-it-8.4.0" = { + "markdown-it-8.4.1" = { name = "markdown-it"; packageName = "markdown-it"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz"; - sha512 = "0c0jpdfbi4fmqyjc2ilwvinxyc8rn4p9j7fwshh2c00nkc0q2lh6yw2dgragvnpy8bjhcwa1hlfy2ih2ih3np78wrpqx7gf4w48xnxl"; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.1.tgz"; + sha512 = "3w1l75fip7divhr6q8n1sf0af49ssf9kc4vh8gha0svw5q84c8s8csr0f50qz7n0smx1a8iwfnlj2kbnl9bwmpryqgia5b44d4ylg0b"; }; }; "markdown-it-emoji-1.4.0" = { @@ -15218,13 +15407,13 @@ let sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"; }; }; - "markdown-it-github-headings-1.1.0" = { + "markdown-it-github-headings-1.1.1" = { name = "markdown-it-github-headings"; packageName = "markdown-it-github-headings"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.1.0.tgz"; - sha1 = "d6f73da5276ded956861337189addf3d52b93558"; + url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.1.1.tgz"; + sha512 = "3cs9xbmjc64jh19ashy00z2hig9q9mvcvnqdm8hkysiidr3fl17zkhypvb5z7dqvklwyycah9s325vwj4gbwr214xc7hrddb2cn2jwc"; }; }; "markdown-it-task-checkbox-1.0.6" = { @@ -15254,13 +15443,13 @@ let sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; }; }; - "marked-0.3.12" = { + "marked-0.3.17" = { name = "marked"; packageName = "marked"; - version = "0.3.12"; + version = "0.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz"; - sha512 = "2h8qj30y9n29m3xvbbg777kmxcdx57hf1ir6z3jyn94gj7s0kcz74203y1hazavwh60cfp69zdjv532vxyjc853kx82pvyjxddmm0wk"; + url = "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz"; + sha512 = "2cw4hwy4hyxspppby5ww0sljhyg0nhlgy0aamqvf7nrhg4vyrgyp8ah52pz99rr8pvsjk3h9z9q8fhrlqaixw5kgk2si5yrr0v9n0pq"; }; }; "matcher-collection-1.0.5" = { @@ -15398,6 +15587,15 @@ let sha1 = "72cb668b425228290abbfa856892587308a801fb"; }; }; + "meow-4.0.0" = { + name = "meow"; + packageName = "meow"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz"; + sha512 = "2rvzq4615rj5x6za96as8f2xx6zs8m8lzraql20fiv5kr03dm9cy3zqq93ccryl42j9mp2n846pmdpkkh79i15962pnxrppbmxf9vri"; + }; + }; "merge-1.2.0" = { name = "merge"; packageName = "merge"; @@ -15542,13 +15740,13 @@ let sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; }; }; - "micromatch-3.1.5" = { + "micromatch-3.1.9" = { name = "micromatch"; packageName = "micromatch"; - version = "3.1.5"; + version = "3.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.5.tgz"; - sha512 = "2y22i8yrib7vcgpfcm5sq9g4fh4wxrn0f3z017vdbkvybvywa1axl3kym81k9ad6h3d4jmqkqyahcaj2c5qy5wpa17kvbyhnfn6sjya"; + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz"; + sha512 = "3vfciram7xbwcwvhii8960vnvf3jczn092sfbfgx1vivk3scvkm9znjnbq2ppywg9h8i86d8vq3ha4c9a3jllaian0gcl7rrgm36lja"; }; }; "miller-rabin-4.0.1" = { @@ -15623,22 +15821,13 @@ let sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; }; }; - "mime-db-1.30.0" = { + "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.30.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; - sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; - }; - }; - "mime-db-1.32.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.32.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.32.0.tgz"; - sha512 = "1bl21q8acya2jj67757518bdy1yhc5d7ybn755wnikwcca3gq5akfg835nj5mp2kmd4f97yyy0qwx662jlwk1rgx7nl9qsd2vzsi5gr"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; + sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; }; }; "mime-types-2.0.14" = { @@ -15650,13 +15839,13 @@ let sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; }; }; - "mime-types-2.1.17" = { + "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.17"; + version = "2.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; - sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; + sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; }; }; "mimelib-0.3.1" = { @@ -15668,13 +15857,13 @@ let sha1 = "787add2415d827acb3af6ec4bca1ea9596418853"; }; }; - "mimic-fn-1.1.0" = { + "mimic-fn-1.2.0" = { name = "mimic-fn"; packageName = "mimic-fn"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; - sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; }; }; "mimic-response-1.0.0" = { @@ -15758,15 +15947,6 @@ let sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; }; }; - "minimatch-3.0.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"; - sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a"; - }; - }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -15821,6 +16001,15 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; + "minimist-options-3.0.2" = { + name = "minimist-options"; + packageName = "minimist-options"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz"; + sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p"; + }; + }; "minipass-2.2.1" = { name = "minipass"; packageName = "minipass"; @@ -15848,13 +16037,22 @@ let sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; }; }; - "mixin-deep-1.3.0" = { + "mississippi-2.0.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz"; + sha512 = "2gnigixsj38hrqchkf6k8wqywihq6l14pg0qb23x3qpjn56vybljv3nz1z7cbzhl952h1xfw28vsqm09pjhpv9zs9sm43rdxazkqync"; + }; + }; + "mixin-deep-1.3.1" = { name = "mixin-deep"; packageName = "mixin-deep"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz"; - sha512 = "016isy937hd503fn41ivc4j267cr1brp7f65waxkk2ijslc1gyh7r815xk4g27cjrgjzydwqbpwk5yj4nyjj085n3l5k2vsi2z841kn"; + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; + sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi"; }; }; "mixin-object-2.0.1" = { @@ -15956,13 +16154,13 @@ let sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; }; }; - "module-deps-5.0.1" = { + "module-deps-6.0.0" = { name = "module-deps"; packageName = "module-deps"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-5.0.1.tgz"; - sha512 = "0jc7ysgbhwbj17j14vcl7aa6pn7pcp5bas2d5lb53rq3l7xkcxgvjqgrc9l4xvdhy2sdwyj1s9nssn7fhwhrdb841wycbxz37z2la5j"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.0.tgz"; + sha512 = "0ri32x2v7ywi8n4h92scc5pq6zlh7mmzbmk0gh2gsh3490w4d9islz1rs0in98cl2h5fl0dfx2dfcad0disnaiqflw46d24ja20raq4"; }; }; "moment-2.1.0" = { @@ -15992,15 +16190,6 @@ let sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; }; }; - "moment-2.18.1" = { - name = "moment"; - packageName = "moment"; - version = "2.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; - sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; - }; - }; "moment-2.20.1" = { name = "moment"; packageName = "moment"; @@ -16082,6 +16271,15 @@ let sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051"; }; }; + "move-concurrently-1.0.1" = { + name = "move-concurrently"; + packageName = "move-concurrently"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + }; "mpath-0.1.1" = { name = "mpath"; packageName = "mpath"; @@ -16100,22 +16298,22 @@ let sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; }; }; - "mqtt-2.9.0" = { + "mqtt-2.15.1" = { name = "mqtt"; packageName = "mqtt"; - version = "2.9.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz"; - sha512 = "181qi8xb0lxxqvwq2xcslv35dbhphyr67w02bad6n4rlibcm6z0j055dyfpdh12mrrvgjzfj11cjylsj26y7vr17cvk1kbgkiqgzpb9"; + url = "https://registry.npmjs.org/mqtt/-/mqtt-2.15.1.tgz"; + sha512 = "13ycishr81p39yimwf97c4p9pwhg8a0k2hfmfhkcrpy4yshilfb9rr197fr0r27kniqnbzcfsa19pyvgnkrq24zb4kdiafgrw8kbif1"; }; }; - "mqtt-packet-5.4.0" = { + "mqtt-packet-5.5.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz"; - sha512 = "2d1hvibps8d4xlw8wm937ykc76yb02rp2065hd6186vygjx3wixjjzrn3fia4wfj7d38ic8gh5ij5rsi9389kl6gpxxjbdcbjwpn8yf"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.5.0.tgz"; + sha512 = "3wbymw2jfhqw0z4zcasxy5njy5ynwrbfq1vkrb2pwwx28mkrywlj2mq4bykrgjgq09v6a5carizhcl6h1kbcvmn902kbbpxxb1r87wi"; }; }; "mri-1.1.0" = { @@ -16199,13 +16397,13 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-2.3.0" = { + "ms-rest-2.3.1" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.0.tgz"; - sha512 = "2dfmfxr3xagmds2agz7g6rnj1s9lh29fgfwxbqsfpkkabh3qhcc7sznkaviilpzr59fks1401wy6sh9xyy3wsaqbm975vm5b2bj6cwf"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.1.tgz"; + sha512 = "34xikyld48lq65i6ngn4wf8gsnn2lllbd7fray2rsxihkz6azm7zsqs2fm9ng566fdy6mf6qj41lvvyl2xih7d5a074rkhxpwdf1w1m"; }; }; "ms-rest-azure-1.15.7" = { @@ -16217,13 +16415,13 @@ let sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; }; }; - "ms-rest-azure-2.5.0" = { + "ms-rest-azure-2.5.4" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.5.0"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.0.tgz"; - sha512 = "22v7h9wa04laz1v40rq0wx3az880flfhz6xzjgk5pny3674kar5c0vj0ww1rjbsi891j9hvxvk9v51dykivirfjh5srqrjfmswzk3fw"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.4.tgz"; + sha512 = "049vfg1l6jfzdn82m5shchi6zzlfk81csihlalwj1mm96j0dykbx885sbjyv3wr0iqwjwzp4i1x2kv750xvzvyljfqrlnh1kfhrq32b"; }; }; "msgpack-1.0.2" = { @@ -16271,13 +16469,13 @@ let sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2"; }; }; - "multicast-dns-6.2.2" = { + "multicast-dns-6.2.3" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.2.tgz"; - sha512 = "06b9ps5a1ymag21szz55z4xzs2ncp0frcqsaldnggmz0m5ijhjv8f553cpkp9zkm37av1pm2y8pn70jbfzk888n1hap6i321babhcy5"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -16505,13 +16703,13 @@ let sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; - "nan-2.8.0" = { + "nan-2.9.2" = { name = "nan"; packageName = "nan"; - version = "2.8.0"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; - sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; + url = "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz"; + sha512 = "1iwlv98jbkr46c7hy28crk2m89jiskrp4qfa5ysyacyq8dkbk4hii3cc61irf39b7n6wd9cjlaasmakv9dsknqhb3876zrvrbjvmmcn"; }; }; "nanoassert-1.1.0" = { @@ -16532,22 +16730,22 @@ let sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; }; }; - "nanoid-1.0.1" = { + "nanoid-1.0.2" = { name = "nanoid"; packageName = "nanoid"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.1.tgz"; - sha512 = "3dh8fdgynnii8rgdpyk69z99y49bnl60244wsaw8mk2lzhfhczgf7nxgmm0qakmgzbvqqqfngq03z3j8hp70smh7ka0il806w7ajxh5"; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.2.tgz"; + sha512 = "2bzl500sgpk3i3ird4iviglsj0gj9a0qhmj4hnky3xmxbl4ahamjhi96rslr8k65j77glmw771m3jm7r5sr5akw6ip5glmxvqkg095h"; }; }; - "nanomatch-1.2.7" = { + "nanomatch-1.2.9" = { name = "nanomatch"; packageName = "nanomatch"; - version = "1.2.7"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz"; - sha512 = "2m4xaq739s2r5bvh287d8zm8af9mxa706z1a7ila48yhvkspi4iimwyg0id1cl327i7kqssrcnc2nwdc2qw8s83xwqg3bmfgjr5v6gz"; + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz"; + sha512 = "1f2indb6hj1h79gxklk6ac2lhfjfydw5ak3v2nwilwir5hqvz9l9kxf63l8k1blsjq4v7r2pf0gqc1b55sqqym5bn9afhrj5xnpvi4z"; }; }; "nanotiming-1.0.1" = { @@ -16743,13 +16941,13 @@ let sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; }; }; - "needle-2.1.1" = { + "needle-2.2.0" = { name = "needle"; packageName = "needle"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.1.1.tgz"; - sha1 = "f3d501d633e661d34cd9648ca6c42f782a44d071"; + url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz"; + sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq"; }; }; "negotiator-0.3.0" = { @@ -16789,6 +16987,15 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; + "neo-async-2.5.0" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz"; + sha512 = "3mgwi8gsgy9lazh0qbpaz8f2l8gvvpn3jp0ghc6xnn0xq0ajdmzp7lfklby1n4s67fy1w5g5gzizyqzds8l3fqsj76cy0mq06rr56cw"; + }; + }; "nested-error-stacks-1.0.2" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -16888,13 +17095,13 @@ let sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f"; }; }; - "node-abi-2.1.2" = { + "node-abi-2.3.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.1.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz"; - sha512 = "1sd6l8zqa18mlzackwy8vns51zjp8xyrd97nc514b0yvndd0y0wsyx2q9h8zr0k9kra5ys1yq75ggkv5av69cyzxji19rdvr5pjsrc6"; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.3.0.tgz"; + sha512 = "2ijjyzh7bcyyhjaa5m0kdfg6hvxkq6czwxfg6y5d2nl6v7m9qab2ixwgvzbaaivn0r0ig48j4443905167vnpzgvlq5icfj9nyvl2fg"; }; }; "node-alias-1.0.4" = { @@ -16960,13 +17167,13 @@ let sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; }; }; - "node-forge-0.7.1" = { + "node-forge-0.7.2" = { name = "node-forge"; packageName = "node-forge"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz"; - sha1 = "9da611ea08982f4b94206b3beb4cc9665f20c300"; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.2.tgz"; + sha512 = "2kc6a8y2fmpsmiddh9vkiy32kg6isg3igpfgpkvvkw48y5x2n3wwrxsi7zcjyxf2yakjygvim3gy74c077lrc0cm60f388diw2nhc2x"; }; }; "node-gyp-build-3.2.2" = { @@ -17050,13 +17257,13 @@ let sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b"; }; }; - "node-red-node-rbe-0.1.14" = { + "node-red-node-rbe-0.2.1" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.14"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.14.tgz"; - sha512 = "2xixj71payi14frjkb30lhnripprfcxzqaa9cbwh7w21s426y452ns0vpaycnbsbfwfcn5gcs4b2fjh0b6rxnbasd9hijqf6h3v26wa"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.1.tgz"; + sha512 = "3s12a0r8a6nzfqk1a1v1k5drczf4qpnia460l3rq4bixnl0k0fahc1hh4cqcw9rlzc59cz3p4dv19ixrwf2wc6nxixsyqz417li68wb"; }; }; "node-red-node-twitter-0.1.12" = { @@ -17410,15 +17617,6 @@ let sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; }; }; - "npm-registry-client-8.4.0" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "8.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz"; - sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx"; - }; - }; "npm-registry-client-8.5.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -17591,13 +17789,13 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "oauth2orize-1.8.0" = { + "oauth2orize-1.11.0" = { name = "oauth2orize"; packageName = "oauth2orize"; - version = "1.8.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.8.0.tgz"; - sha1 = "f2ddc0115d635d0480746249c00f0ea1a9c51ba8"; + url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.11.0.tgz"; + sha1 = "793cef251d45ebdeac32ae40a8b6814faab1d483"; }; }; "object-assign-1.0.0" = { @@ -17942,15 +18140,6 @@ let sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; }; }; - "opn-5.1.0" = { - name = "opn"; - packageName = "opn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz"; - sha512 = "2k8g3x11xbm64r7bbyad08cjv27vaparkigq11w2v8kg8h73k2rzdr3q6f5i2klidgpaq9rbhfv45rf9dkqqv3d8vsbvw4c5knnbww8"; - }; - }; "opn-5.2.0" = { name = "opn"; packageName = "opn"; @@ -18032,13 +18221,13 @@ let sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }; }; - "ora-1.3.0" = { + "ora-1.4.0" = { name = "ora"; packageName = "ora"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz"; - sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a"; + url = "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz"; + sha512 = "2kz616isg6vqp95rsja7fc47k22qipv9b44dhsyxsl7x95ly9j17dwn8dxq8adyhw6ap1nlpfg2dk8v6r7b2m8r61v3ikriwh6bbhl8"; }; }; "orchestrator-0.3.8" = { @@ -18167,13 +18356,13 @@ let sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; }; }; - "osenv-0.1.4" = { + "osenv-0.1.5" = { name = "osenv"; packageName = "osenv"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; "osx-release-1.1.0" = { @@ -18356,6 +18545,15 @@ let sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; }; }; + "parallel-transform-1.1.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; + sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + }; + }; "param-case-2.1.1" = { name = "param-case"; packageName = "param-case"; @@ -18599,15 +18797,6 @@ let sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; - "passport-0.3.2" = { - name = "passport"; - packageName = "passport"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz"; - sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; - }; - }; "passport-0.4.0" = { name = "passport"; packageName = "passport"; @@ -19068,6 +19257,15 @@ let sha512 = "2kg8qqb15pav0a2f16xmj5iqzkx28d0c6i1ydy3vzn71hfv7b7kvsbv917bwj68bh8m2mgy9j0kj8j4npy14hg2h09q4h85sz8wm990"; }; }; + "pkg-dir-2.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + }; "pkg-up-2.0.0" = { name = "pkg-up"; packageName = "pkg-up"; @@ -19104,13 +19302,13 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; - "playerui-1.2.0" = { + "playerui-1.3.0" = { name = "playerui"; packageName = "playerui"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz"; - sha1 = "2d59c8cb736e189cb2398cd809469ca47077f812"; + url = "https://registry.npmjs.org/playerui/-/playerui-1.3.0.tgz"; + sha1 = "a32b907f28d17f61b74d45d46fd89dea3c4e88b5"; }; }; "please-upgrade-node-3.0.1" = { @@ -19266,13 +19464,13 @@ let sha512 = "2id33g6232s35n25daqrkz0bvzm2zmhlkfzmigkgia5q4jy9xg38spppmsdg0qswjankyi28wrbjsdwhczqfkx7h71gg8dmzz8p779l"; }; }; - "postcss-6.0.16" = { + "postcss-6.0.19" = { name = "postcss"; packageName = "postcss"; - version = "6.0.16"; + version = "6.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz"; - sha512 = "2h2vfl4i770c41s6zy98za52jq23a0l5976rgh8x911znh1xsv8pcwvwnck8m1yrxfvpxnihs0myv9rsinwhck3zx3k2jp6cd2prglv"; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz"; + sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz"; }; }; "prebuild-install-2.1.2" = { @@ -19419,6 +19617,15 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; + }; + }; "progress-1.1.8" = { name = "progress"; packageName = "progress"; @@ -19491,6 +19698,15 @@ let sha1 = "ddd5d0f895432b1206ceb8da1275064d18e7aa23"; }; }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + }; "promise-phantom-3.1.6" = { name = "promise-phantom"; packageName = "promise-phantom"; @@ -19536,13 +19752,13 @@ let sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; - "prop-types-15.6.0" = { + "prop-types-15.6.1" = { name = "prop-types"; packageName = "prop-types"; - version = "15.6.0"; + version = "15.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz"; - sha1 = "ceaf083022fc46b4a35f69e13ef75aed0d639856"; + url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz"; + sha512 = "28vp2j7wpa97ygi4clflilfs8wj8qsz1x3fismsqx293a9cvpyc20k4pbrppyn7y6hks0dp3mn0wmj5q3y1y3i5k7ra5ssqimnkprz1"; }; }; "properties-1.2.1" = { @@ -19617,13 +19833,13 @@ let sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; }; }; - "proxy-addr-2.0.2" = { + "proxy-addr-2.0.3" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz"; - sha1 = "6571504f47bb988ec8180253f85dd7e14952bdec"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz"; + sha512 = "1fjf093wrxz3nm9njw491r9rvqwrcv8d8h0mnmyakpijnbff7lllysr7aq9h9w7jdvxjvaf9r055ywd7sghcqxwa2nfpdc9423c414d"; }; }; "proxy-agent-2.0.0" = { @@ -19833,13 +20049,13 @@ let sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b"; }; }; - "pull-level-2.0.3" = { + "pull-level-2.0.4" = { name = "pull-level"; packageName = "pull-level"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.3.tgz"; - sha1 = "9500635e257945d6feede185f5d7a24773455b17"; + url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.4.tgz"; + sha512 = "1k9a17my3m2zkz7g8hynxswrqks679vih7vd97qz5ky16x4kkms4ysxxzs5744kfzwwxg9p14xgnx8vs6kc15wjmdlkhlfy62bajvkx"; }; }; "pull-live-1.0.1" = { @@ -19851,22 +20067,22 @@ let sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; }; }; - "pull-pushable-2.1.2" = { + "pull-pushable-2.2.0" = { name = "pull-pushable"; packageName = "pull-pushable"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.1.2.tgz"; - sha1 = "3fe15b8f7eec89f3972d238bc04890c9405a6dbb"; + url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.2.0.tgz"; + sha1 = "5f2f3aed47ad86919f01b12a2e99d6f1bd776581"; }; }; - "pull-stream-3.6.1" = { + "pull-stream-3.6.2" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.1.tgz"; - sha1 = "c5c2ae4a51246efeebcc65c0412a3d725a92ce00"; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.2.tgz"; + sha1 = "1ea14c6f13174e6ac4def0c2a4e76567b7cb0c5c"; }; }; "pull-window-2.1.4" = { @@ -19995,13 +20211,13 @@ let sha1 = "11f9e8fa8890fe7cb99210c0f44d0613b7372cac"; }; }; - "qjobs-1.1.5" = { + "qjobs-1.2.0" = { name = "qjobs"; packageName = "qjobs"; - version = "1.1.5"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz"; - sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; + url = "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"; + sha512 = "0g8mmxjq1gn92mf9gzpf2469xwrisbg2vdlxg3bnq18gqlviy2s7l7wi99wmbz5kvbb9yn0wxbi9r83f4jchhzivn0299vigc88k0zi"; }; }; "qs-0.4.2" = { @@ -20148,13 +20364,13 @@ let sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; }; }; - "query-string-5.0.1" = { + "query-string-5.1.0" = { name = "query-string"; packageName = "query-string"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz"; - sha512 = "0lcnspv96dv03600bgjxk2ypak8mysp77n47jkddpz6ldcgscwyan1akqjrddii4abb2brz6gr6yq9pcbdx63m9i16kk8m5028qrkv8"; + url = "https://registry.npmjs.org/query-string/-/query-string-5.1.0.tgz"; + sha512 = "04m33y2wlmhz19y109cv7l537bdagzl15jv3y0jc3mb7wrw3jpz15pws8m7pbfbqv9nwad46cg3c4cd620f27mwzs1hml2q373y8w0p"; }; }; "querystring-0.2.0" = { @@ -20184,13 +20400,13 @@ let sha1 = "0ca581de3174becef25ac3c2e8956342381db698"; }; }; - "r-json-1.2.8" = { - name = "r-json"; - packageName = "r-json"; - version = "1.2.8"; + "quick-lru-1.1.0" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/r-json/-/r-json-1.2.8.tgz"; - sha1 = "7440560cc1edf00b9d8d94fa30bcad7dde94eae2"; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz"; + sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8"; }; }; "rai-0.1.12" = { @@ -20211,6 +20427,15 @@ let sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; }; }; + "random-access-file-2.0.1" = { + name = "random-access-file"; + packageName = "random-access-file"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz"; + sha512 = "2zbpqbs4dvnpc3dpr2yz8phz6r49j4a57jjlx7nqk6rzy2q0437g537czdxyk7cfdmhsc0yvlvs8b7p7sxax1slpwz4d8bkb851zglx"; + }; + }; "random-access-memory-2.4.0" = { name = "random-access-memory"; packageName = "random-access-memory"; @@ -20220,6 +20445,15 @@ let sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; + "random-access-storage-1.1.1" = { + name = "random-access-storage"; + packageName = "random-access-storage"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz"; + sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1"; + }; + }; "random-bytes-1.0.0" = { name = "random-bytes"; packageName = "random-bytes"; @@ -20256,13 +20490,13 @@ let sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; }; }; - "randomfill-1.0.3" = { + "randomfill-1.0.4" = { name = "randomfill"; packageName = "randomfill"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz"; - sha512 = "08l7hdx65kfxli7g9pcnlv84bdrccj7d267d1kfi93db6a4mihwyhvsipmx2n0yk9z45cs21isgpld6rib5saxg28s2g8nn3ap8dgk0"; + url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; + sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; }; }; "range-parser-0.0.4" = { @@ -20337,15 +20571,6 @@ let sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; }; }; - "raw-body-2.2.0" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; - sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; - }; - }; "raw-body-2.3.2" = { name = "raw-body"; packageName = "raw-body"; @@ -20373,13 +20598,13 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; - "rc-1.2.4" = { + "rc-1.2.5" = { name = "rc"; packageName = "rc"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; - sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz"; + sha1 = "275cd687f6e3b36cc756baa26dfee80a790301fd"; }; }; "rc-config-loader-2.0.1" = { @@ -20490,6 +20715,15 @@ let sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; }; }; + "read-pkg-up-3.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; + sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; + }; + }; "read-torrent-1.3.0" = { name = "read-torrent"; packageName = "read-torrent"; @@ -20535,13 +20769,13 @@ let sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; - "readable-stream-2.3.3" = { + "readable-stream-2.3.4" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; - sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz"; + sha512 = "1jpffi1v0l7pkzrhh8i9c6cbswa9npyx114cbfncfnzl9d7w9p08k9n703hq5xr2c3rg86qiq023sl1x8y6mawgsxgggy8ccrwk3rmy"; }; }; "readdirp-2.1.0" = { @@ -20589,13 +20823,22 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "recursive-watch-1.1.2" = { + "recursive-readdir-2.2.2" = { + name = "recursive-readdir"; + packageName = "recursive-readdir"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; + sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; + }; + }; + "recursive-watch-1.1.3" = { name = "recursive-watch"; packageName = "recursive-watch"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.2.tgz"; - sha1 = "912e2d62a83c8b388d288c4343495f247bc43f8e"; + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.3.tgz"; + sha512 = "3m0s8140jpamg1xxdlsslshx10qznb889s6yc8av6vvqbs56banhmjqy9lgl7g4ppsrsja0d2lhb5lacl3nxm8ggsrpdd7xqf53hvzx"; }; }; "redent-1.0.0" = { @@ -20607,6 +20850,15 @@ let sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; }; }; + "redent-2.0.0" = { + name = "redent"; + packageName = "redent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz"; + sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; + }; + }; "redis-0.10.3" = { name = "redis"; packageName = "redis"; @@ -20643,13 +20895,13 @@ let sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; }; }; - "redis-commands-1.3.1" = { + "redis-commands-1.3.4" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.3.1"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.1.tgz"; - sha1 = "81d826f45fa9c8b2011f4cd7a0fe597d241d442b"; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.4.tgz"; + sha512 = "2xl6insq71fz02pxvdcqj9q06la7nj0g5idl66yp5x7741k6xah4slrslq8wfil0fa9lx68cgl2rvzy08p1bgp7jyvjbinc8r13df25"; }; }; "redis-parser-2.6.0" = { @@ -20706,31 +20958,22 @@ let sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; - "regex-escape-3.4.8" = { - name = "regex-escape"; - packageName = "regex-escape"; - version = "3.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-escape/-/regex-escape-3.4.8.tgz"; - sha512 = "15ylzlxx4y88jldg7cgwv0dmw3ljpq27f9qf17d3g76dqh6ir1ig7dzvqv9nqpr3da1yd2r5ay8jqa6yk7ni5fbbrzgkhf3yha1av8c"; - }; - }; - "regex-not-1.0.0" = { + "regex-not-1.0.2" = { name = "regex-not"; packageName = "regex-not"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz"; - sha1 = "42f83e39771622df826b02af176525d6a5f157f9"; + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; }; }; - "registry-auth-token-3.3.1" = { + "registry-auth-token-3.3.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; - sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; + sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94"; }; }; "registry-url-3.1.0" = { @@ -20877,6 +21120,15 @@ let sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; }; }; + "replace-ext-1.0.0" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz"; + sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; + }; + }; "request-2.16.6" = { name = "request"; packageName = "request"; @@ -21147,6 +21399,15 @@ let sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; }; }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; + }; + }; "retry-0.10.1" = { name = "retry"; packageName = "retry"; @@ -21318,13 +21579,22 @@ let sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; - "run-parallel-1.1.6" = { + "run-parallel-1.1.7" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.6.tgz"; - sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039"; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.7.tgz"; + sha512 = "322cb6n7h8761gprij4m1z52rizyzvxwviima893gphrbrxkhjv6q4ifwspd0w9jhlk7jj0x64449aagms18v7ps6hr774ymvavh7lw"; + }; + }; + "run-queue-1.0.3" = { + name = "run-queue"; + packageName = "run-queue"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; "run-series-1.1.4" = { @@ -21336,13 +21606,13 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "rusha-0.8.12" = { + "rusha-0.8.13" = { name = "rusha"; packageName = "rusha"; - version = "0.8.12"; + version = "0.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.12.tgz"; - sha1 = "5d838ce1fce8b145674ee771eaad5bcb2575e64b"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.13.tgz"; + sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; "rx-2.5.3" = { @@ -21426,22 +21696,31 @@ let sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; }; }; - "safe-json-stringify-1.0.4" = { + "safe-json-stringify-1.1.0" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz"; - sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz"; + sha512 = "30fqwpa7qn9rsk4va9ih61jqhm0x59s3wa2n5kff1ygdwpi9hxmpig24y1vhdv1di2pfd6gy0iwkryix6lc5gff7pcb3xa7l58nsc0k"; }; }; - "sanitize-html-1.17.0" = { + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "sanitize-html-1.18.2" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.17.0"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.17.0.tgz"; - sha512 = "1gnj506vfw53kv0d0y0v2cg4694lyq7fbcbpjllzmls3z3b8pdrh40nw3pp70bfs851c8sklh3f4zifaznd02jkbn62z089x7kbmgg6"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.2.tgz"; + sha512 = "2kbz3x78dradp1xaddz60iakax4cj1rqgdxhjj5ljfgwm17kjc5pvr1kh2lyqrbxxmcx9kbfv8pa68af126v5clprks11vvwq1y2r77"; }; }; "sax-0.3.5" = { @@ -21507,6 +21786,24 @@ let sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; }; }; + "schema-utils-0.3.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz"; + sha1 = "f5877222ce3e931edae039f17eb3716e7137f8cf"; + }; + }; + "schema-utils-0.4.5" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz"; + sha512 = "1y97jl7qm7xvd867cghrgfzrlyf5z05rvwpigvi4ijzy4c8ckqr0bl76ym5nh6akiyc2qb19kbnmmk1r8nkfm4fsp4lznnpsipy72n9"; + }; + }; "scoped-regex-1.0.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -21696,15 +21993,6 @@ let sha1 = "765e7607c8055452bba6f0b052595350986036de"; }; }; - "send-0.15.3" = { - name = "send"; - packageName = "send"; - version = "0.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; - sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; - }; - }; "send-0.15.6" = { name = "send"; packageName = "send"; @@ -21723,6 +22011,15 @@ let sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j"; }; }; + "send-0.16.2" = { + name = "send"; + packageName = "send"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; + sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; + }; + }; "sentiment-2.1.0" = { name = "sentiment"; packageName = "sentiment"; @@ -21750,6 +22047,15 @@ let sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; }; }; + "serialize-javascript-1.4.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz"; + sha1 = "7c958514db6ac2443a8abc062dc9f7886a7f6005"; + }; + }; "serve-favicon-2.3.2" = { name = "serve-favicon"; packageName = "serve-favicon"; @@ -21795,15 +22101,6 @@ let sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; }; }; - "serve-static-1.12.3" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; - sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; - }; - }; "serve-static-1.12.6" = { name = "serve-static"; packageName = "serve-static"; @@ -21822,6 +22119,15 @@ let sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5"; }; }; + "serve-static-1.13.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; + sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; + }; + }; "serve-static-1.8.1" = { name = "serve-static"; packageName = "serve-static"; @@ -21840,13 +22146,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.5.0" = { + "service-runner-2.5.1" = { name = "service-runner"; packageName = "service-runner"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.5.0.tgz"; - sha1 = "78b347542c5c6ad2f31e78a10533045fc6414c1f"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.5.1.tgz"; + sha1 = "b282214463187607748aa3695023a09f5d28c672"; }; }; "set-blocking-2.0.0" = { @@ -22011,13 +22317,13 @@ let sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "shelljs-0.8.0" = { + "shelljs-0.8.1" = { name = "shelljs"; packageName = "shelljs"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.0.tgz"; - sha512 = "0z8im8zw5g4r44mf2iiy61kxi5idq41b4cs6d4c3lv9shh8ag2gnp25kvwawg899bczvh9g95b07gcpabik39md8q2vmnwcjjizdgn1"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz"; + sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0"; }; }; "shellwords-0.1.1" = { @@ -22110,13 +22416,13 @@ let sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6"; }; }; - "simple-git-1.89.0" = { + "simple-git-1.91.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.89.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.89.0.tgz"; - sha1 = "ef52fe734d5060566ce187b2bbace36c2323e34c"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.91.0.tgz"; + sha1 = "842db6c2ba08328e93c17391a895b850518cd13a"; }; }; "simple-lru-cache-0.0.2" = { @@ -22425,13 +22731,13 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "snyk-1.69.3" = { + "snyk-1.69.10" = { name = "snyk"; packageName = "snyk"; - version = "1.69.3"; + version = "1.69.10"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.69.3.tgz"; - sha1 = "c948a05982b206002a09d4e55fb16aee6d5e80e0"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.69.10.tgz"; + sha1 = "34c66b21791435dd17fa2955904a5fdd6b57415d"; }; }; "snyk-config-1.0.1" = { @@ -22497,31 +22803,22 @@ let sha512 = "2fihlcs2qxdbdfy1pjnf7110l6h4r16vkp0q51wqsfd8fw5s1qgb34plii6yhbfbs8a1il93i6hfn93yclbv50m2129wg7naf57jlqi"; }; }; - "snyk-policy-1.10.1" = { + "snyk-policy-1.10.2" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.1.tgz"; - sha1 = "b1a26c8aef529c61604aca382111e535d511b763"; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.2.tgz"; + sha1 = "2a7bf0f07c7b811b9dda93cf9bbb10dc992dd7bc"; }; }; - "snyk-python-plugin-1.5.3" = { + "snyk-python-plugin-1.5.6" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.5.3"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.3.tgz"; - sha512 = "1yln7fd9x5zayvnq5hrvh44k9f37vnpirvw6gk87aq560kslsq4p2hknq02iq6az58wbc6r69g5rrszmv689c0ky3wjbmb2hmc9q7c1"; - }; - }; - "snyk-recursive-readdir-2.0.0" = { - name = "snyk-recursive-readdir"; - packageName = "snyk-recursive-readdir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz"; - sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.6.tgz"; + sha512 = "1iv7h9k0vj7g2zzx8nzighx84q70kwvl4hhzd4fzxmc8vv06ymwwn4v7cirgbksqrjf9z1bfxq8id308ifb1flyas7blz8zs7xf4w30"; }; }; "snyk-resolve-1.0.0" = { @@ -22542,13 +22839,13 @@ let sha1 = "13743a058437dff890baaf437c333c966a743cb6"; }; }; - "snyk-sbt-plugin-1.2.2" = { + "snyk-sbt-plugin-1.2.4" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.2.tgz"; - sha512 = "1sq30kk2kq0flsak5759wylylzgm6ivd6di4lmbkahy858i26yf6kf86f2m86wvlz4fcmxsbcl7p0wkd498cx193v4nbr2hq39jyjlz"; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.4.tgz"; + sha512 = "3fry8q6f0nrcrzs67zjxkgabb0hinyn5zy1kxq8wf9ca1r0fs67mk4ybiy4fxjy8rwj2axbhhhc3lf5wi97m3amh9k70pakg08yq7q4"; }; }; "snyk-tree-1.0.0" = { @@ -22695,13 +22992,13 @@ let sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; }; }; - "socket.io-parser-3.1.2" = { + "socket.io-parser-3.1.3" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz"; - sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2"; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz"; + sha512 = "3pd3lbxawkd1zs739v0vv81vhf6pyax989j96hrc7vhql0xv7kn13sr893hrnn6m71jngw5h61523dq0b0p8drvff0fm0lbz8fbcil3"; }; }; "socks-1.1.10" = { @@ -22947,13 +23244,13 @@ let sha512 = "276x5a16yv0nlzjdvspsnbkxqhv8lvfj7a0sfzkaasfcwa2rm1ni3h3c0fva63bfqnazbywvs4pzrnbwg43j7gpymjd9cbbndq5x4qi"; }; }; - "source-map-support-0.5.2" = { + "source-map-support-0.5.3" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.2.tgz"; - sha512 = "3hgzhp5z7w8w0sadaa0m7sspd2ihnba3j1rd7l53l1mvx4wjblrbjq2642zz0xxkv4bag4hs4pms7dz5rc8hk5d61d49h6hjrwxqcgp"; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz"; + sha512 = "3xy2ylp2qm8jwglcsf2fjwvn5w56im64w7yjghyv9ilw2fc5qj65w8h38lpls27m3b5prv8x9cnfmrhkfk7rlb52hmf810ycs0i7abq"; }; }; "source-map-url-0.4.0" = { @@ -23001,31 +23298,40 @@ let sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; }; }; - "spdx-correct-1.0.2" = { + "spdx-correct-3.0.0" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "1.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz"; + sha512 = "3xgkqk4hsm4nzvy68icv1rlv4s0qgb7mwpi9s4z2mp1a5fwny6kc6m4nqa7zzx2k7mrjlh7psci9lb7892bl3q4r4y2f4sw7vvnhprp"; }; }; - "spdx-expression-parse-1.0.4" = { + "spdx-exceptions-2.1.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; + sha512 = "057m2ab3y8j38xb89w7d191hfaa693vbf7wnwkf302zicsgi2v5ayvcc4f03vyj4yyycqasqp3ryp2d3q0vcaq54r4ls2g5dar4vbg0"; + }; + }; + "spdx-expression-parse-3.0.0" = { name = "spdx-expression-parse"; packageName = "spdx-expression-parse"; - version = "1.0.4"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2"; }; }; - "spdx-license-ids-1.2.2" = { + "spdx-license-ids-3.0.0" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "1.2.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz"; + sha512 = "066gb8vcffv2mf3lbmxvxp5b60jviw32x52n50l3zgl9z4cgwg74ca4kr4y5c3mss736bmg9nxl1lvprishbikqy0jy56770v10zqfv"; }; }; "spdy-1.32.5" = { @@ -23199,6 +23505,15 @@ let sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr"; }; }; + "ssri-5.2.4" = { + name = "ssri"; + packageName = "ssri"; + version = "5.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-5.2.4.tgz"; + sha512 = "2si1dr4dwg0bkvsn38d6rk5raw5lbn2m9giwf8pnhy55wqgxsvv7b1pn252wj166cd8j302a2gwjy00ni473yr1vrxrzmssqs000waj"; + }; + }; "stable-0.1.6" = { name = "stable"; packageName = "stable"; @@ -23334,13 +23649,13 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "stream-consume-0.1.0" = { + "stream-consume-0.1.1" = { name = "stream-consume"; packageName = "stream-consume"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"; - sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"; + url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz"; + sha512 = "3553srgw60szs493rx8nyy09lcjkw3bh16c2b5z30jcf9h95r4hdiqjk31r9190w47av8dg4zx60fnnvqanv95hbpxl7314723vgmml"; }; }; "stream-counter-0.2.0" = { @@ -23766,6 +24081,15 @@ let sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; }; }; + "strip-indent-2.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz"; + sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68"; + }; + }; "strip-json-comments-0.1.3" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -23793,13 +24117,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strong-data-uri-1.0.4" = { + "strong-data-uri-1.0.5" = { name = "strong-data-uri"; packageName = "strong-data-uri"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.4.tgz"; - sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0"; + url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.5.tgz"; + sha512 = "2mwdm0k873sdi2bramixwg6fafqyi2313scq32fsnq2qa5hqbpdln34rc9a67wd15mi05v3c6bfiw6r4h7dy4aac1q3ac8b2ig6j96n"; }; }; "strong-log-transformer-1.0.6" = { @@ -23928,13 +24252,13 @@ let sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; }; }; - "supports-color-5.1.0" = { + "supports-color-5.2.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz"; - sha512 = "04q31rfgx0r6jgs2r1k6kmzab1vw3qrikiv8wsl86rxll77vdalrag7r4ypww3qp6v8k3avsjc0jxd3ga45fb5f51akm30a9b100ba7"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz"; + sha512 = "3jqwn02aw7bczn3f56mfbx3nvhrydwsc6g9vkp54794rfdg61vbp3qy4vdj1n8jvpahlcywpcv0afxjxbj5a3wm9lpqcsr5ix5nyzqp"; }; }; "symbol-observable-1.0.1" = { @@ -23955,13 +24279,13 @@ let sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c"; }; }; - "syntax-error-1.3.0" = { + "syntax-error-1.4.0" = { name = "syntax-error"; packageName = "syntax-error"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; - sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz"; + sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0"; }; }; "table-3.8.3" = { @@ -23973,13 +24297,13 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "table-4.0.2" = { + "table-4.0.3" = { name = "table"; packageName = "table"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz"; - sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai"; + url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; + sha512 = "0m684sf5sicq9hlavaw7wrm8d10p2vm1cvvrxgl7f2rpqbn5cm6hhsbzb0is6r1bm19p7960dwxif6lc48bz712kx27s176hhafgfjb"; }; }; "tabtab-1.3.2" = { @@ -24028,6 +24352,15 @@ let sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22"; }; }; + "tapable-1.0.0" = { + name = "tapable"; + packageName = "tapable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz"; + sha512 = "2r08r7ymr8jvw7f1vamajcm9na9fscx6qiby1l3c99ndk1x50v0k3x6lhqmysk9bwczdl8kr2908lfvi6j5mfz0dam7cii4sin6213m"; + }; + }; "tape-2.3.3" = { name = "tape"; packageName = "tape"; @@ -24064,13 +24397,13 @@ let sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; }; }; - "tar-4.3.0" = { + "tar-4.4.0" = { name = "tar"; packageName = "tar"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.3.0.tgz"; - sha512 = "1844acixnz54bqf6q85avzdgq39i30d6gridz084iff0f3fh670wag8gs72k8dhbvmhxs2czlax99bfwypyfxbhrq3w80xb2kl5gbjd"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz"; + sha512 = "2jqkq86l5d9kaqvxd7m5r48smv4f8y10vx7r0rpwafwz5sskrmlpdswp8g351jfk5if2jv0a3wbjpss31x1cf6x5dx8zhib465576c0"; }; }; "tar-fs-1.16.0" = { @@ -24226,13 +24559,13 @@ let sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; }; }; - "thriftrw-3.11.1" = { + "thriftrw-3.11.2" = { name = "thriftrw"; packageName = "thriftrw"; - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.1.tgz"; - sha1 = "5a2f5165d665bb195e665e5b5b9f8897dac23acc"; + url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.2.tgz"; + sha512 = "2cll36ns03xrjz6y3116ca9hgnqsi384k6mcyk8xpl81znx0lkwkz7iwyhprc0rm1ry6mrlwpdrnh38sfqvm95hd7ila270a71ah86y"; }; }; "throat-3.2.0" = { @@ -24415,13 +24748,13 @@ let sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929"; }; }; - "tiny-lr-1.1.0" = { + "tiny-lr-1.1.1" = { name = "tiny-lr"; packageName = "tiny-lr"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.0.tgz"; - sha512 = "06rjm9vpcs6h1890gzzj8pbn5k70724dz61qnk2fjwgiva4klx9zzwds5iidlgc31p7q41x6qz81pbbh116ap3jznqw07camvqzm1bz"; + url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz"; + sha512 = "2w2806fq55jn2vd74qn5ryir4j6nbfycd8c2w030fckrwvlif6iiy5ranmsdlyqgcrs87x4zxwnlmwrz6dzn41l7861lsbcgc1s3373"; }; }; "tinycolor-0.0.1" = { @@ -24550,13 +24883,13 @@ let sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; }; }; - "to-regex-3.0.1" = { + "to-regex-3.0.2" = { name = "to-regex"; packageName = "to-regex"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz"; - sha1 = "15358bee4a2c83bd76377ba1dc049d0f18837aae"; + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; }; }; "to-regex-range-2.1.1" = { @@ -24685,13 +25018,13 @@ let sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; }; }; - "tough-cookie-2.3.3" = { + "tough-cookie-2.3.4" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; }; }; "township-client-1.3.2" = { @@ -24775,6 +25108,15 @@ let sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; }; }; + "trim-newlines-2.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz"; + sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; + }; + }; "trim-off-newlines-1.0.1" = { name = "trim-off-newlines"; packageName = "trim-off-newlines"; @@ -24811,13 +25153,13 @@ let sha1 = "a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"; }; }; - "truncate-1.0.5" = { + "truncate-2.0.1" = { name = "truncate"; packageName = "truncate"; - version = "1.0.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz"; - sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28"; + url = "https://registry.npmjs.org/truncate/-/truncate-2.0.1.tgz"; + sha1 = "dd1a6d15630515663d8475f6f24edf2f800ebb1b"; }; }; "tslib-1.9.0" = { @@ -24856,6 +25198,15 @@ let sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; }; }; + "tty-browserify-0.0.1" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz"; + sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b"; + }; + }; "tunnel-0.0.2" = { name = "tunnel"; packageName = "tunnel"; @@ -24937,13 +25288,13 @@ let sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; }; }; - "type-detect-4.0.7" = { + "type-detect-4.0.8" = { name = "type-detect"; packageName = "type-detect"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz"; - sha512 = "06b3944s70gv2pdbdkqpxp88izg727825j0lpdl0pdgs6p6nvpkzb034lycqin3a3nydd0jaafd86a991c78pabrqbd6m8cj3p7a671"; + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; + sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni"; }; }; "type-is-1.5.7" = { @@ -24955,22 +25306,22 @@ let sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; }; }; - "type-is-1.6.15" = { + "type-is-1.6.16" = { name = "type-is"; packageName = "type-is"; - version = "1.6.15"; + version = "1.6.16"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; - sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; + sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x"; }; }; - "typechecker-4.4.1" = { + "typechecker-4.5.0" = { name = "typechecker"; packageName = "typechecker"; - version = "4.4.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz"; - sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6"; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.5.0.tgz"; + sha512 = "3izx27ms2gldkwjyllsg41zpgd7x57v7zrkgrxlrfhs3gc6csg91m6dk23kvcralq9rd5pn7njz4yj8raj31q7ybhd54v9pr7yw98vf"; }; }; "typedarray-0.0.6" = { @@ -24982,22 +25333,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "typescript-2.4.2" = { + "typescript-2.7.2" = { name = "typescript"; packageName = "typescript"; - version = "2.4.2"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz"; - sha1 = "f8395f85d459276067c988aa41837a8f82870844"; - }; - }; - "typescript-2.6.2" = { - name = "typescript"; - packageName = "typescript"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz"; - sha1 = "3c5b6fd7f6de0914269027f03c0946758f7673a4"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; + sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; }; }; "typewise-1.0.3" = { @@ -25045,31 +25387,22 @@ let sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr"; }; }; - "uc-first-array-1.1.8" = { - name = "uc-first-array"; - packageName = "uc-first-array"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/uc-first-array/-/uc-first-array-1.1.8.tgz"; - sha512 = "3gmz15f5f5yn43v5gv1039pkhd3wwwjfd9jd4f501qz01bdlxj5f2vkg4ddy0lv4h7902n2hgw2vdlmc4a578hsr2bij1xzq5pjfc1d"; - }; - }; - "uc.micro-1.0.3" = { + "uc.micro-1.0.5" = { name = "uc.micro"; packageName = "uc.micro"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; - sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz"; + sha512 = "0pb6n8f5qpdf3x1bgxlcvimha0n4xx3mgr1mj6nx6yksgg9ij62ai3nzhyy8806gfkklfk8blhlhimw0237yg9xr66rmgvk1vici0i6"; }; }; - "ucfirst-1.0.0" = { - name = "ucfirst"; - packageName = "ucfirst"; - version = "1.0.0"; + "uglify-es-3.3.10" = { + name = "uglify-es"; + packageName = "uglify-es"; + version = "3.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/ucfirst/-/ucfirst-1.0.0.tgz"; - sha1 = "4e105b6448d05e264ecec435e0b919363c5f2f2f"; + url = "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz"; + sha512 = "31s7k004qjdb42cavkpgszzvz9zm3aw2iv80k1hrykx202x9wb03451l58fhlba1spjgpdq96w7vm6rvavkcwrxj87aynxkq25czz5c"; }; }; "uglify-js-1.2.5" = { @@ -25117,22 +25450,22 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.0.20" = { + "uglify-js-3.3.12" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.0.20"; + version = "3.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz"; - sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.12.tgz"; + sha512 = "166ccv37fz5bsnwpp0n0xqxx63pdg8d4hxhac79k61n47l69mcw7sp5g3c68y98x867da1w1bnv5ryisvsjsj639sbpdl2mg56nng72"; }; }; - "uglify-js-3.3.8" = { + "uglify-js-3.3.6" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.8"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.8.tgz"; - sha512 = "1vxvyq08n6jidg18kiph7m0bjzr4v1dh188b7zgj60mkv4x1qkqrgc8756drldaj3awmn71mwsxja0zhvdm8nqqw5finrajv8dc0j2z"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.6.tgz"; + sha512 = "0q2bfk5m49af6f84q1iyrmw0p6ra1gnaf1npffadjqxd9qsz324r144bwgrnchngvlcdj1zqbmyh1r6gva65zxbrxm89ibdgcs7nykl"; }; }; "uglify-to-browserify-1.0.2" = { @@ -25153,6 +25486,15 @@ let sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; }; }; + "uglifyjs-webpack-plugin-1.2.2" = { + name = "uglifyjs-webpack-plugin"; + packageName = "uglifyjs-webpack-plugin"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz"; + sha512 = "3ngk387v5rza5gly8576cr1kmqmrpvb5jp6l33ac6ps5zkra0anr722gmx29i4m6q5bj6v4gdh8jikqg7l1lf4nkc06aynz6nzwsvq8"; + }; + }; "uid-0.0.2" = { name = "uid"; packageName = "uid"; @@ -25270,13 +25612,13 @@ let sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; }; }; - "undefsafe-2.0.1" = { + "undefsafe-2.0.2" = { name = "undefsafe"; packageName = "undefsafe"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.1.tgz"; - sha1 = "03b2f2a16c94556e14b2edef326cd66aaf82707a"; + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz"; + sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76"; }; }; "underscore-1.2.1" = { @@ -25405,6 +25747,24 @@ let sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; }; }; + "unique-filename-1.1.0" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz"; + sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; + }; + }; + "unique-slug-2.0.0" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz"; + sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; + }; + }; "unique-stream-1.0.0" = { name = "unique-stream"; packageName = "unique-stream"; @@ -25594,6 +25954,15 @@ let sha512 = "19nv38v416yy515gbq0lvg549w1m48mg17ibl9jp6g0pzlzg6j3lzygbw3c4ia2i9vk0ij0g4fcwfvsa9snxpgdk4a7qbprnj7s4abw"; }; }; + "upath-1.0.4" = { + name = "upath"; + packageName = "upath"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz"; + sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; + }; + }; "update-notifier-0.5.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -25729,13 +26098,13 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; - "useragent-2.2.1" = { + "useragent-2.3.0" = { name = "useragent"; packageName = "useragent"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz"; - sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz"; + sha512 = "1vqmf9ng5navlr0kvklslvzbqym47sbqblc3i74ln0hswdyd0yx86fj3cnhb2pjjyy3cqs1mq9ywkz92j5x7km2iv1g2jkfkki0f2p0"; }; }; "utf7-1.0.2" = { @@ -25909,13 +26278,13 @@ let sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; }; }; - "uws-0.14.5" = { + "uws-9.14.0" = { name = "uws"; packageName = "uws"; - version = "0.14.5"; + version = "9.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz"; - sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc"; + url = "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz"; + sha512 = "2m9vgbpgm39qsl9dk1zzqglr29qwy1hxn3cgj0rwrr05c4hyfij3sib08i1ck21y1136ljvvr0l2nixh6g7arjip455n0zryfs37lqw"; }; }; "v8-debug-1.0.1" = { @@ -25963,13 +26332,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "validate-npm-package-license-3.0.1" = { + "validate-npm-package-license-3.0.3" = { name = "validate-npm-package-license"; packageName = "validate-npm-package-license"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; + sha512 = "39caf21ga6s2gvpka90wdngdijarwmkix5fpgh9r94bw14fx1zfnf7j5mprgsdlh8dv0wpwxn65qn9gfwa8n3dxw3iqaj7qf994wxpb"; }; }; "validate-npm-package-name-3.0.0" = { @@ -26161,6 +26530,15 @@ let sha1 = "5c88036cf565e5df05558bfc911f8656df218884"; }; }; + "vinyl-2.1.0" = { + name = "vinyl"; + packageName = "vinyl"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz"; + sha1 = "021f9c2cf951d6b939943c89eb5ee5add4fd924c"; + }; + }; "vinyl-file-2.0.0" = { name = "vinyl-file"; packageName = "vinyl-file"; @@ -26197,13 +26575,13 @@ let sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; }; }; - "voc-1.0.0" = { + "voc-1.1.0" = { name = "voc"; packageName = "voc"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz"; - sha512 = "1zss1rcd373slj9qjmy4zp7ann95isbkvjlrgp2dirpazvn1sy23hgnw6p72w0mj8hcgqpxvs0ls035zmb8isilqhqqpkmya9d3234r"; + url = "https://registry.npmjs.org/voc/-/voc-1.1.0.tgz"; + sha512 = "185v1xryljbds9hw4mc8r5grclrassdi8nq30ckz4sshn4lkivjlx0jm9k25bknf6j9ggxpcybmr94kad4qq2zppjyalbl9qdvn1n3y"; }; }; "void-elements-2.0.1" = { @@ -26341,6 +26719,15 @@ let sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1"; }; }; + "webpack-3.10.0" = { + name = "webpack"; + packageName = "webpack"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz"; + sha512 = "0n3rl5qq259csi0x5qh12wzyaypfds5wy0zrzky19wqsa0mjibrn19fdfgbabply2l576vlj8j69nzkb23jqfy6a36xb3cwi1g4l73z"; + }; + }; "webpack-sources-1.1.0" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -26674,6 +27061,15 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; + "worker-farm-1.5.4" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.4.tgz"; + sha512 = "3xic3z7f6cga2kaps1ysysq02qljwi534lziz472mvngx097xg4y0fk77qi194akp44dbl8wcinys0mjvwxcrd2rqlgsznw9fa84g11"; + }; + }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -26791,15 +27187,6 @@ let sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; }; }; - "ws-1.1.1" = { - name = "ws"; - packageName = "ws"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"; - sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; - }; - }; "ws-1.1.5" = { name = "ws"; packageName = "ws"; @@ -27007,13 +27394,13 @@ let sha1 = "69248673410b4ba42e1a6136551d2922335aa773"; }; }; - "xmlbuilder-9.0.4" = { + "xmlbuilder-9.0.7" = { name = "xmlbuilder"; packageName = "xmlbuilder"; - version = "9.0.4"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz"; - sha1 = "519cb4ca686d005a8420d3496f3f0caeecca580f"; + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; }; "xmlcreate-1.0.2" = { @@ -27170,6 +27557,15 @@ let sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; }; }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g"; + }; + }; "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; @@ -27472,7 +27868,7 @@ in sources."source-map-0.5.7" ]; }) - (sources."babel-generator-6.26.0" // { + (sources."babel-generator-6.26.1" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -27487,11 +27883,11 @@ in sources."babylon-6.18.0" sources."balanced-match-1.0.0" sources."bindings-1.2.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."chmodr-1.0.2" sources."colors-1.1.2" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-js-2.5.3" @@ -27517,10 +27913,10 @@ in sources."home-or-tmp-2.0.0" sources."homedir-polyfill-1.0.1" sources."ini-1.3.5" - sources."invariant-2.2.2" + sources."invariant-2.2.3" sources."is-3.2.1" sources."is-finite-1.0.2" - sources."is-windows-1.0.1" + sources."is-windows-1.0.2" sources."isexe-2.0.0" sources."js-tokens-3.0.2" sources."jsesc-1.3.0" @@ -27533,7 +27929,7 @@ in sources."strip-ansi-0.1.1" ]; }) - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."loose-envify-1.3.1" sources."matcher-collection-1.0.5" sources."minimatch-3.0.4" @@ -27541,7 +27937,7 @@ in sources."mkdirp-0.5.1" sources."moment-2.20.1" sources."ms-2.0.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."node.extend-2.0.0" sources."nomnom-1.8.1" sources."number-is-nan-1.0.1" @@ -27583,10 +27979,10 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "0.14.0"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-0.14.0.tgz"; - sha512 = "149a2ndf9hbminr1y95b9l9p7pprrsw2j05w1mbmr0gbm07sqa6vk4x91ws7clnzc80mli1mgnw9xl5mllqfmiynjdrmss6k9zncvcp"; + url = "https://registry.npmjs.org/asar/-/asar-0.14.2.tgz"; + sha512 = "1s03v9h1823r1y95jgrdnf4b2hj56gdi879kq29lv7q59hnn530q6g32qakjj8d6lzjx52r5qvg30szdi1fkvj3zx1dgaq30k5kiakq"; }; dependencies = [ sources."abbrev-1.1.1" @@ -27600,14 +27996,14 @@ in sources."bcrypt-pbkdf-1.0.1" sources."binary-0.3.0" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."buffers-0.1.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { @@ -27622,10 +28018,10 @@ in sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" @@ -27634,7 +28030,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -27648,8 +28044,8 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."klaw-1.3.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -27682,7 +28078,7 @@ in sources."nopt-1.0.10" ]; }) - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."traverse-0.3.9" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -27708,9 +28104,10 @@ in sha1 = "e991dfa17dc5d7d91731180851fd9cbfbadf73c3"; }; dependencies = [ + sources."@types/caseless-0.12.1" sources."@types/form-data-2.2.1" - sources."@types/node-8.5.9" - sources."@types/request-2.0.13" + sources."@types/node-8.9.4" + sources."@types/request-2.47.0" sources."@types/tough-cookie-2.3.2" sources."@types/uuid-3.4.3" sources."JSV-4.0.2" @@ -27880,7 +28277,7 @@ in sources."bcrypt-pbkdf-1.0.1" sources."bl-1.1.2" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."browserify-mime-1.2.9" sources."buffer-equal-constant-time-1.0.1" sources."caller-id-0.1.0" @@ -27889,7 +28286,7 @@ in sources."clone-1.0.3" sources."co-4.6.0" sources."colors-1.1.2" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."commander-1.0.4" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" @@ -27918,12 +28315,12 @@ in sources."extend-1.2.1" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-patch-0.5.6" sources."fast-json-stable-stringify-2.0.0" sources."fibers-1.0.15" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" sources."galaxy-0.1.12" @@ -27938,7 +28335,7 @@ in sources."has-color-0.1.7" sources."hash-base-3.0.4" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-basic-2.5.1" sources."http-response-object-1.1.0" sources."http-signature-1.2.0" @@ -27946,7 +28343,8 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-buffer-1.1.6" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -27978,29 +28376,32 @@ in sources."streamline-0.4.11" ]; }) - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."map-stream-0.1.0" sources."md5.js-1.3.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.20.1" - (sources."ms-rest-2.3.0" // { + (sources."ms-rest-2.3.1" // { dependencies = [ sources."extend-3.0.1" - sources."moment-2.18.1" sources."request-2.83.0" sources."through-2.3.8" sources."tunnel-0.0.5" ]; }) - (sources."ms-rest-azure-2.5.0" // { + (sources."ms-rest-azure-2.5.4" // { dependencies = [ - sources."adal-node-0.1.27" - sources."async-2.5.0" - sources."moment-2.18.1" + sources."@types/node-9.4.6" + (sources."adal-node-0.1.27" // { + dependencies = [ + sources."@types/node-8.9.4" + ]; + }) + sources."async-2.6.0" sources."xpath.js-1.1.0" ]; }) @@ -28052,7 +28453,7 @@ in sources."boom-2.10.1" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."cryptiles-2.0.5" sources."extend-3.0.1" sources."form-data-1.0.1" @@ -28091,13 +28492,14 @@ in (sources."sync-request-3.0.0" // { dependencies = [ sources."caseless-0.11.0" - sources."readable-stream-2.3.3" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) sources."then-request-2.2.0" sources."through-2.3.4" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-0.0.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -28167,7 +28569,7 @@ in sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" @@ -28212,7 +28614,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.32.0" + sources."mime-db-1.33.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" @@ -28245,9 +28647,10 @@ in sources."signal-exit-3.0.2" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -28257,7 +28660,7 @@ in ]; }) sources."trim-newlines-1.0.0" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -28272,27 +28675,28 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "15.2.0"; + version = "16.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-15.2.0.tgz"; - sha512 = "353sai3zpq5rmqrw5xqkmvxpm866zpv2kiqmp90qp506vij6zvdjrk1zhlpvwmdvsyfjm07q3z2gk5z8ndx2mg55x134pmnz4a34xi0"; + url = "https://registry.npmjs.org/browserify/-/browserify-16.1.0.tgz"; + sha512 = "356pxbnfj5skk2jkc36m9qma51v9f2cf3km9rbvblhdzv1jlpdhppm0ggi42ifmq2knlfg5jcvif4pqlxfkfjrs27x3adz5s0naa14g"; }; dependencies = [ sources."@browserify/acorn5-object-spread-5.0.1" sources."JSONStream-1.3.2" sources."acorn-4.0.13" + sources."acorn-node-1.3.0" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" - sources."asn1.js-4.9.2" + sources."asn1.js-4.10.1" sources."assert-1.4.1" sources."astw-2.2.0" sources."balanced-match-1.0.0" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."bn.js-4.11.8" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."brorand-1.1.0" - sources."browser-pack-6.0.3" + sources."browser-pack-6.0.4" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -28304,19 +28708,14 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.0.8" + sources."buffer-5.1.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) + sources."concat-stream-1.6.0" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" @@ -28335,10 +28734,10 @@ in sources."des.js-1.0.0" sources."detective-5.0.2" sources."diffie-hellman-5.0.2" - sources."domain-browser-1.1.7" + sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" sources."elliptic-6.4.0" - sources."events-1.1.1" + sources."events-2.0.0" sources."evp_bytestokey-1.0.3" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -28357,6 +28756,9 @@ in (sources."insert-module-globals-7.0.1" // { dependencies = [ sources."combine-source-map-0.7.2" + sources."concat-stream-1.5.2" + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" ]; }) sources."is-buffer-1.1.6" @@ -28378,10 +28780,9 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - (sources."module-deps-5.0.1" // { + (sources."module-deps-6.0.0" // { dependencies = [ - sources."acorn-5.3.0" - sources."concat-stream-1.6.0" + sources."acorn-5.5.0" ]; }) sources."once-1.4.0" @@ -28401,9 +28802,13 @@ in sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.0.6" - sources."randomfill-1.0.3" + sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" - sources."readable-stream-2.3.3" + (sources."readable-stream-2.3.4" // { + dependencies = [ + sources."process-nextick-args-2.0.0" + ]; + }) sources."resolve-1.5.0" sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" @@ -28421,12 +28826,16 @@ in sources."minimist-1.2.0" ]; }) - sources."syntax-error-1.3.0" + (sources."syntax-error-1.4.0" // { + dependencies = [ + sources."acorn-5.5.0" + ]; + }) sources."through-2.3.8" sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" - sources."tty-browserify-0.0.0" + sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.1" (sources."url-0.11.0" // { @@ -28456,13 +28865,13 @@ in castnow = nodeEnv.buildNodePackage { name = "castnow"; packageName = "castnow"; - version = "0.4.18"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/castnow/-/castnow-0.4.18.tgz"; - sha1 = "4ffd81c55f381a5aa10c637607683a196830bdd8"; + url = "https://registry.npmjs.org/castnow/-/castnow-0.6.0.tgz"; + sha512 = "01z326dk78dypwf9wyjrcr81bimbkh77cgzp54qv9230j7r7jxvd4xbsd36prrssl66ggixzwxhh6wzfqnj44ygnx3j49rf0vqxj9jp"; }; dependencies = [ - sources."addr-to-ip-port-1.4.2" + sources."addr-to-ip-port-1.4.3" sources."airplay-js-0.2.16" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" @@ -28480,11 +28889,11 @@ in sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" - sources."blob-to-buffer-1.2.6" + sources."blob-to-buffer-1.2.7" sources."bn.js-4.11.8" sources."bncode-0.5.3" sources."boom-0.3.8" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" @@ -28504,7 +28913,7 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."compact2string-1.4.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" @@ -28568,7 +28977,7 @@ in }) sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.5.4" + sources."ipaddr.js-1.6.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -28639,7 +29048,7 @@ in sources."object-assign-4.1.1" sources."once-1.2.0" sources."parse-torrent-file-2.1.4" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."safe-buffer-5.0.1" sources."string_decoder-1.0.3" sources."thirty-two-0.0.2" @@ -28650,7 +29059,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."playerui-1.2.0" // { + (sources."playerui-1.3.0" // { dependencies = [ sources."ansi-regex-0.2.1" sources."ansi-styles-1.1.0" @@ -28661,7 +29070,7 @@ in ]; }) sources."plist-2.1.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promiscuous-0.6.0" sources."protobufjs-3.8.2" sources."pump-0.3.5" @@ -28697,9 +29106,9 @@ in sources."request-2.16.6" sources."rimraf-2.6.2" sources."router-0.6.2" - sources."run-parallel-1.1.6" + sources."run-parallel-1.1.7" sources."run-series-1.1.4" - sources."rusha-0.8.12" + sources."rusha-0.8.13" sources."rx-2.5.3" sources."safe-buffer-5.1.1" sources."sax-1.2.4" @@ -28716,14 +29125,15 @@ in }) sources."single-line-log-0.4.1" sources."sntp-0.1.4" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."speedometer-0.1.4" (sources."srt2vtt-1.3.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -28763,8 +29173,8 @@ in sources."utfx-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" - sources."validate-npm-package-license-3.0.1" - sources."voc-1.0.0" + sources."validate-npm-package-license-3.0.3" + sources."voc-1.1.0" sources."ware-1.3.0" sources."windows-no-runnable-0.0.6" sources."wordwrap-0.0.3" @@ -28773,7 +29183,7 @@ in sources."ws-1.1.5" (sources."xml2js-0.4.19" // { dependencies = [ - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-9.0.7" ]; }) sources."xmlbuilder-8.2.2" @@ -28830,49 +29240,43 @@ in coinmon = nodeEnv.buildNodePackage { name = "coinmon"; packageName = "coinmon"; - version = "0.0.13"; + version = "0.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.13.tgz"; - sha512 = "2q865h8b8fks806q7qhdm728xhcw684xv37fmlphqv0rdy5y7zfj9nffcnzjmlg5b2qgfrybdpp25q27pm26c4mnxl6lq7jdk7hr6f5"; + url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.22.tgz"; + sha512 = "3m2wqxac3lyi8f7hyfq4cp402194lv8mx6izc2qjvabi7s2yxhiwsj8dnam628hpbbgrjixfi37biv7g5wrykc5vha9x7dcp1nzj8i2"; }; dependencies = [ sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-styles-3.2.0" sources."axios-0.17.1" - sources."camelo-1.1.11" - sources."chalk-1.1.3" + sources."chalk-2.3.1" sources."cli-cursor-2.1.0" sources."cli-spinners-1.1.0" sources."cli-table2-0.2.0" sources."code-point-at-1.1.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" sources."colors-1.1.2" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."debug-3.1.0" - sources."emojic-1.1.14" - sources."emojilib-2.2.12" sources."escape-string-regexp-1.0.5" sources."follow-redirects-1.4.1" - sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" sources."humanize-plus-1.8.2" sources."is-buffer-1.1.6" sources."is-fullwidth-code-point-1.0.0" - sources."iterate-object-1.3.2" sources."lodash-3.10.1" - sources."log-symbols-1.0.2" - sources."mimic-fn-1.1.0" + sources."log-symbols-2.2.0" + sources."mimic-fn-1.2.0" sources."ms-2.0.0" sources."number-is-nan-1.0.1" sources."onetime-2.0.1" - sources."ora-1.3.0" - sources."r-json-1.2.8" - sources."regex-escape-3.4.8" + sources."ora-1.4.0" sources."restore-cursor-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."uc-first-array-1.1.8" - sources."ucfirst-1.0.0" + sources."supports-color-5.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -28929,7 +29333,8 @@ in sources."JSONStream-1.3.2" sources."abbrev-1.1.1" sources."accepts-1.3.4" - sources."acorn-5.3.0" + sources."acorn-5.5.0" + sources."acorn-node-1.3.0" sources."aliasify-2.1.0" sources."ansi-0.3.1" sources."ansi-escapes-1.4.0" @@ -28940,7 +29345,7 @@ in sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."asn1-0.2.3" - sources."asn1.js-4.9.2" + sources."asn1.js-4.10.1" sources."assert-1.4.1" sources."assert-plus-0.2.0" sources."astw-2.2.0" @@ -28962,9 +29367,9 @@ in sources."boom-2.10.1" sources."bplist-creator-0.0.7" sources."bplist-parser-0.1.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."brorand-1.1.0" - sources."browser-pack-6.0.3" + sources."browser-pack-6.0.4" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -28972,7 +29377,6 @@ in }) (sources."browserify-14.4.0" // { dependencies = [ - sources."acorn-4.0.13" sources."isarray-1.0.0" ]; }) @@ -28983,7 +29387,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-transform-tools-1.7.0" sources."browserify-zlib-0.1.4" - sources."buffer-5.0.8" + sources."buffer-5.1.0" sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" sources."builtin-status-codes-3.0.0" @@ -28997,10 +29401,10 @@ in sources."cli-width-1.1.1" sources."code-point-at-1.1.0" sources."combine-source-map-0.8.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" - sources."compressible-2.0.12" - sources."compression-1.7.1" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" + sources."compressible-2.0.13" + sources."compression-1.7.2" sources."concat-map-0.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -29027,14 +29431,14 @@ in }) (sources."cordova-js-4.2.2" // { dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" sources."isarray-0.0.1" ]; }) (sources."cordova-lib-8.0.0" // { dependencies = [ sources."acorn-4.0.13" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."combine-source-map-0.7.2" sources."glob-7.1.1" sources."hash-base-2.0.2" @@ -29046,6 +29450,7 @@ in sources."base64-js-1.1.2" ]; }) + sources."process-nextick-args-2.0.0" sources."q-1.0.1" sources."qs-6.3.2" sources."shelljs-0.3.0" @@ -29167,12 +29572,13 @@ in ]; }) sources."interpret-1.1.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-npm-1.0.0" sources."is-obj-1.0.1" sources."is-property-1.0.2" @@ -29209,8 +29615,8 @@ in sources."methods-1.1.2" sources."miller-rabin-4.0.1" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -29238,7 +29644,7 @@ in sources."os-homedir-1.0.2" sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."osx-release-1.1.0" sources."package-json-1.2.0" sources."pako-0.2.9" @@ -29260,7 +29666,7 @@ in sources."process-nextick-args-1.0.7" sources."promzard-0.3.0" sources."properties-parser-0.3.1" - sources."proxy-addr-2.0.2" + sources."proxy-addr-2.0.3" sources."public-encrypt-4.0.0" sources."punycode-1.4.1" sources."q-1.5.1" @@ -29268,15 +29674,15 @@ in sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.0.6" - sources."randomfill-1.0.3" + sources."randomfill-1.0.4" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.4" + sources."rc-1.2.5" sources."read-1.0.7" sources."read-all-stream-3.1.0" sources."read-only-stream-2.0.0" sources."read-package-json-2.0.12" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."registry-url-3.1.0" @@ -29304,9 +29710,10 @@ in sources."slide-1.1.6" sources."sntp-1.0.9" sources."source-map-0.5.7" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -29327,18 +29734,18 @@ in sources."strip-json-comments-2.0.1" sources."subarg-1.0.0" sources."supports-color-2.0.0" - sources."syntax-error-1.3.0" + sources."syntax-error-1.4.0" sources."tar-2.2.1" sources."through-2.3.8" sources."through2-2.0.3" sources."timed-out-2.0.0" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" - sources."tough-cookie-2.3.3" - sources."tty-browserify-0.0.0" + sources."tough-cookie-2.3.4" + sources."tty-browserify-0.0.1" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."umd-3.0.1" sources."underscore-1.8.3" @@ -29365,7 +29772,7 @@ in sources."utils-merge-1.0.1" sources."uuid-2.0.3" sources."valid-identifier-0.0.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -29454,20 +29861,19 @@ in sources."blake2b-wasm-1.1.7" sources."body-0.1.0" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equals-1.0.4" sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.3" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" @@ -29475,7 +29881,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.1.2" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."connections-1.4.2" @@ -29510,18 +29916,23 @@ in sources."debug-2.6.9" ]; }) - sources."dat-log-1.1.1" - (sources."dat-node-3.5.6" // { + (sources."dat-log-1.1.1" // { + dependencies = [ + sources."process-nextick-args-1.0.7" + ]; + }) + (sources."dat-node-3.5.8" // { dependencies = [ sources."minimist-0.0.8" + sources."process-nextick-args-1.0.7" sources."pump-1.0.3" sources."unordered-set-2.0.0" sources."varint-5.0.0" ]; }) sources."dat-registry-4.0.0" - sources."dat-secret-storage-4.0.0" - sources."dat-storage-1.0.3" + sources."dat-secret-storage-4.0.1" + sources."dat-storage-1.0.4" sources."dat-swarm-defaults-1.0.0" sources."datland-swarm-defaults-1.0.2" sources."debug-3.1.0" @@ -29534,11 +29945,7 @@ in sources."thunky-0.1.0" ]; }) - (sources."dns-discovery-5.6.1" // { - dependencies = [ - sources."thunky-0.1.0" - ]; - }) + sources."dns-discovery-5.6.1" sources."dns-packet-1.3.1" sources."dns-socket-1.6.3" sources."dns-txt-2.0.2" @@ -29553,7 +29960,7 @@ in sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-read-stream-1.1.0" sources."filename-regex-2.0.1" @@ -29563,7 +29970,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."from2-2.3.0" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" @@ -29573,28 +29980,24 @@ in sources."global-4.3.2" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.12.0" // { + (sources."hypercore-6.12.2" // { dependencies = [ sources."varint-5.0.0" ]; }) sources."hypercore-protocol-6.5.2" - (sources."hyperdrive-9.12.2" // { + (sources."hyperdrive-9.12.3" // { dependencies = [ sources."varint-4.0.1" ]; }) sources."hyperdrive-http-4.2.2" - (sources."hyperdrive-network-speed-2.0.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -29635,8 +30038,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -29644,11 +30047,11 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-6.2.2" + sources."multicast-dns-6.2.3" sources."multicb-1.2.2" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."nanoassert-1.1.0" sources."nanobus-3.3.0" sources."nanotiming-1.0.1" @@ -29675,7 +30078,7 @@ in sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" sources."process-0.5.2" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."progress-string-1.2.2" (sources."prompt-1.0.0" // { dependencies = [ @@ -29686,12 +30089,9 @@ in sources."pump-2.0.1" sources."punycode-1.4.1" sources."qs-6.5.1" - (sources."random-access-file-1.8.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."random-access-file-2.0.1" sources."random-access-memory-2.4.0" + sources."random-access-storage-1.1.1" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -29704,8 +30104,8 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.3" - sources."recursive-watch-1.1.2" + sources."readable-stream-2.3.4" + sources."recursive-watch-1.1.3" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" @@ -29713,7 +30113,7 @@ in sources."request-2.83.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."rusha-0.8.12" + sources."rusha-0.8.13" sources."safe-buffer-5.1.1" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.0" @@ -29743,7 +30143,7 @@ in sources."debug-2.6.9" ]; }) - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -29753,7 +30153,7 @@ in sources."thunky-1.0.2" sources."to-buffer-1.1.0" sources."toiletdb-1.4.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."township-client-1.3.2" sources."trim-0.0.1" sources."ttl-1.3.1" @@ -29795,10 +30195,10 @@ in dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.9.tgz"; - sha512 = "0xvz5ppq82s4yhrp4alp1ni696v960p9a8hycwns0bj33qjdsd2nn9h2xzpgssn9c27jbr91h9fr851rnc7sz7nd2ycblcsfy193sj0"; + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.10.tgz"; + sha512 = "04a373cxgb6b43gzymh1z71aas9c7nx9ap9q11bsc5jgrhx9q6b9204w08qrlrmgn72kj1csiadl8zlm5031097a8paczgzi9653k3m"; }; dependencies = [ sources."minimist-1.2.0" @@ -29868,7 +30268,7 @@ in sources."fresh-0.2.4" sources."from-0.1.7" sources."hiredis-0.4.1" - sources."http-parser-js-0.4.9" + sources."http-parser-js-0.4.10" sources."inherits-2.0.3" sources."ini-1.3.5" sources."ipaddr.js-1.0.5" @@ -29887,11 +30287,11 @@ in sources."merge-descriptors-0.0.2" sources."methods-1.1.2" sources."mime-1.2.11" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.8.0" + sources."nan-2.9.2" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -29977,7 +30377,7 @@ in sources."docker-parse-image-3.0.1" sources."duplexify-3.5.3" sources."end-of-stream-1.4.1" - (sources."errno-0.1.6" // { + (sources."errno-0.1.7" // { dependencies = [ sources."prr-1.0.1" ]; @@ -29986,7 +30386,7 @@ in (sources."fs-blob-store-5.2.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -29996,7 +30396,7 @@ in sources."jsonparse-0.0.5" sources."level-0.18.0" sources."level-packager-0.18.0" - sources."level-post-1.0.5" + sources."level-post-1.0.7" (sources."level-sublevel-6.6.1" // { dependencies = [ (sources."levelup-0.19.1" // { @@ -30037,7 +30437,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."minimist-1.2.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."split2-2.2.0" sources."string_decoder-1.0.3" sources."through2-2.0.3" @@ -30046,14 +30446,14 @@ in sources."network-address-0.0.5" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."protein-0.5.0" sources."prr-0.0.0" sources."pull-cat-1.1.11" - sources."pull-level-2.0.3" + sources."pull-level-2.0.4" sources."pull-live-1.0.1" - sources."pull-pushable-2.1.2" - sources."pull-stream-3.6.1" + sources."pull-pushable-2.2.0" + sources."pull-stream-3.6.2" sources."pull-window-2.1.4" sources."pump-1.0.3" (sources."pumpify-1.4.0" // { @@ -30076,7 +30476,7 @@ in dependencies = [ sources."bl-1.2.1" sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -30107,10 +30507,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.3.1"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.1.tgz"; - sha512 = "21mmlyi12vnfg5s88vh8i7jk43m69bp4qhgkch8i2qbzf9fv4hqn7b6wcxkbbdxzdvnkkpklb2xxpxi5nflwl513w08d6ykvac2ambh"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.6.tgz"; + sha512 = "0zn9wiliz4sz4xnmcc3nks76gkaxp8q0lk0nqm1ysxczibxnh074kap87w366jnzxvzx5la0h6wdqjrm7zja307sq8g0qj265fjyky6"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -30119,16 +30519,16 @@ in sources."assert-plus-1.0.0" sources."async-2.6.0" sources."asynckit-0.4.0" - sources."aws-sdk-2.187.0" + sources."aws-sdk-2.203.0" sources."aws-sign2-0.7.0" sources."aws4-1.6.0" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" sources."buffer-4.9.1" sources."caseless-0.12.0" sources."co-4.6.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ @@ -30141,15 +30541,15 @@ in sources."events-1.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."ieee754-1.1.8" sources."ini-1.3.5" @@ -30163,9 +30563,9 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."lodash-4.17.5" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.10" sources."oauth-sign-0.8.2" sources."optimist-0.6.1" @@ -30184,7 +30584,7 @@ in sources."sshpk-1.13.1" sources."stringstream-0.0.5" sources."through-2.3.8" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."url-0.10.3" @@ -30236,7 +30636,7 @@ in }) sources."block-stream-0.0.9" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" @@ -30251,8 +30651,8 @@ in sources."chokidar-1.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" @@ -30301,7 +30701,8 @@ in sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-number-2.1.0" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" @@ -30326,13 +30727,13 @@ in sources."lodash-4.13.1" sources."lru-cache-4.1.1" sources."micromatch-2.3.11" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."murmur-hash-js-1.0.0" - sources."nan-2.8.0" + sources."nan-2.9.2" (sources."node-elm-compiler-4.3.3" // { dependencies = [ sources."firstline-1.2.0" @@ -30350,7 +30751,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."preserve-0.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.3.2" @@ -30363,7 +30764,7 @@ in }) ]; }) - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -30387,7 +30788,7 @@ in sources."tar-2.2.1" sources."temp-0.8.3" sources."through-2.3.8" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" @@ -30427,7 +30828,7 @@ in sources."auto-bind-1.2.0" sources."babel-code-frame-6.26.0" sources."babel-core-6.26.0" - sources."babel-generator-6.26.0" + sources."babel-generator-6.26.1" sources."babel-helper-builder-react-jsx-6.26.0" sources."babel-helpers-6.24.1" sources."babel-messages-6.23.0" @@ -30443,7 +30844,7 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -30452,7 +30853,7 @@ in sources."camelcase-keys-2.1.0" sources."chalk-1.1.3" sources."cli-cursor-2.1.0" - sources."clipboardy-1.2.2" + sources."clipboardy-1.2.3" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."concat-map-0.0.1" @@ -30481,8 +30882,8 @@ in sources."got-7.1.0" sources."graceful-fs-4.1.11" sources."has-ansi-3.0.0" - sources."has-flag-2.0.0" - sources."has-symbol-support-x-1.4.1" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.5.0" @@ -30498,14 +30899,14 @@ in (sources."ink-0.3.1" // { dependencies = [ sources."ansi-styles-3.2.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."core-js-1.2.7" sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) sources."ink-text-input-1.1.1" - sources."invariant-2.2.2" + sources."invariant-2.2.3" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -30524,7 +30925,7 @@ in sources."json5-0.5.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.debounce-4.0.8" sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" @@ -30533,7 +30934,7 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" (sources."meow-3.7.0" // { @@ -30545,7 +30946,7 @@ in sources."pify-2.3.0" ]; }) - sources."mimic-fn-1.1.0" + sources."mimic-fn-1.2.0" sources."mimic-response-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -30577,7 +30978,7 @@ in sources."prepend-http-1.0.4" sources."private-0.1.8" sources."promise-7.3.1" - sources."prop-types-15.6.0" + sources."prop-types-15.6.1" sources."pseudomap-1.0.2" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -30597,9 +30998,10 @@ in sources."slash-1.0.0" sources."source-map-0.5.7" sources."source-map-support-0.4.18" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."string-width-2.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -30614,7 +31016,7 @@ in sources."unicode-emoji-modifier-base-1.0.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."whatwg-fetch-2.0.3" sources."which-1.3.0" sources."wrap-ansi-3.0.1" @@ -30633,24 +31035,24 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.16.0"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz"; - sha512 = "330nda1zwh0sqsxsfmlmhbg903gz6n9n4zy870gc2k95wrg1bc7jysfyn98nk2bd8p821xszpygp1vs1i7csapxfb3q2dp1n3hxamb1"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.18.1.tgz"; + sha512 = "21i792qmqdz7dzm68ncjf4q3bi3c5kb1q103hkdp868mm9p7gd153hjzsq70mfyfx0vrjzna8x734xmpkp9himw32svf7j24jjrzx40"; }; dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" + sources."ajv-keywords-3.1.0" sources."ansi-escapes-3.0.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" @@ -30661,13 +31063,13 @@ in ]; }) sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-2.3.0" // { + (sources."chalk-2.3.1" // { dependencies = [ sources."ansi-styles-3.2.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) sources."chardet-0.4.2" @@ -30688,14 +31090,14 @@ in sources."escape-string-regexp-1.0.5" sources."eslint-scope-3.7.1" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.2" + sources."espree-3.5.3" sources."esprima-4.0.0" sources."esquery-1.0.0" - sources."esrecurse-4.2.0" + sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."external-editor-2.1.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" @@ -30704,11 +31106,11 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.2.0" + sources."globals-11.3.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."iconv-lite-0.4.19" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" @@ -30728,9 +31130,9 @@ in sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lru-cache-4.1.1" - sources."mimic-fn-1.1.0" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -30749,10 +31151,10 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."pseudomap-1.0.2" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."require-uncached-1.0.3" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" @@ -30776,7 +31178,11 @@ in }) sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - sources."table-4.0.2" + (sources."table-4.0.3" // { + dependencies = [ + sources."ajv-6.2.0" + ]; + }) sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -30807,18 +31213,18 @@ in sha512 = "32h5278qn4pnlm2wl573mhg112diqpiazr07vxj0la2qwc3a1dlva5gsbyypnbnsis7r05kcx173qhb4wdl9w8spc7g3zk1575ciirc"; }; dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" + sources."ajv-keywords-3.1.0" sources."ansi-escapes-3.0.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" @@ -30829,7 +31235,7 @@ in ]; }) sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" sources."callsites-0.2.0" (sources."chalk-1.1.3" // { @@ -30853,13 +31259,13 @@ in sources."del-2.2.2" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-4.16.0" // { + (sources."eslint-4.18.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.0" - (sources."chalk-2.3.0" // { + (sources."chalk-2.3.1" // { dependencies = [ - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) sources."strip-ansi-4.0.0" @@ -30868,14 +31274,14 @@ in }) sources."eslint-scope-3.7.1" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.2" + sources."espree-3.5.3" sources."esprima-4.0.0" sources."esquery-1.0.0" - sources."esrecurse-4.2.0" + sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."external-editor-2.1.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" @@ -30884,11 +31290,11 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.2.0" + sources."globals-11.3.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."iconv-lite-0.4.19" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" @@ -30908,9 +31314,9 @@ in sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lru-cache-4.1.1" - sources."mimic-fn-1.1.0" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -30930,10 +31336,10 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."pseudomap-1.0.2" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."require-uncached-1.0.3" sources."resolve-1.5.0" sources."resolve-from-1.0.1" @@ -30958,7 +31364,11 @@ in sources."has-flag-1.0.0" ]; }) - sources."table-4.0.2" + (sources."table-4.0.3" // { + dependencies = [ + sources."ajv-6.2.0" + ]; + }) sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -31025,7 +31435,9 @@ in sources."cli-cursor-1.0.2" sources."cli-spinners-1.1.0" sources."co-4.6.0" - sources."combined-stream-1.0.5" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" sources."concat-stream-1.6.0" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { @@ -31046,12 +31458,12 @@ in sources."extend-3.0.1" sources."extract-zip-1.6.6" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.0.1" sources."find-up-1.1.2" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs-extra-1.0.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" @@ -31059,9 +31471,10 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" sources."hasha-2.2.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."hosted-git-info-2.5.0" sources."http-signature-1.2.0" sources."indent-string-2.1.0" @@ -31084,14 +31497,14 @@ in sources."kew-0.7.0" sources."klaw-1.3.1" sources."load-json-file-1.1.0" - sources."log-symbols-1.0.2" + sources."log-symbols-2.2.0" sources."log-update-1.0.2" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" sources."minimist-1.2.0" sources."mkdirp-0.5.0" sources."mkpath-1.0.0" @@ -31102,11 +31515,14 @@ in sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."onetime-1.1.0" - (sources."ora-1.3.0" // { + (sources."ora-1.4.0" // { dependencies = [ + sources."ansi-styles-3.2.0" + sources."chalk-2.3.1" sources."cli-cursor-2.1.0" sources."onetime-2.0.1" sources."restore-cursor-2.0.0" + sources."supports-color-5.2.0" ]; }) sources."os-tmpdir-1.0.2" @@ -31123,14 +31539,14 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."progress-1.1.8" sources."promise-phantom-3.1.6" sources."punycode-1.4.1" sources."qs-6.5.1" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.83.0" @@ -31140,9 +31556,10 @@ in sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sshpk-1.13.1" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" @@ -31152,14 +31569,14 @@ in sources."supports-color-2.0.0" sources."throttleit-1.0.0" sources."tmp-0.0.31" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."which-1.3.0" sources."yauzl-2.4.1" @@ -31217,7 +31634,7 @@ in sources."async-each-1.0.1" sources."balanced-match-1.0.0" sources."binary-extensions-1.11.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" @@ -31292,7 +31709,7 @@ in sources."minimist-0.0.10" sources."mkdirp-0.5.1" sources."mute-stream-0.0.7" - sources."nan-2.8.0" + sources."nan-2.9.2" (sources."nconf-0.6.9" // { dependencies = [ sources."async-0.2.9" @@ -31316,7 +31733,7 @@ in sources."minimist-1.2.0" ]; }) - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."prompt-0.2.14" sources."ps-tree-0.0.3" (sources."randomatic-1.1.7" // { @@ -31329,7 +31746,7 @@ in ]; }) sources."read-1.0.7" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -31377,12 +31794,12 @@ in dependencies = [ sources."async-2.6.0" sources."debug-3.1.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.0.0" - sources."simple-git-1.89.0" + sources."simple-git-1.91.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -31397,10 +31814,10 @@ in git-standup = nodeEnv.buildNodePackage { name = "git-standup"; packageName = "git-standup"; - version = "2.1.8"; + version = "2.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.8.tgz"; - sha1 = "4df13a13e9c49ba4cdbd5ad35a90457c8795e352"; + url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.9.tgz"; + sha512 = "3w5bg88z2wm9b01s7s1yy16dd1qhm44n7dg7anh0w6rigl6r81xmb9vl95imf6lnakwkrsnlw7rqr98c079m6kgribjvzfv9kbzax7r"; }; buildInputs = globalBuildInputs; meta = { @@ -31422,7 +31839,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."findup-sync-0.3.0" sources."glob-5.0.15" @@ -31499,7 +31916,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."msgpack-1.0.2" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."optimist-0.3.7" sources."pop-iterate-1.0.1" sources."promise-6.1.0" @@ -31529,7 +31946,7 @@ in sources."with-4.0.3" sources."wordwrap-0.0.3" sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-9.0.7" sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; @@ -31576,10 +31993,11 @@ in ]; }) sources."beeper-1.1.1" - sources."brace-expansion-1.1.8" - (sources."braces-2.3.0" // { + sources."brace-expansion-1.1.11" + (sources."braces-2.3.1" // { dependencies = [ - sources."kind-of-3.2.2" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" ]; }) sources."cache-base-1.0.1" @@ -31601,7 +32019,7 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."defaults-1.0.3" - sources."define-property-1.0.0" + sources."define-property-2.0.2" sources."deprecated-0.0.1" sources."detect-file-1.0.0" sources."duplexer2-0.0.2" @@ -31614,21 +32032,32 @@ in }) sources."expand-tilde-2.0.2" sources."extend-3.0.1" - sources."extend-shallow-2.0.1" + sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" sources."kind-of-5.1.0" ]; }) sources."fancy-log-1.3.2" - sources."fill-range-4.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."find-index-0.1.1" (sources."findup-sync-2.0.0" // { dependencies = [ sources."is-accessor-descriptor-1.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" - sources."is-extendable-1.0.1" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) ]; }) sources."fined-1.1.0" @@ -31655,7 +32084,7 @@ in (sources."gulp-util-3.0.8" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -31674,16 +32103,16 @@ in sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" - sources."is-extendable-1.0.1" + sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-number-3.0.0" - sources."is-odd-1.0.0" + sources."is-odd-2.0.0" sources."is-plain-object-2.0.4" sources."is-relative-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" - sources."is-windows-1.0.1" + sources."is-windows-1.0.2" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -31703,7 +32132,8 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" + sources."is-extendable-1.0.1" + sources."is-number-4.0.0" sources."isarray-1.0.0" sources."kind-of-3.2.2" ]; @@ -31729,7 +32159,7 @@ in sources."make-iterator-1.0.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - (sources."micromatch-3.1.5" // { + (sources."micromatch-3.1.9" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -31742,19 +32172,16 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" ]; }) sources."minimatch-2.0.10" sources."minimist-1.2.0" - sources."mixin-deep-1.3.0" + sources."mixin-deep-1.3.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multipipe-0.1.2" - (sources."nanomatch-1.2.7" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."nanomatch-1.2.9" sources."natives-1.1.1" sources."object-assign-3.0.0" sources."object-copy-0.1.0" @@ -31774,17 +32201,19 @@ in sources."path-root-regex-0.1.2" sources."posix-character-classes-0.1.1" sources."pretty-hrtime-1.0.3" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."readable-stream-1.1.14" sources."rechoir-0.6.2" - sources."regex-not-1.0.0" + sources."regex-not-1.0.2" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."replace-ext-0.0.1" sources."resolve-1.5.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" sources."semver-4.3.6" sources."sequencify-0.0.7" sources."set-getter-0.1.0" @@ -31797,10 +32226,16 @@ in sources."kind-of-5.1.0" ]; }) + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" sources."kind-of-4.0.0" ]; }) - sources."snapdragon-node-2.1.1" + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" @@ -31812,7 +32247,7 @@ in ]; }) sources."static-extend-0.1.2" - sources."stream-consume-0.1.0" + sources."stream-consume-0.1.1" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."strip-bom-1.0.0" @@ -31821,11 +32256,7 @@ in sources."tildify-1.2.0" sources."time-stamp-1.1.0" sources."to-object-path-0.3.0" - (sources."to-regex-3.0.1" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) + sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."unc-path-regex-0.1.2" (sources."union-value-1.0.0" // { @@ -31887,7 +32318,7 @@ in sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5"; }; dependencies = [ - sources."eventemitter3-3.0.0" + sources."eventemitter3-3.0.1" sources."http-proxy-1.0.2" sources."lru-cache-2.5.2" sources."minimist-0.0.8" @@ -31913,7 +32344,7 @@ in dependencies = [ sources."async-1.4.2" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."cli-0.6.6" // { dependencies = [ sources."minimatch-0.3.0" @@ -31983,15 +32414,15 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.8"; + version = "3.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.8.tgz"; - sha512 = "29sg4r25g8awvmlyzjip0c216bjcd0nq730jd5vihagf3vpxw070gi5nd7z7333givgislxfylv4jrxn4ngqxgnwns5lg3xy3lc6zjr"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.9.tgz"; + sha512 = "3a2xnyzk38awjgzlkd59vsf8bk77ahyxsk7k9vg7gspl9z0v3zxgzzmix1vrz8xdfcxc00kg807z85hfqnz9wg20py4ihn9apvqx6hi"; }; dependencies = [ sources."camel-case-3.0.0" sources."clean-css-4.1.9" - sources."commander-2.12.2" + sources."commander-2.14.1" sources."he-1.1.1" sources."lower-case-1.1.4" sources."ncname-1.0.0" @@ -31999,9 +32430,8 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.3.8" // { + (sources."uglify-js-3.3.12" // { dependencies = [ - sources."commander-2.13.0" sources."source-map-0.6.1" ]; }) @@ -32063,7 +32493,7 @@ in sources."bl-1.2.1" sources."body-5.1.0" sources."body-parser-1.18.2" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" @@ -32071,7 +32501,7 @@ in }) sources."buffer-crc32-0.2.13" sources."bytes-3.0.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."chardet-0.4.2" sources."chokidar-1.7.0" sources."chownr-1.0.1" @@ -32080,7 +32510,7 @@ in sources."cli-width-2.2.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" sources."concat-map-0.0.1" @@ -32122,7 +32552,7 @@ in sources."finalhandler-1.1.0" sources."for-in-1.0.2" sources."for-own-0.1.5" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."formidable-1.1.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" @@ -32133,20 +32563,20 @@ in sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" (sources."http-errors-1.6.2" // { dependencies = [ sources."depd-1.1.1" ]; }) - sources."http-parser-js-0.4.9" + sources."http-parser-js-0.4.10" sources."http-proxy-1.16.2" sources."http-proxy-middleware-0.17.4" sources."iconv-lite-0.4.19" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inquirer-3.3.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-dotfile-1.0.3" @@ -32167,7 +32597,7 @@ in sources."lazystream-1.0.0" sources."leek-0.0.24" sources."livereload-js-2.3.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -32186,9 +32616,9 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."minipass-2.2.1" @@ -32196,7 +32626,7 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."ncp-2.0.0" sources."negotiator-0.6.1" sources."netmask-1.0.6" @@ -32214,8 +32644,8 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."preserve-0.2.0" - sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.2" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" sources."qs-6.5.1" (sources."randomatic-1.1.7" // { @@ -32229,7 +32659,7 @@ in }) sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -32261,18 +32691,22 @@ in sources."string_decoder-1.0.3" sources."strip-ansi-4.0.0" sources."superagent-3.8.2" - sources."supports-color-4.5.0" - (sources."tar-4.3.0" // { + sources."supports-color-5.2.0" + (sources."tar-4.4.0" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."tar-stream-1.5.5" sources."through-2.3.8" - sources."tiny-lr-1.1.0" + (sources."tiny-lr-1.1.1" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."tmp-0.0.33" sources."tslib-1.9.0" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."ultron-1.1.1" sources."unpipe-1.0.0" sources."untildify-3.0.2" @@ -32329,10 +32763,10 @@ in sources."abbrev-1.0.9" sources."align-text-0.1.4" sources."amdefine-1.0.1" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."async-1.5.2" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."camelcase-1.2.1" sources."center-align-0.1.3" sources."cliui-2.1.0" @@ -32410,10 +32844,10 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.5.5"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.5.tgz"; - sha512 = "080s545iykbb70x7xm0nqs6s7qs0slprxcqslpv47ffyz6gx7gb8kaa1dlk9lxvkm8pfhdyyj0f6qsx7d1ydscnnl0x1wmkzagbpmzm"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.7.1.tgz"; + sha512 = "3dxj2iihfilq0dbhhrchhxqd6x9nhrjwnqkgr4gnmqk75zgnaa119p1h2vx7l0wmpqcafw0nifv02bn0g5y1wgal06a5yr6iii7dx18"; }; dependencies = [ sources."ansi-color-0.2.1" @@ -32421,15 +32855,15 @@ in sources."any-promise-1.3.0" sources."assertion-error-1.1.0" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."bufrw-1.2.1" sources."chai-4.1.2" sources."chai-as-promised-7.1.1" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."check-error-1.0.2" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" @@ -32439,16 +32873,16 @@ in sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" sources."glob-7.1.2" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."iterare-0.0.8" - (sources."jaeger-client-3.7.0" // { + (sources."jaeger-client-3.9.1" // { dependencies = [ sources."opentracing-0.13.0" ]; }) - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."long-2.4.0" sources."minimatch-3.0.4" sources."mz-2.7.0" @@ -32463,13 +32897,13 @@ in sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."string-template-0.2.1" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."symbol-observable-1.0.1" sources."thenify-3.3.0" sources."thenify-all-1.6.0" - sources."thriftrw-3.11.1" - sources."type-detect-4.0.7" - sources."typescript-2.4.2" + sources."thriftrw-3.11.2" + sources."type-detect-4.0.8" + sources."typescript-2.7.2" sources."vscode-jsonrpc-3.5.0" sources."vscode-languageserver-3.5.0" sources."vscode-languageserver-protocol-3.5.0" @@ -32528,7 +32962,7 @@ in sources."graceful-fs-4.1.11" sources."js2xmlparser-3.0.0" sources."klaw-2.0.0" - sources."marked-0.3.12" + sources."marked-0.3.17" sources."minimist-0.0.8" sources."mkdirp-0.5.1" (sources."requizzle-0.2.1" // { @@ -32561,7 +32995,7 @@ in }; dependencies = [ sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."cli-1.0.1" sources."concat-map-0.0.1" sources."console-browserify-1.1.0" @@ -32633,7 +33067,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."bluebird-3.5.1" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."config-chain-1.1.11" sources."editorconfig-0.13.3" sources."ini-1.3.5" @@ -32658,10 +33092,10 @@ in jsonlint = nodeEnv.buildNodePackage { name = "jsonlint"; packageName = "jsonlint"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; - sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz"; + sha512 = "3f6z8yv4rp9mhcdbmvrmlvk8gdf05qbvn5fk60yq1cvjn00wsvs5i2k7p1bik8kvidsx44kv7r195asnbr8dfi04czhbvpy6crm7icc"; }; dependencies = [ sources."JSV-4.0.2" @@ -32723,15 +33157,15 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.3.tgz"; - sha512 = "3wagfrcaaj3vscma48jj349wbf838vi5fy0c02xfxd4k57qhf05mfw0i0624fvxfil9gfhx3sl35py85lfjx74hfkw6ra7kqw91p5cw"; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.4.tgz"; + sha512 = "1mbi99gcdrhmkr4nfhfdhwbk2ag55gajxdvzb6m1bddwdwnwn167xx12nypvbs6l0r90k9qrnwmbcbswdm18982b7a7mva27pkc2nah"; }; dependencies = [ - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."asynckit-0.4.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."commander-2.11.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" @@ -32740,24 +33174,24 @@ in sources."delayed-stream-1.0.0" sources."esprima-4.0.0" sources."extend-3.0.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."formidable-1.1.1" sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."js-yaml-3.10.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."ms-2.0.0" sources."native-promise-only-0.8.1" sources."path-loader-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."safe-buffer-5.1.1" sources."slash-1.0.0" sources."sprintf-js-1.0.3" @@ -32804,16 +33238,16 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."cli-boxes-1.0.0" sources."cliui-4.0.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."combined-stream-1.0.5" - sources."compressible-2.0.12" - sources."compression-1.7.1" + sources."combined-stream-1.0.6" + sources."compressible-2.0.13" + sources."compression-1.7.2" sources."configstore-3.1.1" sources."connect-pause-0.1.1" sources."content-disposition-0.5.2" @@ -32860,12 +33294,12 @@ in }) sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.1.0" sources."find-up-2.1.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."get-caller-file-1.0.2" @@ -32876,9 +33310,9 @@ in sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" (sources."http-errors-1.6.2" // { dependencies = [ sources."depd-1.1.1" @@ -32891,7 +33325,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -32915,25 +33349,25 @@ in sources."latest-version-3.1.0" sources."lcid-1.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash-id-0.14.0" sources."lowdb-0.15.5" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."media-typer-0.3.0" sources."mem-1.1.0" sources."merge-descriptors-1.0.1" sources."method-override-2.3.10" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" sources."minimist-1.2.0" sources."morgan-1.9.0" sources."ms-2.0.0" - sources."nanoid-1.0.1" + sources."nanoid-1.0.2" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -32957,14 +33391,14 @@ in sources."please-upgrade-node-3.0.1" sources."pluralize-7.0.0" sources."prepend-http-1.0.4" - sources."proxy-addr-2.0.2" + sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.4" - sources."registry-auth-token-3.3.1" + sources."rc-1.2.5" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."request-2.83.0" sources."require-directory-2.1.1" @@ -32989,13 +33423,13 @@ in sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."term-size-1.2.0" sources."timed-out-4.0.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" @@ -33044,7 +33478,7 @@ in sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; dependencies = [ - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" ]; @@ -33067,8 +33501,9 @@ in }; dependencies = [ sources."JSONStream-1.3.2" - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."acorn-4.0.13" + sources."acorn-node-1.3.0" sources."addressparser-1.0.1" sources."after-0.8.2" sources."agent-base-2.1.1" @@ -33090,10 +33525,10 @@ in sources."array-unique-0.2.1" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.3" - sources."asn1.js-4.9.2" + sources."asn1.js-4.10.1" sources."assert-1.4.1" sources."assert-plus-1.0.0" - sources."ast-types-0.10.1" + sources."ast-types-0.11.2" sources."astw-2.2.0" sources."async-2.1.5" sources."async-each-1.0.1" @@ -33110,7 +33545,7 @@ in sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."base64id-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."better-assert-1.0.2" @@ -33122,14 +33557,14 @@ in sources."bn.js-4.11.8" sources."body-parser-1.18.2" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) sources."brorand-1.1.0" - sources."browser-pack-6.0.3" + sources."browser-pack-6.0.4" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -33137,10 +33572,11 @@ in }) (sources."browserify-14.5.0" // { dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" sources."combine-source-map-0.7.2" sources."hash-base-2.0.2" sources."isarray-0.0.1" + sources."process-nextick-args-2.0.0" sources."source-map-0.5.7" ]; }) @@ -33150,7 +33586,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.0.8" + sources."buffer-5.1.0" sources."buffer-more-ints-0.0.2" sources."buffer-xor-1.0.3" sources."buildmail-4.0.1" @@ -33167,8 +33603,8 @@ in sources."colors-1.1.2" sources."combine-lists-1.0.1" sources."combine-source-map-0.8.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -33179,7 +33615,7 @@ in sources."string_decoder-0.10.31" ]; }) - (sources."connect-3.6.5" // { + (sources."connect-3.6.6" // { dependencies = [ sources."statuses-1.3.1" ]; @@ -33224,13 +33660,21 @@ in sources."ee-first-1.1.1" sources."elliptic-6.4.0" sources."encodeurl-1.0.2" - sources."engine.io-3.1.4" - sources."engine.io-client-3.1.4" + (sources."engine.io-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."engine.io-parser-2.1.2" sources."ent-2.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.9.0" + sources."escodegen-1.9.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -33250,18 +33694,18 @@ in sources."extend-3.0.1" sources."extglob-0.3.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.3" - sources."finalhandler-1.0.6" + sources."finalhandler-1.1.0" sources."follow-redirects-1.0.0" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."fsevents-1.1.3" (sources."ftp-0.3.10" // { @@ -33289,7 +33733,7 @@ in sources."hawk-6.0.2" sources."hipchat-notifier-1.1.0" sources."hmac-drbg-1.0.1" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."htmlescape-1.1.1" (sources."http-errors-1.6.2" // { dependencies = [ @@ -33319,7 +33763,8 @@ in sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-number-2.1.0" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" @@ -33346,9 +33791,9 @@ in sources."libbase64-0.1.0" sources."libmime-3.0.0" sources."libqp-1.1.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.memoize-3.0.4" - (sources."log4js-2.5.2" // { + (sources."log4js-2.5.3" // { dependencies = [ sources."assert-plus-0.2.0" sources."aws-sign2-0.6.0" @@ -33372,7 +33817,6 @@ in sources."request-2.75.0" sources."sntp-1.0.9" sources."socks-1.1.9" - sources."source-map-0.5.7" sources."string_decoder-0.10.31" sources."tunnel-agent-0.4.3" ]; @@ -33392,8 +33836,8 @@ in sources."micromatch-2.3.11" sources."miller-rabin-4.0.1" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -33401,7 +33845,7 @@ in sources."mkdirp-0.5.1" sources."module-deps-4.1.1" sources."ms-2.0.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."negotiator-0.6.1" sources."netmask-1.0.6" sources."node-uuid-1.4.8" @@ -33454,10 +33898,11 @@ in sources."process-0.11.10" sources."process-nextick-args-1.0.7" sources."proxy-agent-2.0.0" + sources."pseudomap-1.0.2" sources."public-encrypt-4.0.0" sources."punycode-1.4.1" sources."q-1.4.1" - sources."qjobs-1.1.5" + sources."qjobs-1.2.0" sources."qs-6.5.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -33471,18 +33916,18 @@ in ]; }) sources."randombytes-2.0.6" - sources."randomfill-1.0.3" + sources."randomfill-1.0.4" sources."range-parser-1.2.0" sources."raw-body-2.3.2" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.3" // { + (sources."readable-stream-2.3.4" // { dependencies = [ sources."isarray-1.0.0" ]; }) sources."readdirp-2.1.0" sources."redis-2.8.0" - sources."redis-commands-1.3.1" + sources."redis-commands-1.3.4" sources."redis-parser-2.6.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -33512,7 +33957,11 @@ in }) sources."socket.io-adapter-1.1.1" sources."socket.io-client-2.0.4" - sources."socket.io-parser-3.1.2" + (sources."socket.io-parser-3.1.3" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."socks-1.1.10" sources."socks-proxy-agent-2.1.1" sources."source-map-0.6.1" @@ -33528,11 +33977,7 @@ in sources."strip-ansi-3.0.1" sources."subarg-1.0.0" sources."supports-color-2.0.0" - (sources."syntax-error-1.3.0" // { - dependencies = [ - sources."acorn-4.0.13" - ]; - }) + sources."syntax-error-1.4.0" sources."through-2.3.8" sources."through2-2.0.3" sources."thunkify-2.1.2" @@ -33541,13 +33986,13 @@ in sources."tmp-0.0.33" sources."to-array-0.1.4" sources."to-arraybuffer-1.0.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tsscmp-1.0.5" - sources."tty-browserify-0.0.0" + sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."ultron-1.1.1" sources."umd-3.0.1" @@ -33558,9 +34003,9 @@ in sources."punycode-1.3.2" ]; }) - (sources."useragent-2.2.1" // { + (sources."useragent-2.3.0" // { dependencies = [ - sources."lru-cache-2.2.4" + sources."lru-cache-4.1.1" ]; }) (sources."util-0.10.3" // { @@ -33571,7 +34016,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."uws-0.14.5" + sources."uws-9.14.0" sources."verror-1.10.0" sources."vm-browserify-0.0.4" sources."void-elements-2.0.1" @@ -33582,6 +34027,7 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."xregexp-2.0.0" sources."xtend-4.0.1" + sources."yallist-2.1.2" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -33611,7 +34057,7 @@ in sources."body-parser-1.13.3" sources."bytes-2.1.0" sources."commander-2.6.0" - sources."compressible-2.0.12" + sources."compressible-2.0.13" sources."compression-1.5.2" (sources."connect-2.30.2" // { dependencies = [ @@ -33677,8 +34123,8 @@ in }) sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."morgan-1.6.1" @@ -33736,7 +34182,7 @@ in sources."stream-counter-0.2.0" sources."string_decoder-0.10.31" sources."tsscmp-1.0.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."uid-safe-2.1.4" sources."uid2-0.0.3" sources."unpipe-1.0.0" @@ -33744,7 +34190,7 @@ in sources."vary-1.0.1" sources."vhost-3.0.2" sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-9.0.7" ]; buildInputs = globalBuildInputs; meta = { @@ -33757,10 +34203,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.8.0.tgz"; - sha512 = "2admd5d0lmnck38apsqbblrk0pffnq52s25bb591q8sazykcfz68kz9pn534sgazjl26p57y23758n8n7xvw0ilb9hd5ri6j34i7kxn"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.9.0.tgz"; + sha512 = "18aayy3dsb36bz3rrvbmg1pfvc4zsxqmiax923v738dlp7nw68y5gndi268db91cyzjxwpdimppqfb84z9ywi79mhlak4i73flxgazh"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -33776,16 +34222,17 @@ in sources."array-ify-1.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" + sources."arrify-1.0.1" sources."async-1.5.2" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."byline-5.0.0" sources."camelcase-1.2.1" sources."camelcase-keys-2.1.0" sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."chardet-0.4.2" sources."ci-info-1.1.2" sources."cli-cursor-2.1.0" @@ -33802,40 +34249,68 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."console-control-strings-1.1.0" - sources."conventional-changelog-1.1.7" - sources."conventional-changelog-angular-1.6.0" - sources."conventional-changelog-atom-0.1.2" - (sources."conventional-changelog-cli-1.3.5" // { + (sources."conventional-changelog-1.1.17" // { + dependencies = [ + sources."camelcase-4.1.0" + sources."map-obj-1.0.1" + sources."meow-3.7.0" + ]; + }) + sources."conventional-changelog-angular-1.6.6" + sources."conventional-changelog-atom-0.2.4" + (sources."conventional-changelog-cli-1.3.15" // { dependencies = [ sources."camelcase-2.1.1" + sources."camelcase-keys-4.2.0" sources."find-up-1.1.2" + sources."indent-string-3.2.0" sources."load-json-file-1.1.0" + sources."map-obj-2.0.0" sources."minimist-1.2.0" + sources."parse-json-4.0.0" sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" sources."read-pkg-1.1.0" + sources."read-pkg-up-3.0.0" + sources."redent-2.0.0" + sources."strip-bom-3.0.0" + sources."strip-indent-2.0.0" + sources."trim-newlines-2.0.0" sources."wordwrap-0.0.2" sources."yargs-3.10.0" ]; }) - sources."conventional-changelog-codemirror-0.2.1" - sources."conventional-changelog-core-1.9.5" - sources."conventional-changelog-ember-0.2.10" - sources."conventional-changelog-eslint-0.2.1" - sources."conventional-changelog-express-0.2.1" + sources."conventional-changelog-codemirror-0.3.4" + (sources."conventional-changelog-core-2.0.5" // { + dependencies = [ + sources."meow-4.0.0" + ]; + }) + sources."conventional-changelog-ember-0.3.6" + sources."conventional-changelog-eslint-1.0.4" + sources."conventional-changelog-express-0.3.4" sources."conventional-changelog-jquery-0.1.0" sources."conventional-changelog-jscs-0.1.0" - sources."conventional-changelog-jshint-0.2.1" - sources."conventional-changelog-writer-2.0.3" - sources."conventional-commits-filter-1.1.1" - sources."conventional-commits-parser-2.1.0" - sources."conventional-recommended-bump-1.1.0" + sources."conventional-changelog-jshint-0.3.4" + sources."conventional-changelog-preset-loader-1.1.6" + sources."conventional-changelog-writer-3.0.4" + sources."conventional-commits-filter-1.1.5" + sources."conventional-commits-parser-2.1.5" + (sources."conventional-recommended-bump-1.2.1" // { + dependencies = [ + sources."meow-3.7.0" + sources."minimist-1.2.0" + ]; + }) sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."currently-unhandled-0.4.1" sources."dargs-4.1.0" - sources."dateformat-1.0.12" + sources."dateformat-3.0.3" sources."decamelize-1.2.0" + sources."decamelize-keys-1.1.0" sources."dedent-0.7.0" sources."deep-extend-0.4.2" sources."defaults-1.0.3" @@ -33858,17 +34333,26 @@ in sources."get-port-3.2.0" sources."get-stdin-4.0.1" sources."get-stream-3.0.0" - sources."git-raw-commits-1.3.0" + (sources."git-raw-commits-1.3.4" // { + dependencies = [ + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + ]; + }) sources."git-remote-origin-url-2.0.0" - sources."git-semver-tags-1.2.3" + sources."git-semver-tags-1.3.4" sources."gitconfiglocal-1.0.0" sources."glob-7.1.2" sources."glob-parent-3.1.0" - sources."globby-6.1.0" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."got-6.7.1" sources."graceful-fs-4.1.11" sources."handlebars-4.0.11" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-2.5.0" sources."iconv-lite-0.4.19" @@ -33913,12 +34397,11 @@ in (sources."load-json-file-4.0.0" // { dependencies = [ sources."parse-json-4.0.0" - sources."pify-3.0.0" sources."strip-bom-3.0.0" ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash._reinterpolate-3.0.0" sources."lodash.template-4.4.0" sources."lodash.templatesettings-4.1.0" @@ -33926,13 +34409,23 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" - sources."meow-3.7.0" - sources."mimic-fn-1.1.0" + (sources."meow-4.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."load-json-file-4.0.0" + sources."path-exists-3.0.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."read-pkg-3.0.0" + ]; + }) + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."minimist-options-3.0.2" sources."mkdirp-0.5.1" sources."modify-values-1.0.0" sources."moment-2.20.1" @@ -33967,26 +34460,22 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-type-1.1.0" - sources."pify-2.3.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."q-1.5.1" - sources."rc-1.2.4" + sources."quick-lru-1.1.0" + sources."rc-1.2.5" sources."read-cmd-shim-1.0.1" - (sources."read-pkg-3.0.0" // { - dependencies = [ - sources."path-type-3.0.0" - sources."pify-3.0.0" - ]; - }) + sources."read-pkg-3.0.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."redent-1.0.0" - sources."registry-auth-token-3.3.1" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" sources."repeating-2.0.1" @@ -34007,9 +34496,10 @@ in sources."slash-1.0.0" sources."sort-keys-2.0.0" sources."source-map-0.4.4" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."split-1.0.1" sources."split2-2.2.0" sources."string-width-2.1.1" @@ -34024,11 +34514,10 @@ in sources."minimist-0.1.0" ]; }) - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."temp-dir-1.0.0" (sources."temp-write-3.4.0" // { dependencies = [ - sources."pify-3.0.0" sources."uuid-3.2.1" ]; }) @@ -34052,7 +34541,7 @@ in sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."uuid-2.0.3" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."wcwidth-1.0.1" sources."which-1.3.0" sources."which-module-2.0.0" @@ -34062,11 +34551,7 @@ in sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" - (sources."write-json-file-2.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."write-json-file-2.3.0" sources."write-pkg-3.1.0" sources."xtend-4.0.1" sources."y18n-3.2.1" @@ -34083,6 +34568,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."load-json-file-2.0.0" sources."path-type-2.0.0" + sources."pify-2.3.0" sources."read-pkg-2.0.0" sources."read-pkg-up-2.0.0" sources."strip-bom-3.0.0" @@ -34102,10 +34588,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "2.7.3"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; - sha512 = "04jbm6adzhknlcwjjdd94n8dhqwgsg0fyampis9854jf23z9g9lxs8593908ymwldl88bjipf9b9rw6xfibb29vv7s0c44wllj4ixr8"; + url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz"; + sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59"; }; dependencies = [ sources."ajv-4.11.8" @@ -34119,13 +34605,13 @@ in sources."boom-2.10.1" sources."caseless-0.12.0" sources."co-4.6.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" - sources."errno-0.1.6" + sources."errno-0.1.7" sources."extend-3.0.1" sources."extsprintf-1.3.0" sources."forever-agent-0.6.1" @@ -34151,8 +34637,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.8.2" @@ -34171,7 +34657,7 @@ in ]; }) sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uuid-3.2.1" @@ -34212,24 +34698,26 @@ in lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.2.0.tgz"; - sha1 = "5de1e6426f885929b77357f014de5fee1dad0553"; + url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-2.0.0.tgz"; + sha512 = "1y38jkc5m8kb1ll4wcc12yikqdb2l19acc3rdjl0bhs4vjh834mz53hhgyc4jm4gya1gnmzrj3g5337xn05kkxs92vl35zdqcwxij08"; }; dependencies = [ sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-unique-0.2.1" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."clone-1.0.3" - sources."clone-stats-0.0.1" + sources."clone-2.1.1" + sources."clone-buffer-1.0.0" + sources."clone-stats-1.0.0" + sources."cloneable-readable-1.0.0" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-util-is-1.0.2" @@ -34295,7 +34783,7 @@ in sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."preserve-0.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -34305,12 +34793,12 @@ in }) ]; }) - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."replace-ext-0.0.1" + sources."replace-ext-1.0.0" sources."safe-buffer-5.1.1" sources."stream-shift-1.0.0" sources."string_decoder-1.0.3" @@ -34322,13 +34810,21 @@ in sources."unique-stream-2.2.1" sources."util-deprecate-1.0.2" sources."vali-date-1.0.0" - sources."vinyl-1.2.0" + (sources."vinyl-2.1.0" // { + dependencies = [ + sources."process-nextick-args-1.0.7" + ]; + }) (sources."vinyl-fs-2.4.4" // { dependencies = [ + sources."clone-1.0.3" + sources."clone-stats-0.0.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" sources."isarray-0.0.1" + sources."replace-ext-0.0.1" sources."string_decoder-0.10.31" + sources."vinyl-1.2.0" ]; }) sources."wrappy-1.0.2" @@ -34356,7 +34852,7 @@ in sources."after-0.8.2" sources."ajv-5.5.2" sources."anymatch-1.3.2" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-flatten-1.1.1" @@ -34379,7 +34875,7 @@ in sources."blob-0.0.4" sources."body-parser-1.18.2" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" @@ -34390,7 +34886,7 @@ in sources."caseless-0.12.0" sources."chokidar-1.7.0" sources."co-4.6.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -34414,8 +34910,16 @@ in sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" - sources."engine.io-3.1.4" - sources."engine.io-client-3.1.4" + (sources."engine.io-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."engine.io-parser-2.1.2" sources."entities-1.1.1" sources."escape-html-1.0.3" @@ -34431,7 +34935,7 @@ in sources."extend-3.0.1" sources."extglob-0.3.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.3" @@ -34439,7 +34943,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fsevents-1.1.3" @@ -34453,7 +34957,7 @@ in sources."has-binary2-1.0.2" sources."has-cors-1.1.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."html-entities-1.2.1" (sources."http-errors-1.6.2" // { dependencies = [ @@ -34465,7 +34969,7 @@ in sources."indexof-0.0.1" sources."inherits-2.0.3" sources."innertext-1.0.2" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-dotfile-1.0.3" @@ -34488,9 +34992,9 @@ in sources."jsprim-1.4.1" sources."kind-of-3.2.2" sources."linkify-it-2.0.3" - sources."markdown-it-8.4.0" + sources."markdown-it-8.4.1" sources."markdown-it-emoji-1.4.0" - sources."markdown-it-github-headings-1.1.0" + sources."markdown-it-github-headings-1.1.1" sources."markdown-it-task-checkbox-1.0.6" sources."mdurl-1.0.1" sources."media-typer-0.3.0" @@ -34498,12 +35002,12 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.0.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" @@ -34519,8 +35023,8 @@ in sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."preserve-0.2.0" - sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.2" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" sources."punycode-1.4.1" sources."qs-6.5.1" (sources."randomatic-1.1.7" // { @@ -34534,7 +35038,7 @@ in }) sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -34549,30 +35053,33 @@ in sources."sntp-2.1.0" (sources."socket.io-2.0.4" // { dependencies = [ - sources."accepts-1.3.3" 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.2" + (sources."socket.io-parser-3.1.3" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."sprintf-js-1.0.3" sources."sshpk-1.13.1" sources."statuses-1.4.0" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" sources."to-array-0.1.4" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" - sources."uc.micro-1.0.3" + sources."type-is-1.6.16" + sources."uc.micro-1.0.5" sources."ultron-1.1.1" sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."uws-0.14.5" + sources."uws-9.14.0" sources."vary-1.1.2" sources."verror-1.10.0" sources."ws-3.3.3" @@ -34610,7 +35117,7 @@ in sources."batch-0.6.1" sources."bcryptjs-2.4.3" sources."binary-extensions-1.11.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" @@ -34652,7 +35159,7 @@ in sources."depd-1.1.1" ]; }) - sources."http-parser-js-0.4.9" + sources."http-parser-js-0.4.10" sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -34671,8 +35178,8 @@ in sources."map-stream-0.1.0" sources."micromatch-2.3.11" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" (sources."morgan-1.9.0" // { dependencies = [ @@ -34681,7 +35188,7 @@ in ]; }) sources."ms-0.7.1" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."object-assign-4.1.1" @@ -34694,7 +35201,7 @@ in sources."path-is-absolute-1.0.1" sources."pause-stream-0.0.11" sources."preserve-0.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."proxy-middleware-0.15.0" (sources."randomatic-1.1.7" // { dependencies = [ @@ -34706,17 +35213,18 @@ in ]; }) sources."range-parser-1.2.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."safe-buffer-5.1.1" - (sources."send-0.16.1" // { + (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" + sources."statuses-1.4.0" ]; }) (sources."serve-index-1.9.1" // { @@ -34789,14 +35297,14 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.0.tgz"; - sha512 = "3rxvm15qz9qdiyihc9pq4kc008iz89cqdqjlca43swmk3fc7bydlaqk1qyhaj19r5m8cxxrpiwxz5cwrp9im26fin4sgqdfbxs7ch5s"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz"; + sha512 = "2975gb84ixyiin9mdahnmpxxqmn9zmc7d07hh6kv0bnl3mqf6slj83r1f44hvk9f5qk247ajfdmynbyinabrbfi0j8za4v776i3572a"; }; dependencies = [ sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."browser-stdout-1.3.0" sources."commander-2.11.0" sources."concat-map-0.0.1" @@ -34837,10 +35345,10 @@ in sha1 = "0161a13e2b3378759e36b9e05be34b46a06decd5"; }; dependencies = [ - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."asynckit-0.4.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."core-util-is-1.0.2" @@ -34848,25 +35356,25 @@ in sources."delayed-stream-1.0.0" sources."esprima-4.0.0" sources."extend-3.0.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."formidable-1.1.1" sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."js-yaml-3.10.0" sources."json-refs-2.1.7" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."ms-2.0.0" sources."native-promise-only-0.8.1" sources."path-loader-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."safe-buffer-5.1.1" sources."slash-1.0.0" sources."sprintf-js-1.0.3" @@ -34907,10 +35415,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.1.tgz"; - sha512 = "1iy5npqmbdgxjalbw73ybgd2pfhizi8jdg91w9dpcmj9hfz02wbl306bwia397njlz5ymcblbc700zp8qb2lvrpw7jnyfvmflpvvglp"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.2.tgz"; + sha512 = "2mvfkqyzfcjfp429vmagcshlp9iqblngn9fslcxpg2n83k6ajwlh0gcnyiypsixpws8nq14d3b3syr9implhsq98wg3zw7nj6b6sg9f"; }; dependencies = [ sources."abbrev-1.1.1" @@ -34923,7 +35431,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.6.0" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" sources."builtin-modules-1.1.1" @@ -34931,7 +35439,7 @@ in sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-stream-1.6.0" sources."config-chain-1.1.11" sources."console-control-strings-1.1.0" @@ -34947,12 +35455,12 @@ in sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."findit-2.0.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs-extra-0.6.4" (sources."fs.extra-1.3.2" // { dependencies = [ @@ -34966,7 +35474,7 @@ in sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."hosted-git-info-2.5.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" @@ -34982,8 +35490,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."minipass-2.2.1" sources."minizlib-1.1.0" @@ -34993,7 +35501,7 @@ in sources."nopt-3.0.6" sources."normalize-package-data-2.4.0" sources."npm-package-arg-5.1.2" - sources."npm-registry-client-8.4.0" + sources."npm-registry-client-8.5.0" (sources."npmconf-2.1.2" // { dependencies = [ sources."once-1.3.3" @@ -35008,26 +35516,27 @@ in sources."optparse-1.0.5" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."performance-now-2.1.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.83.0" sources."retry-0.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."slasp-0.0.4" sources."slide-1.1.6" sources."sntp-2.1.0" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sshpk-1.13.1" sources."ssri-4.1.6" sources."string-width-1.0.2" @@ -35036,14 +35545,14 @@ in sources."strip-ansi-3.0.1" sources."tar-3.1.15" sources."temp-0.8.3" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uid-number-0.0.5" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."walk-2.3.9" @@ -35083,11 +35592,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -35102,10 +35611,10 @@ in sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" @@ -35116,7 +35625,7 @@ in sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -35130,8 +35639,8 @@ in sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -35143,13 +35652,13 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.83.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -35163,7 +35672,7 @@ in sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."tar-2.2.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" @@ -35202,10 +35711,10 @@ in node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; packageName = "node-inspector"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.1.tgz"; - sha1 = "e7851eb973f380543c058db564a9812055eac640"; + url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.2.tgz"; + sha1 = "690c9ef7e5813da50b7a2746f334e3ff319bccd7"; }; dependencies = [ sources."abbrev-1.1.1" @@ -35240,7 +35749,7 @@ in }) sources."boom-2.10.1" sources."bplist-parser-0.1.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."browser-launcher2-0.4.6" // { dependencies = [ sources."minimist-0.0.8" @@ -35254,7 +35763,7 @@ in sources."cliui-3.2.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" @@ -35316,7 +35825,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -35346,13 +35855,13 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."negotiator-0.6.1" sources."node-pre-gyp-0.6.39" sources."nopt-4.0.1" @@ -35367,7 +35876,7 @@ in sources."os-homedir-1.0.2" sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."parse-json-2.2.0" sources."parseurl-1.3.2" sources."path-exists-2.1.0" @@ -35383,16 +35892,16 @@ in sources."lodash-3.10.1" ]; }) - sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.2" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.4" + sources."rc-1.2.5" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.81.0" @@ -35406,9 +35915,10 @@ in sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" sources."sntp-1.0.9" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -35422,15 +35932,15 @@ in sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" sources."strip-json-comments-2.0.1" - sources."strong-data-uri-1.0.4" + sources."strong-data-uri-1.0.5" sources."tar-2.2.1" sources."tar-pack-3.4.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" - sources."truncate-1.0.5" + sources."truncate-2.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."uid-0.0.2" sources."uid-number-0.0.6" sources."ultron-1.0.2" @@ -35448,7 +35958,7 @@ in ]; }) sources."v8-profiler-5.7.0" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.0" @@ -35496,11 +36006,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -35546,8 +36056,8 @@ in sources."assert-plus-1.0.0" ]; }) - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -35560,18 +36070,18 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."performance-now-0.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.4.0" - (sources."rc-1.2.4" // { + (sources."rc-1.2.5" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.81.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -35591,7 +36101,7 @@ in sources."strip-json-comments-2.0.1" sources."tar-2.2.1" sources."tar-pack-3.4.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid-number-0.0.6" @@ -35613,10 +36123,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.14.11"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.14.11.tgz"; - sha512 = "11wlzxf5xjrdybvf0lr1acr7bqhdy7s66m1w5cm02g8pzbd567xziphv1pjx6i27s34qh18rjhp6prc1rapp68x1lr8gkaxi8zfwvfz"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.1.tgz"; + sha512 = "2dnscknr22xf5r06zcrjz0ljaa2agbrnczh4faf42qsmqfpcng6znv6138nwyyr16fpqk28wgfab1bw3snrsyfz8pirmjl9ywdqibx7"; }; dependencies = [ sources."abbrev-1.1.1" @@ -35628,6 +36138,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" ]; }) sources."arr-diff-4.0.0" @@ -35650,15 +36161,23 @@ in }) sources."binary-extensions-1.11.0" sources."boxen-1.3.0" - sources."brace-expansion-1.1.8" - sources."braces-2.3.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.1" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) sources."cache-base-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" - sources."chalk-2.3.0" - (sources."chokidar-2.0.0" // { + sources."chalk-2.3.1" + (sources."chokidar-2.0.2" // { dependencies = [ sources."debug-2.6.9" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" sources."has-values-0.1.4" (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -35671,8 +36190,12 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."is-extendable-1.0.1" - sources."kind-of-3.2.2" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) ]; }) (sources."class-utils-0.3.6" // { @@ -35695,7 +36218,7 @@ in sources."debug-3.1.0" sources."decode-uri-component-0.2.0" sources."deep-extend-0.4.2" - sources."define-property-1.0.0" + sources."define-property-2.0.2" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" sources."duplexer3-0.1.4" @@ -35707,9 +36230,11 @@ in sources."define-property-0.2.5" ]; }) - sources."extend-shallow-2.0.1" + sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" sources."kind-of-5.1.0" ]; }) @@ -35728,7 +36253,7 @@ in sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.1.11" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."has-value-1.0.0" sources."has-values-1.0.0" sources."ignore-by-default-1.0.1" @@ -35741,24 +36266,21 @@ in sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" + sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" - sources."is-number-3.0.0" + sources."is-number-4.0.0" sources."is-obj-1.0.1" - (sources."is-odd-1.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-odd-2.0.0" sources."is-path-inside-1.0.1" sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -35767,11 +36289,11 @@ in sources."lazy-cache-2.0.2" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" - (sources."micromatch-3.1.5" // { + (sources."micromatch-3.1.9" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -35784,18 +36306,15 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" ]; }) sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."mixin-deep-1.3.0" + sources."mixin-deep-1.3.1" sources."ms-2.0.0" - sources."nan-2.8.0" - (sources."nanomatch-1.2.7" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."nan-2.9.2" + sources."nanomatch-1.2.9" sources."nopt-1.0.10" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" @@ -35813,21 +36332,23 @@ in sources."pify-3.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."ps-tree-1.1.0" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.0" - sources."rc-1.2.4" - sources."readable-stream-2.3.3" + sources."rc-1.2.5" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" - sources."regex-not-1.0.0" - sources."registry-auth-token-3.3.1" + sources."regex-not-1.0.2" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."set-getter-0.1.0" @@ -35843,10 +36364,15 @@ in sources."kind-of-5.1.0" ]; }) + sources."extend-shallow-2.0.1" sources."kind-of-4.0.0" ]; }) - sources."snapdragon-node-2.1.1" + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" @@ -35865,19 +36391,15 @@ in sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."term-size-1.2.0" sources."through-2.3.8" sources."timed-out-4.0.1" sources."to-object-path-0.3.0" - (sources."to-regex-3.0.1" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) + sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."touch-3.1.0" - (sources."undefsafe-2.0.1" // { + (sources."undefsafe-2.0.2" // { dependencies = [ sources."debug-2.6.9" ]; @@ -35898,6 +36420,7 @@ in ]; }) sources."unzip-response-2.0.1" + sources."upath-1.0.4" sources."update-notifier-2.3.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" @@ -35921,22 +36444,22 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.17.5"; + version = "0.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.17.5.tgz"; - sha1 = "1dcf3ead7902ce2df615cdfbe19f3cd9a50e28e2"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.18.4.tgz"; + sha512 = "0d25q2hxpf5snrg8f3gplrjd73hqzyzxna0g2q6l0bm04fm8xgby8ydixaf8mgyz9dly2k5mw79jvs653m6vk9cl0r61fv8qr75khjz"; }; dependencies = [ sources."abbrev-1.1.1" sources."accepts-1.3.4" - sources."addressparser-0.1.3" + sources."addressparser-0.3.2" sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."append-field-0.1.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.4" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-indexofobject-0.0.1" sources."asn1-0.2.3" @@ -35947,7 +36470,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."balanced-match-1.0.0" - sources."basic-auth-1.1.0" + sources."basic-auth-2.0.0" (sources."bcrypt-1.0.3" // { dependencies = [ sources."assert-plus-1.0.0" @@ -35959,13 +36482,11 @@ in sources."boom-5.2.0" ]; }) - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."har-validator-5.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" - sources."nopt-4.0.1" - sources."qs-6.5.1" sources."request-2.83.0" sources."sntp-2.1.0" sources."tunnel-agent-0.6.0" @@ -35975,13 +36496,13 @@ in sources."bcryptjs-2.4.3" sources."bl-1.2.1" sources."block-stream-0.0.9" - sources."body-parser-1.17.2" + sources."body-parser-1.18.2" sources."boolbase-1.0.0" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."buildmail-2.0.0" sources."busboy-0.2.14" - sources."bytes-2.4.0" + sources."bytes-3.0.0" sources."callback-stream-1.1.0" sources."caseless-0.11.0" sources."chalk-1.1.3" @@ -35993,8 +36514,8 @@ in sources."clone-2.1.1" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" - sources."commander-2.9.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."commist-1.0.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" @@ -36006,14 +36527,14 @@ in sources."cookie-signature-1.0.6" sources."cookies-0.7.1" sources."core-util-is-1.0.2" - sources."cors-2.8.3" + sources."cors-2.8.4" sources."crc-3.4.4" - sources."cron-1.2.1" + sources."cron-1.3.0" sources."cryptiles-2.0.5" sources."css-select-1.2.0" sources."css-what-2.1.0" sources."dashdash-1.14.1" - sources."debug-2.6.7" + sources."debug-2.6.9" sources."deep-extend-0.4.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -36033,35 +36554,31 @@ in sources."entities-1.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."etag-1.8.1" - (sources."express-4.15.3" // { + (sources."express-4.16.2" // { dependencies = [ + sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) - (sources."express-session-1.15.2" // { - dependencies = [ - sources."debug-2.6.3" - sources."ms-0.7.2" - ]; - }) + sources."express-session-1.15.6" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."feedparser-1.1.3" - (sources."finalhandler-1.0.6" // { + sources."finalhandler-1.1.0" + (sources."follow-redirects-1.3.0" // { dependencies = [ - sources."debug-2.6.9" + sources."debug-3.1.0" ]; }) - sources."follow-redirects-1.2.4" sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."forwarded-0.1.2" - sources."fresh-0.5.0" - sources."fs-extra-1.0.0" + sources."fresh-0.5.2" + sources."fs-extra-5.0.0" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" @@ -36074,18 +36591,13 @@ in sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.1.11" - sources."graceful-readlink-1.0.1" sources."har-schema-2.0.0" sources."har-validator-2.0.6" sources."has-ansi-2.0.0" sources."has-unicode-2.0.1" sources."hash-sum-1.0.2" sources."hawk-3.1.3" - (sources."help-me-1.1.0" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) + sources."help-me-1.1.0" sources."hoek-2.16.3" (sources."htmlparser2-3.9.2" // { dependencies = [ @@ -36100,35 +36612,36 @@ in sources."http-signature-1.1.1" sources."i18next-1.10.6" sources."i18next-client-1.10.3" - sources."iconv-lite-0.4.15" + sources."iconv-lite-0.4.19" sources."imap-0.8.19" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."ipaddr.js-1.4.0" + sources."ipaddr.js-1.6.0" sources."is-absolute-1.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-3.1.0" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-negated-glob-1.0.0" sources."is-property-1.0.2" sources."is-relative-1.0.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" - sources."is-windows-1.0.1" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."js-yaml-3.8.4" + sources."js-yaml-3.10.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json5-0.2.0" - sources."jsonata-1.2.6" - sources."jsonfile-2.4.0" + sources."jsonata-1.5.0" + sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsonpointer-4.0.1" (sources."jsprim-1.4.1" // { @@ -36137,12 +36650,11 @@ in ]; }) sources."keygrip-1.0.2" - sources."klaw-1.3.1" sources."leven-1.0.2" sources."libbase64-0.1.0" sources."libmime-1.2.0" sources."libqp-1.1.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" sources."lodash.defaults-4.2.0" @@ -36150,39 +36662,41 @@ in sources."lodash.flatten-4.4.0" sources."lodash.foreach-4.5.0" sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.0" + sources."lodash.merge-4.6.1" sources."lodash.pick-4.4.0" sources."lodash.reduce-4.6.0" sources."lodash.reject-4.6.0" sources."lodash.some-4.6.0" + sources."lru-cache-4.1.1" (sources."mailcomposer-2.1.0" // { dependencies = [ sources."needle-0.10.0" ]; }) - (sources."mailparser-0.6.2" // { + sources."mailparser-0.6.2" + sources."media-typer-0.3.0" + (sources."memorystore-1.6.0" // { dependencies = [ - sources."addressparser-1.0.1" + sources."debug-3.1.0" ]; }) - sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.3.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."mimelib-0.3.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."moment-2.20.1" sources."moment-timezone-0.5.14" - (sources."mqtt-2.9.0" // { + (sources."mqtt-2.15.1" // { dependencies = [ sources."ws-3.3.3" ]; }) - sources."mqtt-packet-5.4.0" + sources."mqtt-packet-5.5.0" sources."ms-2.0.0" (sources."multer-1.3.0" // { dependencies = [ @@ -36200,26 +36714,28 @@ in sources."node-pre-gyp-0.6.36" (sources."node-red-node-email-0.1.24" // { dependencies = [ - sources."addressparser-0.3.2" + sources."addressparser-1.0.1" sources."clone-1.0.3" sources."isarray-0.0.1" sources."minimist-0.0.10" sources."readable-stream-1.1.14" + sources."semver-5.3.0" sources."string_decoder-0.10.31" ]; }) (sources."node-red-node-feedparser-0.1.8" // { dependencies = [ + sources."addressparser-0.1.3" sources."async-2.6.0" sources."bl-1.1.2" sources."isarray-0.0.1" + sources."process-nextick-args-1.0.7" sources."qs-6.2.3" sources."readable-stream-1.0.34" - sources."sax-0.6.1" sources."string_decoder-0.10.31" ]; }) - sources."node-red-node-rbe-0.1.14" + sources."node-red-node-rbe-0.2.1" (sources."node-red-node-twitter-0.1.12" // { dependencies = [ sources."assert-plus-1.0.0" @@ -36231,12 +36747,11 @@ in sources."boom-5.2.0" ]; }) - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."har-validator-5.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" - sources."qs-6.5.1" sources."request-2.83.0" sources."sntp-2.1.0" sources."tunnel-agent-0.6.0" @@ -36247,13 +36762,13 @@ in sources."nodemailer-direct-transport-1.1.0" sources."nodemailer-smtp-transport-1.1.0" sources."nodemailer-wellknown-0.1.10" - sources."nopt-3.0.6" + sources."nopt-4.0.1" sources."npmlog-4.1.2" sources."nth-check-1.0.1" sources."number-is-nan-1.0.1" sources."oauth-0.9.14" sources."oauth-sign-0.8.2" - sources."oauth2orize-1.8.0" + sources."oauth2orize-1.11.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.1" @@ -36263,9 +36778,9 @@ in sources."ordered-read-streams-1.0.1" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."parseurl-1.3.2" - sources."passport-0.3.2" + sources."passport-0.4.0" sources."passport-http-bearer-1.0.1" sources."passport-oauth2-client-password-0.1.2" sources."passport-strategy-1.0.0" @@ -36277,17 +36792,18 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."poplib-0.1.7" - sources."process-nextick-args-1.0.7" - sources."proxy-addr-1.1.5" - sources."pump-1.0.3" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" + sources."pseudomap-1.0.2" + sources."pump-2.0.1" sources."pumpify-1.4.0" sources."punycode-1.4.1" - sources."qs-6.4.0" + sources."qs-6.5.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - sources."raw-body-2.2.0" - sources."rc-1.2.4" - sources."readable-stream-2.3.3" + sources."raw-body-2.3.2" + sources."rc-1.2.5" + sources."readable-stream-2.3.4" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" (sources."request-2.74.0" // { @@ -36299,17 +36815,17 @@ in sources."retry-0.6.1" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" - sources."sax-1.2.4" - sources."semver-5.3.0" - sources."send-0.15.3" + sources."sax-0.6.1" + sources."semver-5.4.1" + sources."send-0.16.1" sources."sentiment-2.1.0" - sources."serve-static-1.12.3" + sources."serve-static-1.13.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.0.3" sources."signal-exit-3.0.2" sources."smtp-connection-1.3.8" sources."sntp-1.0.9" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" (sources."sshpk-1.13.1" // { @@ -36331,23 +36847,28 @@ in sources."through2-2.0.3" sources."through2-filter-2.0.0" sources."to-absolute-glob-2.0.2" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."twitter-ng-0.6.2" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."typedarray-0.0.6" - sources."uglify-js-3.0.20" + (sources."uglify-js-3.3.6" // { + dependencies = [ + sources."commander-2.13.0" + ]; + }) sources."uid-number-0.0.6" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."ultron-1.1.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.2.1" + sources."universalify-0.1.1" sources."unpipe-1.0.0" sources."utf7-1.0.2" sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.0" + sources."utils-merge-1.0.1" sources."uue-3.1.1" sources."uuid-3.2.1" sources."vary-1.1.2" @@ -36357,14 +36878,15 @@ in sources."wide-align-1.1.2" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - (sources."ws-1.1.1" // { + (sources."ws-1.1.5" // { dependencies = [ sources."ultron-1.0.2" ]; }) - sources."xml2js-0.4.17" - sources."xmlbuilder-4.2.1" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" sources."xtend-4.0.1" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -36548,13 +37070,13 @@ in ]; }) sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."chownr-0.0.2" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."coffee-script-1.12.7" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" (sources."config-chain-1.1.11" // { dependencies = [ @@ -36575,12 +37097,12 @@ in sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."findit-1.2.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs-extra-0.6.4" (sources."fs.extra-1.3.2" // { dependencies = [ @@ -36601,7 +37123,7 @@ in sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -36616,8 +37138,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" @@ -36644,11 +37166,11 @@ in sources."osenv-0.0.3" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.83.0" sources."retry-0.6.0" sources."rimraf-2.6.2" @@ -36676,7 +37198,7 @@ in sources."rimraf-2.1.4" ]; }) - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."underscore-1.4.4" @@ -36713,7 +37235,7 @@ in sources."ansi-styles-2.2.1" sources."ansicolors-0.3.2" sources."archy-1.0.0" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."asap-2.0.6" sources."async-1.5.2" sources."balanced-match-1.0.0" @@ -36721,7 +37243,7 @@ in sources."bluebird-3.5.1" sources."bops-0.1.1" sources."boxen-0.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.0" @@ -36739,7 +37261,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.0.3" - sources."commander-2.13.0" + sources."commander-2.14.1" sources."concat-map-0.0.1" (sources."configstore-1.4.0" // { dependencies = [ @@ -36779,7 +37301,7 @@ in sources."graceful-fs-4.1.11" sources."graphlib-2.1.5" sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."hasbin-1.2.3" sources."hosted-git-info-2.5.0" sources."iconv-lite-0.4.19" @@ -36818,24 +37340,28 @@ in sources."lazy-cache-1.0.4" sources."lcid-1.0.0" sources."load-json-file-1.1.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.assign-4.2.0" sources."lodash.clonedeep-4.5.0" sources."lodash.defaults-4.2.0" sources."lodash.defaultsdeep-4.6.0" - sources."lodash.mergewith-4.6.0" + sources."lodash.mergewith-4.6.1" sources."longest-1.0.1" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" - sources."minimatch-3.0.2" + sources."make-dir-1.2.0" + sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-object-2.0.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.6" sources."nconf-0.7.2" - sources."needle-2.1.1" + (sources."needle-2.2.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."nested-error-stacks-1.0.2" sources."node-alias-1.0.4" sources."node-status-codes-1.0.0" @@ -36857,7 +37383,7 @@ in sources."os-locale-1.4.0" sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."osx-release-1.1.0" sources."p-finally-1.0.0" sources."package-json-2.4.0" @@ -36871,19 +37397,20 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promise-7.3.1" sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."punycode-1.3.2" sources."querystring-0.2.0" - sources."rc-1.2.4" + sources."rc-1.2.5" sources."rc-config-loader-2.0.1" 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.3" - sources."registry-auth-token-3.3.1" + sources."readable-stream-2.3.4" + sources."recursive-readdir-2.2.2" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" sources."repeating-2.0.1" @@ -36909,11 +37436,12 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - (sources."snyk-1.69.3" // { + (sources."snyk-1.69.10" // { dependencies = [ sources."async-0.9.2" sources."camelcase-3.0.0" sources."cliui-3.2.0" + sources."debug-3.1.0" sources."for-in-0.1.8" sources."got-3.3.1" sources."latest-version-1.0.1" @@ -36928,40 +37456,60 @@ in sources."yargs-4.8.1" ]; }) - sources."snyk-config-1.0.1" + (sources."snyk-config-1.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."snyk-go-plugin-1.4.5" sources."snyk-gradle-plugin-1.2.0" - sources."snyk-module-1.8.1" + (sources."snyk-module-1.8.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."snyk-mvn-plugin-1.1.1" (sources."snyk-nuget-plugin-1.3.9" // { dependencies = [ - sources."debug-3.1.0" sources."es6-promise-4.2.4" ]; }) - (sources."snyk-php-plugin-1.3.2" // { + sources."snyk-php-plugin-1.3.2" + (sources."snyk-policy-1.10.2" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-2.6.9" + ]; + }) + sources."snyk-python-plugin-1.5.6" + (sources."snyk-resolve-1.0.0" // { + dependencies = [ + sources."debug-2.6.9" ]; }) - sources."snyk-policy-1.10.1" - sources."snyk-python-plugin-1.5.3" - sources."snyk-recursive-readdir-2.0.0" - sources."snyk-resolve-1.0.0" (sources."snyk-resolve-deps-1.7.0" // { dependencies = [ sources."configstore-2.1.0" + sources."debug-2.6.9" sources."update-notifier-0.6.3" sources."uuid-2.0.3" ]; }) - sources."snyk-sbt-plugin-1.2.2" + (sources."snyk-sbt-plugin-1.2.4" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."snyk-tree-1.0.0" - sources."snyk-try-require-1.2.0" + (sources."snyk-try-require-1.2.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."spawn-please-0.3.0" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" sources."stream-shift-1.0.0" sources."string-length-1.0.1" @@ -36992,7 +37540,7 @@ in sources."ansi-styles-3.2.0" sources."boxen-1.3.0" sources."camelcase-4.1.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."configstore-3.1.1" sources."dot-prop-4.2.0" sources."got-6.7.1" @@ -37002,7 +37550,7 @@ in sources."pify-3.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."timed-out-4.0.1" sources."unzip-response-2.0.1" sources."widest-line-2.0.0" @@ -37014,7 +37562,7 @@ in sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."which-1.3.0" sources."which-module-1.0.0" sources."widest-line-1.0.0" @@ -37026,7 +37574,7 @@ in sources."write-file-atomic-1.3.4" sources."xdg-basedir-2.0.0" sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-9.0.7" sources."y18n-3.2.1" sources."yallist-2.1.2" sources."yargs-3.15.0" @@ -37045,10 +37593,10 @@ in nsp = nodeEnv.buildNodePackage { name = "nsp"; packageName = "nsp"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/nsp/-/nsp-3.1.0.tgz"; - sha512 = "0hbwm017cl5ybzw14l44mbinhnv38jrnbpg1ngkdibhc5hiimm8hqr2pi5dzh6flvxr0x6nym93029i7j41clr6rlvn1ab6r5cgdl4f"; + url = "https://registry.npmjs.org/nsp/-/nsp-3.2.1.tgz"; + sha512 = "06qrykgjpr3m7sl9g2axaraxh3mndmffgjxf45nqw5jblqa9zsnkvgmds8s29avp4qhmk084ri0rbg30yr15bd73i2152q6na5qdfbl"; }; dependencies = [ sources."agent-base-4.2.0" @@ -37058,7 +37606,7 @@ in sources."boom-5.2.0" sources."builtin-modules-1.1.1" sources."camelcase-4.1.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."chardet-0.4.2" sources."cli-cursor-2.1.0" sources."cli-table2-0.2.0" @@ -37087,8 +37635,8 @@ in sources."get-caller-file-1.0.2" sources."get-stream-3.0.0" sources."graceful-fs-4.1.11" - sources."has-flag-2.0.0" - sources."hoek-4.2.0" + sources."has-flag-3.0.0" + sources."hoek-4.2.1" sources."hosted-git-info-2.5.0" sources."https-proxy-agent-2.1.1" sources."iconv-lite-0.4.19" @@ -37096,7 +37644,7 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -37114,7 +37662,7 @@ in sources."lodash-3.10.1" sources."lru-cache-4.1.1" sources."mem-1.1.0" - sources."mimic-fn-1.1.0" + sources."mimic-fn-1.2.0" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nodesecurity-npm-utils-6.0.0" @@ -37147,17 +37695,18 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."through-2.3.8" sources."tmp-0.0.33" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."which-1.3.0" sources."which-module-2.0.0" sources."wrap-ansi-2.1.0" @@ -37186,22 +37735,23 @@ in ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; - version = "1.0.16"; + version = "1.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.16.tgz"; - sha512 = "2f63gvm5x3c7dxp8fpaxhvjlha7isdfrbq7pqpkj0n33zndhi4925qkmzgrgn7qhrff6dhiqb3j1a3m1jjwq1k5kff910rrxd1622jd"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.27.tgz"; + sha512 = "14fhxv57nybf56n1454ccmdn2sn41amzf4f6a1n70ha48ndrpcw14g6hvv91k5bj775pxh74aa8ncsc3f7bfgz0cg0nwg8ysv43dmqw"; }; dependencies = [ sources."async-2.6.0" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" + sources."deepmerge-2.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.2" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."lodash-4.17.4" - sources."lokijs-1.5.1" + sources."lodash-4.17.5" + sources."lokijs-1.5.2" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -37237,7 +37787,7 @@ in sources."align-text-0.1.4" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."asap-2.0.6" sources."asn1-0.2.3" @@ -37257,7 +37807,7 @@ in ]; }) sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."bunyan-1.8.12" sources."bunyan-syslog-udp-0.1.0" @@ -37271,9 +37821,9 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."colors-1.1.2" - sources."combined-stream-1.0.5" - sources."compressible-2.0.12" - sources."compression-1.7.1" + sources."combined-stream-1.0.6" + sources."compressible-2.0.13" + sources."compression-1.7.2" sources."concat-map-0.0.1" sources."connect-busboy-0.0.2" sources."content-disposition-0.5.2" @@ -37324,7 +37874,7 @@ in }) sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" (sources."finalhandler-1.1.0" // { dependencies = [ @@ -37334,7 +37884,7 @@ in sources."find-up-1.1.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."function-bind-1.1.1" @@ -37350,7 +37900,7 @@ in sources."has-symbols-1.0.0" sources."hat-0.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."hosted-git-info-2.5.0" sources."hot-shots-4.8.0" (sources."http-errors-1.6.2" // { @@ -37363,7 +37913,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-arguments-1.0.2" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" @@ -37398,8 +37948,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."mkdirp-0.5.1" @@ -37407,7 +37957,7 @@ in sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."normalize-package-data-2.4.0" @@ -37432,9 +37982,9 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prfun-2.1.5" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promise-7.3.1" - sources."proxy-addr-2.0.2" + sources."proxy-addr-2.0.3" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" @@ -37449,17 +37999,17 @@ in sources."right-align-0.1.3" sources."rimraf-2.4.5" sources."safe-buffer-5.1.1" - sources."safe-json-stringify-1.0.4" + sources."safe-json-stringify-1.1.0" sources."semver-5.5.0" sources."send-0.16.1" sources."serve-favicon-2.4.5" sources."serve-static-1.13.1" - (sources."service-runner-2.5.0" // { + (sources."service-runner-2.5.1" // { dependencies = [ sources."isarray-1.0.0" sources."minimist-0.0.8" sources."ms-0.7.3" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -37468,9 +38018,10 @@ in sources."simplediff-0.1.1" sources."sntp-2.1.0" sources."source-map-0.4.4" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" sources."sshpk-1.13.1" sources."statuses-1.4.0" @@ -37480,10 +38031,10 @@ in sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.7" @@ -37494,7 +38045,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-module-1.0.0" @@ -37529,7 +38080,7 @@ in sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf"; }; dependencies = [ - sources."addr-to-ip-port-1.4.2" + sources."addr-to-ip-port-1.4.3" sources."airplay-protocol-2.0.2" sources."airplayer-2.0.0" sources."ansi-escapes-1.4.0" @@ -37545,13 +38096,13 @@ in sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" - sources."blob-to-buffer-1.2.6" + sources."blob-to-buffer-1.2.7" sources."bn.js-4.11.8" sources."bncode-0.5.3" sources."bonjour-3.5.0" sources."bplist-creator-0.0.6" sources."bplist-parser-0.1.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" @@ -37611,13 +38162,13 @@ in sources."ini-1.3.5" (sources."inquirer-1.2.3" // { dependencies = [ - sources."lodash-4.17.4" + sources."lodash-4.17.5" ]; }) sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.5.4" + sources."ipaddr.js-1.6.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -37647,7 +38198,7 @@ in sources."minimist-1.2.0" sources."mkdirp-0.3.5" sources."ms-2.0.0" - sources."multicast-dns-6.2.2" + sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.6" sources."network-address-1.1.2" @@ -37687,26 +38238,26 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."plist-1.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."pump-1.0.3" sources."random-access-file-1.8.1" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - sources."rc-1.2.4" + sources."rc-1.2.5" sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."redent-1.0.0" sources."repeating-2.0.1" sources."restore-cursor-1.0.1" sources."reverse-http-1.3.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."run-parallel-1.1.6" + sources."run-parallel-1.1.7" sources."run-series-1.1.4" - sources."rusha-0.8.12" + sources."rusha-0.8.13" sources."rx-4.1.0" sources."safe-buffer-5.1.1" sources."semver-5.5.0" @@ -37723,9 +38274,10 @@ in }) sources."single-line-log-1.1.2" sources."spawn-sync-1.0.15" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -37738,14 +38290,14 @@ in sources."supports-color-2.0.0" sources."thirty-two-1.0.2" sources."through-2.3.8" - sources."thunky-0.1.0" + sources."thunky-1.0.2" sources."tmp-0.0.29" (sources."torrent-discovery-5.4.0" // { dependencies = [ sources."bencode-0.8.0" sources."isarray-1.0.0" sources."minimist-1.2.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -37764,7 +38316,6 @@ in sources."safe-buffer-5.0.1" sources."string_decoder-0.10.31" sources."thirty-two-0.0.2" - sources."thunky-1.0.2" sources."ultron-1.0.2" ]; }) @@ -37774,7 +38325,7 @@ in sources."uniq-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."winreg-1.2.3" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" @@ -37802,7 +38353,7 @@ in }; dependencies = [ sources."accepts-1.2.13" - sources."addr-to-ip-port-1.4.2" + sources."addr-to-ip-port-1.4.3" sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."async-0.2.10" @@ -37825,7 +38376,7 @@ in sources."bncode-0.5.3" sources."body-parser-1.13.3" sources."boom-0.3.8" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" @@ -37837,7 +38388,7 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" - sources."compressible-2.0.12" + sources."compressible-2.0.13" sources."compression-1.5.2" sources."concat-map-0.0.1" (sources."connect-2.30.2" // { @@ -37954,8 +38505,8 @@ in }) sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."mimic-response-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -37991,7 +38542,7 @@ in ]; }) sources."pend-1.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."proxy-addr-1.0.10" sources."pump-1.0.3" sources."qs-6.5.1" @@ -38022,9 +38573,9 @@ in }) sources."rimraf-2.6.2" sources."rndm-1.2.0" - sources."run-parallel-1.1.6" + sources."run-parallel-1.1.7" sources."run-series-1.1.4" - sources."rusha-0.8.12" + sources."rusha-0.8.13" sources."safe-buffer-5.1.1" (sources."send-0.13.0" // { dependencies = [ @@ -38087,7 +38638,7 @@ in sources."mkdirp-0.3.5" sources."ms-2.0.0" sources."once-1.3.3" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."safe-buffer-5.0.1" sources."string_decoder-1.0.3" sources."ultron-1.1.1" @@ -38095,7 +38646,7 @@ in }) sources."tsscmp-1.0.5" sources."tunnel-agent-0.2.0" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."uid-safe-2.1.4" sources."ultron-1.0.2" sources."uniq-1.0.1" @@ -38141,11 +38692,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."bl-1.0.3" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -38176,7 +38727,8 @@ in sources."http-signature-1.1.1" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -38195,9 +38747,9 @@ in }) sources."kew-0.7.0" sources."klaw-1.3.1" - sources."lodash-4.17.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."lodash-4.17.5" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.0" @@ -38249,10 +38801,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.10.2.tgz"; - sha512 = "1k0h7nzg4lg3lf86xy0z7adx2z7nhj8r1y7c5s0gwhfb7qn4qp0845w5agq9zy48ll7sldv7ak2haypkm7akspajvdq25hn0ahlvisd"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.11.0.tgz"; + sha512 = "3xk1i02slbak5bilsgbsi5qh2f68dn84s1as0h2bymmiwm3isnazndlvl74yjwlmqxkaw9sj45c402xhy5xk5h0nkbcv39gqwyyfg75"; }; buildInputs = globalBuildInputs; meta = { @@ -38274,6 +38826,7 @@ in dependencies = [ sources."JSONStream-1.3.2" sources."acorn-4.0.13" + sources."acorn-node-1.3.0" sources."anymatch-1.3.2" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" @@ -38281,23 +38834,23 @@ in sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."array-unique-0.2.1" - sources."asn1.js-4.9.2" + sources."asn1.js-4.10.1" sources."assert-1.4.1" sources."astw-2.2.0" sources."async-1.5.2" sources."async-each-1.0.1" sources."balanced-match-1.0.0" - sources."base64-js-1.2.1" + sources."base64-js-1.2.3" sources."binary-extensions-1.11.0" sources."bn.js-4.11.8" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) sources."brorand-1.1.0" - sources."browser-pack-6.0.3" + sources."browser-pack-6.0.4" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -38305,7 +38858,7 @@ in }) (sources."browserify-13.3.0" // { dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" sources."combine-source-map-0.7.2" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -38314,6 +38867,7 @@ in }) sources."hash-base-2.0.2" sources."isarray-0.0.1" + sources."process-nextick-args-2.0.0" ]; }) sources."browserify-aes-1.1.1" @@ -38403,7 +38957,7 @@ in sources."kind-of-3.2.2" sources."labeled-stream-splicer-2.0.0" sources."lexical-scope-1.2.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.4" sources."micromatch-2.3.11" @@ -38415,7 +38969,7 @@ in sources."minimist-1.2.0" sources."module-deps-4.1.1" sources."mute-stream-0.0.7" - sources."nan-2.8.0" + sources."nan-2.9.2" (sources."node-static-0.7.10" // { dependencies = [ sources."minimist-0.0.10" @@ -38454,10 +39008,10 @@ in ]; }) sources."randombytes-2.0.6" - sources."randomfill-1.0.3" + sources."randomfill-1.0.4" sources."read-1.0.7" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.3" // { + (sources."readable-stream-2.3.4" // { dependencies = [ sources."isarray-1.0.0" sources."string_decoder-1.0.3" @@ -38484,18 +39038,14 @@ in sources."string-stream-0.0.7" sources."string_decoder-0.10.31" sources."subarg-1.0.0" - (sources."syntax-error-1.3.0" // { - dependencies = [ - sources."acorn-4.0.13" - ]; - }) + sources."syntax-error-1.4.0" sources."temp-0.8.3" sources."through-2.3.8" sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" sources."tree-kill-1.2.0" - sources."tty-browserify-0.0.0" + sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.1" (sources."url-0.11.0" // { @@ -38538,6 +39088,8 @@ in sha1 = "195a2a5b6dd76e4a244a807002678b037d70eeaa"; }; dependencies = [ + sources."@types/babel-types-7.0.1" + sources."@types/babylon-6.16.2" sources."accepts-1.3.4" sources."acorn-3.3.0" (sources."acorn-globals-3.1.0" // { @@ -38558,6 +39110,9 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" + sources."babel-runtime-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" sources."basic-auth-2.0.0" sources."bcrypt-pbkdf-1.0.1" sources."bindings-1.2.1" @@ -38575,15 +39130,16 @@ in sources."cliui-2.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."console-control-strings-1.1.0" - sources."constantinople-3.1.0" + sources."constantinople-3.1.2" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-parser-1.4.3" sources."cookie-signature-1.0.6" + sources."core-js-2.5.3" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."dashdash-1.14.1" @@ -38599,8 +39155,9 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" - sources."errno-0.1.6" + sources."errno-0.1.7" sources."escape-html-1.0.3" + sources."esutils-2.0.2" sources."etag-1.8.1" sources."eventemitter2-3.0.2" sources."expand-template-1.1.0" @@ -38641,10 +39198,10 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."int64-buffer-0.1.10" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-3.2.1" sources."is-buffer-1.1.6" - sources."is-expression-2.1.0" + sources."is-expression-3.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-promise-2.1.0" sources."is-regex-1.0.4" @@ -38672,13 +39229,14 @@ in }) sources."less-middleware-2.2.1" sources."libquassel-2.1.9" + sources."lodash-4.17.5" sources."longest-1.0.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."morgan-1.9.0" @@ -38692,7 +39250,7 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."node-abi-2.1.2" + sources."node-abi-2.3.0" sources."node.extend-2.0.0" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" @@ -38708,15 +39266,14 @@ in sources."path-to-regexp-0.1.7" sources."performance-now-0.2.0" sources."prebuild-install-2.1.2" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promise-7.3.1" - sources."proxy-addr-2.0.2" + sources."proxy-addr-2.0.3" sources."prr-1.0.1" (sources."pug-2.0.0-rc.4" // { dependencies = [ sources."acorn-4.0.13" sources."commander-2.8.1" - sources."is-expression-3.0.0" sources."source-map-0.4.4" ]; }) @@ -38741,8 +39298,9 @@ in sources."qtdatastream-0.7.1" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.4" - sources."readable-stream-2.3.3" + sources."rc-1.2.5" + sources."readable-stream-2.3.4" + sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" sources."request-2.81.0" sources."resolve-1.5.0" @@ -38777,11 +39335,12 @@ in sources."strip-json-comments-2.0.1" sources."tar-fs-1.16.0" sources."tar-stream-1.5.5" + sources."to-fast-properties-1.0.3" sources."token-stream-0.0.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."uglify-js-2.8.29" sources."uglify-to-browserify-1.0.2" sources."ultron-1.1.1" @@ -38820,13 +39379,13 @@ in sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; }; dependencies = [ - sources."acorn-5.3.0" + sources."acorn-5.5.0" sources."amdefine-1.0.1" sources."ast-types-0.9.6" sources."balanced-match-1.0.0" sources."base62-0.1.1" - sources."brace-expansion-1.1.8" - sources."commander-2.13.0" + sources."brace-expansion-1.1.11" + sources."commander-2.14.1" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -38876,7 +39435,7 @@ in sources."ansi-styles-2.2.1" sources."async-0.2.10" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."colors-0.6.2" sources."concat-map-0.0.1" @@ -38951,7 +39510,7 @@ in sources."caseless-0.12.0" sources."co-4.6.0" sources."coffee-script-1.6.3" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."commander-2.0.0" (sources."connect-2.11.0" // { dependencies = [ @@ -38992,17 +39551,17 @@ in }) sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."formidable-1.0.11" sources."fresh-0.2.0" sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-auth-2.0.7" sources."http-signature-1.2.0" sources."inherits-2.0.3" @@ -39017,8 +39576,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."mkdirp-0.3.5" sources."ms-2.0.0" sources."multiparty-2.2.0" @@ -39051,7 +39610,7 @@ in sources."string-1.6.1" sources."string_decoder-0.10.31" sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid2-0.0.3" @@ -39087,13 +39646,17 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.4.9"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.4.9.tgz"; - sha512 = "2241nrhci4lgj15pxzvspx6m3vjdpcsih532sz1mi17fby8yiadv33d84v05z1465cszh35xhzf7kx3yirwzq5zbi7zvzhw13ddsqy0"; + url = "https://registry.npmjs.org/serve/-/serve-6.5.0.tgz"; + sha512 = "3jvih9f09fhgz59n8j1nb607wvhwailsnw1x98zqrq8rig5rc2a6dc3v3r2mw4mnvbgg5jnpiss440jfm9gbrymf985hqw1wlngbyf2"; }; dependencies = [ - sources."@zeit/check-updates-1.0.5" + (sources."@zeit/check-updates-1.1.0" // { + dependencies = [ + sources."chalk-2.3.0" + ]; + }) sources."accepts-1.3.4" sources."address-1.0.3" sources."align-text-0.1.4" @@ -39115,9 +39678,14 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" - sources."chalk-2.3.0" + (sources."chalk-2.3.1" // { + dependencies = [ + sources."has-flag-3.0.0" + sources."supports-color-5.2.0" + ]; + }) sources."cli-boxes-1.0.0" - (sources."clipboardy-1.2.2" // { + (sources."clipboardy-1.2.3" // { dependencies = [ sources."execa-0.8.0" ]; @@ -39125,8 +39693,8 @@ in sources."cliui-2.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."compressible-2.0.12" - sources."compression-1.7.1" + sources."compressible-2.0.13" + sources."compression-1.7.2" sources."configstore-3.1.1" sources."content-type-1.0.4" sources."create-error-class-3.0.2" @@ -39151,7 +39719,7 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-0.7.0" - sources."filesize-3.5.11" + sources."filesize-3.6.0" sources."fresh-0.5.2" sources."fs-extra-5.0.0" sources."get-stream-3.0.0" @@ -39188,20 +39756,16 @@ in sources."kind-of-3.2.2" sources."latest-version-3.1.0" sources."lazy-cache-1.0.4" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."longest-1.0.1" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."micro-9.1.0" sources."micro-compress-1.0.0" sources."mime-1.4.1" - sources."mime-db-1.32.0" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-1.2.0" sources."mri-1.1.0" sources."ms-2.1.1" @@ -39211,7 +39775,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."openssl-self-signed-certificate-1.1.6" - sources."opn-5.1.0" + sources."opn-5.2.0" sources."optimist-0.6.1" sources."p-finally-1.0.0" sources."package-json-4.0.1" @@ -39224,18 +39788,18 @@ in sources."pseudomap-1.0.2" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.4" - sources."registry-auth-token-3.3.1" + sources."rc-1.2.5" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" sources."semver-5.5.0" sources."semver-diff-2.1.0" - (sources."send-0.16.1" // { + (sources."send-0.16.2" // { dependencies = [ + sources."depd-1.1.2" sources."ms-2.0.0" - sources."statuses-1.3.1" ]; }) sources."setprototypeof-1.0.3" @@ -39326,8 +39890,8 @@ in ]; }) sources."co-4.6.0" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -39369,11 +39933,11 @@ in sources."express-4.16.2" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.1.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."from-0.1.7" @@ -39384,7 +39948,7 @@ in sources."has-binary-data-0.1.1" sources."has-cors-1.0.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" (sources."htmlparser2-3.7.3" // { dependencies = [ sources."entities-1.0.0" @@ -39399,7 +39963,7 @@ in sources."iconv-lite-0.4.19" sources."indexof-0.0.1" sources."inherits-2.0.3" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."irc-replies-2.0.1" sources."is-typedarray-1.0.0" sources."isarray-0.0.1" @@ -39417,8 +39981,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.7.0" @@ -39437,7 +40001,7 @@ in sources."path-to-regexp-0.1.7" sources."pause-stream-0.0.11" sources."performance-now-2.1.0" - sources."proxy-addr-2.0.2" + sources."proxy-addr-2.0.3" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" @@ -39479,10 +40043,10 @@ in sources."through-2.3.8" sources."tinycolor-0.0.1" sources."to-array-0.1.3" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" + sources."type-is-1.6.16" sources."unpipe-1.0.0" sources."utf8-2.0.0" sources."utils-merge-1.0.1" @@ -39515,7 +40079,7 @@ in sources."ajv-5.5.2" sources."amdefine-1.0.1" sources."ansi-styles-3.2.0" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."array-flatten-2.1.1" sources."array-uniq-1.0.3" sources."asn1-0.2.3" @@ -39535,7 +40099,7 @@ in ]; }) sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."bunyan-1.8.12" // { dependencies = [ sources."minimatch-3.0.4" @@ -39543,14 +40107,14 @@ in }) sources."bytes-1.0.0" sources."caseless-0.12.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."co-4.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" - sources."compressible-2.0.12" - (sources."compression-1.7.1" // { + sources."combined-stream-1.0.6" + sources."commander-2.14.1" + sources."compressible-2.0.13" + (sources."compression-1.7.2" // { dependencies = [ sources."bytes-3.0.0" ]; @@ -39580,7 +40144,7 @@ in }) sources."domelementtype-1.3.0" sources."domhandler-2.4.1" - sources."domutils-1.6.2" + sources."domutils-1.7.0" sources."dtrace-provider-0.8.6" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" @@ -39595,11 +40159,11 @@ in sources."express-json5-0.1.0" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.0.6" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-ext-0.6.0" @@ -39612,10 +40176,10 @@ in }) sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."hawk-6.0.2" sources."highlight.js-8.9.1" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."htmlparser2-3.9.2" (sources."http-errors-1.6.2" // { dependencies = [ @@ -39642,7 +40206,9 @@ in sources."linkify-it-1.2.4" sources."lodash.clonedeep-4.5.0" sources."lodash.escaperegexp-4.1.2" - sources."lodash.mergewith-4.6.0" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.mergewith-4.6.1" sources."lru-cache-2.7.3" sources."lunr-0.7.2" sources."markdown-it-4.4.0" @@ -39651,15 +40217,15 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-1.0.0" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.20.1" sources."ms-2.0.0" sources."mv-2.1.1" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."ncp-2.0.0" sources."negotiator-0.6.1" sources."number-is-nan-1.0.1" @@ -39672,8 +40238,8 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" - sources."postcss-6.0.16" - sources."process-nextick-args-1.0.7" + sources."postcss-6.0.19" + sources."process-nextick-args-2.0.0" sources."proxy-addr-1.1.5" sources."punycode-1.4.1" sources."qs-6.5.0" @@ -39687,9 +40253,8 @@ in }) (sources."render-readme-1.3.1" // { dependencies = [ - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."source-map-0.6.1" - sources."supports-color-5.1.0" ]; }) (sources."request-2.83.0" // { @@ -39705,8 +40270,8 @@ in ]; }) sources."safe-buffer-5.1.1" - sources."safe-json-stringify-1.0.4" - sources."sanitize-html-1.17.0" + sources."safe-json-stringify-1.1.0" + sources."sanitize-html-1.18.2" sources."semver-4.3.6" sources."send-0.15.6" sources."serve-static-1.12.6" @@ -39721,13 +40286,13 @@ in sources."statuses-1.3.1" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" sources."through-2.3.8" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" - sources."uc.micro-1.0.3" + sources."type-is-1.6.16" + sources."uc.micro-1.0.5" sources."uglify-js-2.3.6" sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" @@ -39762,7 +40327,7 @@ in dependencies = [ sources."async-2.1.5" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."cli-table-0.3.1" sources."colors-1.0.3" sources."commander-2.9.0" @@ -39772,10 +40337,10 @@ in sources."graceful-readlink-1.0.1" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."minimatch-3.0.4" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.3.3" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" sources."set-immediate-shim-1.0.1" @@ -39805,7 +40370,7 @@ in sources."assert-plus-0.1.5" sources."backoff-2.5.0" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."bunyan-1.5.1" sources."clone-0.1.6" sources."cmdln-3.2.1" @@ -39838,7 +40403,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."mv-2.1.1" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -39846,9 +40411,9 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."precond-0.2.3" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."qs-3.1.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" (sources."restify-4.0.3" // { dependencies = [ sources."lru-cache-2.7.3" @@ -39861,7 +40426,7 @@ in }) sources."rimraf-2.4.5" sources."safe-buffer-5.1.1" - sources."safe-json-stringify-1.0.4" + sources."safe-json-stringify-1.1.0" sources."semver-4.3.6" (sources."smartdc-auth-2.3.1" // { dependencies = [ @@ -39936,7 +40501,7 @@ in sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; dependencies = [ - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."after-0.8.2" sources."arraybuffer.slice-0.0.7" sources."async-limiter-1.0.0" @@ -39951,15 +40516,23 @@ in sources."component-inherit-0.0.3" sources."cookie-0.3.1" sources."debug-2.6.9" - sources."engine.io-3.1.4" - sources."engine.io-client-3.1.4" + (sources."engine.io-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."engine.io-parser-2.1.2" sources."has-binary2-1.0.2" sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."object-component-0.0.3" @@ -39968,10 +40541,14 @@ in sources."safe-buffer-5.1.1" sources."socket.io-adapter-1.1.1" sources."socket.io-client-2.0.4" - sources."socket.io-parser-3.1.2" + (sources."socket.io-parser-3.1.3" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."to-array-0.1.4" sources."ultron-1.1.1" - sources."uws-0.14.5" + sources."uws-9.14.0" sources."ws-3.3.3" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" @@ -40017,7 +40594,7 @@ in sources."hashring-3.2.0" sources."keypress-0.1.0" sources."modern-syslog-1.1.2" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."sequence-2.2.1" sources."simple-lru-cache-0.0.2" sources."winser-0.1.6" @@ -40079,7 +40656,7 @@ in dependencies = [ sources."amdefine-1.0.1" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."css-parse-1.7.0" sources."debug-3.1.0" @@ -40109,13 +40686,13 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.0.3.tgz"; - sha512 = "1f9s0zk5rrb842w5gibjarlc9qw8bmjcxnbxc8jjn8is4d6c9l66ajwvifw87yx3pis6dcinyjwvvkxvzpyp326nl72vjv9rw5ndxnp"; + url = "https://registry.npmjs.org/svgo/-/svgo-1.0.5.tgz"; + sha512 = "0z83qdi781ax865bpw8ywmp5dyljjwnan5f9lgja0zcyr8niycd0x35yqw7chwmh3wpps4ai1lkswybk8mjnjik526vdvw1z1zf52lx"; }; dependencies = [ - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."boolbase-1.0.0" sources."coa-2.0.1" sources."colors-1.1.2" @@ -40184,11 +40761,11 @@ in dependencies = [ sources."acorn-4.0.13" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."enhanced-resolve-2.3.0" - sources."errno-0.1.6" + sources."errno-0.1.7" sources."fs.realpath-1.0.0" sources."glob-7.1.2" sources."graceful-fs-4.1.11" @@ -40200,9 +40777,9 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."prr-1.0.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."resolve-from-2.0.0" sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" @@ -40247,8 +40824,8 @@ in sources."chalk-1.1.3" sources."cliui-2.1.0" sources."colors-1.1.2" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."cycle-1.0.3" @@ -40280,7 +40857,8 @@ in sources."http-signature-1.1.1" sources."humanize-0.0.9" sources."is-buffer-1.1.6" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-property-1.0.2" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" @@ -40297,11 +40875,11 @@ in sources."keypress-0.2.1" sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."longest-1.0.1" sources."longjohn-0.2.11" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.10" sources."moment-2.16.0" (sources."node-appc-0.2.41" // { @@ -40339,7 +40917,7 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."temp-0.8.3" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" (sources."uglify-js-2.7.5" // { @@ -40375,10 +40953,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.6.2"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz"; - sha1 = "3c5b6fd7f6de0914269027f03c0946758f7673a4"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; + sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; }; buildInputs = globalBuildInputs; meta = { @@ -40411,7 +40989,7 @@ in sources."balanced-match-1.0.0" sources."bluebird-3.5.1" sources."boxen-1.3.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-1.1.3" @@ -40427,7 +41005,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."columnify-1.5.4" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."configstore-3.1.1" @@ -40448,7 +41026,7 @@ in sources."execa-0.7.0" sources."exit-hook-1.1.1" sources."extend-3.0.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stream-3.0.0" @@ -40458,7 +41036,7 @@ in sources."graceful-fs-4.1.11" sources."has-1.0.1" sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."http-proxy-agent-1.0.0" sources."https-proxy-agent-1.0.0" @@ -40467,7 +41045,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."invariant-2.2.2" + sources."invariant-2.2.3" sources."is-absolute-0.2.6" sources."is-arrayish-0.2.1" sources."is-fullwidth-code-point-2.0.0" @@ -40494,11 +41072,11 @@ in sources."loose-envify-1.3.1" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" - sources."make-error-1.3.2" + sources."make-dir-1.2.0" + sources."make-error-1.3.4" sources."make-error-cause-1.2.2" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" @@ -40521,17 +41099,17 @@ in sources."popsicle-rewrite-1.0.0" sources."popsicle-status-2.0.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promise-finally-3.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" - (sources."rc-1.2.4" // { + (sources."rc-1.2.5" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.3" - sources."registry-auth-token-3.3.1" + sources."readable-stream-2.3.4" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."restore-cursor-1.0.1" sources."rimraf-2.6.2" @@ -40556,9 +41134,9 @@ in sources."throat-3.2.0" sources."timed-out-4.0.1" sources."touch-1.0.0" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."typedarray-0.0.6" - sources."typescript-2.6.2" + sources."typescript-2.7.2" (sources."typings-core-2.3.3" // { dependencies = [ sources."minimist-0.0.8" @@ -40570,9 +41148,9 @@ in (sources."update-notifier-2.3.0" // { dependencies = [ sources."ansi-styles-3.2.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."semver-5.5.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) sources."url-parse-lax-1.0.0" @@ -40600,13 +41178,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.8"; + version = "3.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.8.tgz"; - sha512 = "1vxvyq08n6jidg18kiph7m0bjzr4v1dh188b7zgj60mkv4x1qkqrgc8756drldaj3awmn71mwsxja0zhvdm8nqqw5finrajv8dc0j2z"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.12.tgz"; + sha512 = "166ccv37fz5bsnwpp0n0xqxx63pdg8d4hxhac79k61n47l69mcw7sp5g3c68y98x867da1w1bnv5ryisvsjsj639sbpdl2mg56nng72"; }; dependencies = [ - sources."commander-2.13.0" + sources."commander-2.14.1" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -40621,10 +41199,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.7"; + version = "1.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.7.tgz"; - sha512 = "1fg2pwdf3d1qnlly7y0kpm8ghx56kc35993ww9v4xgpkdn7ga1s53190yjsifi6dj6j3v6602y8dnr5y0jyp4qm6v4rdb385dw5p2xs"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.10.tgz"; + sha512 = "0l2pf7nl7pkc8kq77agwg5s5c21wd3rl10l42l6xk6s3bkdv8l0vhlrvzampasaraikblyjh0sq81rqym3whn2jfspqhivllpkb8iqp"; }; dependencies = [ sources."abbrev-1.1.1" @@ -40654,7 +41232,7 @@ in sources."blueimp-md5-2.10.0" sources."body-parser-1.18.2" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."bytes-3.0.0" @@ -40713,11 +41291,19 @@ in }) sources."eachr-3.2.0" sources."ecc-jsbn-0.1.1" - sources."editions-1.3.3" + sources."editions-1.3.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - sources."engine.io-3.1.4" - sources."engine.io-client-3.1.4" + (sources."engine.io-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."engine.io-parser-2.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -40725,6 +41311,7 @@ in sources."execa-0.7.0" (sources."express-4.16.2" // { dependencies = [ + sources."serve-static-1.13.1" sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; @@ -40734,7 +41321,7 @@ in sources."extract-opts-3.3.1" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.1.0" sources."find-up-2.1.0" @@ -40758,7 +41345,7 @@ in sources."has-unicode-2.0.1" sources."hasher-1.2.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."hogan.js-3.0.2" sources."hosted-git-info-2.5.0" (sources."http-errors-1.6.2" // { @@ -40774,7 +41361,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.6.0" sources."is-arrayish-0.3.1" sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-1.0.0" @@ -40801,7 +41388,7 @@ in sources."knockout-3.5.0-beta" sources."lcid-1.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lru-cache-4.1.1" sources."lsmod-1.0.0" sources."media-typer-0.3.0" @@ -40814,9 +41401,9 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -40830,12 +41417,12 @@ in sources."npm-package-arg-5.1.2" (sources."npm-registry-client-8.5.0" // { dependencies = [ - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."delayed-stream-1.0.0" sources."extend-3.0.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -40854,7 +41441,7 @@ in sources."os-homedir-1.0.2" sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."p-finally-1.0.0" sources."p-limit-1.2.0" sources."p-locate-2.0.0" @@ -40871,8 +41458,8 @@ in sources."path-to-regexp-0.1.7" sources."pause-0.0.1" sources."performance-now-2.1.0" - sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.2" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.1" @@ -40884,7 +41471,7 @@ in ]; }) sources."raw-body-2.3.2" - (sources."rc-1.2.4" // { + (sources."rc-1.2.5" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -40899,7 +41486,11 @@ in sources."safe-buffer-5.1.1" sources."semver-5.4.1" sources."send-0.16.1" - sources."serve-static-1.13.1" + (sources."serve-static-1.13.2" // { + dependencies = [ + sources."send-0.16.2" + ]; + }) sources."set-blocking-2.0.0" sources."setprototypeof-1.0.3" sources."shebang-command-1.2.0" @@ -40912,17 +41503,21 @@ in sources."sntp-2.1.0" (sources."socket.io-2.0.4" // { dependencies = [ - sources."accepts-1.3.3" sources."component-emitter-1.2.1" 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.2" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + (sources."socket.io-parser-3.1.3" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sshpk-1.13.1" sources."ssri-4.1.6" sources."stack-trace-0.0.9" @@ -40935,16 +41530,16 @@ in sources."strip-json-comments-2.0.1" (sources."superagent-3.8.2" // { dependencies = [ - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."debug-3.1.0" sources."delayed-stream-1.0.0" sources."extend-3.0.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."formidable-1.1.1" sources."isarray-1.0.0" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."string_decoder-1.0.3" ]; }) @@ -40955,11 +41550,11 @@ in }) sources."timed-out-4.0.1" sources."to-array-0.1.4" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.15" - sources."typechecker-4.4.1" + sources."type-is-1.6.16" + sources."typechecker-4.5.0" sources."typedarray-0.0.6" sources."uid-safe-2.1.5" sources."ultron-1.1.1" @@ -40968,8 +41563,8 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."uws-0.14.5" - sources."validate-npm-package-license-3.0.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" sources."verror-1.10.0" @@ -41034,11 +41629,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."bl-1.0.3" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.11" // { @@ -41076,7 +41671,8 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.1.0" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -41095,9 +41691,9 @@ in }) sources."kew-0.1.7" sources."klaw-1.3.1" - sources."lodash-4.17.4" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."lodash-4.17.5" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" @@ -41163,39 +41759,50 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "3.10.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz"; - sha512 = "0n3rl5qq259csi0x5qh12wzyaypfds5wy0zrzky19wqsa0mjibrn19fdfgbabply2l576vlj8j69nzkb23jqfy6a36xb3cwi1g4l73z"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.0.1.tgz"; + sha512 = "1hb2dyvj718ijrx00xnd3zbzqll3jqnij5rp5qp4pxx3vl9wxg7jsz8s703h3snxr73yi9a2xpfgwqxs8gcbhl277g5l4lgc8r0sx4c"; }; dependencies = [ - sources."acorn-5.3.0" - (sources."acorn-dynamic-import-2.0.2" // { - dependencies = [ - sources."acorn-4.0.13" - ]; - }) - sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" - sources."align-text-0.1.4" - sources."ansi-regex-2.1.1" + sources."acorn-5.5.0" + sources."acorn-dynamic-import-3.0.0" + sources."ajv-6.2.0" + sources."ajv-keywords-3.1.0" sources."anymatch-1.3.2" - sources."arr-diff-2.0.0" + sources."aproba-1.2.0" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" - sources."array-unique-0.2.1" - sources."asn1.js-4.9.2" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."asn1.js-4.10.1" sources."assert-1.4.1" + sources."assign-symbols-1.0.0" sources."async-2.6.0" sources."async-each-1.0.1" + sources."atob-2.0.3" sources."balanced-match-1.0.0" - sources."base64-js-1.2.1" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-extendable-1.0.1" + sources."kind-of-3.2.2" + ]; + }) + sources."base64-js-1.2.3" sources."big.js-3.2.0" sources."binary-extensions-1.11.0" + sources."bluebird-3.5.1" sources."bn.js-4.11.8" - sources."brace-expansion-1.1.8" - (sources."braces-1.8.5" // { + sources."brace-expansion-1.1.11" + (sources."braces-2.3.1" // { dependencies = [ - sources."kind-of-4.0.0" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" ]; }) sources."brorand-1.1.0" @@ -41207,152 +41814,202 @@ in sources."browserify-zlib-0.2.0" sources."buffer-4.9.1" sources."buffer-xor-1.0.3" - sources."builtin-modules-1.1.1" sources."builtin-status-codes-3.0.0" - sources."camelcase-1.2.1" - sources."center-align-0.1.3" + sources."cacache-10.0.4" + sources."cache-base-1.0.1" sources."chokidar-1.7.0" + sources."chownr-1.0.1" + sources."chrome-trace-event-0.1.2" sources."cipher-base-1.0.4" - sources."cliui-2.1.0" - sources."co-4.6.0" - sources."code-point-at-1.1.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."collection-visit-1.0.0" + sources."commander-2.14.1" + sources."commondir-1.0.1" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.0" sources."create-hash-1.1.3" sources."create-hmac-1.1.6" - sources."cross-spawn-5.1.0" sources."crypto-browserify-3.12.0" - sources."d-1.0.0" + sources."cyclist-0.2.2" sources."date-now-0.1.4" - sources."decamelize-1.2.0" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" sources."des.js-1.0.0" sources."diffie-hellman-5.0.2" sources."domain-browser-1.2.0" + sources."duplexify-3.5.3" sources."elliptic-6.4.0" sources."emojis-list-2.1.0" - sources."enhanced-resolve-3.4.1" - sources."errno-0.1.6" - sources."error-ex-1.3.1" - sources."es5-ext-0.10.38" - sources."es6-iterator-2.0.3" - sources."es6-map-0.1.5" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" - sources."es6-weak-map-2.0.2" - sources."escope-3.6.0" - sources."esrecurse-4.2.0" + sources."end-of-stream-1.4.1" + sources."enhanced-resolve-4.0.0" + sources."errno-0.1.7" + sources."eslint-scope-3.7.1" + sources."esrecurse-4.2.1" sources."estraverse-4.2.0" - sources."event-emitter-0.3.5" sources."events-1.1.1" sources."evp_bytestokey-1.0.3" - sources."execa-0.7.0" - sources."expand-brackets-0.1.5" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) sources."expand-range-1.8.2" - sources."extglob-0.3.2" - sources."fast-deep-equal-1.0.0" + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" + ]; + }) + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."filename-regex-2.0.1" - sources."fill-range-2.2.3" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."find-cache-dir-1.0.0" sources."find-up-2.1.0" + sources."flush-write-stream-1.0.2" sources."for-in-1.0.2" sources."for-own-0.1.5" + sources."fragment-cache-0.2.1" + sources."from2-2.3.0" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" sources."fsevents-1.1.3" - sources."get-caller-file-1.0.2" - sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" - sources."has-flag-2.0.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" sources."hash-base-3.0.4" sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" - sources."hosted-git-info-2.5.0" sources."https-browserify-1.0.0" sources."ieee754-1.1.8" + sources."iferr-0.1.5" + sources."imurmurhash-0.1.4" sources."indexof-0.0.1" + sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."interpret-1.1.0" - sources."invert-kv-1.0.0" - sources."is-arrayish-0.2.1" + sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" - sources."is-fullwidth-code-point-1.0.0" sources."is-glob-2.0.1" - sources."is-number-2.1.0" + sources."is-number-3.0.0" + sources."is-odd-2.0.0" + sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-stream-1.1.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-2.1.0" - sources."json-loader-0.5.7" + sources."isobject-3.0.1" sources."json-schema-traverse-0.3.1" sources."json5-0.5.1" - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" - sources."lcid-1.0.0" - sources."load-json-file-2.0.0" + sources."kind-of-6.0.2" + sources."lazy-cache-2.0.2" sources."loader-runner-2.3.0" sources."loader-utils-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" - sources."longest-1.0.1" + sources."lodash-4.17.5" sources."lru-cache-4.1.1" + sources."make-dir-1.2.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."md5.js-1.3.4" - sources."mem-1.1.0" sources."memory-fs-0.4.1" - sources."micromatch-2.3.11" + (sources."micromatch-3.1.9" // { + dependencies = [ + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + sources."is-number-4.0.0" + ]; + }) sources."miller-rabin-4.0.1" - sources."mimic-fn-1.1.0" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."mississippi-2.0.0" + sources."mixin-deep-1.3.1" sources."mkdirp-0.5.1" - sources."nan-2.8.0" + sources."move-concurrently-1.0.1" + sources."ms-2.0.0" + sources."nan-2.9.2" + sources."nanomatch-1.2.9" + sources."neo-async-2.5.0" (sources."node-libs-browser-2.1.0" // { dependencies = [ sources."hash-base-2.0.2" sources."inherits-2.0.1" ]; }) - sources."normalize-package-data-2.4.0" sources."normalize-path-2.1.1" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" sources."object.omit-2.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."os-locale-2.1.0" - sources."p-finally-1.0.0" sources."p-limit-1.2.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" sources."pako-1.0.6" + sources."parallel-transform-1.1.0" sources."parse-asn1-5.1.0" sources."parse-glob-3.0.4" - sources."parse-json-2.2.0" + sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-type-2.0.0" sources."pbkdf2-3.0.14" - sources."pify-2.3.0" + sources."pify-3.0.0" + sources."pkg-dir-2.0.0" + sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" sources."process-0.11.10" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" + sources."promise-inflight-1.0.1" sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."public-encrypt-4.0.0" + sources."pump-2.0.1" + sources."pumpify-1.4.0" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -41366,89 +42023,150 @@ in ]; }) sources."randombytes-2.0.6" - sources."randomfill-1.0.3" - sources."read-pkg-2.0.0" - sources."read-pkg-up-2.0.0" - sources."readable-stream-2.3.3" + sources."randomfill-1.0.4" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."right-align-0.1.3" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."rimraf-2.6.2" sources."ripemd160-2.0.1" + sources."run-queue-1.0.3" sources."safe-buffer-5.1.1" - sources."semver-5.5.0" - sources."set-blocking-2.0.0" + sources."safe-regex-1.1.0" + sources."schema-utils-0.4.5" + sources."serialize-javascript-1.4.0" + sources."set-getter-0.1.0" sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.10" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" - sources."source-list-map-2.0.0" - sources."source-map-0.5.7" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" - sources."stream-browserify-2.0.1" - sources."stream-http-2.8.0" - sources."string-width-2.1.1" - sources."string_decoder-1.0.3" - sources."strip-ansi-3.0.1" - sources."strip-bom-3.0.0" - sources."strip-eof-1.0.0" - sources."supports-color-4.5.0" - sources."tapable-0.2.8" - sources."timers-browserify-2.0.6" - sources."to-arraybuffer-1.0.1" - sources."tty-browserify-0.0.0" - sources."uglify-js-2.8.29" - sources."uglify-to-browserify-1.0.2" - (sources."uglifyjs-webpack-plugin-0.4.6" // { + (sources."snapdragon-0.8.1" // { dependencies = [ - sources."yargs-3.10.0" + (sources."define-property-0.2.5" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" ]; }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."source-list-map-2.0.0" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + ]; + }) + sources."ssri-5.2.4" + sources."static-extend-0.1.2" + sources."stream-browserify-2.0.1" + sources."stream-each-1.2.2" + sources."stream-http-2.8.0" + sources."stream-shift-1.0.0" + sources."string_decoder-1.0.3" + sources."tapable-1.0.0" + sources."through2-2.0.3" + sources."timers-browserify-2.0.6" + sources."to-arraybuffer-1.0.1" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."tty-browserify-0.0.0" + sources."typedarray-0.0.6" + sources."uglify-es-3.3.10" + (sources."uglifyjs-webpack-plugin-1.2.2" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + sources."unique-filename-1.1.0" + sources."unique-slug-2.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) + sources."use-2.0.2" sources."util-0.10.3" sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.1" sources."vm-browserify-0.0.4" - sources."watchpack-1.4.0" + (sources."watchpack-1.4.0" // { + dependencies = [ + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + sources."kind-of-3.2.2" + sources."micromatch-2.3.11" + ]; + }) (sources."webpack-sources-1.1.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."which-1.3.0" - sources."which-module-2.0.0" - sources."window-size-0.1.0" - sources."wordwrap-0.0.2" - sources."wrap-ansi-2.1.0" + sources."worker-farm-1.5.4" + sources."wrappy-1.0.2" sources."xtend-4.0.1" - sources."y18n-3.2.1" + sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-8.0.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."camelcase-4.1.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."yargs-parser-7.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -41462,15 +42180,20 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.3.2.tgz"; - sha1 = "45c7cb50cbea90d6127a3c4bb128802a67f67c93"; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.4.0.tgz"; + sha1 = "4103e737196eb2a9fe83087752357d1dfe618294"; }; dependencies = [ - sources."@types/node-9.3.0" + sources."@types/node-9.4.6" sources."JSONSelect-0.2.1" - sources."acorn-5.3.0" + sources."acorn-5.5.0" + (sources."acorn-dynamic-import-2.0.2" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -41479,23 +42202,32 @@ in sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-0.33.0" // { + (sources."addons-linter-0.35.0" // { dependencies = [ sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.0" sources."async-2.6.0" + sources."camelcase-1.2.1" sources."cli-cursor-1.0.2" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) sources."debug-3.1.0" sources."decamelize-1.2.0" sources."domelementtype-1.1.3" sources."figures-1.7.0" - sources."globals-11.2.0" + sources."globals-11.3.0" + sources."hash-base-2.0.2" + sources."inherits-2.0.1" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-1.0.0" sources."mute-stream-0.0.5" sources."onetime-1.1.0" + sources."parse-json-2.2.0" sources."pluralize-1.2.1" sources."progress-1.1.8" sources."punycode-2.1.0" @@ -41510,24 +42242,22 @@ in sources."supports-color-4.5.0" sources."table-3.8.3" sources."underscore-1.6.0" + sources."wordwrap-0.0.2" (sources."yargs-10.0.3" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."camelcase-4.1.0" sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."strip-ansi-3.0.1" + sources."string-width-2.1.1" ]; }) + sources."yargs-parser-8.1.0" ]; }) sources."adm-zip-0.4.7" sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" + sources."ajv-keywords-3.1.0" + sources."ajv-merge-patch-3.0.0" + sources."align-text-0.1.4" sources."anchor-markdown-header-0.5.7" sources."ansi-align-2.0.0" sources."ansi-escapes-3.0.0" @@ -41537,7 +42267,7 @@ in sources."anymatch-1.3.2" sources."archiver-2.1.1" sources."archiver-utils-1.3.0" - sources."argparse-1.0.9" + sources."argparse-1.0.10" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-filter-0.0.1" @@ -41549,6 +42279,8 @@ in sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."asn1-0.2.3" + sources."asn1.js-4.10.1" + sources."assert-1.4.1" sources."assert-plus-1.0.0" sources."async-0.2.10" sources."async-each-1.0.1" @@ -41557,7 +42289,7 @@ in sources."aws4-1.6.0" sources."babel-code-frame-6.26.0" sources."babel-core-6.26.0" - sources."babel-generator-6.26.0" + sources."babel-generator-6.26.1" sources."babel-helpers-6.24.1" sources."babel-messages-6.23.0" (sources."babel-polyfill-6.26.0" // { @@ -41578,24 +42310,37 @@ in sources."babylon-6.18.0" sources."bail-1.0.2" sources."balanced-match-1.0.0" + sources."base64-js-1.2.3" sources."base64url-2.0.0" sources."bcrypt-pbkdf-1.0.1" + sources."big.js-3.2.0" sources."binary-extensions-1.11.0" sources."bl-1.2.1" sources."bluebird-2.9.34" + sources."bn.js-4.11.8" sources."boolbase-1.0.0" sources."boom-4.3.1" sources."boundary-1.0.1" sources."boxen-1.3.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) + sources."brorand-1.1.0" + sources."browserify-aes-1.1.1" + sources."browserify-cipher-1.0.0" + sources."browserify-des-1.0.0" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."buffer-4.9.1" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" + sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" (sources."bunyan-1.8.12" // { dependencies = [ sources."glob-6.0.4" @@ -41608,6 +42353,7 @@ in sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."ccount-1.0.2" + sources."center-align-0.1.3" sources."chalk-2.3.0" sources."character-entities-1.2.1" sources."character-entities-html4-1.1.1" @@ -41620,15 +42366,12 @@ in ]; }) sources."chokidar-1.7.0" + sources."cipher-base-1.0.4" sources."circular-json-0.3.3" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) + sources."cliui-2.1.0" sources."clone-1.0.3" sources."co-4.6.0" sources."code-point-at-1.1.0" @@ -41637,19 +42380,24 @@ in sources."color-name-1.1.3" sources."colors-0.5.1" sources."columnify-1.5.4" - sources."combined-stream-1.0.5" - sources."commander-2.13.0" + sources."combined-stream-1.0.6" + sources."commander-2.14.1" sources."common-tags-1.7.2" sources."compress-commons-1.2.2" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."configstore-3.1.1" + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" sources."convert-source-map-1.5.1" sources."core-js-2.5.3" sources."core-util-is-1.0.2" sources."crc-3.5.0" sources."crc32-stream-2.0.0" + sources."create-ecdh-4.0.0" sources."create-error-class-3.0.2" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" sources."cross-spawn-5.1.0" sources."crx-parser-0.1.2" (sources."cryptiles-3.1.2" // { @@ -41657,14 +42405,17 @@ in sources."boom-5.2.0" ]; }) + sources."crypto-browserify-3.12.0" sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" sources."css-what-2.1.0" sources."d-1.0.0" sources."dashdash-1.14.1" + sources."date-now-0.1.4" sources."debounce-1.1.0" sources."debug-2.6.9" sources."decamelize-2.0.0" + sources."deep-equal-1.0.1" sources."deep-extend-0.4.2" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" @@ -41672,15 +42423,19 @@ in sources."defaults-1.0.3" sources."del-2.2.2" sources."delayed-stream-1.0.0" + sources."des.js-1.0.0" sources."detect-indent-4.0.0" + sources."diffie-hellman-5.0.2" (sources."dispensary-0.12.0" // { dependencies = [ + sources."semver-5.4.1" sources."source-map-support-0.5.0" ]; }) sources."doctoc-1.3.0" sources."doctrine-2.1.0" sources."dom-serializer-0.1.0" + sources."domain-browser-1.2.0" sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.5.1" @@ -41689,12 +42444,16 @@ in sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.1" sources."ecdsa-sig-formatter-1.0.9" + sources."elliptic-6.4.0" sources."emoji-regex-6.1.3" + sources."emojis-list-2.1.0" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" + sources."enhanced-resolve-3.4.1" sources."entities-1.1.1" + sources."errno-0.1.7" sources."error-ex-1.3.1" - sources."es5-ext-0.10.38" + sources."es5-ext-0.10.39" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -41733,14 +42492,16 @@ in }) sources."eslint-scope-3.7.1" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.2" + sources."espree-3.5.3" sources."esprima-3.1.3" sources."esquery-1.0.0" - sources."esrecurse-4.2.0" + sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" + sources."events-1.1.1" + sources."evp_bytestokey-1.0.3" sources."execa-0.7.0" sources."exit-hook-1.1.1" sources."expand-brackets-0.1.5" @@ -41748,9 +42509,11 @@ in sources."extend-3.0.1" sources."external-editor-2.1.0" sources."extglob-0.3.2" + sources."extract-text-webpack-plugin-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-parse-1.0.3" + sources."fast-json-patch-1.2.2" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-1.2.3" @@ -41773,7 +42536,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" sources."fsevents-1.1.3" @@ -41814,22 +42577,28 @@ in sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."has-flag-2.0.0" + sources."hash-base-3.0.4" + sources."hash.js-1.1.3" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hmac-drbg-1.0.1" + sources."hoek-4.2.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.5.0" sources."htmlparser2-3.9.2" sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" sources."iconv-lite-0.4.19" + sources."ieee754-1.1.8" sources."ignore-3.3.7" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" + sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."inquirer-3.3.0" sources."interpret-1.1.0" - sources."invariant-2.2.2" + sources."invariant-2.2.3" sources."invert-kv-1.0.0" sources."is-absolute-0.1.7" sources."is-alphabetical-1.0.1" @@ -41848,7 +42617,8 @@ in sources."is-glob-2.0.1" sources."is-hexadecimal-1.0.1" sources."is-installed-globally-0.1.0" - sources."is-my-json-valid-2.17.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" sources."is-npm-1.0.0" sources."is-number-2.1.0" sources."is-obj-1.0.1" @@ -41879,6 +42649,8 @@ in sources."js-yaml-3.10.0" sources."jsbn-0.1.1" sources."jsesc-1.3.0" + sources."json-loader-0.5.7" + sources."json-merge-patch-0.2.3" sources."json-parse-better-errors-1.0.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -41896,30 +42668,39 @@ in sources."jws-3.1.4" sources."kind-of-3.2.2" sources."latest-version-3.1.0" + sources."lazy-cache-1.0.4" sources."lazystream-1.0.0" sources."lcid-1.0.0" sources."levn-0.3.0" - sources."load-json-file-1.1.0" + sources."load-json-file-2.0.0" + sources."loader-runner-2.3.0" + sources."loader-utils-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash.endswith-4.2.1" - sources."lodash.isfunction-3.0.8" + sources."lodash.isfunction-3.0.9" sources."lodash.isstring-4.0.1" sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" sources."lodash.startswith-4.2.1" + sources."longest-1.0.1" sources."longest-streak-1.0.0" sources."loose-envify-1.3.1" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."markdown-table-0.4.0" sources."markdown-to-ast-3.4.0" + sources."md5.js-1.3.4" sources."mem-1.1.0" + sources."memory-fs-0.4.1" sources."micromatch-2.3.11" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."miller-rabin-4.0.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -41932,7 +42713,7 @@ in sources."mute-stream-0.0.7" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" @@ -41943,7 +42724,8 @@ in sources."traverse-0.4.6" ]; }) - sources."node-forge-0.7.1" + sources."node-forge-0.7.2" + sources."node-libs-browser-2.1.0" sources."node-notifier-5.2.1" sources."nomnom-1.8.1" sources."normalize-package-data-2.4.0" @@ -41958,6 +42740,7 @@ in sources."onetime-2.0.1" sources."open-0.0.5" sources."optionator-0.8.2" + sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" sources."os-shim-0.1.3" @@ -41968,16 +42751,19 @@ in sources."p-try-1.0.0" sources."package-json-4.0.1" sources."pako-1.0.6" + sources."parse-asn1-5.1.0" sources."parse-entities-1.1.1" sources."parse-glob-3.0.4" sources."parse-json-4.0.0" sources."parse5-3.0.3" + sources."path-browserify-0.0.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.5" - sources."path-type-1.1.0" + sources."path-type-2.0.0" + sources."pbkdf2-3.0.14" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."pify-2.3.0" @@ -42002,12 +42788,17 @@ in sources."debug-2.6.9" ]; }) - sources."process-nextick-args-1.0.7" + sources."process-0.11.10" + sources."process-nextick-args-2.0.0" sources."progress-2.0.0" + sources."prr-1.0.1" sources."pseudomap-1.0.2" + sources."public-encrypt-4.0.0" sources."pump-2.0.1" sources."punycode-1.4.1" sources."qs-6.5.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" sources."quick-format-unescaped-1.1.2" (sources."randomatic-1.1.7" // { dependencies = [ @@ -42018,16 +42809,18 @@ in }) ]; }) - sources."rc-1.2.4" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.3" + sources."randombytes-2.0.6" + sources."randomfill-1.0.4" + sources."rc-1.2.5" + sources."read-pkg-2.0.0" + sources."read-pkg-up-2.0.0" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."regenerator-runtime-0.11.1" sources."regex-cache-0.4.4" - sources."registry-auth-token-3.3.1" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { dependencies = [ @@ -42052,22 +42845,26 @@ in sources."resolve-1.5.0" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" + sources."right-align-0.1.3" sources."rimraf-2.6.2" + sources."ripemd160-2.0.1" sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" - sources."safe-json-stringify-1.0.4" + sources."safe-json-stringify-1.1.0" sources."sax-1.2.4" - sources."semver-5.4.1" + sources."schema-utils-0.3.0" + sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" + sources."setimmediate-1.0.5" sources."sha.js-2.4.10" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" - sources."shelljs-0.8.0" + sources."shelljs-0.8.1" sources."shellwords-0.1.1" (sources."sign-addon-0.2.2" // { dependencies = [ @@ -42098,20 +42895,24 @@ in sources."slash-1.0.0" sources."slice-ansi-1.0.0" sources."sntp-2.1.0" + sources."source-list-map-2.0.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.2" // { + (sources."source-map-support-0.5.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."spawn-sync-1.0.15" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."split-0.3.3" sources."split2-2.2.0" sources."sprintf-js-1.0.3" sources."sshpk-1.13.1" + sources."stream-browserify-2.0.1" + sources."stream-http-2.8.0" sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" (sources."stream-to-promise-2.2.0" // { @@ -42132,7 +42933,12 @@ in sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."supports-color-2.0.0" - sources."table-4.0.2" + (sources."table-4.0.3" // { + dependencies = [ + sources."ajv-6.2.0" + ]; + }) + sources."tapable-0.2.8" sources."tar-stream-1.5.5" sources."term-size-1.2.0" sources."text-table-0.2.0" @@ -42141,21 +42947,31 @@ in sources."through-2.3.8" sources."through2-2.0.3" sources."timed-out-4.0.1" + sources."timers-browserify-2.0.6" sources."tmp-0.0.33" + sources."to-arraybuffer-1.0.1" sources."to-fast-properties-1.0.3" sources."topo-1.1.0" sources."tosource-1.0.0" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tr46-1.0.1" sources."traverse-0.6.6" sources."trim-0.0.1" sources."trim-right-1.0.1" sources."trim-trailing-lines-1.1.0" sources."trough-1.0.1" + sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" + sources."uglify-js-2.8.29" + sources."uglify-to-browserify-1.0.2" + (sources."uglifyjs-webpack-plugin-0.4.6" // { + dependencies = [ + sources."yargs-3.10.0" + ]; + }) sources."underscore-1.8.3" sources."unherit-1.1.0" sources."unified-4.2.1" @@ -42172,14 +42988,21 @@ in ]; }) sources."update-section-0.3.3" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) sources."url-parse-lax-1.0.0" sources."user-home-2.0.0" + sources."util-0.10.3" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vfile-1.4.0" sources."vfile-location-2.0.2" + sources."vm-browserify-0.0.4" (sources."watchpack-1.4.0" // { dependencies = [ sources."async-2.6.0" @@ -42187,11 +43010,30 @@ in }) sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" + (sources."webpack-3.10.0" // { + dependencies = [ + sources."ajv-keywords-2.1.1" + sources."ansi-regex-2.1.1" + sources."camelcase-4.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."source-map-0.5.7" + sources."string-width-2.1.1" + sources."strip-ansi-3.0.1" + (sources."yargs-8.0.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + ]; + }) + sources."webpack-sources-1.1.0" sources."whatwg-url-6.3.0" sources."when-3.7.7" sources."which-1.3.0" sources."which-module-2.0.0" sources."widest-line-2.0.0" + sources."window-size-0.1.0" sources."winreg-0.0.12" sources."wordwrap-1.0.0" sources."wrap-ansi-2.1.0" @@ -42200,7 +43042,7 @@ in sources."write-file-atomic-2.3.0" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.4" + sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" sources."xregexp-4.0.0" sources."xtend-4.0.1" @@ -42209,19 +43051,24 @@ in (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" + sources."cliui-3.2.0" sources."decamelize-1.2.0" sources."find-up-1.1.2" sources."is-fullwidth-code-point-1.0.0" + sources."load-json-file-1.1.0" sources."os-locale-1.4.0" sources."parse-json-2.2.0" sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" sources."string-width-1.0.2" sources."strip-bom-2.0.0" sources."which-module-1.0.0" sources."yargs-parser-4.2.1" ]; }) - sources."yargs-parser-8.1.0" + sources."yargs-parser-7.0.0" sources."yauzl-2.9.1" (sources."zip-dir-1.0.2" // { dependencies = [ @@ -42259,10 +43106,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.3.2"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.3.2.tgz"; - sha1 = "5939762581b5b4ddcd3418c0f6be42df3aee195f"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.5.1.tgz"; + sha1 = "e8680360e832ac89521eb80dad3a7bc27a40bab4"; }; buildInputs = globalBuildInputs; meta = { @@ -42311,7 +43158,7 @@ in }) sources."boom-4.3.1" sources."boxen-1.3.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."cacheable-request-2.1.4" sources."camelcase-2.1.1" @@ -42333,7 +43180,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."configstore-3.1.1" @@ -42371,7 +43218,7 @@ in sources."extend-3.0.1" sources."external-editor-2.1.0" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" sources."filter-obj-1.1.0" @@ -42380,7 +43227,7 @@ in sources."first-chunk-stream-2.0.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."from2-2.3.0" sources."fs.realpath-1.0.0" (sources."fullname-3.3.0" // { @@ -42397,18 +43244,18 @@ in sources."glob-7.1.2" sources."global-dirs-0.1.1" sources."globby-6.1.0" - sources."got-8.0.3" + sources."got-8.2.0" sources."graceful-fs-4.1.11" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" - sources."has-symbol-support-x-1.4.1" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."has-unicode-2.0.1" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."hosted-git-info-2.5.0" sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" @@ -42424,9 +43271,9 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) (sources."insight-0.8.4" // { @@ -42490,7 +43337,7 @@ in sources."latest-version-3.1.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."lodash._getnative-3.9.1" sources."lodash.debounce-3.1.1" sources."lodash.pad-4.5.1" @@ -42500,7 +43347,7 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" + sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" sources."mem-fs-1.1.3" @@ -42511,9 +43358,9 @@ in sources."read-pkg-up-1.0.1" ]; }) - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" sources."mimic-response-1.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -42547,7 +43394,7 @@ in }) sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."osx-release-1.1.0" sources."p-any-1.1.0" sources."p-cancelable-0.3.0" @@ -42583,12 +43430,12 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."query-string-5.0.1" - sources."rc-1.2.4" + sources."query-string-5.1.0" + sources."rc-1.2.5" sources."read-pkg-1.1.0" (sources."read-pkg-up-2.0.0" // { dependencies = [ @@ -42601,10 +43448,10 @@ in sources."strip-bom-3.0.0" ]; }) - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."readline2-1.0.1" sources."redent-1.0.0" - sources."registry-auth-token-3.3.1" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeating-2.0.1" sources."replace-ext-0.0.1" @@ -42635,9 +43482,10 @@ in sources."sort-keys-2.0.0" sources."sort-on-2.0.0" sources."spawn-sync-1.0.15" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" sources."sshpk-1.13.1" sources."strict-uri-encode-1.1.0" sources."string-length-1.0.1" @@ -42675,7 +43523,7 @@ in sources."timed-out-4.0.1" sources."titleize-1.0.0" sources."tmp-0.0.33" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -42688,9 +43536,9 @@ in dependencies = [ sources."ansi-styles-3.2.0" sources."camelcase-4.1.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."execa-0.7.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) sources."url-parse-lax-3.0.0" @@ -42698,7 +43546,7 @@ in sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vinyl-1.2.0" sources."vinyl-file-2.0.0" @@ -42730,11 +43578,11 @@ in (sources."yeoman-environment-2.0.5" // { dependencies = [ sources."ansi-styles-3.2.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."debug-3.1.0" sources."log-symbols-2.2.0" sources."pify-2.3.0" - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" ]; }) (sources."yosay-2.0.1" // { diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 744894de4ffd..8abdc0e608cd 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -11,4 +11,5 @@ , "pnpm" , "semver" , "sloc" +, "npm" ] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 7397866ccea8..61752e7598c5 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -1,432 +1,9 @@ -# This file has been generated by node2nix 1.5.1. Do not edit! +# This file has been generated by node2nix 1.5.2. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "@most/multicast-1.3.0" = { - name = "_at_most_slash_multicast"; - packageName = "@most/multicast"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@most/multicast/-/multicast-1.3.0.tgz"; - sha512 = "2zs8n5gpgl9frbw960m4q63svcgvqkbb9iay3klw3qcj4c0hwbw6llbkj9h4v13s1fh5gc4k6zg2cxpz4vipbp6kzbrd9v0500zqq8d"; - }; - }; - "@most/prelude-1.7.0" = { - name = "_at_most_slash_prelude"; - packageName = "@most/prelude"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@most/prelude/-/prelude-1.7.0.tgz"; - sha512 = "0cdx6nag042jl38sm34c4cpc70wya0xns7f5j9i3hs8kwca8lkgbss9db6jkgd090hpvxq2qh5fzxnfnw705ph1zklgmnxf9wgw4l1s"; - }; - }; - "@pnpm/check-package-1.0.0" = { - name = "_at_pnpm_slash_check-package"; - packageName = "@pnpm/check-package"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/check-package/-/check-package-1.0.0.tgz"; - sha512 = "1hg0g5snqp1lkmnmis335fpvg7xz93snvlbzqmyxxmyl0ab2d4wdlar6rwl7gr59113cpsyn2k3sawh656zrp6fp8q1rdy6x24a3pxc"; - }; - }; - "@pnpm/default-fetcher-0.3.2" = { - name = "_at_pnpm_slash_default-fetcher"; - packageName = "@pnpm/default-fetcher"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/default-fetcher/-/default-fetcher-0.3.2.tgz"; - sha512 = "25lb4pf7sqsw31h5rdaqii969bl19ypip4l3x19i28p3c2174zi1hk152y3r6z36rfp66sfwq0p6f6gvnx10lf46vigw02ppv7szk49"; - }; - }; - "@pnpm/default-resolver-0.1.2" = { - name = "_at_pnpm_slash_default-resolver"; - packageName = "@pnpm/default-resolver"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/default-resolver/-/default-resolver-0.1.2.tgz"; - sha512 = "3smnd8xcmslnba22i9p10f7a724whjm2wvjz3l9fvw23fw8d5nwn78xdkgrvpraqb7xw75xwq8cxj3nvmvib1iqpmp3pcx7j4px5fhx"; - }; - }; - "@pnpm/fs-locker-1.0.1" = { - name = "_at_pnpm_slash_fs-locker"; - packageName = "@pnpm/fs-locker"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/fs-locker/-/fs-locker-1.0.1.tgz"; - sha512 = "3nadpl6sinl2h484m7nnn1vsry8pp0kfxgw8apbnyhajqsq00chx3f2v93hl26xnxri2wlhz0s2pc15617xb0xlpln9n1lzrr43fqw2"; - }; - }; - "@pnpm/git-fetcher-0.2.0" = { - name = "_at_pnpm_slash_git-fetcher"; - packageName = "@pnpm/git-fetcher"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/git-fetcher/-/git-fetcher-0.2.0.tgz"; - sha512 = "2ax9drzzzrc2c7risivkxbv76nxdxafhfckl5g481b3k92gc8r8hl4j6kwrq8vl62sav010ssd7giadxs0b0h0nxqgwppsf0v942492"; - }; - }; - "@pnpm/git-resolver-0.3.0" = { - name = "_at_pnpm_slash_git-resolver"; - packageName = "@pnpm/git-resolver"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/git-resolver/-/git-resolver-0.3.0.tgz"; - sha512 = "3xh8kq7pykgpp39g7pjd7x9f834q2dj3jxw3fcrikim1vpn0xiim3g17mz9s87ci0cxrgxcrn2sd4qcap99z9jg5s577af64z4pj6qw"; - }; - }; - "@pnpm/local-resolver-0.1.1" = { - name = "_at_pnpm_slash_local-resolver"; - packageName = "@pnpm/local-resolver"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/local-resolver/-/local-resolver-0.1.1.tgz"; - sha512 = "3i66qx6iw71i07pg21k5j044r807ysq2ijy8q4a92jdg2a17w55ah2j59rs2mxsljl9kkxvp06852q8x00j2g8bbw2v5iivl5191h7y"; - }; - }; - "@pnpm/logger-1.0.0" = { - name = "_at_pnpm_slash_logger"; - packageName = "@pnpm/logger"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/logger/-/logger-1.0.0.tgz"; - sha512 = "2yi5y7s91gz8dhv7gjqar4mp7j6mr2m05irm9l85v2xlzsaqx7mcjw0gap3xmpfmbi1di5rb1g57l7k3zh4nrh0mzcixfd2ykkq86jm"; - }; - }; - "@pnpm/npm-resolver-0.3.11" = { - name = "_at_pnpm_slash_npm-resolver"; - packageName = "@pnpm/npm-resolver"; - version = "0.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/npm-resolver/-/npm-resolver-0.3.11.tgz"; - sha512 = "1mjzlk9hv180r3igrcg3kmgvkp5wkv2ipsr4aqmcjzky8sgz152g22292ps6sndcggri71a8ivjzi61f36bxcz60vz55zvmi6mnawdz"; - }; - }; - "@pnpm/outdated-0.2.5" = { - name = "_at_pnpm_slash_outdated"; - packageName = "@pnpm/outdated"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/outdated/-/outdated-0.2.5.tgz"; - sha512 = "08y7lv6gzw8yyzj24djya1pzh8r41rciz102lhb3nq279dyg5sgzr18z6fqlff8krdw160a8adx5s4csmlmfah2akawpczz9h8zy609"; - }; - }; - "@pnpm/package-requester-0.7.1" = { - name = "_at_pnpm_slash_package-requester"; - packageName = "@pnpm/package-requester"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/package-requester/-/package-requester-0.7.1.tgz"; - sha512 = "09azfnn5831bniyy2va2bjwaxx2pvgbxwqzd82f4p4y4610b26ii3mpyhpd5l19via1il1ylxc73na8ih2ihgv8xi9x9jd4dv6lfnfz"; - }; - }; - "@pnpm/pkgid-to-filename-1.0.0" = { - name = "_at_pnpm_slash_pkgid-to-filename"; - packageName = "@pnpm/pkgid-to-filename"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/pkgid-to-filename/-/pkgid-to-filename-1.0.0.tgz"; - sha512 = "17f44ay160i8pd1sl26v7ph8vdbx6bhydp0jhdc6mslhlyp4bwd1i9220hjvpiyiqkx4hwb4pa5b6hqzq3nyz8ldmna084wfz5q6x8y"; - }; - }; - "@pnpm/server-0.7.1" = { - name = "_at_pnpm_slash_server"; - packageName = "@pnpm/server"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/server/-/server-0.7.1.tgz"; - sha512 = "0y2h510ps6kg1ssdwfpi0wrb4ps7jr28qrng2hfwh01r969f2j1nskajzvn6wa68hnfjq2ysajl66nwccrqydsj24w6dn2kl1jbl0b6"; - }; - }; - "@pnpm/tarball-fetcher-0.3.4" = { - name = "_at_pnpm_slash_tarball-fetcher"; - packageName = "@pnpm/tarball-fetcher"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/tarball-fetcher/-/tarball-fetcher-0.3.4.tgz"; - sha512 = "1mpgr0ywrzkxq013ci9rjc9w9jdmr4lp5x121wwnnlybnzsxb98vzkh9mhmlrm77i98sb2drv880d82wgkdxkzx2d445pcmcsmf4z0w"; - }; - }; - "@pnpm/tarball-resolver-0.1.0" = { - name = "_at_pnpm_slash_tarball-resolver"; - packageName = "@pnpm/tarball-resolver"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/tarball-resolver/-/tarball-resolver-0.1.0.tgz"; - sha512 = "3rdjpckjhhcamkin62ycyqqssvjxd1kx7k927z8m7ing9sqgsf2ascpg2wpp2kh1shbgl5kkldgbalnqm41xv09fqa9ka9rd3saxrr1"; - }; - }; - "@pnpm/types-1.7.0" = { - name = "_at_pnpm_slash_types"; - packageName = "@pnpm/types"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/types/-/types-1.7.0.tgz"; - sha512 = "2bww115m0q5d4m69xvm0kn8xmidncrp3xc8rn2sj03xpkhnd78mcn3m0ib13sq0mlhl4fgq3abvdhlhmxicdp3g6j9zb8awxkif0zm6"; - }; - }; - "@sindresorhus/is-0.7.0" = { - name = "_at_sindresorhus_slash_is"; - packageName = "@sindresorhus/is"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; - sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q"; - }; - }; - "@types/archy-0.0.31" = { - name = "_at_types_slash_archy"; - packageName = "@types/archy"; - version = "0.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/archy/-/archy-0.0.31.tgz"; - sha512 = "08lzn97gp9rbcmfs592xib111b3fn7nlvmnkn3vpxm2ins5as3p3s3447d5y22lgx6zr6696q9dv27mjgm1cabi1zh2amq57f5p3rxz"; - }; - }; - "@types/byline-4.2.31" = { - name = "_at_types_slash_byline"; - packageName = "@types/byline"; - version = "4.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/byline/-/byline-4.2.31.tgz"; - sha1 = "0e61fcb9c03e047d21c4496554c7116297ab60cd"; - }; - }; - "@types/chalk-0.4.31" = { - name = "_at_types_slash_chalk"; - packageName = "@types/chalk"; - version = "0.4.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz"; - sha1 = "a31d74241a6b1edbb973cf36d97a2896834a51f9"; - }; - }; - "@types/common-tags-1.4.0" = { - name = "_at_types_slash_common-tags"; - packageName = "@types/common-tags"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.4.0.tgz"; - sha512 = "1s47pidf7gs7k79gxz1yy0rwhamf147h9ylvg9b6wfc8p3ixpzsq2xlj2w99mq9pi2j1g2flia2z21babjhrdzln1snggivxx46v38w"; - }; - }; - "@types/get-port-3.2.0" = { - name = "_at_types_slash_get-port"; - packageName = "@types/get-port"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/get-port/-/get-port-3.2.0.tgz"; - sha512 = "3axab8z99gfcfzqvrqs2dq6qa24abjxblh17grpqxxgcz0wyg5xrabj5ss8zzcn7ybpgx2n2gy401hbdxgz96zvwig3g3343pqn08sf"; - }; - }; - "@types/got-7.1.6" = { - name = "_at_types_slash_got"; - packageName = "@types/got"; - version = "7.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/got/-/got-7.1.6.tgz"; - sha512 = "0l95rpnrhc6n7khfjm4cl59206f387xap0j2qrk1j6z5gginkxfnkps2l0jw4jq842ii0hzdcakgxnllc2zxmdzsdg2z1wkm28jqf1i"; - }; - }; - "@types/load-json-file-2.0.7" = { - name = "_at_types_slash_load-json-file"; - packageName = "@types/load-json-file"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/load-json-file/-/load-json-file-2.0.7.tgz"; - sha512 = "1gwn4lafk2nq3nrxl8vjbndpb1ky25hkj4h7hjxh8kyxzlqmhk8258ah4a5g4fdv5yap970nkpsn8vsss3iwh7qah1b9vsmz66gmc9n"; - }; - }; - "@types/mem-1.1.2" = { - name = "_at_types_slash_mem"; - packageName = "@types/mem"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mem/-/mem-1.1.2.tgz"; - sha1 = "e3c8b095f2f2563b518f0aad59df9fe6a8b82065"; - }; - }; - "@types/mz-0.0.32" = { - name = "_at_types_slash_mz"; - packageName = "@types/mz"; - version = "0.0.32"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mz/-/mz-0.0.32.tgz"; - sha512 = "3i9s14bzsibxc5700404s654iygj7j301kvrkmyf1wy5ncglr1m9rcgysfy5zhmsjpp96g009fm66hy1py92imjfa77pb51n9wz4bbk"; - }; - }; - "@types/node-7.0.52" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "7.0.52"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-7.0.52.tgz"; - sha512 = "3jzvdqsd0pgl0ax2vbn9h8iawx4m6pjf21wb8lqz34glnacjz5l4qv2b3h53j2dbs497g6aqdvkxfahrwvkc9a1q5zy3c46q9174flf"; - }; - }; - "@types/node-8.5.9" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "8.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz"; - sha512 = "2j38fqqziiv6m51w16lz6lgivrkycvn4nwch7sdpg32hbl5kv5m2ngg4y4jrf0v1s7iryi5gyh9729b8l1p48cf9hf0gj567h13grxk"; - }; - }; - "@types/node-9.3.0" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz"; - sha512 = "0mhmzddyv8rhkha7ibpbsa5dfygzaa90438aqzpg9w7d31n093a7spx2zg4zfki4qrab71xrfb381hmqajn826cnrw9kc7kv2y5zl60"; - }; - }; - "@types/nopt-3.0.29" = { - name = "_at_types_slash_nopt"; - packageName = "@types/nopt"; - version = "3.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/nopt/-/nopt-3.0.29.tgz"; - sha1 = "f19df3db4c97ee1459a2740028320a71d70964ce"; - }; - }; - "@types/npm-2.0.29" = { - name = "_at_types_slash_npm"; - packageName = "@types/npm"; - version = "2.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/npm/-/npm-2.0.29.tgz"; - sha512 = "1ccspslp1mil7f8w4dj3khyxxv5fpakkky4s4bnvvsd2b1hgvwahpv8bk83rr9aq2as2q6hi3143g3b6aynh3ybpf6d9mlksw6qdjii"; - }; - }; - "@types/p-limit-1.1.2" = { - name = "_at_types_slash_p-limit"; - packageName = "@types/p-limit"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/p-limit/-/p-limit-1.1.2.tgz"; - sha512 = "21nzl33ss5mcflc6p0b0wgfhijb97nf1zr3s52ffvq8xy1l0svqwy3alqpj8g1ycsjisblh4xrcigrn2bzak702z4jnpxpbss02jx96"; - }; - }; - "@types/p-queue-1.1.0" = { - name = "_at_types_slash_p-queue"; - packageName = "@types/p-queue"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/p-queue/-/p-queue-1.1.0.tgz"; - sha512 = "1881hys9v61yxxzjmwckxgf0z5i562ix7xb6ibzfb6qmf40hl1ah8l2dlbqiq3vsglmy56vbjcndsx7skjnzrcapamdnhwapfcazdwl"; - }; - }; - "@types/p-series-1.0.1" = { - name = "_at_types_slash_p-series"; - packageName = "@types/p-series"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/p-series/-/p-series-1.0.1.tgz"; - sha512 = "0vpq52z9kblmkbqdp6icimy1qiyklhjarryn4n4svpa96srz4q7k98496rf3dcgy1wpn79jfvg4ddibvw88x7rbbb2jkrhz9gmzs2vp"; - }; - }; - "@types/ramda-0.25.16" = { - name = "_at_types_slash_ramda"; - packageName = "@types/ramda"; - version = "0.25.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ramda/-/ramda-0.25.16.tgz"; - sha512 = "1an84z8hbgidxn2dbkg8ln94z7si3a6a4cchv3ax86ci9bryiqm6q576m1chfbfag5zjm2pxk2h7s16n0b6qgd3i5y9wj541w95mp4c"; - }; - }; - "@types/rc-0.0.1" = { - name = "_at_types_slash_rc"; - packageName = "@types/rc"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rc/-/rc-0.0.1.tgz"; - sha1 = "1f5b8a1b3b1ac6d1fee137c53fac5fa0f28ae0d7"; - }; - }; - "@types/retry-0.10.2" = { - name = "_at_types_slash_retry"; - packageName = "@types/retry"; - version = "0.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/retry/-/retry-0.10.2.tgz"; - sha512 = "18ksn4fqz03wac8179aagjcfibm1k6lrzlpy8nzig47jn083sr64bsw1mdzbdwfxypi8flimg2l1g9prq6r0fqjbqyjvvahhmin98if"; - }; - }; - "@types/semver-5.4.0" = { - name = "_at_types_slash_semver"; - packageName = "@types/semver"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-5.4.0.tgz"; - sha512 = "256379swd2mh4gi5vxsgk9pf7387g32xkw1vsj1jhs7q4njds107nmkkxpaddjv5w5cqwbiwl64sil7bgqdcg8fyjfdg13wxyyc449w"; - }; - }; - "@types/update-notifier-1.0.3" = { - name = "_at_types_slash_update-notifier"; - packageName = "@types/update-notifier"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/update-notifier/-/update-notifier-1.0.3.tgz"; - sha512 = "0fivfj3sqfmhj3z8sp11iqc0hgzyyn50pximpbx56jk7rkvvw40pl0qzdlzcf97vm5c6yvdsixasgm0vh24gh79grxm237n2cvavd04"; - }; - }; - "@types/uuid-3.4.3" = { - name = "_at_types_slash_uuid"; - packageName = "@types/uuid"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz"; - sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; - }; - }; - "@types/write-json-file-2.2.1" = { - name = "_at_types_slash_write-json-file"; - packageName = "@types/write-json-file"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/write-json-file/-/write-json-file-2.2.1.tgz"; - sha512 = "2sasn3m49kqb3y62b2k4avvmb5536z98sq6rkmq7wb441pxaxvqj1ajfxn08jxgg7d4bznfc7gf7knwdnbp2m8k83nimxg6jd9bzlr5"; - }; - }; - "@zkochan/cmd-shim-2.2.4" = { - name = "_at_zkochan_slash_cmd-shim"; - packageName = "@zkochan/cmd-shim"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-2.2.4.tgz"; - sha512 = "0s6wbip576kwjkjcvgf3l6fszrbp1n7ijpjhwjy02hvdfb0hj9ynfi92ninp5blfd1mdhfp361cb76c2y4z1dbyxyc8q5cs7sivag04"; - }; - }; - "@zkochan/libnpx-9.6.1" = { - name = "_at_zkochan_slash_libnpx"; - packageName = "@zkochan/libnpx"; - version = "9.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@zkochan/libnpx/-/libnpx-9.6.1.tgz"; - sha512 = "3lwjqxnqxn1jq5fnsdh31mvy9q4y5i000qd7xmra7wlmalxag1py7903f36s1l8bxfxh8j409vpnrz8pkhnc5vwipdn91kdzl8qvxj7"; - }; - }; - "@zkochan/npm-package-arg-1.0.0" = { - name = "_at_zkochan_slash_npm-package-arg"; - packageName = "@zkochan/npm-package-arg"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zkochan/npm-package-arg/-/npm-package-arg-1.0.0.tgz"; - sha512 = "2v87vqr2pjg6phz5h8mngbymf3b4fmqawisjfng2c424qib6bwldhfvkwqxqfla4s2bzry1qb5dm89if3lddvi3dbp2xqvy9k1h3wxr"; - }; - }; - "JSONStream-1.3.2" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; - sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; - }; - }; "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; @@ -445,33 +22,6 @@ let sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "add-subtract-date-1.0.13" = { - name = "add-subtract-date"; - packageName = "add-subtract-date"; - version = "1.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/add-subtract-date/-/add-subtract-date-1.0.13.tgz"; - sha512 = "1jpp2jqxqm1ljj8a6xs15yl579jc48fdx4kflfd0faa78gy91gda0svy4jdv5dqqj1c5ccssq24kyz1ck5c3g4qykia2x32qmc2rc5x"; - }; - }; - "agent-base-4.2.0" = { - name = "agent-base"; - packageName = "agent-base"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz"; - sha512 = "0i6q0c347f7z5c56gi1cggjiwvdhl3p9zfsysq66gqggk3prlqildnpva900rz8f8gfc8rav8jk7m51z9dhias0z7v3rnzyjm9pzr3k"; - }; - }; - "agentkeepalive-3.3.0" = { - name = "agentkeepalive"; - packageName = "agentkeepalive"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz"; - sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p"; - }; - }; "ajv-4.11.8" = { name = "ajv"; packageName = "ajv"; @@ -490,15 +40,6 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ansi-align-2.0.0" = { - name = "ansi-align"; - packageName = "ansi-align"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"; - sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; - }; - }; "ansi-diff-stream-1.2.0" = { name = "ansi-diff-stream"; packageName = "ansi-diff-stream"; @@ -508,51 +49,6 @@ let sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; }; }; - "ansi-escapes-1.4.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; - sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; - }; - }; - "ansi-escapes-3.0.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; - sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; - }; - }; - "ansi-parser-2.0.0" = { - name = "ansi-parser"; - packageName = "ansi-parser"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-parser/-/ansi-parser-2.0.0.tgz"; - sha1 = "433498af32fee8c2a1df2c4e47941bc029bcf407"; - }; - }; - "ansi-parser-3.0.0" = { - name = "ansi-parser"; - packageName = "ansi-parser"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-parser/-/ansi-parser-3.0.0.tgz"; - sha1 = "945c0e7232caf5675217375b3eb8892008c14629"; - }; - }; - "ansi-parser-3.2.8" = { - name = "ansi-parser"; - packageName = "ansi-parser"; - version = "3.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-parser/-/ansi-parser-3.2.8.tgz"; - sha1 = "ad80a6351ac5e58cc7e8a761abc037b5505041d0"; - }; - }; "ansi-regex-2.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -571,15 +67,6 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; "ansi-styles-3.2.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -589,42 +76,6 @@ let sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; }; }; - "ansicolors-0.3.2" = { - name = "ansicolors"; - packageName = "ansicolors"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; - sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; - }; - }; - "ansistyles-0.1.3" = { - name = "ansistyles"; - packageName = "ansistyles"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"; - sha1 = "5de60415bda071bb37127854c864f41b23254539"; - }; - }; - "ansy-1.0.13" = { - name = "ansy"; - packageName = "ansy"; - version = "1.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/ansy/-/ansy-1.0.13.tgz"; - sha512 = "1a13d7ws8k5vnckqfbrlmmmdxxmj0fjlsgs4h1g8ymmm6fz019gykr01kr479dsqzikgcbmz56jnfj1jjknllij7b840w7mzhvpxvyc"; - }; - }; - "any-promise-1.3.0" = { - name = "any-promise"; - packageName = "any-promise"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; - }; - }; "anymatch-1.3.2" = { name = "anymatch"; packageName = "anymatch"; @@ -661,15 +112,6 @@ let sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; }; }; - "archy-1.0.0" = { - name = "archy"; - packageName = "archy"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; - sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; - }; - }; "are-we-there-yet-1.1.4" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -679,15 +121,6 @@ let sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; }; }; - "argparse-1.0.9" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; - sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; - }; - }; "arr-diff-2.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -706,33 +139,6 @@ let sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; }; }; - "array-find-index-1.0.2" = { - name = "array-find-index"; - packageName = "array-find-index"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; - sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; - }; - }; - "array-flatten-2.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz"; - sha1 = "426bb9da84090c1838d812c8150af20a8331e296"; - }; - }; - "array-includes-3.0.3" = { - name = "array-includes"; - packageName = "array-includes"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz"; - sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; - }; - }; "array-lru-1.1.1" = { name = "array-lru"; packageName = "array-lru"; @@ -742,24 +148,6 @@ let sha1 = "0c7e1b4e022ae166ff1e8448c595f3181fcd3337"; }; }; - "array-union-1.0.2" = { - name = "array-union"; - packageName = "array-union"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; - sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; - }; - }; - "array-uniq-1.0.3" = { - name = "array-uniq"; - packageName = "array-uniq"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; - sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; - }; - }; "array-unique-0.2.1" = { name = "array-unique"; packageName = "array-unique"; @@ -769,33 +157,6 @@ let sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; }; }; - "arrify-1.0.1" = { - name = "arrify"; - packageName = "arrify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; - sha1 = "898508da2226f380df904728456849c1501a4b0d"; - }; - }; - "as-table-1.0.31" = { - name = "as-table"; - packageName = "as-table"; - version = "1.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/as-table/-/as-table-1.0.31.tgz"; - sha1 = "d00180024ecbb6d1a747150df751d3716aea8166"; - }; - }; - "asap-2.0.6" = { - name = "asap"; - packageName = "asap"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; - sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; - }; - }; "asn1-0.2.3" = { name = "asn1"; packageName = "asn1"; @@ -895,15 +256,6 @@ let sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; - "babel-runtime-6.26.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; - }; - }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -913,15 +265,6 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "base64-js-0.0.8" = { - name = "base64-js"; - packageName = "base64-js"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; - sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; - }; - }; "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; @@ -940,13 +283,13 @@ let sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p"; }; }; - "bindings-1.3.0" = { - name = "bindings"; - packageName = "bindings"; - version = "1.3.0"; + "bencode-2.0.0" = { + name = "bencode"; + packageName = "bencode"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz"; - sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf"; + url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz"; + sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2"; }; }; "bitfield-rle-2.1.0" = { @@ -967,15 +310,6 @@ let sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; - "bl-1.2.1" = { - name = "bl"; - packageName = "bl"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz"; - sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; - }; - }; "blake2b-2.1.2" = { name = "blake2b"; packageName = "blake2b"; @@ -1003,15 +337,6 @@ let sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; - "bluebird-3.5.1" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; - sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; - }; - }; "body-0.1.0" = { name = "body"; packageName = "body"; @@ -1021,15 +346,6 @@ let sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8"; }; }; - "bole-3.0.2" = { - name = "bole"; - packageName = "bole"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bole/-/bole-3.0.2.tgz"; - sha1 = "bc8a483ca94049da9b837c1ad11cdfebee6e0514"; - }; - }; "boom-2.10.1" = { name = "boom"; packageName = "boom"; @@ -1057,22 +373,13 @@ let sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; }; }; - "boxen-1.3.0" = { - name = "boxen"; - packageName = "boxen"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; - sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc"; - }; - }; - "brace-expansion-1.1.8" = { + "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.8"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; "braces-1.8.5" = { @@ -1093,33 +400,6 @@ let sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; }; }; - "browserify-zlib-0.1.4" = { - name = "browserify-zlib"; - packageName = "browserify-zlib"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; - sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; - }; - }; - "buffer-3.6.0" = { - name = "buffer"; - packageName = "buffer"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; - sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; - }; - }; - "buffer-alloc-unsafe-1.0.0" = { - name = "buffer-alloc-unsafe"; - packageName = "buffer-alloc-unsafe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; - sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; - }; - }; "buffer-equals-1.0.4" = { name = "buffer-equals"; packageName = "buffer-equals"; @@ -1138,33 +418,6 @@ let sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; }; }; - "bug-killer-4.4.4" = { - name = "bug-killer"; - packageName = "bug-killer"; - version = "4.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bug-killer/-/bug-killer-4.4.4.tgz"; - sha1 = "96e0322b9437a2b0672d78aacd1ed2bef11f945a"; - }; - }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; - "builtins-1.0.3" = { - name = "builtins"; - packageName = "builtins"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; - sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; - }; - }; "bulk-write-stream-1.1.3" = { name = "bulk-write-stream"; packageName = "bulk-write-stream"; @@ -1174,15 +427,6 @@ let sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; }; }; - "byline-5.0.0" = { - name = "byline"; - packageName = "byline"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; - sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; - }; - }; "bytes-3.0.0" = { name = "bytes"; packageName = "bytes"; @@ -1192,51 +436,6 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "bzip2-maybe-1.0.0" = { - name = "bzip2-maybe"; - packageName = "bzip2-maybe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bzip2-maybe/-/bzip2-maybe-1.0.0.tgz"; - sha1 = "c9aef7008a6b943cbe99cc617125eb4bd478296b"; - }; - }; - "cacache-10.0.2" = { - name = "cacache"; - packageName = "cacache"; - version = "10.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-10.0.2.tgz"; - sha512 = "1nn7is7pd6vgcf96b9hym6ia3a0adgw2r4a4ckbb9ykm6risqsnw16kgqfrwvi37mpkzizricfnkns7d0d7agh1laws73imv7nxnn3n"; - }; - }; - "cacache-9.2.9" = { - name = "cacache"; - packageName = "cacache"; - version = "9.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz"; - sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642"; - }; - }; - "cacheable-request-2.1.4" = { - name = "cacheable-request"; - packageName = "cacheable-request"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; - }; - }; - "call-limit-1.1.0" = { - name = "call-limit"; - packageName = "call-limit"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz"; - sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"; - }; - }; "call-me-maybe-1.0.1" = { name = "call-me-maybe"; packageName = "call-me-maybe"; @@ -1246,24 +445,6 @@ let sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; - "camelcase-4.1.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - }; - "capture-stack-trace-1.0.0" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; - }; - }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -1273,85 +454,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chalk-1.1.3" = { + "chalk-2.3.1" = { name = "chalk"; packageName = "chalk"; - version = "1.1.3"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "chalk-2.3.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; - sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; - }; - }; - "chownr-1.0.1" = { - name = "chownr"; - packageName = "chownr"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; - sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; - }; - }; - "ci-info-1.1.2" = { - name = "ci-info"; - packageName = "ci-info"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz"; - sha512 = "1jbmihk48iby72h0b6k4rvhrnaydml49qyjcb83ix310ivjzd4zmdk3yxx1ssn6ryjblm7xzaswnwj53rxwcyn1fr0jm7bzvhy8hcdr"; - }; - }; - "cidr-regex-1.0.6" = { - name = "cidr-regex"; - packageName = "cidr-regex"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cidr-regex/-/cidr-regex-1.0.6.tgz"; - sha1 = "74abfd619df370b9d54ab14475568e97dd64c0c1"; - }; - }; - "class-methods-1.0.10" = { - name = "class-methods"; - packageName = "class-methods"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/class-methods/-/class-methods-1.0.10.tgz"; - sha512 = "2j59qyqmhdcldp2k34mrcfx2rqblcv1c2902zzin1fzqamys2jxs32q341k4faclld17w96w7x3hnv2vjinn0jq0b6a7ld1icaay2wv"; - }; - }; - "cli-box-5.0.0" = { - name = "cli-box"; - packageName = "cli-box"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-box/-/cli-box-5.0.0.tgz"; - sha1 = "870ea8aa77e7c25179416ceccfe5ed0690804602"; - }; - }; - "cli-boxes-1.0.0" = { - name = "cli-boxes"; - packageName = "cli-boxes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; - sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; + sha512 = "3m0k6j50aridlrk1q8kf3cd1vcj6qcg2nx5yk8d0196hmw0c4a6y1h315p24l34yz0chfrcrkrsr12cixccfp5q7caw5803z6hkhia1"; }; }; "cli-table-0.3.1" = { @@ -1363,15 +472,6 @@ let sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; }; }; - "cli-table2-0.2.0" = { - name = "cli-table2"; - packageName = "cli-table2"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz"; - sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; - }; - }; "cli-truncate-1.1.0" = { name = "cli-truncate"; packageName = "cli-truncate"; @@ -1390,51 +490,6 @@ let sha1 = "69431c7cb5af723774b0d3911b4c37512431910f"; }; }; - "cliui-3.2.0" = { - name = "cliui"; - packageName = "cliui"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; - }; - }; - "clone-1.0.3" = { - name = "clone"; - packageName = "clone"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz"; - sha1 = "298d7e2231660f40c003c2ed3140decf3f53085f"; - }; - }; - "clone-response-1.0.2" = { - name = "clone-response"; - packageName = "clone-response"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; - }; - }; - "clp-3.2.1" = { - name = "clp"; - packageName = "clp"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clp/-/clp-3.2.1.tgz"; - sha1 = "af1ed66db895a5c9ce9b6d32e9c33dee02b3edf2"; - }; - }; - "cmd-shim-2.0.2" = { - name = "cmd-shim"; - packageName = "cmd-shim"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz"; - sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb"; - }; - }; "co-4.6.0" = { name = "co"; packageName = "co"; @@ -1498,22 +553,13 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; - "columnify-1.5.4" = { - name = "columnify"; - packageName = "columnify"; - version = "1.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz"; - sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; - }; - }; - "combined-stream-1.0.5" = { + "combined-stream-1.0.6" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; "commander-2.11.0" = { @@ -1534,15 +580,6 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "common-tags-1.7.2" = { - name = "common-tags"; - packageName = "common-tags"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.7.2.tgz"; - sha512 = "0jx2cncv7x5ms1gg2vks5bhxi9c5jbwymfk42dzmp9vrxrmhrl9vaw4wsh4lvf65shxmq1v8f8s0i3rkyk2x8mrfpq2m30famkgv24f"; - }; - }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -1561,24 +598,6 @@ let sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; }; }; - "config-chain-1.1.11" = { - name = "config-chain"; - packageName = "config-chain"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; - sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; - }; - }; - "configstore-3.1.1" = { - name = "configstore"; - packageName = "configstore"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; - sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6"; - }; - }; "connections-1.4.2" = { name = "connections"; packageName = "connections"; @@ -1606,24 +625,6 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "copy-concurrently-1.0.5" = { - name = "copy-concurrently"; - packageName = "copy-concurrently"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; - sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz"; - }; - }; - "core-js-2.5.3" = { - name = "core-js"; - packageName = "core-js"; - version = "2.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz"; - sha1 = "8acc38345824f16d8365b7c9b4259168e8ed603e"; - }; - }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -1642,51 +643,6 @@ let sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; }; }; - "couleurs-5.0.0" = { - name = "couleurs"; - packageName = "couleurs"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/couleurs/-/couleurs-5.0.0.tgz"; - sha1 = "1cd3ace5cca1bec0041578b27464b2676387f6db"; - }; - }; - "couleurs-6.0.9" = { - name = "couleurs"; - packageName = "couleurs"; - version = "6.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/couleurs/-/couleurs-6.0.9.tgz"; - sha1 = "b2b2a3ee37dae51875c9efd243ec7e7894afbc9e"; - }; - }; - "create-error-class-3.0.2" = { - name = "create-error-class"; - packageName = "create-error-class"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; - sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; - }; - }; - "credentials-by-uri-1.0.0" = { - name = "credentials-by-uri"; - packageName = "credentials-by-uri"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/credentials-by-uri/-/credentials-by-uri-1.0.0.tgz"; - sha512 = "3c5r91jgf91szpxfh7rh0c5wi3xzck43b8kzgmxi3ppw29hj9v9is6a3jh5divbgg7dr5diw6zysri7mpvji5jagh2ain0mcj81knjs"; - }; - }; - "cross-spawn-5.1.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - }; "cryptiles-2.0.5" = { name = "cryptiles"; packageName = "cryptiles"; @@ -1705,42 +661,6 @@ let sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; }; }; - "crypto-random-string-1.0.0" = { - name = "crypto-random-string"; - packageName = "crypto-random-string"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; - sha1 = "a230f64f568310e1498009940790ec99545bca7e"; - }; - }; - "csv-parser-1.12.0" = { - name = "csv-parser"; - packageName = "csv-parser"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csv-parser/-/csv-parser-1.12.0.tgz"; - sha512 = "3amd2y4wd86nqpmj4ngich00g73ldp4di353338vjdsgch52zgc7fl6mgh1yfm9n46nlifh7p0c6y8i8p5al90crkbfnsxw561m9lli"; - }; - }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; - }; - }; - "custom-return-1.0.10" = { - name = "custom-return"; - packageName = "custom-return"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/custom-return/-/custom-return-1.0.10.tgz"; - sha512 = "3pk09pi85idb0ycy2hmh3k2cbphacc3hr7rdv157gb93vvk9hfgjnc9dv0k1qvb11h46zpya9njb07f9whrmn31zbx8cf1hchmknpaq"; - }; - }; "cycle-1.0.3" = { name = "cycle"; packageName = "cycle"; @@ -1750,15 +670,6 @@ let sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }; }; - "cyclist-0.2.2" = { - name = "cyclist"; - packageName = "cyclist"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; - sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -1840,13 +751,13 @@ let sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; }; }; - "dat-node-3.5.6" = { + "dat-node-3.5.8" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.6.tgz"; - sha512 = "17i7n2n3bappi34pnv2240cr5baawf2ab8wf22bmlxx4xkcb5g0z24ycz542fsx8myn4fyjgfgdhwbv44f5sz1c4z7i7g4q3ah9n7zh"; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.8.tgz"; + sha512 = "3j28p80dwmic3g00asmcpgiv3sh3s8023x1023g7bm534h1ai8i2zryivx95gc22is64k9mynmqr2g0ny25xp1f7h1cbc25klizg8dc"; }; }; "dat-registry-4.0.0" = { @@ -1858,22 +769,22 @@ let sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; }; }; - "dat-secret-storage-4.0.0" = { + "dat-secret-storage-4.0.1" = { name = "dat-secret-storage"; packageName = "dat-secret-storage"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.0.tgz"; - sha1 = "01b219a5bc1619efc0f58122a3c6cebb1eb8b40a"; + url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.1.tgz"; + sha512 = "3ad9x7n3qxivrj03fsa8ll3i511ivclnyrv1421zklnmskkxxi2d2fykb1kx1sbwdyx35167a7k4mbw63jhxxaz6r54hpd9fad5wj05"; }; }; - "dat-storage-1.0.3" = { + "dat-storage-1.0.4" = { name = "dat-storage"; packageName = "dat-storage"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.3.tgz"; - sha512 = "1n7gszxdkchx0bilz4phnanzmw00fkljwm9rl0z7cndi94xrb6pkzczh6x137xn62j9p7yp6nz24a82q8llsrlk3c1pwvn269cdx97a"; + url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz"; + sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; "dat-swarm-defaults-1.0.0" = { @@ -1885,24 +796,6 @@ let sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; }; }; - "data-uri-to-buffer-2.0.0" = { - name = "data-uri-to-buffer"; - packageName = "data-uri-to-buffer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.0.tgz"; - sha512 = "1pvmcndfngvwy1z5x3vhy8jvrcpaahgc8jhq7cpnjcb2zfacai445afjpykxyzy8s6css19p1rl3ab91vz22fa1ffkqhgygncs85ck1"; - }; - }; - "date-unit-ms-1.1.12" = { - name = "date-unit-ms"; - packageName = "date-unit-ms"; - version = "1.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/date-unit-ms/-/date-unit-ms-1.1.12.tgz"; - sha512 = "39jwcz9i3f80f9sqx06abcpk9zs9dw90gyy2pb603h1h5q0ph2qpx005wzmmn0phfg83d4nx2d14p3lgfn1ywa6yfcc71rnnbw3l3f3"; - }; - }; "datland-swarm-defaults-1.0.2" = { name = "datland-swarm-defaults"; packageName = "datland-swarm-defaults"; @@ -1912,24 +805,6 @@ let sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; }; }; - "daty-1.1.4" = { - name = "daty"; - packageName = "daty"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/daty/-/daty-1.1.4.tgz"; - sha512 = "0a8n1f6rfaa6k4r76b2rqgvfp9qvw5xj7w0lzjfv1g4fxcjllk519vj3jfrx540jiv2mbpky6jv17d3zhwc0jg0a9rbnc0k1m4m5dgs"; - }; - }; - "days-1.1.1" = { - name = "days"; - packageName = "days"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/days/-/days-1.1.1.tgz"; - sha512 = "13wlz4m9gk0wf2w3x44y2gph1mmqmj8z1mfkhxpxhjk3rs7h28gj6lc8x0b6i966w00dvrws86da672vmizmy31whvj08q4bg0qhdxz"; - }; - }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -1948,51 +823,6 @@ let sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; }; }; - "debuglog-1.0.1" = { - name = "debuglog"; - packageName = "debuglog"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"; - sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "decode-uri-component-0.2.0" = { - name = "decode-uri-component"; - packageName = "decode-uri-component"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; - }; - }; - "decompress-maybe-1.0.0" = { - name = "decompress-maybe"; - packageName = "decompress-maybe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-maybe/-/decompress-maybe-1.0.0.tgz"; - sha1 = "adfe78c66cc069e64e824bd1405b85e75e6d1cbb"; - }; - }; - "decompress-response-3.3.0" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; - }; - }; "deep-equal-0.2.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -2011,51 +841,6 @@ let sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; - "defaults-1.0.3" = { - name = "defaults"; - packageName = "defaults"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; - }; - }; - "deffy-2.0.0" = { - name = "deffy"; - packageName = "deffy"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deffy/-/deffy-2.0.0.tgz"; - sha1 = "f82e08eea518c4a0a30b1f03ec504d248af28932"; - }; - }; - "deffy-2.2.2" = { - name = "deffy"; - packageName = "deffy"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deffy/-/deffy-2.2.2.tgz"; - sha1 = "088f40913cb47078653fa6f697c206e03471d523"; - }; - }; - "define-properties-1.1.2" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; - sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; - }; - }; - "delay-2.0.0" = { - name = "delay"; - packageName = "delay"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz"; - sha1 = "9112eadc03e4ec7e00297337896f273bbd91fae5"; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -2074,33 +859,6 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "dependencies-hierarchy-2.0.1" = { - name = "dependencies-hierarchy"; - packageName = "dependencies-hierarchy"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dependencies-hierarchy/-/dependencies-hierarchy-2.0.1.tgz"; - sha512 = "1sfyf5x0ffhb2yh04wcwd0szfknjfrf21ibabzk780m31ww4fnzm01ddr9h3j1wfn4ib15pjvg24kylhs2l9g5fg9gnkirpa7zphyxz"; - }; - }; - "dependency-path-1.2.0" = { - name = "dependency-path"; - packageName = "dependency-path"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dependency-path/-/dependency-path-1.2.0.tgz"; - sha512 = "3fx4g67dcmnhggas6gyk3qd0376f5ff9imzi9n3npqjdbnxqd0niagdl591n64mlk8l8rrnkp39fj7cgbd05az9k5b2ir5pr73lf9aq"; - }; - }; - "detect-indent-5.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; - sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; - }; - }; "detect-libc-1.0.3" = { name = "detect-libc"; packageName = "detect-libc"; @@ -2110,24 +868,6 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; - "dezalgo-1.0.3" = { - name = "dezalgo"; - packageName = "dezalgo"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz"; - sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; - }; - }; - "diable-4.0.1" = { - name = "diable"; - packageName = "diable"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/diable/-/diable-4.0.1.tgz"; - sha512 = "3xs7mj78f1pz54n7lgqczhksnznrsj1bz0733lnrsarqshqci89980q25yms1iva430jfxsjd9kgk4f1f30y3xpyi8krd0vkb57xkl6"; - }; - }; "diff-3.3.1" = { name = "diff"; packageName = "diff"; @@ -2137,33 +877,6 @@ let sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; }; }; - "diff-dates-1.0.11" = { - name = "diff-dates"; - packageName = "diff-dates"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/diff-dates/-/diff-dates-1.0.11.tgz"; - sha512 = "3n24i042lak0xiwsf39kqkmgfjpk3yy7b7s5j4yli6a41h438lh8khdn0zg71jz30vmz0iil8bpjbm0amy24mmbyf4vz5jwp7z312fj"; - }; - }; - "dint-2.0.2" = { - name = "dint"; - packageName = "dint"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dint/-/dint-2.0.2.tgz"; - sha512 = "1kj5zqj3mz3jr7624dszj4qnypqa6z1ll8ysn56mibmchrdfb6x82ncfr8jl1h2igla24kp7kbivpmzzjp1zbb29s2gwj9y0zzrmf9v"; - }; - }; - "dir-glob-2.0.0" = { - name = "dir-glob"; - packageName = "dir-glob"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz"; - sha512 = "1m705yfirf97v4w87gfvylhhq9jlwjsgfp5x0p0cp33mc180ldmvgbs06zmr7by48d7r01n3awx4xz3m3vzba99gqww1wgka2na5fnz"; - }; - }; "directory-index-html-2.1.0" = { name = "directory-index-html"; packageName = "directory-index-html"; @@ -2236,51 +949,6 @@ let sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; }; - "dot-prop-4.2.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; - sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm"; - }; - }; - "dotenv-4.0.0" = { - name = "dotenv"; - packageName = "dotenv"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz"; - sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; - }; - }; - "drive-by-path-1.0.0" = { - name = "drive-by-path"; - packageName = "drive-by-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/drive-by-path/-/drive-by-path-1.0.0.tgz"; - sha512 = "2qa8hminmq4ccas79iblr6bhpi5db7pr4wprwabf3b26mzky20grbamh8w91x0305gr9ab0hg314dqbhk7fjqylrzc5f8aq21mkl9hm"; - }; - }; - "drivelist-5.2.12" = { - name = "drivelist"; - packageName = "drivelist"; - version = "5.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/drivelist/-/drivelist-5.2.12.tgz"; - sha512 = "16zzhdm5j9sxfgcgh547v4s5y3han38a5iwj8ap8glp5ql6vbrl01jj6dsjpiqlbjf56pxla8shnz64yjngvnq0zcdkabns4cr1i0lp"; - }; - }; - "duplexer3-0.1.4" = { - name = "duplexer3"; - packageName = "duplexer3"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; - }; - }; "duplexify-3.5.3" = { name = "duplexify"; packageName = "duplexify"; @@ -2299,33 +967,6 @@ let sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; - "editor-1.0.0" = { - name = "editor"; - packageName = "editor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"; - sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; - }; - }; - "encode-registry-1.1.0" = { - name = "encode-registry"; - packageName = "encode-registry"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/encode-registry/-/encode-registry-1.1.0.tgz"; - sha512 = "0s849n20b958rnb9r35b9i0l6zvpk0vx49c6xap06fy5iq1zz0ls0wqc1bdskw1v39z5xz4a8sfaigsw0rjfckic6xlxmw4ybvn9vf1"; - }; - }; - "encoding-0.1.12" = { - name = "encoding"; - packageName = "encoding"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; - }; - }; "end-of-stream-1.4.1" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -2335,69 +976,6 @@ let sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl"; }; }; - "err-code-1.1.2" = { - name = "err-code"; - packageName = "err-code"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz"; - sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; - }; - }; - "errno-0.1.6" = { - name = "errno"; - packageName = "errno"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz"; - sha512 = "0vny3xisd56kx193rhv6vpccjxlajjn9ss5wk96l1ya8zbpkwbjrrgrm9wpfm3xc8apx8z9xb0kjkw0y5qnc6gy1hf2qsas79093hr2"; - }; - }; - "error-ex-1.3.1" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; - sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; - }; - }; - "es-abstract-1.10.0" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz"; - sha512 = "04nd5ylkfffc08vn5kjhz0saqh44nj19f5j3ahrrhf3zvc9da5rf6snnh63xv4gfhacjbax1jajzgqv4zpm77v806jf883a2w77zs7y"; - }; - }; - "es-to-primitive-1.1.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; - sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; - }; - }; - "es6-promise-4.2.4" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz"; - sha512 = "10hlgvxhshjxlbwvm1gnf1b01sv1fmh191a97l0h5gmcs9am1b6x937wnhkvvj5fkin10qscii8pcwnp9rlnpkgnrhfdyk0a9jlvmzw"; - }; - }; - "es6-promisify-5.0.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; - }; - }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -2407,51 +985,6 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "esprima-4.0.0" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; - }; - }; - "exclude-arr-1.0.9" = { - name = "exclude-arr"; - packageName = "exclude-arr"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/exclude-arr/-/exclude-arr-1.0.9.tgz"; - sha512 = "1j9b7mbjp9g840wwzgq7jmqx66qv2xwxl3z3330891qd1a4yrm1x3jsig1g0adx6q1lj9d9f6dsb0snm564f4ff8lxhiag0k645vap7"; - }; - }; - "execa-0.7.0" = { - name = "execa"; - packageName = "execa"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; - }; - }; - "execa-0.8.0" = { - name = "execa"; - packageName = "execa"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; - sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; - }; - }; - "execa-0.9.0" = { - name = "execa"; - packageName = "execa"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.9.0.tgz"; - sha512 = "2c2sw5624513vxbr2q2ay9x3qc80zfnwyr60n8cw35m1ji76yxhxv4nrk47iqd2wj1rv5l07klmncr2lfdzhfa0cn3si1pq4l30rd85"; - }; - }; "expand-brackets-0.1.5" = { name = "expand-brackets"; packageName = "expand-brackets"; @@ -2470,15 +1003,6 @@ let sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; }; }; - "expand-template-1.1.0" = { - name = "expand-template"; - packageName = "expand-template"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz"; - sha512 = "34i2f4clwy5bpzgl137zwplybp5hn6ncxq0p794cx9m0crhgk31nfy0s8wp1v6hvw90h20c268r040g892dixy6zqq1xlm3ra8g0j4j"; - }; - }; "extend-3.0.1" = { name = "extend"; packageName = "extend"; @@ -2515,13 +1039,13 @@ let sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; }; - "fast-deep-equal-1.0.0" = { + "fast-deep-equal-1.1.0" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; - sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; + sha1 = "c053477817c86b51daa853c81e059b733d023614"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -2533,15 +1057,6 @@ let sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; - "fast-safe-stringify-1.1.13" = { - name = "fast-safe-stringify"; - packageName = "fast-safe-stringify"; - version = "1.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.1.13.tgz"; - sha1 = "a01e9cd9c9e491715c98a75a42d5f0bbd107ff76"; - }; - }; "fd-read-stream-1.1.0" = { name = "fd-read-stream"; packageName = "fd-read-stream"; @@ -2551,15 +1066,6 @@ let sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; }; }; - "fetch-from-npm-registry-0.1.0" = { - name = "fetch-from-npm-registry"; - packageName = "fetch-from-npm-registry"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fetch-from-npm-registry/-/fetch-from-npm-registry-0.1.0.tgz"; - sha512 = "1264ixqa9c8kzm56hlq6y91d7rhzfkvbjy0asvj4xkdspwb5sy363n9g9frai3w415j9xyqfw8k73rcpw295gmhp790rnl5p1w0m88g"; - }; - }; "filename-regex-2.0.1" = { name = "filename-regex"; packageName = "filename-regex"; @@ -2578,33 +1084,6 @@ let sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; }; }; - "fillo-1.0.11" = { - name = "fillo"; - packageName = "fillo"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/fillo/-/fillo-1.0.11.tgz"; - sha512 = "36l602p8x6jkfpk75skz4dwjlpy9bna1zqpx7jgfjlalqbwa7b67wb8rv23cd6m5saklalf77irgvly60b5ziy611a4477idbrrr1fx"; - }; - }; - "find-packages-2.1.2" = { - name = "find-packages"; - packageName = "find-packages"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-packages/-/find-packages-2.1.2.tgz"; - sha512 = "18j6pnfzxysg3ylhx9npp90infzxgczn174pd3mvy8mw13cshll2rzf6i9b27qfyzgq4chk7wbwy8wr1flmzlpll5g22c0ryp6dq2rh"; - }; - }; - "find-up-2.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; - }; - }; "findup-sync-0.3.0" = { name = "findup-sync"; packageName = "findup-sync"; @@ -2614,15 +1093,6 @@ let sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; }; }; - "flat-colors-3.0.0" = { - name = "flat-colors"; - packageName = "flat-colors"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-colors/-/flat-colors-3.0.0.tgz"; - sha1 = "253ab1a23989c321f13b0acd4bf73fff4072ecb7"; - }; - }; "flat-tree-1.6.0" = { name = "flat-tree"; packageName = "flat-tree"; @@ -2632,15 +1102,6 @@ let sha1 = "fca30cddb9006fb656eb5ebc79aeb274e7fde9ed"; }; }; - "flush-write-stream-1.0.2" = { - name = "flush-write-stream"; - packageName = "flush-write-stream"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; - sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; - }; - }; "for-each-0.3.2" = { name = "for-each"; packageName = "for-each"; @@ -2668,15 +1129,6 @@ let sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; }; }; - "foreach-2.0.5" = { - name = "foreach"; - packageName = "foreach"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; - sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; - }; - }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -2695,31 +1147,13 @@ let sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; - "form-data-2.3.1" = { + "form-data-2.3.2" = { name = "form-data"; packageName = "form-data"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; - sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; - }; - }; - "formatoid-1.2.2" = { - name = "formatoid"; - packageName = "formatoid"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/formatoid/-/formatoid-1.2.2.tgz"; - sha512 = "3z818q9sgzw7jky4kc4gfmx15k3hhh7lj1dy17j30vcyzmx1p14k38d0a8nvl23f2sfm4bszam36wzz8niwkznr4m992wz009ipr6yy"; - }; - }; - "from2-1.3.0" = { - name = "from2"; - packageName = "from2"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/from2/-/from2-1.3.0.tgz"; - sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; + sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; "from2-2.3.0" = { @@ -2731,24 +1165,6 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; - "fs-vacuum-1.2.10" = { - name = "fs-vacuum"; - packageName = "fs-vacuum"; - version = "1.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz"; - sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"; - }; - }; - "fs-write-stream-atomic-1.0.10" = { - name = "fs-write-stream-atomic"; - packageName = "fs-write-stream-atomic"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; - sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; - }; - }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -2776,24 +1192,6 @@ let sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; }; }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; - }; - }; - "function.name-1.0.10" = { - name = "function.name"; - packageName = "function.name"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/function.name/-/function.name-1.0.10.tgz"; - sha512 = "02zis7zxfkwajdf08z58mr0z2axddibclbk8xd849mkz7pq3y29s781fjycqigp3fdnwmy2mlvcnsg4z5hrfm44sr7gw30wx2p41x10"; - }; - }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -2803,87 +1201,6 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; - "generate-function-1.1.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-1.1.0.tgz"; - sha1 = "54c21b080192b16d9877779c5bb81666e772365f"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; - "genfun-4.0.1" = { - name = "genfun"; - packageName = "genfun"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/genfun/-/genfun-4.0.1.tgz"; - sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"; - }; - }; - "get-caller-file-1.0.2" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; - sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; - }; - }; - "get-npm-tarball-url-2.0.1" = { - name = "get-npm-tarball-url"; - packageName = "get-npm-tarball-url"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.1.tgz"; - sha512 = "051jj5v45fys9v10fpvga4wby8aq0wjydhfgynfip8bgyl7db3zkjzssqn4rv264br9b04mdc25hr9479zgqyffzdq7xxcjdi2dbsiw"; - }; - }; - "get-port-3.2.0" = { - name = "get-port"; - packageName = "get-port"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz"; - sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; - }; - }; - "get-source-1.0.24" = { - name = "get-source"; - packageName = "get-source"; - version = "1.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/get-source/-/get-source-1.0.24.tgz"; - sha1 = "898dcc7b5592adba02e8bb82b8d2cda60cdae5c5"; - }; - }; - "get-stream-2.3.1" = { - name = "get-stream"; - packageName = "get-stream"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; - }; - }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -2893,15 +1210,6 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "github-from-package-0.0.0" = { - name = "github-from-package"; - packageName = "github-from-package"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; - sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; - }; - }; "glob-5.0.15" = { name = "glob"; packageName = "glob"; @@ -2947,42 +1255,6 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; - "global-dirs-0.1.1" = { - name = "global-dirs"; - packageName = "global-dirs"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz"; - sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; - }; - }; - "globby-7.1.1" = { - name = "globby"; - packageName = "globby"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz"; - sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; - }; - }; - "got-6.7.1" = { - name = "got"; - packageName = "got"; - version = "6.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; - sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; - }; - }; - "got-8.0.3" = { - name = "got"; - packageName = "got"; - version = "8.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.0.3.tgz"; - sha512 = "2bglci1j77rvr4z2klmnr6d2qfqk0f60nm1myj9m0g2rzh7pd68hzki9nm8f5dpaxqr98ncjbd4rfzw75j35nvsfcyb2i1l9jjailak"; - }; - }; "graceful-fs-4.1.11" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -2992,15 +1264,6 @@ let sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; - "graceful-git-1.0.1" = { - name = "graceful-git"; - packageName = "graceful-git"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-git/-/graceful-git-1.0.1.tgz"; - sha512 = "31ajgk1zmq4zym3ckmr9n1x6n7sidg8naa3n8d2v6p8vr67g4gl7xxij5la1dxp6c9475pbrzq5vab7psp2dbjxvwdrzrlb8xwq83xp"; - }; - }; "graceful-readlink-1.0.1" = { name = "graceful-readlink"; packageName = "graceful-readlink"; @@ -3010,15 +1273,6 @@ let sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; }; - "graph-sequencer-2.0.0" = { - name = "graph-sequencer"; - packageName = "graph-sequencer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graph-sequencer/-/graph-sequencer-2.0.0.tgz"; - sha1 = "bfb809b8af584f6f5287cdce507a30d4aea6ee70"; - }; - }; "growl-1.10.3" = { name = "growl"; packageName = "growl"; @@ -3037,15 +1291,6 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "gunzip-maybe-1.4.1" = { - name = "gunzip-maybe"; - packageName = "gunzip-maybe"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; - sha512 = "3d6jyhcq21cxy2n6mnalnxcdxl9i00n8qka7awrqamggss8yllz57msx7c480knv037snkzkymq6npl36wlpl71h54x511dlchavnxa"; - }; - }; "har-schema-1.0.5" = { name = "har-schema"; packageName = "har-schema"; @@ -3082,33 +1327,6 @@ let sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "has-1.0.1" = { - name = "has"; - packageName = "has"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; - sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "has-flag-1.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; - }; - }; "has-flag-2.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -3118,22 +1336,13 @@ let sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; - "has-symbol-support-x-1.4.1" = { - name = "has-symbol-support-x"; - packageName = "has-symbol-support-x"; - version = "1.4.1"; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz"; - sha512 = "0qgqbqmrlx51w4ixcln9ljr5hs2jj8fvryq7i8cg9a739p7y2c5z8wpplp9jhnfn4a3xn6li2b2npmhfm2x80khm9di3vllyyv9wii6"; - }; - }; - "has-to-string-tag-x-1.4.1" = { - name = "has-to-string-tag-x"; - packageName = "has-to-string-tag-x"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; "has-unicode-2.0.1" = { @@ -3181,31 +1390,13 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "hoek-4.2.0" = { + "hoek-4.2.1" = { name = "hoek"; packageName = "hoek"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; - sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; - }; - }; - "hosted-git-info-2.5.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; - }; - }; - "http-cache-semantics-3.8.1" = { - name = "http-cache-semantics"; - packageName = "http-cache-semantics"; - version = "3.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75"; + url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; + sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; }; }; "http-methods-0.1.0" = { @@ -3217,15 +1408,6 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "http-proxy-agent-2.0.0" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz"; - sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; - }; - }; "http-signature-1.1.1" = { name = "http-signature"; packageName = "http-signature"; @@ -3244,31 +1426,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "https-proxy-agent-2.1.1" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz"; - sha512 = "0rxbj60hs8fhs3i02lgb6ypcf9m9v8ybd4lfvfvpy0f1iyy54f1686lmv0rvkyxxihwvs4yizjgv8r8jksh385c4c9yjm3z8i0svbic"; - }; - }; - "humanize-ms-1.2.1" = { - name = "humanize-ms"; - packageName = "humanize-ms"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; - }; - }; - "hypercore-6.12.0" = { + "hypercore-6.12.2" = { name = "hypercore"; packageName = "hypercore"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.0.tgz"; - sha512 = "00xsmbx8jcjzsibwwgknlpjvndb7zv6jdxik5skqnbizbdssvcwa2r5a7gd1cf7mpr2827067sxqqca9fmmknjnin2vvm16yb1pn5g8"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.2.tgz"; + sha512 = "1s7l8r5bpiialz194g5kryp5bpcg8n0x0l7jfgynjiimi3pyn0lkcijijk20g5ibagfzi3jnrlyh1jp9ywbrys5inbwl83ra7a6qbr6"; }; }; "hypercore-protocol-6.5.2" = { @@ -3280,13 +1444,13 @@ let sha512 = "03l77nma8ga06ywa469jzqgc13hjk9bg3w2cv95g3fwnqy2fvz8qpczcih65jscvk0ira5kpm3sk2vqh2whzzvnm19jlqrzi78v80n3"; }; }; - "hyperdrive-9.12.2" = { + "hyperdrive-9.12.3" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.12.2"; + version = "9.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.2.tgz"; - sha512 = "133iwkp8w88awfxffdjjfxl2wsrj99cdw1p2rvbv65q7mgficva14skid7vsd55r750lrvg0wbmlz0h4m44w6ypd7cvpb4hjvb2f815"; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.3.tgz"; + sha512 = "3w0ia766bacphqzgyjhiwbppgdja61vlz2xp6x710dk4pn6570gag3w5xa8rfivh2lvig8v2ics3bkdlm9cmq9kpzjgwzm19a089fb3"; }; }; "hyperdrive-http-4.2.2" = { @@ -3298,13 +1462,13 @@ let sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn"; }; }; - "hyperdrive-network-speed-2.0.1" = { + "hyperdrive-network-speed-2.1.0" = { name = "hyperdrive-network-speed"; packageName = "hyperdrive-network-speed"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.0.1.tgz"; - sha1 = "40daf82e31b9d753f2ae6dfaf0818661ed24fe15"; + url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.1.0.tgz"; + sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296"; }; }; "i-0.3.6" = { @@ -3316,78 +1480,6 @@ let sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; - "iconv-lite-0.4.19" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; - }; - }; - "ieee754-1.1.8" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; - sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; - }; - }; - "iferr-0.1.5" = { - name = "iferr"; - packageName = "iferr"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; - sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; - }; - }; - "ignore-3.3.7" = { - name = "ignore"; - packageName = "ignore"; - version = "3.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; - sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; - }; - }; - "ignore-walk-3.0.1" = { - name = "ignore-walk"; - packageName = "ignore-walk"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; - sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; - }; - }; - "import-lazy-2.1.0" = { - name = "import-lazy"; - packageName = "import-lazy"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; - }; - }; - "individual-3.0.0" = { - name = "individual"; - packageName = "individual"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/individual/-/individual-3.0.0.tgz"; - sha1 = "e7ca4f85f8957b018734f285750dc22ec2f9862d"; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -3415,42 +1507,6 @@ let sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; - "init-package-json-1.10.1" = { - name = "init-package-json"; - packageName = "init-package-json"; - version = "1.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz"; - sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a"; - }; - }; - "into-stream-2.0.1" = { - name = "into-stream"; - packageName = "into-stream"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-2.0.1.tgz"; - sha1 = "db9b003694453eae091d8a5c84cc11507b781d31"; - }; - }; - "into-stream-3.1.0" = { - name = "into-stream"; - packageName = "into-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; - sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; - }; - }; - "invert-kv-1.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -3460,15 +1516,6 @@ let sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -3478,69 +1525,6 @@ let sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; - "is-bzip2-1.0.0" = { - name = "is-bzip2"; - packageName = "is-bzip2"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz"; - sha1 = "5ee58eaa5a2e9c80e21407bedf23ae5ac091b3fc"; - }; - }; - "is-callable-1.1.3" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; - sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; - }; - }; - "is-ci-1.1.0" = { - name = "is-ci"; - packageName = "is-ci"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; - sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; - }; - }; - "is-cidr-1.0.0" = { - name = "is-cidr"; - packageName = "is-cidr"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-cidr/-/is-cidr-1.0.0.tgz"; - sha1 = "fb5aacf659255310359da32cae03e40c6a1c2afc"; - }; - }; - "is-date-object-1.0.1" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; - }; - }; - "is-deflate-1.0.0" = { - name = "is-deflate"; - packageName = "is-deflate"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz"; - sha1 = "c862901c3c161fb09dac7cdc7e784f80e98f2f14"; - }; - }; "is-dotfile-1.0.3" = { name = "is-dotfile"; packageName = "is-dotfile"; @@ -3613,42 +1597,6 @@ let sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; }; }; - "is-gzip-1.0.0" = { - name = "is-gzip"; - packageName = "is-gzip"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz"; - sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83"; - }; - }; - "is-inner-link-2.0.2" = { - name = "is-inner-link"; - packageName = "is-inner-link"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-inner-link/-/is-inner-link-2.0.2.tgz"; - sha512 = "2xbj75av7s092kdl27ic28ckwnfnxvl4wr3x879djhamp0waw1js8c0zrakfnbjbsp5vh087brimykngrg319zfzhgwjvni994m2bv1"; - }; - }; - "is-installed-globally-0.1.0" = { - name = "is-installed-globally"; - packageName = "is-installed-globally"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; - sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; - }; - }; - "is-npm-1.0.0" = { - name = "is-npm"; - packageName = "is-npm"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; - sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; - }; - }; "is-number-2.1.0" = { name = "is-number"; packageName = "is-number"; @@ -3667,42 +1615,6 @@ let sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; }; }; - "is-obj-1.0.1" = { - name = "is-obj"; - packageName = "is-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; - }; - }; - "is-object-1.0.1" = { - name = "is-object"; - packageName = "is-object"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; - sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; - }; - }; - "is-path-inside-1.0.1" = { - name = "is-path-inside"; - packageName = "is-path-inside"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz"; - sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; - }; - }; - "is-plain-obj-1.1.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; - }; - }; "is-posix-bracket-0.1.1" = { name = "is-posix-bracket"; packageName = "is-posix-bracket"; @@ -3721,60 +1633,6 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - }; - "is-redirect-1.0.0" = { - name = "is-redirect"; - packageName = "is-redirect"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; - sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; - }; - }; - "is-regex-1.0.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; - }; - }; - "is-retry-allowed-1.1.0" = { - name = "is-retry-allowed"; - packageName = "is-retry-allowed"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; - sha1 = "11a060568b67339444033d0125a61a20d564fb34"; - }; - }; - "is-ssh-1.3.0" = { - name = "is-ssh"; - packageName = "is-ssh"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.0.tgz"; - sha1 = "ebea1169a2614da392a63740366c3ce049d8dff6"; - }; - }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; - }; - }; "is-string-1.0.4" = { name = "is-string"; packageName = "is-string"; @@ -3784,24 +1642,6 @@ let sha1 = "cc3a9b69857d621e963725a24caeec873b826e64"; }; }; - "is-subdir-1.0.2" = { - name = "is-subdir"; - packageName = "is-subdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-subdir/-/is-subdir-1.0.2.tgz"; - sha512 = "2czdnl66p1ls8xjwh0vx5ydk118b9m1zhnc4khf16v7bh9n8nwjhafr4aigvd6kj2igl0ylbzznc181pf0ppxm4bgiv9kwyvlryyzfq"; - }; - }; - "is-symbol-1.0.1" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; - sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; - }; - }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -3811,24 +1651,6 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; - "is-windows-1.0.1" = { - name = "is-windows"; - packageName = "is-windows"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; - sha1 = "310db70f742d259a16a369202b51af84233310d9"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -3865,24 +1687,6 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "isurl-1.0.0" = { - name = "isurl"; - packageName = "isurl"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; - }; - }; - "iterate-object-1.3.2" = { - name = "iterate-object"; - packageName = "iterate-object"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iterate-object/-/iterate-object-1.3.2.tgz"; - sha1 = "24ec15affa5d0039e8839695a21c2cae1f45b66b"; - }; - }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -3892,15 +1696,6 @@ let sha1 = "d03f666ca4e6130138565997cacea54164203156"; }; }; - "js-yaml-3.10.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; - sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; - }; - }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -3910,24 +1705,6 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "json-buffer-3.0.0" = { - name = "json-buffer"; - packageName = "json-buffer"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; - }; - }; - "json-parse-better-errors-1.0.1" = { - name = "json-parse-better-errors"; - packageName = "json-parse-better-errors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz"; - sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967"; - }; - }; "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; @@ -3964,15 +1741,6 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json2yaml-1.1.0" = { - name = "json2yaml"; - packageName = "json2yaml"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json2yaml/-/json2yaml-1.1.0.tgz"; - sha1 = "5414d907f9816586b80c513ec2e3aeb2ab819a6c"; - }; - }; "jsonify-0.0.0" = { name = "jsonify"; packageName = "jsonify"; @@ -3982,15 +1750,6 @@ let sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; }; }; - "jsonparse-1.3.1" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; - sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; - }; - }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -4018,22 +1777,13 @@ let sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; }; }; - "k-rpc-socket-1.7.2" = { + "k-rpc-socket-1.8.0" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz"; - sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; - }; - }; - "keyv-3.0.0" = { - name = "keyv"; - packageName = "keyv"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; - sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz"; + sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz"; }; }; "kind-of-3.2.2" = { @@ -4063,42 +1813,6 @@ let sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a"; }; }; - "latest-version-3.1.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz"; - sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; - }; - }; - "lazy-property-1.0.0" = { - name = "lazy-property"; - packageName = "lazy-property"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz"; - sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; - }; - }; - "lcid-1.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - }; - "le-table-4.0.0" = { - name = "le-table"; - packageName = "le-table"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/le-table/-/le-table-4.0.0.tgz"; - sha1 = "3bfeb72d24cbfc37752f01539f9006d711d9be93"; - }; - }; "length-prefixed-message-3.0.3" = { name = "length-prefixed-message"; packageName = "length-prefixed-message"; @@ -4108,112 +1822,13 @@ let sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; }; }; - "libnpx-9.6.0" = { - name = "libnpx"; - packageName = "libnpx"; - version = "9.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libnpx/-/libnpx-9.6.0.tgz"; - sha512 = "28v6bsd92dcqj92yr2bk9r29ajwbqx46fd46mriva2934nr7s6hhkxy6f7xbf4nd7p93fxsbpzfx0ghq0y788x1zj8gnh1iswgd89sz"; - }; - }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; - }; - }; - "load-json-file-4.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"; - sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; - }; - }; - "load-yaml-file-0.1.0" = { - name = "load-yaml-file"; - packageName = "load-yaml-file"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-yaml-file/-/load-yaml-file-0.1.0.tgz"; - sha1 = "f680066e691b3eeb45017672e4a3956af5b83b89"; - }; - }; - "locate-path-2.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; - }; - }; - "lockfile-1.0.3" = { - name = "lockfile"; - packageName = "lockfile"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; - sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; - }; - }; - "lodash-3.10.1" = { + "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; - version = "3.10.1"; + version = "4.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; - sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; - }; - }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; - }; - }; - "lodash._baseuniq-4.6.0" = { - name = "lodash._baseuniq"; - packageName = "lodash._baseuniq"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"; - sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; - }; - }; - "lodash._createset-4.0.3" = { - name = "lodash._createset"; - packageName = "lodash._createset"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz"; - sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; - }; - }; - "lodash._root-3.0.1" = { - name = "lodash._root"; - packageName = "lodash._root"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; - sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; - }; - }; - "lodash.clonedeep-4.5.0" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; + sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; "lodash.flattendeep-4.4.0" = { @@ -4234,60 +1849,6 @@ let sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; }; }; - "lodash.union-4.6.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; - sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; - }; - }; - "lodash.uniq-4.5.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; - }; - }; - "lodash.without-4.4.0" = { - name = "lodash.without"; - packageName = "lodash.without"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; - sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; - }; - }; - "log-update-2.3.0" = { - name = "log-update"; - packageName = "log-update"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; - sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; - }; - }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; - }; - }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; - }; - }; "lru-2.0.1" = { name = "lru"; packageName = "lru"; @@ -4306,60 +1867,6 @@ let sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5"; }; }; - "lru-cache-4.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; - sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb"; - }; - }; - "make-dir-1.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz"; - sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh"; - }; - }; - "make-fetch-happen-2.6.0" = { - name = "make-fetch-happen"; - packageName = "make-fetch-happen"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.6.0.tgz"; - sha512 = "1kmyri7r2lpf3fjzwbbdramk86mhplv53x5pl535frn1vryq9xl7hmzkb3awxw6c31n19w0i20mv0h3zj8mmcw5yjkiysrlsaab8nhl"; - }; - }; - "meant-1.0.1" = { - name = "meant"; - packageName = "meant"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz"; - sha512 = "2b6yi25bkxg4hd38w2cpfjy0xyka4iqiyzhsnkklx3nxwbgnzr4hfl07xxpflccjvnb03zvnssw0y9fspxdk2fmq3abd4fab0n1baai"; - }; - }; - "mem-1.1.0" = { - name = "mem"; - packageName = "mem"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; - sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; - }; - }; - "mem-3.0.0" = { - name = "mem"; - packageName = "mem"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-3.0.0.tgz"; - sha1 = "84e58ad4dfbdf5d105b26b6548a398b2b3aa8a21"; - }; - }; "memory-pager-1.1.0" = { name = "memory-pager"; packageName = "memory-pager"; @@ -4396,40 +1903,22 @@ let sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; - "mime-db-1.30.0" = { + "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.30.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; - sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; + sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; }; }; - "mime-types-2.1.17" = { + "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.17"; + version = "2.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; - sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; - }; - }; - "mimic-fn-1.1.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; - sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; - }; - }; - "mimic-response-1.0.0" = { - name = "mimic-response"; - packageName = "mimic-response"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; - sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; + sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; }; }; "min-document-2.19.0" = { @@ -4468,24 +1957,6 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.2.1" = { - name = "minipass"; - packageName = "minipass"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz"; - sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; - }; - }; - "minizlib-1.1.0" = { - name = "minizlib"; - packageName = "minizlib"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; - sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; - }; - }; "mirror-folder-2.1.1" = { name = "mirror-folder"; packageName = "mirror-folder"; @@ -4495,15 +1966,6 @@ let sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; }; }; - "mississippi-1.3.1" = { - name = "mississippi"; - packageName = "mississippi"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.1.tgz"; - sha512 = "2vfagk7xiqrqmyp78yz1cpnjsaibgix7q22cgxggwzf5kqr7y1p21dbi67vcvsvip1g2s6mrvskw7d8a2288sala5n0nv65hpqw3apz"; - }; - }; "mkdirp-0.5.1" = { name = "mkdirp"; packageName = "mkdirp"; @@ -4513,51 +1975,6 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "mkdirp-promise-5.0.1" = { - name = "mkdirp-promise"; - packageName = "mkdirp-promise"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz"; - sha1 = "e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"; - }; - }; - "months-1.2.0" = { - name = "months"; - packageName = "months"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/months/-/months-1.2.0.tgz"; - sha512 = "0wl48vfgi3c46vwy8cfa0j4z65rbar2j8cwgns9jcgi3cc3n79fm7yjg6wlbd90y3jhhfj03i2xs0as0sv3kkb0jc32d2bk9a2knlyc"; - }; - }; - "most-1.7.2" = { - name = "most"; - packageName = "most"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/most/-/most-1.7.2.tgz"; - sha512 = "1jxsiagsdkjmd2h0ys7kkc34rw79bswfdlyijd2fv434d0sxk8i8j055fhmpfs4ca1j9wgi6pj9k4b2cyq7di528vykwgf7mr8v6d4c"; - }; - }; - "most-last-1.0.0" = { - name = "most-last"; - packageName = "most-last"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/most-last/-/most-last-1.0.0.tgz"; - sha1 = "4e3f0b289c24cf90b9d8384676de90a26e376171"; - }; - }; - "move-concurrently-1.0.1" = { - name = "move-concurrently"; - packageName = "move-concurrently"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; - sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; - }; - }; "ms-2.0.0" = { name = "ms"; packageName = "ms"; @@ -4567,15 +1984,6 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "ms-2.1.1" = { - name = "ms"; - packageName = "ms"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; - }; - }; "multi-random-access-2.1.1" = { name = "multi-random-access"; packageName = "multi-random-access"; @@ -4585,13 +1993,13 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "multicast-dns-6.2.2" = { + "multicast-dns-6.2.3" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.2.tgz"; - sha512 = "06b9ps5a1ymag21szz55z4xzs2ncp0frcqsaldnggmz0m5ijhjv8f553cpkp9zkm37av1pm2y8pn70jbfzk888n1hap6i321babhcy5"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; "multicb-1.2.2" = { @@ -4621,22 +2029,13 @@ let sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2"; }; }; - "mz-2.7.0" = { - name = "mz"; - packageName = "mz"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; - }; - }; - "nan-2.8.0" = { + "nan-2.9.2" = { name = "nan"; packageName = "nan"; - version = "2.8.0"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; - sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; + url = "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz"; + sha512 = "1iwlv98jbkr46c7hy28crk2m89jiskrp4qfa5ysyacyq8dkbk4hii3cc61irf39b7n6wd9cjlaasmakv9dsknqhb3876zrvrbjvmmcn"; }; }; "nanoassert-1.1.0" = { @@ -4675,33 +2074,6 @@ let sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; }; }; - "ncp-2.0.0" = { - name = "ncp"; - packageName = "ncp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; - sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; - }; - }; - "ndjson-1.5.0" = { - name = "ndjson"; - packageName = "ndjson"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz"; - sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; - }; - }; - "neat-csv-2.1.0" = { - name = "neat-csv"; - packageName = "neat-csv"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/neat-csv/-/neat-csv-2.1.0.tgz"; - sha1 = "06f58360c4c3b955bd467ddc85ae4511a3907a4c"; - }; - }; "neat-log-1.1.2" = { name = "neat-log"; packageName = "neat-log"; @@ -4711,15 +2083,6 @@ let sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; }; }; - "nerf-dart-1.0.0" = { - name = "nerf-dart"; - packageName = "nerf-dart"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nerf-dart/-/nerf-dart-1.0.0.tgz"; - sha1 = "e6dab7febf5ad816ea81cf5c629c5a0ebde72c1a"; - }; - }; "nets-3.2.0" = { name = "nets"; packageName = "nets"; @@ -4738,33 +2101,6 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; - "node-abi-2.1.2" = { - name = "node-abi"; - packageName = "node-abi"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz"; - sha512 = "1sd6l8zqa18mlzackwy8vns51zjp8xyrd97nc514b0yvndd0y0wsyx2q9h8zr0k9kra5ys1yq75ggkv5av69cyzxji19rdvr5pjsrc6"; - }; - }; - "node-fetch-npm-2.0.2" = { - name = "node-fetch-npm"; - packageName = "node-fetch-npm"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz"; - sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw"; - }; - }; - "node-gyp-3.6.2" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; - sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; - }; - }; "node-gyp-build-3.2.2" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -4774,24 +2110,6 @@ let sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; }; }; - "noop-logger-0.1.1" = { - name = "noop-logger"; - packageName = "noop-logger"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"; - sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; - }; - }; - "noop6-1.0.7" = { - name = "noop6"; - packageName = "noop6"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/noop6/-/noop6-1.0.7.tgz"; - sha1 = "96767bf2058ba59ca8cb91559347ddc80239fa8e"; - }; - }; "nopt-3.0.6" = { name = "nopt"; packageName = "nopt"; @@ -4810,15 +2128,6 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "normalize-package-data-2.4.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; - }; - }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -4828,159 +2137,6 @@ let sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; }; }; - "normalize-registry-url-1.0.0" = { - name = "normalize-registry-url"; - packageName = "normalize-registry-url"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-registry-url/-/normalize-registry-url-1.0.0.tgz"; - sha512 = "3s6mrnn04pf7i9gqc04l6c4mnwdwy08235c4rd1rzw080z1a27bs1xwh2fcbzc8p1lbm4xjbby1g11pd38i4wsfjarbsvvmrvir7znj"; - }; - }; - "normalize-ssh-1.0.0" = { - name = "normalize-ssh"; - packageName = "normalize-ssh"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-ssh/-/normalize-ssh-1.0.0.tgz"; - sha1 = "22a8308fa7cd932bdb49af74ecac644cf4a6196b"; - }; - }; - "normalize-url-2.0.1" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; - sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg"; - }; - }; - "not-bundled-npm-5.5.1" = { - name = "not-bundled-npm"; - packageName = "not-bundled-npm"; - version = "5.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/not-bundled-npm/-/not-bundled-npm-5.5.1.tgz"; - sha512 = "1mzbw8sibjcs0c9ldxq90v7z5nrni5jz1khkbv7yvxf2gxqdp12b85fzs9qw3lrxjjcxk5w32rzadaz0q0llpqs72ikxcpi3i4wak9a"; - }; - }; - "npm-bundled-1.0.3" = { - name = "npm-bundled"; - packageName = "npm-bundled"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; - sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; - }; - }; - "npm-cache-filename-1.0.2" = { - name = "npm-cache-filename"; - packageName = "npm-cache-filename"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"; - sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11"; - }; - }; - "npm-install-checks-3.0.0" = { - name = "npm-install-checks"; - packageName = "npm-install-checks"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-3.0.0.tgz"; - sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; - }; - }; - "npm-lifecycle-1.0.3" = { - name = "npm-lifecycle"; - packageName = "npm-lifecycle"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-1.0.3.tgz"; - sha512 = "0iapgirmdb46ia3apm6fsb9qv9c0hi4k9jflrxlgnrm0jhliqgas49lmpz06xafncx1sxgjngl0fw3gr472c7kapzdvpivf0fp5miqa"; - }; - }; - "npm-lifecycle-2.0.0" = { - name = "npm-lifecycle"; - packageName = "npm-lifecycle"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-2.0.0.tgz"; - sha512 = "1rwl5baayxqs7bcgbrjjbrl8lj46p9r4b4k9ad9gnkvgcs5ghsdr9fi6s4xmd0a9dlli0hfwf5mrd9h0rxmlh9zbn553lwfbp9wfkk8"; - }; - }; - "npm-package-arg-5.1.2" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; - sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460"; - }; - }; - "npm-package-arg-6.0.0" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz"; - sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047"; - }; - }; - "npm-packlist-1.1.10" = { - name = "npm-packlist"; - packageName = "npm-packlist"; - version = "1.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; - sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; - }; - }; - "npm-pick-manifest-1.0.4" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; - sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h"; - }; - }; - "npm-profile-2.0.5" = { - name = "npm-profile"; - packageName = "npm-profile"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-profile/-/npm-profile-2.0.5.tgz"; - sha512 = "2325avpmbzxl4vi1hxnxv96rw9j0y712ym3mph3hrsvgq4p8d0yh44vnja22plnw9vplskcx661j2spzqka65zsszzngvwm806skfdl"; - }; - }; - "npm-registry-client-8.5.0" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz"; - sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn"; - }; - }; - "npm-run-path-2.0.2" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; - }; - }; - "npm-user-validate-1.0.0" = { - name = "npm-user-validate"; - packageName = "npm-user-validate"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-1.0.0.tgz"; - sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951"; - }; - }; "npmlog-4.1.2" = { name = "npmlog"; packageName = "npmlog"; @@ -5017,24 +2173,6 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "object-keys-1.0.11" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; - sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; - }; - }; - "object.getownpropertydescriptors-2.0.3" = { - name = "object.getownpropertydescriptors"; - packageName = "object.getownpropertydescriptors"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; - }; - }; "object.omit-2.0.1" = { name = "object.omit"; packageName = "object.omit"; @@ -5044,15 +2182,6 @@ let sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; }; }; - "observatory-1.0.0" = { - name = "observatory"; - packageName = "observatory"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/observatory/-/observatory-1.0.0.tgz"; - sha1 = "2baa606e8299e6866914ec9c8a4db6a41136e59b"; - }; - }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -5062,24 +2191,6 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - }; - "opener-1.4.3" = { - name = "opener"; - packageName = "opener"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz"; - sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; - }; - }; "optparse-1.0.5" = { name = "optparse"; packageName = "optparse"; @@ -5098,15 +2209,6 @@ let sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; - "os-locale-2.1.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; - sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy"; - }; - }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -5116,193 +2218,13 @@ let sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "osenv-0.1.4" = { + "osenv-0.1.5" = { name = "osenv"; packageName = "osenv"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; - }; - }; - "overlap-2.0.0" = { - name = "overlap"; - packageName = "overlap"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/overlap/-/overlap-2.0.0.tgz"; - sha1 = "b29b6bb2ad7569c4e66faef28cb5d74361179cb4"; - }; - }; - "p-cancelable-0.3.0" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; - sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5"; - }; - }; - "p-defer-1.0.0" = { - name = "p-defer"; - packageName = "p-defer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - }; - "p-every-1.0.2" = { - name = "p-every"; - packageName = "p-every"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/p-every/-/p-every-1.0.2.tgz"; - sha1 = "4e01d85c23da19ed71a4afba319bdb4d94c85e00"; - }; - }; - "p-filter-1.0.0" = { - name = "p-filter"; - packageName = "p-filter"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-filter/-/p-filter-1.0.0.tgz"; - sha1 = "629d317150209c8fd508ba137713ef4bb920e9db"; - }; - }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; - }; - }; - "p-is-promise-1.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; - sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; - }; - }; - "p-limit-1.2.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz"; - sha512 = "2g0r6r6bbcdp6lrxbj2zbcihr1byd55kycm1ijz80l2zvmcvhqsbd7rhmfqylp004d61fibvmwzk4ig89dbyk4azpwgll7dllhsvwv3"; - }; - }; - "p-locate-2.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; - }; - }; - "p-map-1.2.0" = { - name = "p-map"; - packageName = "p-map"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz"; - sha512 = "084pyivsr35xi3fdmpznf0c0nc9jz15hak8iyh3v24n25b376blg13ngb4mgpm71zdnfp9b17zbyn728z0jjz1r674k71hd4c0cmb5g"; - }; - }; - "p-queue-2.3.0" = { - name = "p-queue"; - packageName = "p-queue"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-2.3.0.tgz"; - sha1 = "65d55e71bc1500fc413122da98ae457ff8a7c038"; - }; - }; - "p-reduce-1.0.0" = { - name = "p-reduce"; - packageName = "p-reduce"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz"; - sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; - }; - }; - "p-series-1.0.0" = { - name = "p-series"; - packageName = "p-series"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-series/-/p-series-1.0.0.tgz"; - sha1 = "7ec9e7b4406cc32066298a6f9860e55e91b36e07"; - }; - }; - "p-timeout-2.0.1" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; - sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk"; - }; - }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; - }; - }; - "package-json-4.0.1" = { - name = "package-json"; - packageName = "package-json"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz"; - sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; - }; - }; - "package-store-0.15.2" = { - name = "package-store"; - packageName = "package-store"; - version = "0.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/package-store/-/package-store-0.15.2.tgz"; - sha512 = "074xsl6ca8j68cvbh8gj3h846g9rxgcxwxhbryab9f72brc5lmcq3dcj80kbjbykkzgpikzxj4qdmvxzwrhj3bilgncbbm0ladlv17r"; - }; - }; - "pacote-6.0.4" = { - name = "pacote"; - packageName = "pacote"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-6.0.4.tgz"; - sha512 = "36bx0mnsvm3fvq0vbcl05j6fsjf4v4gks1hlxqyga0jxz491cis9y38j8q9cmmfdfbx9xaz3n3h93h0ik4bkn82rb3nz2413wk7xfxi"; - }; - }; - "pako-0.2.9" = { - name = "pako"; - packageName = "pako"; - version = "0.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; - sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; - }; - }; - "parallel-transform-1.1.0" = { - name = "parallel-transform"; - packageName = "parallel-transform"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; - sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; "parse-glob-3.0.4" = { @@ -5323,69 +2245,6 @@ let sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; }; }; - "parse-it-1.0.8" = { - name = "parse-it"; - packageName = "parse-it"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-it/-/parse-it-1.0.8.tgz"; - sha1 = "e9a53bde18c8049e7bb415b73e16d3292df8eae7"; - }; - }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - }; - "parse-json-4.0.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; - }; - }; - "parse-npm-tarball-url-1.0.2" = { - name = "parse-npm-tarball-url"; - packageName = "parse-npm-tarball-url"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-npm-tarball-url/-/parse-npm-tarball-url-1.0.2.tgz"; - sha512 = "26zvr85a2wbbkqrwzyy3226waj0p5z3vrh19gxxvkgxf98qgvl1jdz20hvsr20x5f1viwqm9n2yr8yi61kkb9h0cd1kszw2yv8542cs"; - }; - }; - "parse-url-1.3.11" = { - name = "parse-url"; - packageName = "parse-url"; - version = "1.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-url/-/parse-url-1.3.11.tgz"; - sha1 = "57c15428ab8a892b1f43869645c711d0e144b554"; - }; - }; - "path-absolute-1.0.0" = { - name = "path-absolute"; - packageName = "path-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-absolute/-/path-absolute-1.0.0.tgz"; - sha512 = "2fjzk70izrnlxrvqprakq310j8b1zcvsln7aji0qfljcl5is8c7aip8bc6ly07v8qg6l4rsrgzyj411rlbzyhmgnsiwzlnlhkr1lk5k"; - }; - }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; - }; - }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -5395,60 +2254,6 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "path-is-inside-1.0.2" = { - name = "path-is-inside"; - packageName = "path-is-inside"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; - sha1 = "365417dede44430d1c11af61027facf074bdfc53"; - }; - }; - "path-key-2.0.1" = { - name = "path-key"; - packageName = "path-key"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; - }; - }; - "path-name-1.0.0" = { - name = "path-name"; - packageName = "path-name"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-name/-/path-name-1.0.0.tgz"; - sha1 = "8ca063a63de7982dfa95760edaffd10214494f24"; - }; - }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; - }; - }; - "path-type-3.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; - sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; - }; - }; - "peek-stream-1.1.2" = { - name = "peek-stream"; - packageName = "peek-stream"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.2.tgz"; - sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"; - }; - }; "performance-now-0.2.0" = { name = "performance-now"; packageName = "performance-now"; @@ -5467,42 +2272,6 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - }; - "pify-3.0.0" = { - name = "pify"; - packageName = "pify"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; "pkginfo-0.3.1" = { name = "pkginfo"; packageName = "pkginfo"; @@ -5521,96 +2290,6 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; - "pkgs-graph-2.0.0-0" = { - name = "pkgs-graph"; - packageName = "pkgs-graph"; - version = "2.0.0-0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkgs-graph/-/pkgs-graph-2.0.0-0.tgz"; - sha512 = "3p1llv78shph6qwba9p8vd14hxanjdp1zmzivmn94dzfff2diqkvsc0zar9pj40pl2fwkbqg3p266ilcjbj6ajhzn8kcpmir5fx2f0c"; - }; - }; - "pnpm-default-reporter-0.11.8" = { - name = "pnpm-default-reporter"; - packageName = "pnpm-default-reporter"; - version = "0.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-default-reporter/-/pnpm-default-reporter-0.11.8.tgz"; - sha512 = "2x14yf0yi5q5dvq1777khbvah4wpcm92l4il946nq0f7nyra450llgp09q56161rk6qk6x7gr9hffii97c25b98a35pr7gwgc8yfrwz"; - }; - }; - "pnpm-file-reporter-0.0.1" = { - name = "pnpm-file-reporter"; - packageName = "pnpm-file-reporter"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-file-reporter/-/pnpm-file-reporter-0.0.1.tgz"; - sha1 = "f7c3e2164c5cc955a0b3ed661314e6357b3f2e63"; - }; - }; - "pnpm-install-checks-1.1.0" = { - name = "pnpm-install-checks"; - packageName = "pnpm-install-checks"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-install-checks/-/pnpm-install-checks-1.1.0.tgz"; - sha1 = "741d9979762fdfad93f3e469deb4a814d3430008"; - }; - }; - "pnpm-list-2.0.1" = { - name = "pnpm-list"; - packageName = "pnpm-list"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-list/-/pnpm-list-2.0.1.tgz"; - sha512 = "0rrmch43p1dncghmvb6mwv59c0gan88d87fdbvzsmg4lj6j5l4bkfrr5x6gmi9z8f4nf3lqddf5b5wg8l7bb5if6c5wknim1w3l2vlb"; - }; - }; - "pnpm-logger-0.0.0" = { - name = "pnpm-logger"; - packageName = "pnpm-logger"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-logger/-/pnpm-logger-0.0.0.tgz"; - sha1 = "28701b97618a1fc32d2fee1bf410746588bb1a85"; - }; - }; - "pnpm-shrinkwrap-5.1.1" = { - name = "pnpm-shrinkwrap"; - packageName = "pnpm-shrinkwrap"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm-shrinkwrap/-/pnpm-shrinkwrap-5.1.1.tgz"; - sha512 = "0nrnbsdiq01q2383pib07a7hrc602bpl9sf2j05pmjk5xn7hipicp90jdwlzf36wln2bqjzi1zgv5a5fhw41zx3zfad6affppkf8c5d"; - }; - }; - "prebuild-install-2.5.0" = { - name = "prebuild-install"; - packageName = "prebuild-install"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.0.tgz"; - sha512 = "137vbrb6szyda92qg093yp1l6d2l4s1nb7c0dznjgbyrzsm252spxnrdpmj8nmf170fcq404pgsn0p65sxm4z74p2fyqyd415k742fz"; - }; - }; - "prepend-http-1.0.4" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; - }; - }; - "prepend-http-2.0.0" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; - }; - }; "preserve-0.2.0" = { name = "preserve"; packageName = "preserve"; @@ -5629,15 +2308,6 @@ let sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6"; }; }; - "pretty-bytes-4.0.2" = { - name = "pretty-bytes"; - packageName = "pretty-bytes"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz"; - sha1 = "b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"; - }; - }; "pretty-hash-1.0.1" = { name = "pretty-hash"; packageName = "pretty-hash"; @@ -5647,24 +2317,6 @@ let sha1 = "16e0579188def56bdb565892bcd05a5d65324807"; }; }; - "printable-characters-1.0.38" = { - name = "printable-characters"; - packageName = "printable-characters"; - version = "1.0.38"; - src = fetchurl { - url = "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.38.tgz"; - sha1 = "76ef84accfd7f8366fb7138fb92466a916d599bc"; - }; - }; - "proc-output-1.0.6" = { - name = "proc-output"; - packageName = "proc-output"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/proc-output/-/proc-output-1.0.6.tgz"; - sha1 = "9ffcfb3ac6a156ee32b7ebd69f024a4f6d896350"; - }; - }; "process-0.5.2" = { name = "process"; packageName = "process"; @@ -5674,15 +2326,6 @@ let sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; }; }; - "process-exists-3.0.0" = { - name = "process-exists"; - packageName = "process-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/process-exists/-/process-exists-3.0.0.tgz"; - sha512 = "3lwxdzkx3bzfvb8qvrjccjdk90advh7p3j52d1b4hn3v2d7cf780k7wbvy94w6chgpq6lrrs6m0n122463q7g8z06aajbjqncq0db9h"; - }; - }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -5692,6 +2335,15 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; + }; + }; "progress-string-1.2.2" = { name = "progress-string"; packageName = "progress-string"; @@ -5701,24 +2353,6 @@ let sha512 = "07n7s98b5fqdx9jspg14zkw0dndfdpbrd12f5nj5c7m6aifvl4nn27qdbrgy6gzb837cs86cakldqh5kwbi7fv6ra9ll9q83qhsya97"; }; }; - "promise-inflight-1.0.1" = { - name = "promise-inflight"; - packageName = "promise-inflight"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; - }; - }; - "promise-retry-1.1.1" = { - name = "promise-retry"; - packageName = "promise-retry"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz"; - sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; - }; - }; "prompt-1.0.0" = { name = "prompt"; packageName = "prompt"; @@ -5728,33 +2362,6 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "promzard-0.3.0" = { - name = "promzard"; - packageName = "promzard"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"; - sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; - }; - }; - "proper-lockfile-2.0.1" = { - name = "proper-lockfile"; - packageName = "proper-lockfile"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz"; - sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d"; - }; - }; - "proto-list-1.2.4" = { - name = "proto-list"; - packageName = "proto-list"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; - }; - }; "protocol-buffers-encodings-1.1.0" = { name = "protocol-buffers-encodings"; packageName = "protocol-buffers-encodings"; @@ -5764,51 +2371,6 @@ let sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; }; }; - "protocols-1.4.6" = { - name = "protocols"; - packageName = "protocols"; - version = "1.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/protocols/-/protocols-1.4.6.tgz"; - sha1 = "f8bb263ea1b5fd7a7604d26b8be39bd77678bf8a"; - }; - }; - "protoduck-4.0.0" = { - name = "protoduck"; - packageName = "protoduck"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz"; - sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e"; - }; - }; - "prr-1.0.1" = { - name = "prr"; - packageName = "prr"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; - sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; - }; - }; - "ps-list-4.0.0" = { - name = "ps-list"; - packageName = "ps-list"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ps-list/-/ps-list-4.0.0.tgz"; - sha1 = "57c8b3d38161ee8977811cd32a5dc52237fdb299"; - }; - }; - "pseudomap-1.0.2" = { - name = "pseudomap"; - packageName = "pseudomap"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; - }; - }; "pump-1.0.3" = { name = "pump"; packageName = "pump"; @@ -5827,15 +2389,6 @@ let sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; }; }; - "pumpify-1.4.0" = { - name = "pumpify"; - packageName = "pumpify"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz"; - sha512 = "1h37biy199n445y10vpyiswwcxv8zigfqp0b1xwgbyjq51f2dhjn1pcggjc4j5ccbd64l1ivfi0bqinx4m5clcawvwggy7jv93qsjfs"; - }; - }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -5845,15 +2398,6 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; - "qrcode-terminal-0.11.0" = { - name = "qrcode-terminal"; - packageName = "qrcode-terminal"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz"; - sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e"; - }; - }; "qs-6.4.0" = { name = "qs"; packageName = "qs"; @@ -5872,49 +2416,13 @@ let sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; - "query-string-5.0.1" = { - name = "query-string"; - packageName = "query-string"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz"; - sha512 = "0lcnspv96dv03600bgjxk2ypak8mysp77n47jkddpz6ldcgscwyan1akqjrddii4abb2brz6gr6yq9pcbdx63m9i16kk8m5028qrkv8"; - }; - }; - "qw-1.0.1" = { - name = "qw"; - packageName = "qw"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qw/-/qw-1.0.1.tgz"; - sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4"; - }; - }; - "ramda-0.24.1" = { - name = "ramda"; - packageName = "ramda"; - version = "0.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz"; - sha1 = "c3b7755197f35b8dc3502228262c4c91ddb6b857"; - }; - }; - "ramda-0.25.0" = { - name = "ramda"; - packageName = "ramda"; - version = "0.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ramda/-/ramda-0.25.0.tgz"; - sha512 = "1qixam46hr8jsw2f4g0rvhn8jf493dpjqhi65ggacz83ndqwnal1m8kiy18d3ak9x4lapcjb1fvrx18zj26jfhlxp51vhsghnnmyyhr"; - }; - }; - "random-access-file-1.8.1" = { + "random-access-file-2.0.1" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.8.1"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; - sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz"; + sha512 = "2zbpqbs4dvnpc3dpr2yz8phz6r49j4a57jjlx7nqk6rzy2q0437g537czdxyk7cfdmhsc0yvlvs8b7p7sxax1slpwz4d8bkb851zglx"; }; }; "random-access-memory-2.4.0" = { @@ -5926,6 +2434,15 @@ let sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; + "random-access-storage-1.1.1" = { + name = "random-access-storage"; + packageName = "random-access-storage"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz"; + sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1"; + }; + }; "randomatic-1.1.7" = { name = "randomatic"; packageName = "randomatic"; @@ -5953,13 +2470,13 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "rc-1.2.4" = { + "rc-1.2.5" = { name = "rc"; packageName = "rc"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; - sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz"; + sha1 = "275cd687f6e3b36cc756baa26dfee80a790301fd"; }; }; "read-1.0.7" = { @@ -5971,94 +2488,13 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; - "read-cmd-shim-1.0.1" = { - name = "read-cmd-shim"; - packageName = "read-cmd-shim"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; - sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; - }; - }; - "read-installed-4.0.3" = { - name = "read-installed"; - packageName = "read-installed"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz"; - sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; - }; - }; - "read-package-json-2.0.12" = { - name = "read-package-json"; - packageName = "read-package-json"; - version = "2.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz"; - sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv"; - }; - }; - "read-package-tree-5.1.6" = { - name = "read-package-tree"; - packageName = "read-package-tree"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz"; - sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l"; - }; - }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; - }; - }; - "read-pkg-3.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; - sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; - }; - }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - }; - "readable-stream-1.1.14" = { + "readable-stream-2.3.4" = { name = "readable-stream"; packageName = "readable-stream"; - version = "1.1.14"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "readable-stream-2.3.3" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; - sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; - }; - }; - "readdir-scoped-modules-1.0.2" = { - name = "readdir-scoped-modules"; - packageName = "readdir-scoped-modules"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz"; - sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz"; + sha512 = "1jpffi1v0l7pkzrhh8i9c6cbswa9npyx114cbfncfnzl9d7w9p08k9n703hq5xr2c3rg86qiq023sl1x8y6mawgsxgggy8ccrwk3rmy"; }; }; "readdirp-2.1.0" = { @@ -6070,22 +2506,13 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "recursive-watch-1.1.2" = { + "recursive-watch-1.1.3" = { name = "recursive-watch"; packageName = "recursive-watch"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.2.tgz"; - sha1 = "912e2d62a83c8b388d288c4343495f247bc43f8e"; - }; - }; - "regenerator-runtime-0.11.1" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.3.tgz"; + sha512 = "3m0s8140jpamg1xxdlsslshx10qznb889s6yc8av6vvqbs56banhmjqy9lgl7g4ppsrsja0d2lhb5lacl3nxm8ggsrpdd7xqf53hvzx"; }; }; "regex-cache-0.4.4" = { @@ -6097,51 +2524,6 @@ let sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; - "regex-escape-3.4.8" = { - name = "regex-escape"; - packageName = "regex-escape"; - version = "3.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-escape/-/regex-escape-3.4.8.tgz"; - sha512 = "15ylzlxx4y88jldg7cgwv0dmw3ljpq27f9qf17d3g76dqh6ir1ig7dzvqv9nqpr3da1yd2r5ay8jqa6yk7ni5fbbrzgkhf3yha1av8c"; - }; - }; - "registry-auth-token-3.3.1" = { - name = "registry-auth-token"; - packageName = "registry-auth-token"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; - sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; - }; - }; - "registry-url-3.1.0" = { - name = "registry-url"; - packageName = "registry-url"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; - }; - }; - "remedial-1.0.7" = { - name = "remedial"; - packageName = "remedial"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/remedial/-/remedial-1.0.7.tgz"; - sha1 = "d6674413a65676007be00dd400980987b2c300c1"; - }; - }; - "remove-all-except-outer-links-1.0.3" = { - name = "remove-all-except-outer-links"; - packageName = "remove-all-except-outer-links"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/remove-all-except-outer-links/-/remove-all-except-outer-links-1.0.3.tgz"; - sha512 = "27mlgakm2rw58mad07fnzfmjk893mr23qqi393b30qsqv2wyng86j0mqn1d06wi2cjzhlcq86zxzz1i3rvd58ajhq71crrm27dyblw7"; - }; - }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -6151,15 +2533,6 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "rename-overwrite-1.0.0" = { - name = "rename-overwrite"; - packageName = "rename-overwrite"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rename-overwrite/-/rename-overwrite-1.0.0.tgz"; - sha1 = "b45a74ceb93d1073e31c5b701c428de5796523d8"; - }; - }; "repeat-element-1.1.2" = { name = "repeat-element"; packageName = "repeat-element"; @@ -6178,15 +2551,6 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "replace-string-1.1.0" = { - name = "replace-string"; - packageName = "replace-string"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/replace-string/-/replace-string-1.1.0.tgz"; - sha1 = "87062117f823fe5800c306bacb2cfa359b935fea"; - }; - }; "request-2.81.0" = { name = "request"; packageName = "request"; @@ -6205,24 +2569,6 @@ let sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; }; }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; - }; - }; - "require-main-filename-1.0.1" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - }; "resolve-1.1.7" = { name = "resolve"; packageName = "resolve"; @@ -6232,51 +2578,6 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-from-4.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "3i345pdv74jb3xbprqb38xq1zfhsbxzm6b1h0mbcvhfpzz907m4amq35s0spijdj3phs508sha4cnr3incg4w8in4r0kd7ccmicrgx5"; - }; - }; - "resolve-link-target-1.0.1" = { - name = "resolve-link-target"; - packageName = "resolve-link-target"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-link-target/-/resolve-link-target-1.0.1.tgz"; - sha512 = "144pdhsw05w6zrwzh2daxd63x0qv6qgf5cimbkbvz9m4ncclp5z9xj6ym5ayhd6xvc2s7pwymj4x439k00czm5jz2h7z1dhgzipf9xs"; - }; - }; - "responselike-1.0.2" = { - name = "responselike"; - packageName = "responselike"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; - }; - }; - "retry-0.10.1" = { - name = "retry"; - packageName = "retry"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; - sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; - }; - }; "revalidator-0.1.8" = { name = "revalidator"; packageName = "revalidator"; @@ -6295,31 +2596,13 @@ let sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; - "rimraf-then-1.0.1" = { - name = "rimraf-then"; - packageName = "rimraf-then"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf-then/-/rimraf-then-1.0.1.tgz"; - sha1 = "bd4458a79eb561b7548aaec0ac3753ef429fe70b"; - }; - }; - "run-queue-1.0.3" = { - name = "run-queue"; - packageName = "run-queue"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; - sha1 = "e848396f057d223f24386924618e25694161ec47"; - }; - }; - "rusha-0.8.12" = { + "rusha-0.8.13" = { name = "rusha"; packageName = "rusha"; - version = "0.8.12"; + version = "0.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.12.tgz"; - sha1 = "5d838ce1fce8b145674ee771eaad5bcb2575e64b"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.13.tgz"; + sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; "safe-buffer-5.1.1" = { @@ -6331,15 +2614,6 @@ let sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; }; }; - "sec-1.0.0" = { - name = "sec"; - packageName = "sec"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sec/-/sec-1.0.0.tgz"; - sha1 = "033d60a3ad20ecf2e00940d14f97823465774335"; - }; - }; "semver-5.3.0" = { name = "semver"; packageName = "semver"; @@ -6349,15 +2623,6 @@ let sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; }; - "semver-5.4.1" = { - name = "semver"; - packageName = "semver"; - version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; - }; - }; "semver-5.5.0" = { name = "semver"; packageName = "semver"; @@ -6367,24 +2632,6 @@ let sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; - "semver-diff-2.1.0" = { - name = "semver-diff"; - packageName = "semver-diff"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; - sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; - }; - }; - "semver-regex-1.0.0" = { - name = "semver-regex"; - packageName = "semver-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; - sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; - }; - }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -6403,33 +2650,6 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "sha-2.0.1" = { - name = "sha"; - packageName = "sha"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz"; - sha1 = "6030822fbd2c9823949f8f72ed6411ee5cf25aae"; - }; - }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - }; "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; @@ -6448,15 +2668,6 @@ let sha1 = "50a9989da7c98c2c61dad119bc97470ef8528129"; }; }; - "simple-get-1.4.3" = { - name = "simple-get"; - packageName = "simple-get"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz"; - sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; - }; - }; "simple-sha1-2.1.0" = { name = "simple-sha1"; packageName = "simple-sha1"; @@ -6475,15 +2686,6 @@ let sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w"; }; }; - "slash-1.0.0" = { - name = "slash"; - packageName = "slash"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; - sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; - }; - }; "slasp-0.0.4" = { name = "slasp"; packageName = "slasp"; @@ -6502,24 +2704,6 @@ let sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; - "slide-1.1.6" = { - name = "slide"; - packageName = "slide"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }; - }; - "smart-buffer-1.1.15" = { - name = "smart-buffer"; - packageName = "smart-buffer"; - version = "1.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; - sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; - }; - }; "sntp-1.0.9" = { name = "sntp"; packageName = "sntp"; @@ -6538,24 +2722,6 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "socks-1.1.10" = { - name = "socks"; - packageName = "socks"; - version = "1.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; - sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; - }; - }; - "socks-proxy-agent-3.0.1" = { - name = "socks-proxy-agent"; - packageName = "socks-proxy-agent"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz"; - sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7"; - }; - }; "sodium-javascript-0.5.4" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -6583,15 +2749,6 @@ let sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; }; }; - "sort-keys-2.0.0" = { - name = "sort-keys"; - packageName = "sort-keys"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; - }; - }; "sorted-array-functions-1.1.0" = { name = "sorted-array-functions"; packageName = "sorted-array-functions"; @@ -6610,33 +2767,6 @@ let sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899"; }; }; - "sorted-object-2.0.1" = { - name = "sorted-object"; - packageName = "sorted-object"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz"; - sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; - }; - }; - "sorted-union-stream-2.1.3" = { - name = "sorted-union-stream"; - packageName = "sorted-union-stream"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; - sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; - }; - }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; - }; - }; "sparse-bitfield-3.0.3" = { name = "sparse-bitfield"; packageName = "sparse-bitfield"; @@ -6646,42 +2776,6 @@ let sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; }; }; - "spawno-2.0.7" = { - name = "spawno"; - packageName = "spawno"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/spawno/-/spawno-2.0.7.tgz"; - sha512 = "0h8xflvrqwdvz8gadif970wlj5mby4vxhar40h0g96ld6qv6b696msspl89rs2l6n8zv3d9yd5lm85v1g5qk7fpjhqiai2862anzyrc"; - }; - }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; - }; - }; - "spdx-expression-parse-1.0.4" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; - }; - }; - "spdx-license-ids-1.2.2" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; - }; - }; "speedometer-1.0.0" = { name = "speedometer"; packageName = "speedometer"; @@ -6691,24 +2785,6 @@ let sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2"; }; }; - "split2-2.2.0" = { - name = "split2"; - packageName = "split2"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz"; - sha512 = "1plzy1n554n2gwfpavi4azb4y45dm2mwj7dq8ma99yg1z55xcdxmkibsfhsh1h19qgsrcamm0ha5qi2c3has6skvx4bix5p67czc1j4"; - }; - }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; - }; - }; "sshpk-1.13.1" = { name = "sshpk"; packageName = "sshpk"; @@ -6718,33 +2794,6 @@ let sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; }; }; - "ssri-4.1.6" = { - name = "ssri"; - packageName = "ssri"; - version = "4.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; - sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr"; - }; - }; - "ssri-5.0.0" = { - name = "ssri"; - packageName = "ssri"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-5.0.0.tgz"; - sha512 = "0g0vz6pdy8f13fqnadimwxx39hq1ix1my6gv0cm308vpv7i06f7gk4ywp7q9aw5sbhrakf86x37ai9fn2y4jvw6lashjw8h5bih6vzg"; - }; - }; - "ssri-5.1.0" = { - name = "ssri"; - packageName = "ssri"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-5.1.0.tgz"; - sha512 = "11f7imn7d4s1vs4z45yk8gkis18gbb5qn1z4v5liidy6vwairj5426xciyk10yh3gnxj77bkamzffip8v7v9mjr8ggs8h1iz3qw5ssd"; - }; - }; "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; @@ -6754,24 +2803,6 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; - "stacktracey-1.2.100" = { - name = "stacktracey"; - packageName = "stacktracey"; - version = "1.2.100"; - src = fetchurl { - url = "https://registry.npmjs.org/stacktracey/-/stacktracey-1.2.100.tgz"; - sha1 = "9e32c7a7fa643eaf69a8f9572361339a8afb6b59"; - }; - }; - "static-methods-1.0.10" = { - name = "static-methods"; - packageName = "static-methods"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/static-methods/-/static-methods-1.0.10.tgz"; - sha512 = "2vn92wnri9w5d8san58a7nyyz1ai56gl2qaic9w430bbyyscw98k0a89h3nhk3fkpg9p47hdizwmgp4cnx2g6kxjgk7la5mclk7vb2y"; - }; - }; "status-logger-3.1.1" = { name = "status-logger"; packageName = "status-logger"; @@ -6799,15 +2830,6 @@ let sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; }; }; - "stream-iterate-1.2.0" = { - name = "stream-iterate"; - packageName = "stream-iterate"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz"; - sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; - }; - }; "stream-parser-0.3.1" = { name = "stream-parser"; packageName = "stream-parser"; @@ -6826,15 +2848,6 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; - "strict-uri-encode-1.1.0" = { - name = "strict-uri-encode"; - packageName = "strict-uri-encode"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; - }; - }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -6853,15 +2866,6 @@ let sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; }; }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; "string_decoder-1.0.3" = { name = "string_decoder"; packageName = "string_decoder"; @@ -6898,33 +2902,6 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; - }; - }; - "strip-color-0.1.0" = { - name = "strip-color"; - packageName = "strip-color"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-color/-/strip-color-0.1.0.tgz"; - sha1 = "106f65d3d3e6a2d9401cac0eb0ce8b8a702b4f7b"; - }; - }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; - }; - }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -6943,33 +2920,6 @@ let sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760"; }; }; - "supi-0.12.1" = { - name = "supi"; - packageName = "supi"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/supi/-/supi-0.12.1.tgz"; - sha512 = "1fb6fkng687rhx89agz3mqa854p424b8nwj1ix6ckfv40gnkz3saydxs0di4nildpccn2rgwf01flxk922pj2rap6wqg8fdr2c8crz7"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "supports-color-3.2.3" = { - name = "supports-color"; - packageName = "supports-color"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"; - sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; - }; - }; "supports-color-4.4.0" = { name = "supports-color"; packageName = "supports-color"; @@ -6979,31 +2929,13 @@ let sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; }; }; - "supports-color-4.5.0" = { + "supports-color-5.2.0" = { name = "supports-color"; packageName = "supports-color"; - version = "4.5.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; - sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; - }; - }; - "symbol-observable-1.1.0" = { - name = "symbol-observable"; - packageName = "symbol-observable"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz"; - sha512 = "19pk4fk1ddq50all5c15bb58iwchzck5lvmsvlx5va17sfrq89pda0qrrnlma34m1kzay4q3k3ghmfp32hlqvk8njlfnhvavdvj42km"; - }; - }; - "symlink-dir-1.1.2" = { - name = "symlink-dir"; - packageName = "symlink-dir"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/symlink-dir/-/symlink-dir-1.1.2.tgz"; - sha512 = "2bzpdrkxnd1iysdlc7n6i5pqwqm98s2m2srfp9br9872qdvv8pbnm3i7r27rqxbad6pypj2lzhkxf8zghfzp3psl9psk9bkbp02yw8r"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz"; + sha512 = "3jqwn02aw7bczn3f56mfbx3nvhrydwsc6g9vkp54794rfdg61vbp3qy4vdj1n8jvpahlcywpcv0afxjxbj5a3wm9lpqcsr5ix5nyzqp"; }; }; "tar-2.2.1" = { @@ -7015,24 +2947,6 @@ let sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; }; }; - "tar-4.0.2" = { - name = "tar"; - packageName = "tar"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz"; - sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2"; - }; - }; - "tar-fs-1.16.0" = { - name = "tar-fs"; - packageName = "tar-fs"; - version = "1.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz"; - sha512 = "1i39d75rgrl2a3v3x65w7bz6az06sg7xdvp7j9zk5bqilj5znclmr7r5n9l6la6nkqikn4lkhnfrgp4hzbvp6ph77nn53g6zvmdpni3"; - }; - }; "tar-pack-3.4.1" = { name = "tar-pack"; packageName = "tar-pack"; @@ -7042,60 +2956,6 @@ let sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; }; }; - "tar-stream-1.5.5" = { - name = "tar-stream"; - packageName = "tar-stream"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; - sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; - }; - }; - "tasklist-3.1.0" = { - name = "tasklist"; - packageName = "tasklist"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tasklist/-/tasklist-3.1.0.tgz"; - sha1 = "873a98a4e45cbdecfa2c2ee18865353057e63696"; - }; - }; - "term-size-1.2.0" = { - name = "term-size"; - packageName = "term-size"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; - sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; - }; - }; - "text-table-0.2.0" = { - name = "text-table"; - packageName = "text-table"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; - }; - }; - "thenify-3.3.0" = { - name = "thenify"; - packageName = "thenify"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz"; - sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; - }; - }; - "thenify-all-1.6.0" = { - name = "thenify-all"; - packageName = "thenify-all"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; - }; - }; "throttle-1.0.3" = { name = "throttle"; packageName = "throttle"; @@ -7105,15 +2965,6 @@ let sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7"; }; }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - }; "through2-2.0.3" = { name = "through2"; packageName = "through2"; @@ -7141,24 +2992,6 @@ let sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; - "timed-out-4.0.1" = { - name = "timed-out"; - packageName = "timed-out"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; - sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; - }; - }; - "timeout-then-1.1.0" = { - name = "timeout-then"; - packageName = "timeout-then"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/timeout-then/-/timeout-then-1.1.0.tgz"; - sha1 = "0145b06070159c17e2146fd292b01a1bd81e5fbc"; - }; - }; "to-buffer-1.1.0" = { name = "to-buffer"; packageName = "to-buffer"; @@ -7177,13 +3010,13 @@ let sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l"; }; }; - "tough-cookie-2.3.3" = { + "tough-cookie-2.3.4" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; }; }; "township-client-1.3.2" = { @@ -7195,15 +3028,6 @@ let sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; }; }; - "tree-kill-1.2.0" = { - name = "tree-kill"; - packageName = "tree-kill"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz"; - sha512 = "1r0mixygpdqrm2fn92z4cyxzbnvimm16k5gdm2m2jxx8wrj3w0mql9s748hcqp2nzcnybnw74wkm211zlr9ld0j2x1q8f153mszlm8f"; - }; - }; "trim-0.0.1" = { name = "trim"; packageName = "trim"; @@ -7249,24 +3073,6 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "typpy-2.0.0" = { - name = "typpy"; - packageName = "typpy"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typpy/-/typpy-2.0.0.tgz"; - sha1 = "adef3bacc12ff47aff920fab03a8ff3279d737d6"; - }; - }; - "typpy-2.3.10" = { - name = "typpy"; - packageName = "typpy"; - version = "2.3.10"; - src = fetchurl { - url = "https://registry.npmjs.org/typpy/-/typpy-2.3.10.tgz"; - sha512 = "2m116608xyx0v7pl2hwvw0z7gw1yyxqx7yhp0l3a2nxrlsn7xav33rnys72xrc6jr0dwsg0r71f7qj42pdzgza15fz8l5wphycr5a0c"; - }; - }; "uid-number-0.0.6" = { name = "uid-number"; packageName = "uid-number"; @@ -7285,69 +3091,6 @@ let sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; }; }; - "ul-5.0.0" = { - name = "ul"; - packageName = "ul"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ul/-/ul-5.0.0.tgz"; - sha1 = "ca80d793025f3fd5dc9bf83469818d310a7c9a62"; - }; - }; - "ul-5.2.13" = { - name = "ul"; - packageName = "ul"; - version = "5.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/ul/-/ul-5.2.13.tgz"; - sha1 = "9ff0504ea35ca1f74c0bf59e6480def009bad7b5"; - }; - }; - "umask-1.1.0" = { - name = "umask"; - packageName = "umask"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"; - sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; - }; - }; - "unbzip2-stream-1.2.5" = { - name = "unbzip2-stream"; - packageName = "unbzip2-stream"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; - sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b"; - }; - }; - "unique-filename-1.1.0" = { - name = "unique-filename"; - packageName = "unique-filename"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz"; - sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; - }; - }; - "unique-slug-2.0.0" = { - name = "unique-slug"; - packageName = "unique-slug"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz"; - sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; - }; - }; - "unique-string-1.0.0" = { - name = "unique-string"; - packageName = "unique-string"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; - sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; - }; - }; "unixify-1.0.0" = { name = "unixify"; packageName = "unixify"; @@ -7384,24 +3127,6 @@ let sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec"; }; }; - "unpack-stream-3.0.1" = { - name = "unpack-stream"; - packageName = "unpack-stream"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unpack-stream/-/unpack-stream-3.0.1.tgz"; - sha512 = "3m37z48fshadh46ay1hibdw9fawz3rgx1c16wx63mgplka0bs71364xnn72awwzc83dns0gkhnv3slmk071k1mdrm1bzvbi8z1br8f9"; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - }; "untildify-3.0.2" = { name = "untildify"; packageName = "untildify"; @@ -7411,69 +3136,6 @@ let sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; }; }; - "unzip-response-1.0.2" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; - sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; - }; - }; - "unzip-response-2.0.1" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; - sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; - }; - }; - "update-notifier-2.2.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; - sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; - }; - }; - "update-notifier-2.3.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz"; - sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; - }; - }; - "url-parse-lax-1.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; - }; - }; - "url-parse-lax-3.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; - }; - }; - "url-to-options-1.0.1" = { - name = "url-to-options"; - packageName = "url-to-options"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; - sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; - }; - }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -7483,24 +3145,6 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "util-extend-1.0.3" = { - name = "util-extend"; - packageName = "util-extend"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz"; - sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; - }; - }; - "util.promisify-1.0.0" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb"; - }; - }; "utile-0.3.0" = { name = "utile"; packageName = "utile"; @@ -7519,15 +3163,6 @@ let sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; }; }; - "uuid-3.1.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; - sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; - }; - }; "uuid-3.2.1" = { name = "uuid"; packageName = "uuid"; @@ -7537,24 +3172,6 @@ let sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; }; }; - "validate-npm-package-license-3.0.1" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; - }; - }; - "validate-npm-package-name-3.0.0" = { - name = "validate-npm-package-name"; - packageName = "validate-npm-package-name"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; - sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; - }; - }; "varint-3.0.1" = { name = "varint"; packageName = "varint"; @@ -7591,24 +3208,6 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "version-selector-type-2.0.0" = { - name = "version-selector-type"; - packageName = "version-selector-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/version-selector-type/-/version-selector-type-2.0.0.tgz"; - sha512 = "3n7bidjd5r4lph1qq3sz6kyjk3isb2hjvvaccsqqsspphm2in151xgga6lzjimydbvl9a6cr9jy8q06qdgvalq4nxyggs1v49i150qm"; - }; - }; - "wcwidth-1.0.1" = { - name = "wcwidth"; - packageName = "wcwidth"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; - sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; - }; - }; "which-1.3.0" = { name = "which"; packageName = "which"; @@ -7618,15 +3217,6 @@ let sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; }; }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - }; "wide-align-1.1.2" = { name = "wide-align"; packageName = "wide-align"; @@ -7636,15 +3226,6 @@ let sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; }; }; - "widest-line-2.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz"; - sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273"; - }; - }; "winston-2.1.1" = { name = "winston"; packageName = "winston"; @@ -7654,24 +3235,6 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "worker-farm-1.5.2" = { - name = "worker-farm"; - packageName = "worker-farm"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.2.tgz"; - sha512 = "28xgfshjpa79hz7v39axfrfnjhhjl371w30vy7dhs0kdzsdd42xi8lz85yjs2m0fp481iydiwscsy61gr99igkmkak7xrjd8vv9062z"; - }; - }; - "wrap-ansi-2.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - }; "wrap-ansi-3.0.1" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -7690,78 +3253,6 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "write-file-atomic-1.3.4" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; - sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; - }; - }; - "write-file-atomic-2.1.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz"; - sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni"; - }; - }; - "write-file-atomic-2.3.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; - sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; - }; - }; - "write-json-file-2.3.0" = { - name = "write-json-file"; - packageName = "write-json-file"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz"; - sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f"; - }; - }; - "write-pkg-3.1.0" = { - name = "write-pkg"; - packageName = "write-pkg"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz"; - sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9"; - }; - }; - "write-yaml-file-1.0.0" = { - name = "write-yaml-file"; - packageName = "write-yaml-file"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-yaml-file/-/write-yaml-file-1.0.0.tgz"; - sha1 = "7b4bd0df72ca13fbe9d6b0178fd83c077b8ea86b"; - }; - }; - "x256-0.0.2" = { - name = "x256"; - packageName = "x256"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/x256/-/x256-0.0.2.tgz"; - sha1 = "c9af18876f7a175801d564fe70ad9e8317784934"; - }; - }; - "xdg-basedir-3.0.0" = { - name = "xdg-basedir"; - packageName = "xdg-basedir"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; - sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; - }; - }; "xhr-2.4.1" = { name = "xhr"; packageName = "xhr"; @@ -7789,69 +3280,6 @@ let sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; - "y18n-3.2.1" = { - name = "y18n"; - packageName = "y18n"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; - }; - }; - "yallist-2.1.2" = { - name = "yallist"; - packageName = "yallist"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; - }; - }; - "yallist-3.0.2" = { - name = "yallist"; - packageName = "yallist"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; - sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; - }; - }; - "yargs-8.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; - }; - }; - "yargs-parser-7.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; - sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; - }; - }; - "zen-observable-0.7.1" = { - name = "zen-observable"; - packageName = "zen-observable"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.7.1.tgz"; - sha512 = "134nwk2ggcx46rx0n2cy1fqmlixar7c4sygxkym7kpd8wkqvdnlg1win4kns4zcxx99mxmbpr57jppq8bkva5z2ladfmjdl4wqrb3iq"; - }; - }; - "zen-push-0.2.1" = { - name = "zen-push"; - packageName = "zen-push"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-push/-/zen-push-0.2.1.tgz"; - sha512 = "3bx83jgamf9vq3n0150j5h8ndbxck5psnhw21fwifmq7jz37vcmlm7wmirbxh824jhq3kv16lc4h6iki1kwxx0zsjwyf8hrryyjmzj2"; - }; - }; }; in { @@ -7930,20 +3358,19 @@ in sources."blake2b-wasm-1.1.7" sources."body-0.1.0" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equals-1.0.4" sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.3" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.3.0" + sources."chalk-2.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" @@ -7951,7 +3378,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.1.2" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."connections-1.4.2" @@ -7986,18 +3413,23 @@ in sources."debug-2.6.9" ]; }) - sources."dat-log-1.1.1" - (sources."dat-node-3.5.6" // { + (sources."dat-log-1.1.1" // { + dependencies = [ + sources."process-nextick-args-1.0.7" + ]; + }) + (sources."dat-node-3.5.8" // { dependencies = [ sources."minimist-0.0.8" + sources."process-nextick-args-1.0.7" sources."pump-1.0.3" sources."unordered-set-2.0.0" sources."varint-5.0.0" ]; }) sources."dat-registry-4.0.0" - sources."dat-secret-storage-4.0.0" - sources."dat-storage-1.0.3" + sources."dat-secret-storage-4.0.1" + sources."dat-storage-1.0.4" sources."dat-swarm-defaults-1.0.0" sources."datland-swarm-defaults-1.0.2" sources."debug-3.1.0" @@ -8010,11 +3442,7 @@ in sources."thunky-0.1.0" ]; }) - (sources."dns-discovery-5.6.1" // { - dependencies = [ - sources."thunky-0.1.0" - ]; - }) + sources."dns-discovery-5.6.1" sources."dns-packet-1.3.1" sources."dns-socket-1.6.3" sources."dns-txt-2.0.2" @@ -8029,7 +3457,7 @@ in sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-read-stream-1.1.0" sources."filename-regex-2.0.1" @@ -8039,7 +3467,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."from2-2.3.0" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" @@ -8049,28 +3477,24 @@ in sources."global-4.3.2" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.12.0" // { + (sources."hypercore-6.12.2" // { dependencies = [ sources."varint-5.0.0" ]; }) sources."hypercore-protocol-6.5.2" - (sources."hyperdrive-9.12.2" // { + (sources."hyperdrive-9.12.3" // { dependencies = [ sources."varint-4.0.1" ]; }) sources."hyperdrive-http-4.2.2" - (sources."hyperdrive-network-speed-2.0.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -8099,8 +3523,12 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."k-bucket-3.3.1" - sources."k-rpc-4.2.1" - sources."k-rpc-socket-1.7.2" + (sources."k-rpc-4.2.1" // { + dependencies = [ + sources."bencode-2.0.0" + ]; + }) + sources."k-rpc-socket-1.8.0" sources."kind-of-3.2.2" sources."last-one-wins-1.0.4" sources."length-prefixed-message-3.0.3" @@ -8111,8 +3539,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -8120,11 +3548,11 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-6.2.2" + sources."multicast-dns-6.2.3" sources."multicb-1.2.2" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" - sources."nan-2.8.0" + sources."nan-2.9.2" sources."nanoassert-1.1.0" sources."nanobus-3.3.0" sources."nanotiming-1.0.1" @@ -8151,7 +3579,7 @@ in sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" sources."process-0.5.2" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."progress-string-1.2.2" (sources."prompt-1.0.0" // { dependencies = [ @@ -8162,12 +3590,9 @@ in sources."pump-2.0.1" sources."punycode-1.4.1" sources."qs-6.5.1" - (sources."random-access-file-1.8.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."random-access-file-2.0.1" sources."random-access-memory-2.4.0" + sources."random-access-storage-1.1.1" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -8180,8 +3605,8 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.3" - sources."recursive-watch-1.1.2" + sources."readable-stream-2.3.4" + sources."recursive-watch-1.1.3" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" @@ -8189,7 +3614,7 @@ in sources."request-2.83.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."rusha-0.8.12" + sources."rusha-0.8.13" sources."safe-buffer-5.1.1" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.0" @@ -8219,7 +3644,7 @@ in sources."debug-2.6.9" ]; }) - sources."supports-color-4.5.0" + sources."supports-color-5.2.0" (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -8229,7 +3654,7 @@ in sources."thunky-1.0.2" sources."to-buffer-1.1.0" sources."toiletdb-1.4.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."township-client-1.3.2" sources."trim-0.0.1" sources."ttl-1.3.1" @@ -8279,7 +3704,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."findup-sync-0.3.0" sources."glob-5.0.15" @@ -8305,14 +3730,14 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.0.tgz"; - sha512 = "3rxvm15qz9qdiyihc9pq4kc008iz89cqdqjlca43swmk3fc7bydlaqk1qyhaj19r5m8cxxrpiwxz5cwrp9im26fin4sgqdfbxs7ch5s"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz"; + sha512 = "2975gb84ixyiin9mdahnmpxxqmn9zmc7d07hh6kv0bnl3mqf6slj83r1f44hvk9f5qk247ajfdmynbyinabrbfi0j8za4v776i3572a"; }; dependencies = [ sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."browser-stdout-1.3.0" sources."commander-2.11.0" sources."concat-map-0.0.1" @@ -8388,11 +3813,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" sources."boom-4.3.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -8407,10 +3832,10 @@ in sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" + sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" @@ -8421,7 +3846,7 @@ in sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hawk-6.0.2" - sources."hoek-4.2.0" + sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -8435,8 +3860,8 @@ in sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -8448,13 +3873,13 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.83.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -8468,7 +3893,7 @@ in sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."tar-2.2.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" @@ -8527,11 +3952,11 @@ in sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" sources."boom-2.10.1" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.5" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -8577,8 +4002,8 @@ in sources."assert-plus-1.0.0" ]; }) - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -8591,18 +4016,18 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."performance-now-0.2.0" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.4.0" - (sources."rc-1.2.4" // { + (sources."rc-1.2.5" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.3" + sources."readable-stream-2.3.4" sources."request-2.81.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -8622,7 +4047,7 @@ in sources."strip-json-comments-2.0.1" sources."tar-2.2.1" sources."tar-pack-3.4.1" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid-number-0.0.6" @@ -8644,818 +4069,11 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "1.31.0"; + version = "1.35.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-1.31.0.tgz"; - sha1 = "7d971bb0e48c25d4e04db420eee8ee0bcb4c66d4"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-1.35.1.tgz"; + sha1 = "7eb1265daa9da18dab7a7b1645747cd046c42f33"; }; - dependencies = [ - sources."@most/multicast-1.3.0" - sources."@most/prelude-1.7.0" - sources."@pnpm/check-package-1.0.0" - (sources."@pnpm/default-fetcher-0.3.2" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - sources."ssri-5.0.0" - ]; - }) - (sources."@pnpm/default-resolver-0.1.2" // { - dependencies = [ - sources."@types/node-9.3.0" - ]; - }) - sources."@pnpm/fs-locker-1.0.1" - sources."@pnpm/git-fetcher-0.2.0" - sources."@pnpm/git-resolver-0.3.0" - sources."@pnpm/local-resolver-0.1.1" - (sources."@pnpm/logger-1.0.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."@pnpm/npm-resolver-0.3.11" - (sources."@pnpm/outdated-0.2.5" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."pify-2.3.0" - ]; - }) - sources."@pnpm/package-requester-0.7.1" - sources."@pnpm/pkgid-to-filename-1.0.0" - (sources."@pnpm/server-0.7.1" // { - dependencies = [ - sources."@types/node-9.3.0" - ]; - }) - sources."@pnpm/tarball-fetcher-0.3.4" - (sources."@pnpm/tarball-resolver-0.1.0" // { - dependencies = [ - sources."@types/node-8.5.9" - ]; - }) - sources."@pnpm/types-1.7.0" - sources."@sindresorhus/is-0.7.0" - sources."@types/archy-0.0.31" - sources."@types/byline-4.2.31" - sources."@types/chalk-0.4.31" - sources."@types/common-tags-1.4.0" - sources."@types/get-port-3.2.0" - sources."@types/got-7.1.6" - sources."@types/load-json-file-2.0.7" - sources."@types/mem-1.1.2" - sources."@types/mz-0.0.32" - sources."@types/node-8.5.9" - sources."@types/nopt-3.0.29" - sources."@types/npm-2.0.29" - sources."@types/p-limit-1.1.2" - sources."@types/p-queue-1.1.0" - sources."@types/p-series-1.0.1" - sources."@types/ramda-0.25.16" - sources."@types/rc-0.0.1" - sources."@types/retry-0.10.2" - sources."@types/semver-5.4.0" - sources."@types/update-notifier-1.0.3" - sources."@types/uuid-3.4.3" - sources."@types/write-json-file-2.2.1" - sources."@zkochan/cmd-shim-2.2.4" - (sources."@zkochan/libnpx-9.6.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."execa-0.7.0" - sources."is-fullwidth-code-point-2.0.0" - sources."load-json-file-2.0.0" - sources."mem-1.1.0" - sources."pify-2.3.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."@zkochan/npm-package-arg-1.0.0" - sources."JSONStream-1.3.2" - sources."abbrev-1.1.1" - sources."add-subtract-date-1.0.13" - sources."agent-base-4.2.0" - sources."agentkeepalive-3.3.0" - sources."ajv-5.5.2" - sources."ansi-align-2.0.0" - sources."ansi-escapes-3.0.0" - sources."ansi-parser-3.2.8" - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.0" - sources."ansicolors-0.3.2" - sources."ansistyles-0.1.3" - sources."ansy-1.0.13" - sources."any-promise-1.3.0" - sources."aproba-1.2.0" - sources."archy-1.0.0" - sources."are-we-there-yet-1.1.4" - sources."argparse-1.0.9" - sources."arr-flatten-1.1.0" - sources."array-find-index-1.0.2" - sources."array-flatten-2.1.1" - sources."array-includes-3.0.3" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."arrify-1.0.1" - sources."as-table-1.0.31" - sources."asap-2.0.6" - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."babel-runtime-6.26.0" - sources."balanced-match-1.0.0" - sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" - sources."bindings-1.3.0" - sources."bl-1.2.1" - sources."block-stream-0.0.9" - sources."bluebird-3.5.1" - sources."bole-3.0.2" - sources."boom-4.3.1" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."chalk-2.3.0" - ]; - }) - sources."brace-expansion-1.1.8" - sources."browserify-zlib-0.1.4" - sources."buffer-3.6.0" - sources."bug-killer-4.4.4" - sources."builtin-modules-1.1.1" - sources."builtins-1.0.3" - sources."byline-5.0.0" - sources."bzip2-maybe-1.0.0" - sources."cacache-10.0.2" - sources."cacheable-request-2.1.4" - sources."call-limit-1.1.0" - sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" - sources."caseless-0.12.0" - sources."chalk-2.3.0" - sources."chownr-1.0.1" - sources."ci-info-1.1.2" - sources."cidr-regex-1.0.6" - sources."class-methods-1.0.10" - sources."cli-box-5.0.0" - sources."cli-boxes-1.0.0" - sources."cli-cursor-2.1.0" - (sources."cli-table2-0.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) - sources."clone-1.0.3" - sources."clone-response-1.0.2" - (sources."clp-3.2.1" // { - dependencies = [ - sources."typpy-2.0.0" - sources."ul-5.0.0" - ]; - }) - sources."cmd-shim-2.0.2" - sources."co-4.6.0" - sources."code-point-at-1.1.0" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."colors-1.1.2" - (sources."columnify-1.5.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) - sources."combined-stream-1.0.5" - sources."common-tags-1.7.2" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" - sources."config-chain-1.1.11" - sources."configstore-3.1.1" - sources."console-control-strings-1.1.0" - sources."copy-concurrently-1.0.5" - sources."core-js-2.5.3" - sources."core-util-is-1.0.2" - sources."couleurs-6.0.9" - sources."create-error-class-3.0.2" - sources."credentials-by-uri-1.0.0" - sources."cross-spawn-5.1.0" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."crypto-random-string-1.0.0" - sources."csv-parser-1.12.0" - sources."currently-unhandled-0.4.1" - sources."custom-return-1.0.10" - sources."cyclist-0.2.2" - sources."dashdash-1.14.1" - sources."data-uri-to-buffer-2.0.0" - sources."date-unit-ms-1.1.12" - sources."daty-1.1.4" - sources."days-1.1.1" - sources."debug-2.6.9" - sources."debuglog-1.0.1" - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" - sources."decompress-maybe-1.0.0" - sources."decompress-response-3.3.0" - sources."deep-extend-0.4.2" - sources."defaults-1.0.3" - sources."deffy-2.2.2" - sources."define-properties-1.1.2" - sources."delay-2.0.0" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."dependencies-hierarchy-2.0.1" - sources."dependency-path-1.2.0" - sources."detect-indent-5.0.0" - sources."detect-libc-1.0.3" - sources."dezalgo-1.0.3" - (sources."diable-4.0.1" // { - dependencies = [ - sources."ansi-parser-2.0.0" - sources."couleurs-5.0.0" - sources."deffy-2.0.0" - sources."has-flag-1.0.0" - sources."supports-color-3.2.3" - ]; - }) - sources."diff-dates-1.0.11" - sources."dint-2.0.2" - sources."dir-glob-2.0.0" - sources."dot-prop-4.2.0" - sources."dotenv-4.0.0" - (sources."drive-by-path-1.0.0" // { - dependencies = [ - sources."ramda-0.24.1" - ]; - }) - sources."drivelist-5.2.12" - sources."duplexer3-0.1.4" - sources."duplexify-3.5.3" - sources."ecc-jsbn-0.1.1" - sources."editor-1.0.0" - sources."encode-registry-1.1.0" - sources."encoding-0.1.12" - sources."end-of-stream-1.4.1" - sources."err-code-1.1.2" - sources."errno-0.1.6" - sources."error-ex-1.3.1" - sources."es-abstract-1.10.0" - sources."es-to-primitive-1.1.1" - sources."es6-promise-4.2.4" - sources."es6-promisify-5.0.0" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" - sources."exclude-arr-1.0.9" - sources."execa-0.8.0" - sources."expand-template-1.1.0" - sources."extend-3.0.1" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."fast-safe-stringify-1.1.13" - (sources."fetch-from-npm-registry-0.1.0" // { - dependencies = [ - sources."@types/node-8.5.9" - ]; - }) - sources."fillo-1.0.11" - (sources."find-packages-2.1.2" // { - dependencies = [ - sources."path-type-3.0.0" - sources."read-pkg-3.0.0" - ]; - }) - sources."find-up-2.1.0" - sources."flat-colors-3.0.0" - sources."flush-write-stream-1.0.2" - sources."foreach-2.0.5" - sources."forever-agent-0.6.1" - sources."form-data-2.3.1" - sources."formatoid-1.2.2" - sources."from2-2.3.0" - sources."fs-vacuum-1.2.10" - sources."fs-write-stream-atomic-1.0.10" - sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" - sources."function-bind-1.1.1" - sources."function.name-1.0.10" - sources."gauge-2.7.4" - sources."generate-function-1.1.0" - sources."generate-object-property-1.2.0" - sources."genfun-4.0.1" - sources."get-caller-file-1.0.2" - sources."get-npm-tarball-url-2.0.1" - sources."get-port-3.2.0" - sources."get-source-1.0.24" - sources."get-stream-3.0.0" - sources."getpass-0.1.7" - sources."github-from-package-0.0.0" - sources."glob-7.1.2" - sources."global-dirs-0.1.1" - sources."globby-7.1.1" - sources."got-8.0.3" - sources."graceful-fs-4.1.11" - sources."graceful-git-1.0.1" - sources."graph-sequencer-2.0.0" - sources."gunzip-maybe-1.4.1" - sources."har-schema-2.0.0" - sources."har-validator-5.0.3" - sources."has-1.0.1" - sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" - sources."has-symbol-support-x-1.4.1" - sources."has-to-string-tag-x-1.4.1" - sources."has-unicode-2.0.1" - sources."hawk-6.0.2" - sources."hoek-4.2.0" - sources."hosted-git-info-2.5.0" - sources."http-cache-semantics-3.8.1" - sources."http-proxy-agent-2.0.0" - sources."http-signature-1.2.0" - sources."https-proxy-agent-2.1.1" - sources."humanize-ms-1.2.1" - sources."iconv-lite-0.4.19" - sources."ieee754-1.1.8" - sources."iferr-0.1.5" - sources."ignore-3.3.7" - sources."ignore-walk-3.0.1" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" - sources."individual-3.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."ini-1.3.5" - sources."init-package-json-1.10.1" - sources."into-stream-3.1.0" - sources."invert-kv-1.0.0" - sources."ip-1.1.5" - sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" - sources."is-bzip2-1.0.0" - sources."is-callable-1.1.3" - sources."is-ci-1.1.0" - sources."is-cidr-1.0.0" - sources."is-date-object-1.0.1" - sources."is-deflate-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."is-gzip-1.0.0" - sources."is-inner-link-2.0.2" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - sources."is-obj-1.0.1" - sources."is-object-1.0.1" - sources."is-path-inside-1.0.1" - sources."is-plain-obj-1.1.0" - sources."is-property-1.0.2" - sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" - sources."is-retry-allowed-1.1.0" - sources."is-ssh-1.3.0" - sources."is-stream-1.1.0" - sources."is-subdir-1.0.2" - sources."is-symbol-1.0.1" - sources."is-typedarray-1.0.0" - sources."is-windows-1.0.1" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."isurl-1.0.0" - sources."iterate-object-1.3.2" - sources."js-yaml-3.10.0" - sources."jsbn-0.1.1" - sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" - sources."json-stringify-safe-5.0.1" - sources."json2yaml-1.1.0" - sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" - sources."keyv-3.0.0" - sources."latest-version-3.1.0" - sources."lazy-property-1.0.0" - sources."lcid-1.0.0" - (sources."le-table-4.0.0" // { - dependencies = [ - sources."ansi-parser-3.0.0" - ]; - }) - sources."libnpx-9.6.0" - (sources."load-json-file-4.0.0" // { - dependencies = [ - sources."parse-json-4.0.0" - ]; - }) - sources."load-yaml-file-0.1.0" - sources."locate-path-2.0.0" - sources."lockfile-1.0.3" - sources."lodash-3.10.1" - sources."lodash._baseuniq-4.6.0" - sources."lodash._createset-4.0.3" - sources."lodash._root-3.0.1" - sources."lodash.clonedeep-4.5.0" - sources."lodash.union-4.6.0" - sources."lodash.uniq-4.5.0" - sources."lodash.without-4.4.0" - sources."log-update-2.3.0" - sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" - sources."make-dir-1.1.0" - sources."make-fetch-happen-2.6.0" - sources."meant-1.0.1" - sources."mem-3.0.0" - sources."mime-db-1.30.0" - sources."mime-types-2.1.17" - sources."mimic-fn-1.1.0" - sources."mimic-response-1.0.0" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."minipass-2.2.1" - sources."minizlib-1.1.0" - sources."mississippi-1.3.1" - sources."mkdirp-0.5.1" - sources."mkdirp-promise-5.0.1" - sources."months-1.2.0" - sources."most-1.7.2" - sources."most-last-1.0.0" - sources."move-concurrently-1.0.1" - sources."ms-2.1.1" - sources."mute-stream-0.0.7" - sources."mz-2.7.0" - sources."nan-2.8.0" - sources."ncp-2.0.0" - sources."ndjson-1.5.0" - sources."neat-csv-2.1.0" - sources."nerf-dart-1.0.0" - sources."node-abi-2.1.2" - sources."node-fetch-npm-2.0.2" - (sources."node-gyp-3.6.2" // { - dependencies = [ - sources."nopt-3.0.6" - sources."semver-5.3.0" - sources."tar-2.2.1" - ]; - }) - sources."noop-logger-0.1.1" - sources."noop6-1.0.7" - sources."nopt-4.0.1" - sources."normalize-package-data-2.4.0" - sources."normalize-path-2.1.1" - sources."normalize-registry-url-1.0.0" - sources."normalize-ssh-1.0.0" - sources."normalize-url-2.0.1" - (sources."not-bundled-npm-5.5.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-2.2.1" - sources."cacache-9.2.9" - sources."chalk-1.1.3" - sources."execa-0.7.0" - sources."from2-1.3.0" - sources."got-6.7.1" - sources."is-fullwidth-code-point-2.0.0" - sources."isarray-0.0.1" - sources."minimist-1.2.0" - sources."prepend-http-1.0.4" - sources."semver-5.4.1" - sources."ssri-4.1.6" - sources."string-width-1.0.2" - sources."string_decoder-0.10.31" - sources."strip-ansi-4.0.0" - sources."supports-color-2.0.0" - (sources."update-notifier-2.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."string-width-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) - sources."url-parse-lax-1.0.0" - sources."uuid-3.1.0" - sources."write-file-atomic-2.1.0" - sources."yallist-3.0.2" - ]; - }) - sources."npm-bundled-1.0.3" - sources."npm-cache-filename-1.0.2" - sources."npm-install-checks-3.0.0" - sources."npm-lifecycle-1.0.3" - sources."npm-package-arg-5.1.2" - sources."npm-packlist-1.1.10" - sources."npm-pick-manifest-1.0.4" - sources."npm-profile-2.0.5" - sources."npm-registry-client-8.5.0" - sources."npm-run-path-2.0.2" - sources."npm-user-validate-1.0.0" - (sources."npmlog-4.1.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" - sources."object-assign-4.1.1" - sources."object-keys-1.0.11" - sources."object.getownpropertydescriptors-2.0.3" - sources."observatory-1.0.0" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."opener-1.4.3" - sources."os-homedir-1.0.2" - sources."os-locale-2.1.0" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" - sources."overlap-2.0.0" - sources."p-cancelable-0.3.0" - sources."p-defer-1.0.0" - sources."p-every-1.0.2" - sources."p-filter-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-limit-1.2.0" - sources."p-locate-2.0.0" - sources."p-map-1.2.0" - sources."p-queue-2.3.0" - sources."p-reduce-1.0.0" - sources."p-series-1.0.0" - sources."p-timeout-2.0.1" - sources."p-try-1.0.0" - sources."package-json-4.0.1" - (sources."package-store-0.15.2" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."debug-3.1.0" - sources."minimist-1.2.0" - sources."ms-2.0.0" - sources."unzip-response-1.0.2" - ]; - }) - sources."pacote-6.0.4" - sources."pako-0.2.9" - sources."parallel-transform-1.1.0" - sources."parse-it-1.0.8" - sources."parse-json-2.2.0" - sources."parse-npm-tarball-url-1.0.2" - sources."parse-url-1.3.11" - sources."path-absolute-1.0.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" - sources."path-name-1.0.0" - sources."path-type-2.0.0" - sources."peek-stream-1.1.2" - sources."performance-now-2.1.0" - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - (sources."pkgs-graph-2.0.0-0" // { - dependencies = [ - sources."npm-package-arg-6.0.0" - ]; - }) - (sources."pnpm-default-reporter-0.11.8" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - sources."wrap-ansi-3.0.1" - ]; - }) - (sources."pnpm-file-reporter-0.0.1" // { - dependencies = [ - sources."@types/node-7.0.52" - sources."ansi-escapes-1.4.0" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."supports-color-2.0.0" - ]; - }) - sources."pnpm-install-checks-1.1.0" - (sources."pnpm-list-2.0.1" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."npm-package-arg-6.0.0" - ]; - }) - sources."pnpm-logger-0.0.0" - sources."pnpm-shrinkwrap-5.1.1" - sources."prebuild-install-2.5.0" - sources."prepend-http-2.0.0" - sources."pretty-bytes-4.0.2" - sources."printable-characters-1.0.38" - sources."proc-output-1.0.6" - (sources."process-exists-3.0.0" // { - dependencies = [ - sources."get-stream-2.3.1" - sources."into-stream-2.0.1" - sources."minimist-1.2.0" - ]; - }) - sources."process-nextick-args-1.0.7" - sources."promise-inflight-1.0.1" - sources."promise-retry-1.1.1" - sources."promzard-0.3.0" - sources."proper-lockfile-2.0.1" - sources."proto-list-1.2.4" - sources."protocols-1.4.6" - sources."protoduck-4.0.0" - sources."prr-1.0.1" - sources."ps-list-4.0.0" - sources."pseudomap-1.0.2" - sources."pump-1.0.3" - (sources."pumpify-1.4.0" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) - sources."punycode-1.4.1" - sources."qrcode-terminal-0.11.0" - sources."qs-6.5.1" - sources."query-string-5.0.1" - sources."qw-1.0.1" - sources."ramda-0.25.0" - sources."rc-1.2.4" - sources."read-1.0.7" - sources."read-cmd-shim-1.0.1" - sources."read-installed-4.0.3" - sources."read-package-json-2.0.12" - sources."read-package-tree-5.1.6" - sources."read-pkg-2.0.0" - sources."read-pkg-up-2.0.0" - sources."readable-stream-2.3.3" - sources."readdir-scoped-modules-1.0.2" - sources."regenerator-runtime-0.11.1" - sources."regex-escape-3.4.8" - sources."registry-auth-token-3.3.1" - sources."registry-url-3.1.0" - sources."remedial-1.0.7" - sources."remove-all-except-outer-links-1.0.3" - sources."remove-trailing-separator-1.1.0" - sources."rename-overwrite-1.0.0" - sources."replace-string-1.1.0" - sources."request-2.83.0" - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."resolve-from-4.0.0" - sources."resolve-link-target-1.0.1" - sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" - sources."retry-0.10.1" - sources."rimraf-2.6.2" - sources."rimraf-then-1.0.1" - sources."run-queue-1.0.3" - sources."safe-buffer-5.1.1" - sources."sec-1.0.0" - sources."semver-5.5.0" - sources."semver-diff-2.1.0" - sources."semver-regex-1.0.0" - sources."set-blocking-2.0.0" - sources."sha-2.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" - sources."simple-get-1.4.3" - sources."slash-1.0.0" - sources."slide-1.1.6" - sources."smart-buffer-1.1.15" - sources."sntp-2.1.0" - sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" - sources."sort-keys-2.0.0" - sources."sorted-object-2.0.1" - (sources."sorted-union-stream-2.1.3" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-1.1.14" - sources."string_decoder-1.0.3" - ]; - }) - sources."source-map-0.6.1" - sources."spawno-2.0.7" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" - sources."split2-2.2.0" - sources."sprintf-js-1.0.3" - sources."sshpk-1.13.1" - sources."ssri-5.1.0" - (sources."stacktracey-1.2.100" // { - dependencies = [ - sources."@types/node-8.5.9" - ]; - }) - sources."static-methods-1.0.10" - sources."stream-each-1.2.2" - (sources."stream-iterate-1.2.0" // { - dependencies = [ - sources."readable-stream-2.3.3" - ]; - }) - sources."stream-shift-1.0.0" - sources."strict-uri-encode-1.1.0" - sources."string-width-2.1.1" - sources."string_decoder-1.0.3" - sources."stringstream-0.0.5" - sources."strip-ansi-3.0.1" - sources."strip-bom-3.0.0" - sources."strip-color-0.1.0" - sources."strip-eof-1.0.0" - sources."strip-json-comments-2.0.1" - (sources."supi-0.12.1" // { - dependencies = [ - sources."@types/node-9.3.0" - sources."execa-0.9.0" - sources."npm-lifecycle-2.0.0" - sources."pify-2.3.0" - sources."write-file-atomic-1.3.4" - ]; - }) - sources."supports-color-4.5.0" - sources."symbol-observable-1.1.0" - sources."symlink-dir-1.1.2" - sources."tar-4.0.2" - sources."tar-fs-1.16.0" - sources."tar-stream-1.5.5" - (sources."tasklist-3.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."term-size-1.2.0" - sources."text-table-0.2.0" - sources."thenify-3.3.0" - sources."thenify-all-1.6.0" - sources."through-2.3.8" - sources."through2-2.0.3" - sources."timed-out-4.0.1" - sources."timeout-then-1.1.0" - sources."tough-cookie-2.3.3" - sources."tree-kill-1.2.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."typedarray-0.0.6" - sources."typpy-2.3.10" - sources."uid-number-0.0.6" - (sources."ul-5.2.13" // { - dependencies = [ - sources."deffy-2.2.2" - ]; - }) - sources."umask-1.1.0" - sources."unbzip2-stream-1.2.5" - sources."unique-filename-1.1.0" - sources."unique-slug-2.0.0" - sources."unique-string-1.0.0" - sources."unpack-stream-3.0.1" - sources."unpipe-1.0.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.3.0" - sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" - sources."util-deprecate-1.0.2" - sources."util-extend-1.0.3" - sources."util.promisify-1.0.0" - sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.1" - sources."validate-npm-package-name-3.0.0" - sources."verror-1.10.0" - sources."version-selector-type-2.0.0" - sources."wcwidth-1.0.1" - sources."which-1.3.0" - sources."which-module-2.0.0" - sources."wide-align-1.1.2" - sources."widest-line-2.0.0" - sources."worker-farm-1.5.2" - sources."wrap-ansi-2.1.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" - sources."write-json-file-2.3.0" - sources."write-pkg-3.1.0" - sources."write-yaml-file-1.0.0" - sources."x256-0.0.2" - sources."xdg-basedir-3.0.0" - sources."xtend-4.0.1" - sources."y18n-3.2.1" - sources."yallist-2.1.2" - sources."yargs-8.0.2" - sources."yargs-parser-7.0.0" - sources."zen-observable-0.7.1" - sources."zen-push-0.2.1" - ]; buildInputs = globalBuildInputs; meta = { description = "Fast, disk space efficient package manager"; @@ -9493,7 +4111,7 @@ in dependencies = [ sources."async-2.1.5" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.8" + sources."brace-expansion-1.1.11" sources."cli-table-0.3.1" sources."colors-1.0.3" sources."commander-2.9.0" @@ -9503,10 +4121,10 @@ in sources."graceful-readlink-1.0.1" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."lodash-4.17.4" + sources."lodash-4.17.5" sources."minimatch-3.0.4" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.3.3" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.4" sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" sources."set-immediate-shim-1.0.1" @@ -9522,4 +4140,21 @@ in production = true; bypassCache = true; }; + npm = nodeEnv.buildNodePackage { + name = "npm"; + packageName = "npm"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; + sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "a package manager for JavaScript"; + homepage = https://docs.npmjs.com/; + license = "Artistic-2.0"; + }; + production = true; + bypassCache = true; + }; } \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index c4ed5acbe1b6..154b4890e4fc 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib }: +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" - then { - version = "0.5.1"; - sha256 = "0rm79xyszy9aqvflcc13y9xiya82z31fzmr3b3hx91pmqviymhgc"; - } else { - version = "0.4.0"; - sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2"; - }; -in +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "angstrom is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - inherit (param) version; - name = "ocaml-angstrom-${version}"; + version = "0.8.1"; + name = "ocaml${ocaml.version}-angstrom-${version}"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = "angstrom"; rev = "${version}"; - inherit (param) sha256; + sha256 = "067r3vy5lac1bfx947gy722amna3dbcak54nlh24vx87pmcq31qc"; }; - createFindlibDestdir = true; + buildInputs = [ ocaml findlib jbuilder alcotest ]; + propagatedBuildInputs = [ result ]; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ result cstruct ]; + buildPhase = "jbuilder build -p angstrom"; + + doCheck = true; + checkPhase = "jbuilder runtest -p angstrom"; + + inherit (jbuilder) installPhase; meta = { homepage = https://github.com/inhabitedtype/angstrom; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index ea151d1e0e5c..8c42783c9780 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,18 +1,21 @@ -{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, utop, which, makeWrapper, writeText, ocaml}: +{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, + bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, + utop, + which, makeWrapper, writeText, ocaml}: buildOcaml rec { name = "bap"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap"; rev = "v${version}"; - sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw"; + sha256 = "0329m65x8q5q8vgvsqgyz2vz7q6qkh2rh11j7x29hckk3fzxsf8g"; }; sigs = fetchurl { url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; - sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn"; + sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; }; createFindlibDestdir = true; @@ -28,7 +31,7 @@ buildOcaml rec { llvm_38 utop ]; - propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi + propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp piqi-ocaml uuidm frontc ounit ]; installPhase = '' @@ -45,11 +48,7 @@ buildOcaml rec { disableIda = "--disable-ida --disable-fsi-benchmark"; - doCheck = true; - - checkTarget = "check test"; - - configureFlags = "--enable-everything --enable-tests ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; + configureFlags = "--enable-everything ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; @@ -58,6 +57,6 @@ buildOcaml rec { homepage = https://github.com/BinaryAnalysisPlatform/bap/; maintainers = [ maintainers.maurer ]; license = licenses.mit; - broken = versionAtLeast ocaml.version "4.03"; + broken = versionOlder ocaml.version "4.03"; }; } diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 7047edf24b3e..97c4750002e6 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,26 +1,30 @@ { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }: stdenv.mkDerivation rec { - version = "1.2.0"; - name = "ocaml${ocaml.version}-biniou-${version}"; - src = fetchFromGitHub { - owner = "mjambon"; - repo = "biniou"; - rev = "v${version}"; - sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; - }; + version = "1.2.0"; + name = "ocaml${ocaml.version}-biniou-${version}"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "biniou"; + rev = "v${version}"; + sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; + }; - buildInputs = [ ocaml findlib jbuilder ]; + buildInputs = [ ocaml findlib jbuilder ]; - propagatedBuildInputs = [ easy-format ]; + propagatedBuildInputs = [ easy-format ]; - inherit (jbuilder) installPhase; + postPatch = '' + patchShebangs . + ''; - meta = { - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; - }; + inherit (jbuilder) installPhase; + + meta = { + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.bsd3; + }; } diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index ef92a005c773..24f0e9bfd7a5 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.0.2"; name = "ocaml${ocaml.version}-cohttp-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-cohttp"; rev = "v${version}"; - sha256 = "0h9ak2bvhmcdxickvybpg45il33xszh2ksacpjgqrnnslxnh81ig"; + sha256 = "0zgn32axmjvkmbvyfkbjcqximzc4zcfxs118b98xyrqnvwb0k7ka"; }; buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index b419971921ba..0ddf3cb5995c 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,19 +1,19 @@ -{stdenv, buildOcaml, fetchurl, libffi, pkgconfig, ncurses}: +{ stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }: buildOcaml rec { name = "ctypes"; - version = "0.11.5"; + version = "0.13.1"; minimumSupportedOcamlVersion = "4"; - src = fetchurl { - url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "164gyrs6zxr5pyljwpjgd4knwlrkcmamsq3gvkkkvgf9rmhrl3zf"; + src = fetchzip { + url = "https://github.com/ocamllabs/ocaml-ctypes/archive/67e711ec891e087fbe1e0b4665aa525af4eaa409.tar.gz"; + sha256 = "1z84s5znr3lj84rzv6m37xxj9h7fwx4qiiykx3djf52qgk1rb2xb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; - propagatedBuildInputs = [ libffi ]; + propagatedBuildInputs = [ integers libffi ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 4fd75e7aac53..eebb2f68f3dd 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; + # Fix build for recent ncurses versions + NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + createFindlibDestdir = true; postPatch = '' diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index 5cd4c6064e08..fdfd0338bb23 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -1,10 +1,12 @@ -{stdenv, buildOcamlJane, fetchurl, async, comparelib, core, ctypes, openssl, - fieldslib, herelib, pipebang, sexplib, ocaml_oasis}: +{ stdenv, ocaml, buildOcamlJane, fetchurl, async, comparelib, core, ctypes +, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis, integers +}: buildOcamlJane rec { name = "async_ssl"; version = "113.33.07"; hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; + postPatch = "export CAML_LD_LIBRARY_PATH=${integers}/lib/ocaml/${ocaml.version}/site-lib/stubslibs:$CAML_LD_LIBRARY_PATH"; propagatedBuildInputs = [ ctypes async comparelib core fieldslib herelib pipebang sexplib openssl ocaml_oasis ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index 6a8e33dc2ee6..2e85a1017b6e 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "bap"; - version = "1.1.0"; + version = "1.3.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-python"; - rev = "v${version}"; - sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3"; + rev = "${version}"; + sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp"; }; propagatedBuildInputs = [bap requests]; diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix new file mode 100644 index 000000000000..a8a8ac110f10 --- /dev/null +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -0,0 +1,58 @@ +# FIXME: make gdk_pixbuf dependency optional +{ buildPythonPackage +, fetchPypi +, lib +, substituteAll +, makeFontsConf +, freefont_ttf +, pytest +, glibcLocales +, cairo +, cffi +, withXcffib ? false, xcffib +, python +, glib +, gdk_pixbuf }: + +buildPythonPackage rec { + pname = "cairocffi"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i9m3p39g9wrkpjvpawch2qmnmm3cnim7niz3nmmbcp2hrkixwk5"; + }; + + LC_ALL = "en_US.UTF-8"; + + # checkPhase require at least one 'normal' font and one 'monospace', + # otherwise glyph tests fails + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + checkInputs = [ pytest glibcLocales ]; + propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + patches = [ + # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0 + (substituteAll { + src = ./dlopen-paths.patch; + cairo = cairo.out; + glib = glib.out; + gdk_pixbuf = gdk_pixbuf.out; + }) + ./fix_test_scaled_font.patch + ]; + + meta = with lib; { + homepage = https://github.com/SimonSapin/cairocffi; + license = licenses.bsd3; + maintainers = with maintainers; []; + description = "cffi-based cairo bindings for Python"; + }; +} diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 3fbdb500af80..36cc20e027bb 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "cement"; - name = "${pname}-${version}"; version = "2.10.2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix new file mode 100644 index 000000000000..5ffa51def0d2 --- /dev/null +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchPypi, buildPythonPackage, pythonOlder +, pyperclip, six, pyparsing, vim +, contextlib2 ? null, subprocess32 ? null +, pytest, mock, which, fetchFromGitHub, glibcLocales +}: +buildPythonPackage rec { + pname = "cmd2"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "python-cmd2"; + repo = "cmd2"; + rev = version; + sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z"; + }; + + LC_ALL="en_US.UTF-8"; + + postPatch = stdenv.lib.optional stdenv.isDarwin '' + # Fake the impure dependencies pbpaste and pbcopy + mkdir bin + echo '#/bin/sh' > bin/pbpaste + echo '#/bin/sh' > bin/pbcopy + chmod +x bin/{pbcopy,pbpaste} + export PATH=$(realpath bin):$PATH + ''; + + checkInputs= [ pytest mock which vim glibcLocales ]; + checkPhase = '' + # test_path_completion_user_expansion might be fixed in the next release + py.test -k 'not test_path_completion_user_expansion' + ''; + doCheck = !stdenv.isDarwin; + + propagatedBuildInputs = [ + pyperclip + six + pyparsing + ] + ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 + ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32 + ; + + meta = with stdenv.lib; { + description = "Enhancements for standard library's cmd module"; + homepage = https://github.com/python-cmd2/cmd2; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index 99a59ae8fd43..bce14db7704f 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "colorama"; version = "0.3.9"; diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix new file mode 100644 index 000000000000..195b20c27e4f --- /dev/null +++ b/pkgs/development/python-modules/d2to1/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +, nose +}: +buildPythonPackage rec { + pname = "d2to1"; + version = "0.2.12"; + + checkInputs = [ nose ]; + + src = fetchFromGitHub { + owner = "embray"; + repo = pname; + rev = version; + sha256 = "1q04ab8vjvx7fmq9ckkl8r9hlwwbqiyjbzaa4v1mv5zicfssxwsi"; + }; + + meta = with lib;{ + description = "Support for distutils2-like setup.cfg files as package metadata"; + homepage = https://github.com/embray/d2to1; + license = licenses.bsd2; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index c8f122098da8..a0724c9ada59 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy +{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy , ncurses, pygobject3 }: if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { @@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa postPatch = "patchShebangs ."; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus dbus_glib ] + buildInputs = [ dbus dbus-glib ] ++ lib.optionals doCheck [ dbus_tools pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. diff --git a/pkgs/development/python-modules/dmenu/default.nix b/pkgs/development/python-modules/dmenu/default.nix new file mode 100644 index 000000000000..d7ec8161ef5e --- /dev/null +++ b/pkgs/development/python-modules/dmenu/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, lib, fetchPypi, dmenu }: + +buildPythonPackage rec { + pname = "dmenu-python"; + version = "0.2.1"; + + src = fetchPypi { + inherit version; + pname = "dmenu"; + sha256 = "06v2fq0ciallbib7sbk4kncj0n3gdqp1kz8n5k2669x49wyh34wm"; + }; + + propagatedBuildInputs = [ dmenu ]; + + # No tests existing + doCheck = false; + + meta = { + description = "A Python wrapper for dmenu"; + homepage = http://dmenu.readthedocs.io; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 4ce013ac7976..bb39ccd7cf6e 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -1,14 +1,13 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi , six, requests, websocket_client , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { version = "2.7.0"; pname = "docker"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/docker/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c"; }; diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix new file mode 100644 index 000000000000..6b1d2af357a4 --- /dev/null +++ b/pkgs/development/python-modules/enum-compat/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, enum34 }: + +buildPythonPackage rec { + pname = "enum-compat"; + version = "0.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "14j1i963jic2vncbf9k5nq1vvv8pw2zsg7yvwhm7d9c6h7qyz74k"; + }; + + propagatedBuildInputs = [ enum34 ]; + + meta = with lib; { + homepage = https://github.com/jstasiak/enum-compat; + description = "enum/enum34 compatibility package"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix new file mode 100644 index 000000000000..128a8d18d819 --- /dev/null +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }: + +buildPythonPackage rec { + pname = "flake8-import-order"; + version = "0.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "60ea6674c77e4d916071beabf2b31b9b45e2f5b3bbda48a34db65766a5b25678"; + }; + + propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; + + checkInputs = [ pytest flake8 pycodestyle pylama ]; + + checkPhase = '' + pytest --strict + ''; + + meta = with lib; { + description = "Flake8 and pylama plugin that checks the ordering of import statements"; + homepage = https://github.com/PyCQA/flake8-import-order; + license = with licenses; [ lgpl3 mit ]; + }; +} diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix new file mode 100644 index 000000000000..53307333048e --- /dev/null +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, flask, webassets, flask_script, nose }: + +buildPythonPackage rec { + name = "Flask-Assets-${version}"; + version = "0.12"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; + sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; + }; + + propagatedBuildInputs = [ flask webassets flask_script nose ]; + + meta = with lib; { + homepage = http://github.com/miracle2k/flask-assets; + description = "Asset management for Flask, to compress and merge CSS and Javascript files"; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 3c7731c30a8b..e2585262e58e 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,19 +1,19 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast -, flask, nose, mock, blinker}: +, flask, blinker, nose, mock, semantic-version }: buildPythonPackage rec { pname = "Flask-Login"; name = "${pname}-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "maxcountryman"; repo = "flask-login"; rev = version; - sha256 = "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh"; + sha256 = "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9"; }; - buildInputs = [ nose mock ]; + checkInputs = [ nose mock semantic-version ]; propagatedBuildInputs = [ flask blinker ]; checkPhase = "nosetests -d"; diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix new file mode 100644 index 000000000000..1f41f7987631 --- /dev/null +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, flask, blinker, nose }: + +buildPythonPackage rec { + name = "Flask-Principal-${version}"; + version = "0.4.0"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Principal/${name}.tar.gz"; + sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm"; + }; + + propagatedBuildInputs = [ flask blinker ]; + + checkInputs = [ nose ]; + + meta = with lib; { + homepage = http://packages.python.org/Flask-Principal/; + description = "Identity management for flask"; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix new file mode 100644 index 000000000000..ace3cee2d22e --- /dev/null +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchurl, flask, pytest }: + +buildPythonPackage rec { + name = "Flask-Script-${version}"; + version = "2.0.6"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Script/${name}.tar.gz"; + sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf"; + }; + + propagatedBuildInputs = [ flask ]; + checkInputs = [ pytest ]; + + meta = with lib; { + homepage = http://github.com/smurfix/flask-script; + description = "Scripting support for Flask"; + license = licenses.bsd3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix new file mode 100644 index 000000000000..c11bcaa5baa5 --- /dev/null +++ b/pkgs/development/python-modules/grip/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +# Python bits: +, buildPythonPackage +, pytest +, responses +, docopt +, flask +, markdown +, path-and-address +, pygments +, requests +, tabulate +}: + +buildPythonPackage rec { + pname = "grip"; + version = "4.4.0"; + + src = fetchFromGitHub { + owner = "joeyespo"; + repo = "grip"; + rev = "v${version}"; + sha256 = "1768n3w40qg1njkzqjyl5gkva0h31k8h250821v69imj1zimymag"; + }; + + patches = [ + # Render "front matter", used in our RFC template and elsewhere + (fetchpatch { + url = https://github.com/joeyespo/grip/pull/249.patch; + sha256 = "07za5iymfv647dfrvi6hhj54a96hgjyarys51zbi08c51shqyzpg"; + }) + ]; + + checkInputs = [ pytest responses ]; + + propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ]; + + checkPhase = '' + export PATH="$PATH:$out/bin" + py.test -xm "not assumption" + ''; + + meta = with stdenv.lib; { + description = "Preview GitHub Markdown files like Readme locally before committing them"; + homepage = https://github.com/joeyespo/grip; + license = licenses.mit; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 3295786bd08c..e0294c2afca4 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hidden Markov Models in Python with scikit-learn like API"; - homepage = "https://github.com/hmmlearn/hmmlearn"; + homepage = https://github.com/hmmlearn/hmmlearn; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix new file mode 100644 index 000000000000..1018c536ff7d --- /dev/null +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp, jsonrpc-base }: + +buildPythonPackage rec { + pname = "jsonrpc-async"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f1p3qv56jn4sdyp8gzf915nya6vr0rn2pbzld9x23y9jdjmibzw"; + }; + + propagatedBuildInputs = [ aiohttp jsonrpc-base ]; + + meta = with stdenv.lib; { + description = "A JSON-RPC client library for asyncio"; + homepage = http://github.com/armills/jsonrpc-async; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix new file mode 100644 index 000000000000..8dbe07382889 --- /dev/null +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "jsonrpc-base"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dl55n54ha5kf4x6hap2p1k3s4qa4w7g791wp2656rjg2zxfgywk"; + }; + + propagatedBuildInputs = [ ]; + + meta = with stdenv.lib; { + description = "A JSON-RPC client library base interface"; + homepage = https://github.com/armills/jsonrpc-base; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix new file mode 100644 index 000000000000..b8a0c07d5a5d --- /dev/null +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp, jsonrpc-base }: + +buildPythonPackage rec { + pname = "jsonrpc-websocket"; + version = "0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cijqb8fvv9iq5ds9y5sj0gd6lapi90mgqvpkczp28fxz440ihq4"; + }; + + propagatedBuildInputs = [ aiohttp jsonrpc-base ]; + + meta = with stdenv.lib; { + description = "A JSON-RPC websocket client library for asyncio"; + homepage = https://github.com/armills/jsonrpc-websocket; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix new file mode 100644 index 000000000000..02348c68e07a --- /dev/null +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, jupyterhub +, ldap3 +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jupyterhub-ldapauthenticator"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "19dz3a3122wln8lkixj5jbh9x3cqlrcb3p7a53825cj72cmpcxwz"; + }; + + # No tests implemented + doCheck = false; + + propagatedBuildInputs = [ jupyterhub ldap3 ]; + + meta = with lib; { + description = "Simple LDAP Authenticator Plugin for JupyterHub"; + homepage = https://github.com/jupyterhub/ldapauthenticator; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix new file mode 100644 index 000000000000..5566eea64eb8 --- /dev/null +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, + ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, + isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: + +buildPythonPackage rec { + pname = "kubernetes"; + version = "5.0.0"; + + prePatch = '' + sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt + + # This is used to randomize tests, which is not reproducible. Drop it. + sed -e '/randomize/d' -i test-requirements.txt + '' + # This is a python2 and python3.2 only requiremet since it is a backport of a python-3.3 api. + + (if (pythonAtLeast "3.3") then '' + sed -e '/ipaddress/d' -i requirements.txt + '' else ""); + + checkPhase = '' + py.test + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "1z8rrlq73bzli9rg57kj8ivz09vhsydyjq1ksbcis6j7h9c187zq"; + }; + + checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; + propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth ]; + + meta = with stdenv.lib; { + description = "Kubernetes python client"; + homepage = https://github.com/kubernetes-client/python; + license = licenses.asl20; + maintainers = with maintainers; [ lsix ]; + }; +} diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 789beaa2384c..d9cc5fb0d9e5 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -7,13 +7,13 @@ else stdenv.mkDerivation rec { pname = "libarcus"; name = "${pname}-${version}"; - version = "3.0.3"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "05dpd6nx32nws0ghsm365wlsb8hg2s3v9fqcmdk11biwfhnr6rjw"; + sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk"; }; propagatedBuildInputs = [ sip protobuf ]; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 67353a32ada6..c0c2b205f58b 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "libgpuarray"; - version = "0.6.9"; + version = "0.7.5"; name = pname + "-" + version; src = fetchFromGitHub { owner = "Theano"; repo = "libgpuarray"; rev = "v${version}"; - sha256 = "06z47ls42a37gbv0x7f3l1qvils7q0hvy02s95l530klgibp19s0"; + sha256 = "0zkdwjq3k6ciiyf8y5w663fbsnmzhgy27yvpxfhkpxazw9vg3l5v"; }; # requires a GPU @@ -40,7 +40,6 @@ buildPythonPackage rec { make -j$NIX_BUILD_CORES make install - ls $out/lib export NIX_CFLAGS_COMPILE="-L $out/lib -I $out/include $NIX_CFLAGS_COMPILE" cd .. diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix new file mode 100644 index 000000000000..e6be19198efb --- /dev/null +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, twisted, mock }: + +buildPythonPackage rec { + pname = "magic-wormhole-transit-relay"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "faac36266c72745102a1a8b93abc5b25feed1be5bca7b29968a156966c312567"; + }; + + propagatedBuildInputs = [ twisted ]; + + checkInputs = [ mock ]; + + checkPhase = '' + python -m twisted.trial wormhole_transit_relay + ''; + + meta = with lib; { + description = "Transit Relay server for Magic-Wormhole"; + homepage = https://github.com/warner/magic-wormhole-transit-relay; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 9d2d80747a93..7d170345dbbe 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -2,41 +2,49 @@ , buildPythonPackage , fetchPypi , pythonAtLeast -, nettools -, glibcLocales -, autobahn -, cffi -, click -, hkdf -, pynacl -, spake2 -, tqdm , python -, mock -, ipaddress +, spake2 +, pynacl +, six +, attrs +, twisted +, autobahn +, automat +, hkdf +, tqdm +, click , humanize -, pyopenssl -, service-identity +, ipaddress , txtorcon +, nettools +, glibc +, glibcLocales +, mock +, magic-wormhole-transit-relay }: buildPythonPackage rec { pname = "magic-wormhole"; version = "0.10.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee"; }; - checkInputs = [ mock ]; + checkInputs = [ mock magic-wormhole-transit-relay ]; buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ]; + propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize ipaddress txtorcon ]; postPatch = '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_cli.py + + # magic-wormhole will attempt to find all available locales by running + # 'locale -a'. If we're building on Linux, then this may result in us + # running the system's locale binary instead of the one from Nix, so let's + # ensure we patch this. + sed -i -e 's|getProcessOutputAndValue("locale"|getProcessOutputAndValue("${glibc}/bin/locale"|' src/wormhole/test/test_cli.py '' + lib.optionalString (pythonAtLeast "3.3") '' sed -i -e 's|"ipaddress",||' setup.py ''; diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix new file mode 100644 index 000000000000..c0a1e39b384b --- /dev/null +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, docopt, netifaces }: + +buildPythonPackage rec { + pname = "onkyo-eiscp"; + version = "1.2.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qb5w2g2cnckq7psh92g1w3gf76437x1vwfhwnd247wshs5h7hxj"; + }; + + propagatedBuildInputs = [ docopt netifaces ]; + + meta = with stdenv.lib; { + description = "Control Onkyo receivers over ethernet"; + homepage = https://github.com/miracle2k/onkyo-eiscp; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 18c083298e68..09d759c97ee3 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -22,6 +22,7 @@ if !(pythonOlder "3.4") then null else buildPythonPackage rec { preCheck = '' export LC_ALL="en_US.UTF-8" + sed -i test_pathlib2.py -e "s@hasattr(pwd, 'getpwall')@False@" ''; meta = { @@ -29,4 +30,4 @@ if !(pythonOlder "3.4") then null else buildPythonPackage rec { homepage = https://pypi.python.org/pypi/pathlib2/; license = with lib.licenses; [ mit ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 410a633c46b0..bfe5d2f202df 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "NumPy-based text/binary PLY file reader/writer for Python"; - homepage = "https://github.com/dranjan/python-plyfile"; + homepage = https://github.com/dranjan/python-plyfile; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 0ed51d7acecf..da7ddbc7dcb7 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -5,12 +5,12 @@ , requests, tox, unicorn, intervaltree, fetchpatch }: buildPythonPackage rec { - version = "3.11.0"; + version = "3.12.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "609b3f0ba47c975f4dbedd3da2af4c5ca1b3a2aa13fb99240531b6a68edb87be"; + sha256 = "09a7yhsyqxb4xf2r6mbn3p5zx1wp89lxq7lj34y4zbin6ns5929s"; }; propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pyserial dateutil requests tox unicorn intervaltree ]; @@ -18,10 +18,10 @@ buildPythonPackage rec { disabled = isPy3k; doCheck = false; # no setuptools tests for the package - # Can be removed when 3.12.0 is released + # Can be removed when 3.13.0 is released patches = [ (fetchpatch { - url = "https://github.com/Gallopsled/pwntools/pull/1098.patch"; + url = "https://github.com/Gallopsled/pwntools/commit/9859f54a21404174dd17efee02f91521a2dd09c5.patch"; sha256 = "0p0h87npn1mwsd8ciab7lg74bk3ahlk5r0mjbvx4jhihl2gjc3z2"; }) ]; diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix new file mode 100644 index 000000000000..3931078c12ed --- /dev/null +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, numpy +, six +, nose +, fetchPypi +}: + +buildPythonPackage rec { + pname = "py_stringmatching"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rjsx7iipn6svki21lmsza7b0dz9vkgmix696zryiv7gkhblqyb4"; + }; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ numpy six ]; + + meta = with lib; { + description = "A Python string matching library including string tokenizers and string similarity measures"; + homepage = https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index d96a4c8cea32..6192f94445f3 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }: +{ stdenv, fetchurl, pkgconfig, at-spi2-core, pythonPackages }: stdenv.mkDerivation rec { pname = "pyatspi"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { broken = true; buildInputs = [ - at_spi2_core + at-spi2-core pkgconfig pythonPackages.python pythonPackages.pygobject3 diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 46d3272807eb..0b41b6ef0b10 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,19 +2,19 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "1.0.3"; + version = "2.0.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "714a9e03e6a258081e3b6296ed15592e015facbe38bbe60819cca6f04c599f25"; + sha256 = "1cp1ssfb8zk4sz74nsnf72b7dd5fzkwc4qdgc7rq8nfr4v611w6c"; }; propagatedBuildInputs = [ requests six zeroconf protobuf ]; meta = with lib; { description = "Library for Python 2 and 3 to communicate with the Google Chromecast"; - homepage = "https://github.com/balloob/pychromecast"; + homepage = https://github.com/balloob/pychromecast; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index fd1f0db0c1e5..a2f2daa2fe9c 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -1,20 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, snowballstemmer, configparser, - pytest, pytestpep8, mock, pathlib }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder +, snowballstemmer, six, configparser +, pytest, pytestpep8, mock, pathlib }: buildPythonPackage rec { pname = "pydocstyle"; version = "2.1.1"; - src = fetchPypi { - inherit pname version; - sha256 = "15ssv8l6cvrmzgwcdzw76rnl4np3qf0dbwr1wsx76y0hc7lwsnsd"; + # no tests on PyPI + # https://github.com/PyCQA/pydocstyle/issues/302 + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = version; + sha256 = "1h0k8lpx14svc8dini62j0kqiam10pck5sdzvxa4xhsx7y689g5l"; }; - propagatedBuildInputs = [ snowballstemmer configparser ]; + propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; - checkInputs = [ pytest pytestpep8 mock pathlib ]; + checkInputs = [ pytest pytestpep8 mock ] ++ lib.optional (pythonOlder "3.4") pathlib; - meta = with stdenv.lib; { + checkPhase = '' + # test_integration.py installs packages via pip + py.test --pep8 --cache-clear -vv src/tests -k "not test_integration" + ''; + + meta = with lib; { description = "Python docstring style checker"; homepage = https://github.com/PyCQA/pydocstyle/; license = licenses.mit; diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix index dbf36d0eac8b..c5e148d1500a 100644 --- a/pkgs/development/python-modules/pykde4/kdelibs.nix +++ b/pkgs/development/python-modules/pykde4/kdelibs.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, - automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared_mime_info, + automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info, attica, docbook_xml_dtd_42, docbook_xsl, giflib, libdbusmenu_qt, libjpeg, phonon, qt4 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - automoc4 cmake_2_8 libxslt perl pkgconfig shared_mime_info + automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info ]; buildInputs = [ attica giflib libdbusmenu_qt libjpeg diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix new file mode 100644 index 000000000000..c4ef98b43ef6 --- /dev/null +++ b/pkgs/development/python-modules/pylama/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, fetchpatch +, mccabe, pycodestyle, pydocstyle, pyflakes +, pytest, ipdb }: + +buildPythonPackage rec { + pname = "pylama"; + version = "7.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "390c1dab1daebdf3d6acc923e551b035c3faa77d8b96b98530c230493f9ec712"; + }; + + patches = fetchpatch { + url = "${meta.homepage}/pull/116.patch"; + sha256 = "00jz5k2w0xahs1m3s603j6l4cwzz92qsbbk81fh17nq0f47999mv"; + }; + + propagatedBuildInputs = [ mccabe pycodestyle pydocstyle pyflakes ]; + + checkInputs = [ pytest ipdb ]; + + # tries to mess with the file system + doCheck = false; + + meta = with lib; { + description = "Code audit tool for python"; + homepage = https://github.com/klen/pylama; + # ambiguous license declarations: https://github.com/klen/pylama/issues/64 + license = licenses.lgpl3; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 194d91341d8a..c38b71c7f47c 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; - propagatedBuildInputs = [ astroid configparser isort ]; + propagatedBuildInputs = [ astroid configparser isort mccabe ]; postPatch = '' # Remove broken darwin tests diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix new file mode 100644 index 000000000000..db8584c4f9e5 --- /dev/null +++ b/pkgs/development/python-modules/pylru/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "pylru-${version}"; + version = "1.0.9"; + + src = fetchurl { + url = "mirror://pypi/p/pylru/${name}.tar.gz"; + sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi"; + }; + + meta = with lib; { + homepage = https://github.com/jlhutch/pylru; + description = "A least recently used (LRU) cache implementation"; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix new file mode 100644 index 000000000000..a918528bdf87 --- /dev/null +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: + +buildPythonPackage rec { + pname = "pymetar"; + version = "0.21"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k"; + }; + + meta = with stdenv.lib; { + description = "A command-line tool to show the weather report by a given station ID"; + homepage = http://www.schwarzvogel.de/software/pymetar.html; + license = licenses.gpl2; + maintainers = with maintainers; [ erosennin ]; + }; +} diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix new file mode 100644 index 000000000000..6903b6c7a0c0 --- /dev/null +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, pydns }: + +buildPythonPackage rec { + name = "pyspf-${version}"; + version = "2.0.12"; + + src = fetchurl { + url = "mirror://sourceforge/pymilter/pyspf/${name}/${name}.tar.gz"; + sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la"; + }; + + propagatedBuildInputs = [ pydns ]; + + meta = with lib; { + homepage = http://bmsi.com/python/milter.html; + description = "Python API for Sendmail Milters (SPF)"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix new file mode 100644 index 000000000000..d90b7fa740dc --- /dev/null +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "python-axolotl-curve25519-${version}"; + version = "0.1"; + + src = fetchurl { + url = "mirror://pypi/p/python-axolotl-curve25519/${name}.tar.gz"; + sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5"; + }; + + meta = with lib; { + homepage = https://github.com/tgalal/python-axolotl-curve25519; + description = "Curve25519 with ed25519 signatures"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix new file mode 100644 index 000000000000..71c456875bcf --- /dev/null +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, python-axolotl-curve25519, protobuf, pycrypto }: + +buildPythonPackage rec { + name = "python-axolotl-${version}"; + version = "0.1.39"; + + src = fetchurl { + url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; + sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; + }; + + propagatedBuildInputs = [ python-axolotl-curve25519 protobuf pycrypto ]; + # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) + doCheck = false; + + meta = with lib; { + homepage = https://github.com/tgalal/python-axolotl; + description = "Python port of libaxolotl-android"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix new file mode 100644 index 000000000000..31ec613df4c8 --- /dev/null +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests }: + +buildPythonPackage rec { + pname = "pyunifi"; + version = "2.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dhbfzv5a29v763m0b9wsc4pvkdr979w7g4rz7ak8hsi4sx6b9dq"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + description = "API towards Ubiquity Networks UniFi controller"; + homepage = https://github.com/finish06/unifi-api; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 65de08382239..44650618f5f5 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -15,9 +15,9 @@ buildPythonPackage rec { meta = { description = "Alternative regular expression module, to replace re"; - homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; + homepage = https://bitbucket.org/mrabarnett/mrab-regex; license = lib.licenses.psfl; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ abbradar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index f3ff4a84f1e8..aeca2abf17cf 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -3,7 +3,6 @@ , pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "requests"; version = "2.18.4"; diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix new file mode 100644 index 000000000000..340c8d002b72 --- /dev/null +++ b/pkgs/development/python-modules/sarge/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "sarge-${version}"; + version = "0.1.4"; + + src = fetchurl { + url = "mirror://pypi/s/sarge/${name}.tar.gz"; + sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar"; + }; + + meta = with lib; { + homepage = http://sarge.readthedocs.org/; + description = "A wrapper for subprocess which provides command pipeline functionality"; + license = licenses.bsd3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix new file mode 100644 index 000000000000..521f68db1cc6 --- /dev/null +++ b/pkgs/development/python-modules/scandir/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "scandir-${version}"; + version = "1.7"; + + src = fetchurl { + url = "mirror://pypi/s/scandir/${name}.tar.gz"; + sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj"; + }; + + meta = with lib; { + description = "A better directory iterator and faster os.walk()"; + homepage = https://github.com/benhoyt/scandir; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index f9e04691c1cb..e3c92a0e40fc 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "semantic_version"; version = "2.6.0"; - name = "${pname}${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 379f5677bd1c..7ea0705f8154 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , pytest @@ -16,6 +17,7 @@ buildPythonPackage rec { sha256 = "1w502i5h8xaqf03g6h95h4vs1wqfv6kg925dn63phrwmg1hfz2xx"; }; + doCheck = !stdenv.isDarwin; checkPhase = "HOME=. py.test"; checkInputs = [ pytest configparser ]; diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix new file mode 100644 index 000000000000..eff799e0d014 --- /dev/null +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, tornado }: + +buildPythonPackage rec { + name = "sockjs-tornado-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; + sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; + }; + + propagatedBuildInputs = [ tornado ]; + + meta = with lib; { + homepage = http://github.com/mrjoes/sockjs-tornado/; + description = "SockJS python server implementation on top of Tornado framework"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix new file mode 100644 index 000000000000..08500aeb4ad1 --- /dev/null +++ b/pkgs/development/python-modules/spake2/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, hkdf, pytest }: + +buildPythonPackage rec { + pname = "spake2"; + version = "0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ hkdf ]; + + checkPhase = '' + py.test $out + ''; + + meta = with lib; { + description = "SPAKE2 password-authenticated key exchange library"; + homepage = "http://github.com/warner/python-spake2"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index 189fa7c932da..8ee4ce76069f 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Numpy-based NIST SPH audio-file reader"; - homepage = "https://github.com/mcfletch/sphfile"; + homepage = https://github.com/mcfletch/sphfile; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index db7f43c1ea46..b238d58f68d3 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { version = "0.8.2"; pname = "tabulate"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -25,4 +24,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index e51ceb313ef2..85dd30118cc3 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -3,8 +3,9 @@ , which, swig, binutils, glibcLocales , python, jemalloc, openmpi , numpy, six, protobuf, tensorflow-tensorboard, backports_weakref, mock, enum34, absl-py -, xlaSupport ? true , cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null +# XLA without CUDA is broken +, xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] , sse42Support ? false @@ -145,9 +146,10 @@ in buildPythonPackage rec { meta = with stdenv.lib; { description = "Computation using data flow graphs for scalable machine learning"; - homepage = "http://tensorflow.org"; + homepage = http://tensorflow.org; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; if cudaSupport then linux else linux ++ darwin; + broken = !(xlaSupport -> cudaSupport); }; } diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 24eecf82311a..774799f3b4d8 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -5,7 +5,7 @@ then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - version = "3.1.0"; + version = "3.2.1"; pname = "uranium"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1wz2nk973g8227r9v6j7gry3m0b0ikirkws8sfhysvgj0vgak9yk"; + sha256 = "1p05iw1x3rvb51p6hj57yq6nsjawjba3pyyr4jx924iq96vcc3fz"; }; buildInputs = [ python gettext ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = "https://github.com/Ultimaker/Uranium"; + homepage = https://github.com/Ultimaker/Uranium; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix new file mode 100644 index 000000000000..e18e9f87acd3 --- /dev/null +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xextproto, xproto }: + +buildPythonPackage rec { + name = "virtkey-${version}"; + majorVersion = "0.63"; + version = "${majorVersion}.0"; + + src = fetchurl { + url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz"; + sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xextproto xproto ]; + + meta = with lib; { + description = "Extension to emulate keypresses and to get the layout information from the X server"; + homepage = https://launchpad.net/virtkey; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix new file mode 100644 index 000000000000..d4a47138d4ab --- /dev/null +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "wakeonlan"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1snkyc6ph0bnypqs5yjw35mx3f9ij4808r5i06gl2vhn1rfzgyh1"; + }; + + meta = with stdenv.lib; { + description = "A small python module for wake on lan"; + homepage = https://github.com/remcohaszing/pywakeonlan; + license = licenses.wtfpl; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix new file mode 100644 index 000000000000..a5a7957e8ec1 --- /dev/null +++ b/pkgs/development/python-modules/webassets/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchurl, pyyaml, nose, jinja2, mock, pytest }: + +buildPythonPackage rec { + name = "webassets-${version}"; + version = "0.12.1"; + + src = fetchurl { + url = "mirror://pypi/w/webassets/${name}.tar.gz"; + sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7"; + }; + + propagatedBuildInputs = [ pyyaml ]; + checkInputs = [ nose jinja2 mock pytest ]; + + # Needs Babel CLI tool + doCheck = false; + checkPhase = "py.test"; + + meta = with lib; { + description = "Media asset management for Python, with glue code for various web frameworks"; + homepage = http://github.com/miracle2k/webassets/; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/websockets_client/default.nix b/pkgs/development/python-modules/websockets_client/default.nix new file mode 100644 index 000000000000..dd6e9200db52 --- /dev/null +++ b/pkgs/development/python-modules/websockets_client/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: +buildPythonPackage rec { + pname = "websocket_client"; + version = "0.47.0"; + + src = fetchPypi { + inherit version pname; + sha256 = "0jb1446053ryp5p25wsr1hjfdzwfm04a6f3pzpcb63bfz96xqlx4"; + }; + + prePatch = '' + # ssl.match_hostname exists in python2.7 version maintained in nixpkgs, + # the dependency is not necessary. + sed -e "s/\['backports.ssl_match_hostname'\]/\[\]/" -i setup.py + ''; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/liris/websocket-client; + description = "Websocket client for python"; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix new file mode 100644 index 000000000000..68c81157eb08 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Bootbox"; + version = "4.3.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0wks1lsqngn3gvlhzrvaan1zj8w4wr58xi0pfqhrzckbghvvr0gj"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://bootboxjs.com; + description = "Bootboxjs packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix new file mode 100644 index 000000000000..757c2cc240ed --- /dev/null +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Bootstrap"; + version = "3.3.5.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0jzjq3d4vp2shd2n20f9y53jnnk1cvphkj1v0awgrf18qsy2bmin"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://getbootstrap.com; + description = "Bootstrap packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix new file mode 100644 index 000000000000..0cf029c68a59 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, xstatic-jquery +}: + +buildPythonPackage rec { + pname = "XStatic-jQuery-File-Upload"; + version = "9.7.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0d5za18lhzhb54baxq8z73wazq801n3qfj5vgcz7ri3ngx7nb0cg"; + }; + + # no tests implemented + doCheck = false; + + propagatedBuildInputs = [ xstatic-jquery ]; + + meta = with lib;{ + homepage = http://plugins.jquery.com/project/jQuery-File-Upload; + description = "jquery-file-upload packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix new file mode 100644 index 000000000000..1b884a97eb22 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, xstatic-jquery +}: + +buildPythonPackage rec { + pname = "XStatic-jquery-ui"; + version = "1.12.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0w7mabv6qflpd47g33j3ggp5rv17mqk0xz3bsdswcj97wqpga2l2"; + }; + + # no tests implemented + doCheck = false; + + propagatedBuildInputs = [ xstatic-jquery ]; + + meta = with lib;{ + homepage = http://jqueryui.com/; + description = "jquery-ui packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix new file mode 100644 index 000000000000..c414e0a070ae --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-jQuery"; + version = "1.10.2.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "018kx4zijflcq8081xx6kmiqf748bsjdq7adij2k91bfp1mnlhc3"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://jquery.org; + description = "jquery packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix new file mode 100644 index 000000000000..8ec9b77860c2 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-pygments/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Pygments"; + version = "1.6.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0fjqgg433wfdnswn7fad1g6k2x6mf24wfnay2j82j0fwgkdxrr7m"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://pygments.org; + description = "pygments packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix new file mode 100644 index 000000000000..02931215b8d3 --- /dev/null +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic"; + version = "1.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = https://bitbucket.org/thomaswaldmann/xstatic; + description = "Base packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 9ff7d1da71b2..e81ce35977e1 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -369,7 +369,7 @@ let VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ]; WhopGenome = [ pkgs.zlib.dev ]; XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; - xml2 = [ pkgs.libxml2.dev ]; + xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ]; affyPLM = [ pkgs.zlib.dev ]; bamsignals = [ pkgs.zlib.dev ]; @@ -411,6 +411,7 @@ let fftw = [ pkgs.pkgconfig ]; geoCount = [ pkgs.pkgconfig ]; gdtools = [ pkgs.pkgconfig ]; + JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ]; kza = [ pkgs.pkgconfig ]; magick = [ pkgs.pkgconfig ]; mwaved = [ pkgs.pkgconfig ]; @@ -760,6 +761,17 @@ let ''; }); + JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: { + postPatch = '' + for file in {R,src}/*.R; do + sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file + done + ''; + preConfigure = '' + patchShebangs configure + ''; + }); + Mposterior = old.Mposterior.overrideDerivation (attrs: { PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 8da6355e0016..ac0b2dd07f83 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -139,8 +139,9 @@ in }; grpc = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ]; }; hitimes = attrs: { diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 1393229333d3..3aa64356896f 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.0.3"; + version = "1.0.5"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0pa60fy5skx781hwspaskisv8zx0sfddkvprgmwkhfdpz892srwm"; + sha256 = "10y73a4aaz3530qr9mms1j70c6dxgl9kwvnpbh062gnrbyw34z9l"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index 99958a416c39..a9793e048839 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, qtsvg, qtxmlpatterns, karchive, kconfig, kcoreaddons, kparts, kio, ki18n, kdiagram, kgraphviewer }: @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; }; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtsvg qtxmlpatterns karchive kconfig kcoreaddons kparts kio ki18n diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index 3cd1d309e15d..2f82dc0fb8b5 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -1,39 +1,18 @@ { stdenv, fetchFromGitHub, fetchpatch, qmake, pkgconfig, qtbase, qtsvg, radare2 }: - stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "02m5sf45n455hn34y7hrqanj830rc5xhz2ppp1z3mzbz0s515pfl"; + sha256 = "1ph8kvpai7kr7kcqfp0aagvrm098bbh9ygzg5fp8z8y51mwq898g"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; - patches = [ - # Fixup version number :D - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/69506b64600df632afdca8b680baa7d946c78644.patch"; - sha256 = "0ks3ixz8bycjcfi26bd0p6z7qaplhq00alw44hsfzpdm4bmr01x0"; - }) - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/8b52c66f4f0091cd9d97389b32aa519c2c602e2b.patch"; - sha256 = "0wcdn35lx2943pfzm7mkg4sr82pm0qz3yxf74m8fxbd70s3w0gkm"; - }) - - # case-insensitive filtering - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/0ebd34370bcaed00000168147572bb78106eeab1.patch"; - sha256 = "0sc50jwhncfnd2i5mlyld4dbdzi2ws7nh4yglkhlap9l9h1jxn20"; - }) - ]; - - patchFlags = [ "-p2" ]; - nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtsvg radare2 ]; diff --git a/pkgs/development/tools/build-managers/bear/cmakepaths.patch b/pkgs/development/tools/build-managers/bear/cmakepaths.patch new file mode 100644 index 000000000000..d237267078e6 --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/cmakepaths.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04c5c58..429ca47 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Rogue") + + set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear") +-set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") ++set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") + + add_subdirectory(libear) + add_subdirectory(bear) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 6afec72de5fd..8f352f84b228 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # all fail - patches = [ ./ignore_wrapper.patch ]; + patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ]; meta = with stdenv.lib; { description = "Tool that generates a compilation database for clang tooling"; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/rizsotto/Bear; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.vcunat ]; + maintainers = [ maintainers.vcunat maintainers.babariviere ]; }; } diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index d62ccd0c9fda..3e994227ef05 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -14,11 +14,11 @@ let package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.15.post1"; + version = "1.0.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "01m5x4lpz90lqf8j0s2c26gqb5yzan6x9d1ffgmrklwf0bljkwni"; + sha256 = "0y7gpymxl09gd9dyqj7zqhaihpl9da1v8ppxi4r161ywd8jv9b1g"; }; buildInputs = with pythonPackages; [ diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix index 8b23f8a24889..07480d15f211 100644 --- a/pkgs/development/tools/build-managers/buildbot/pkg.nix +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.15.post1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0gsa5fi1gkwnz8dsrl2s5kzcfawnj3nl8g8h6z1winz627l9n8sh"; + sha256 = "1rs2x0b2v92xfsfk0f2nr9x8lz5baawf768s58brj4jiab6mq312"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 40aaad2efd25..1d1b963df993 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -11,7 +11,7 @@ src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "19cnzp5prima3jrk525xspw7vqc5pjln2nihj4kc3w90dhzllj8x"; + sha256 = "0nmrq50c5ib185rpb8ai1mm7gjq2mjvxik1kqrjfa62i1ia9ikyj"; }; meta = with stdenv.lib; { @@ -29,7 +29,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1j6aw2j2sl7ix8rb67pbs6nfvv8v3smgkvqzsjsyh5sdfr2663cg"; + sha256 = "1laz7l7cbbz0czb6skxw314bd2qk2f63qw3n2rs7m7v11gd9cdll"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -49,7 +49,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0k0wd4rq034bij2flfjv60h8czkfn836bnaa7hwsrl58gxds39m4"; + sha256 = "0mmri8c4n1zwxc1dx2a11yllrmnwqqxjvvil9224lbs98mpchppi"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -69,7 +69,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "08ng56jmy50s3zyn6wxizji1zhgzhi65z7w3wljg02qrbd5688gj"; + sha256 = "0nwlw2m3qfifia6gy3d4lrnycra50k98ax071p2zjqknanh563vr"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -89,7 +89,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "15fm72yymv873n3vsw9kprypcf6jzln18v4lb062n8lqw9pykwb1"; + sha256 = "1zml9bd910zwcby4vr3lmzap2grinha2w5zgb2cmixmz7hfrqswp"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 51d6a5b56952..75e6bb0404be 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.15.post1"; + version = "1.0.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "12zscqb218w88y9fd1jwfn4cr2sw35j998d0jlgd22bch020sy65"; + sha256 = "0ws31ypmksah1c83h4npwg560p8v7n9j6l94p79y5pispjsgzqzl"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index bdf446d4d12a..5e8f14c5f843 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.5"; + name = "gradle-4.6"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1qxmb4mki2gjhfwmy7lwak283l86iq3nivw57a2gpw2g64xa9wh3"; + sha256 = "05drn7a9d2blbmd3l0443bpf5qzf5frwnl9ww0bha1qfng95zgcq"; }; }; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 4ea85eca2138..01a112bcecce 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.0"; + version = "1.1.1"; 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 = "1mz2aiwb3ha8dnx9fzbykz1y5ax01l2x6xml956fs1vm555v534x"; + sha256 = "0fy04mnnrbdm7kfnjh6sv1q3g6wqzvwyf1p43f36rw3qalap544a"; }; patchPhase = '' diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 61184cb6ba1a..65501b2b9350 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "waf-${version}"; - version = "1.9.0"; + version = "2.0.4"; src = fetchurl { url = "https://waf.io/waf-${version}.tar.bz2"; - sha256 = "1sjpqzm2fzm8pxi3fwfinpsbw4z9040qkrzbg3lxik7ppsbjhn58"; + sha256 = "0zmnwgccq5j7ipfi2j0k5s40q27krp1m6v2bd650axgzdbpa7ain"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 5fdbd7766cf8..c778b67a95f5 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ , go-md2man }: let - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { rev = "v${version}"; owner = "projectatomic"; repo = "buildah"; - sha256 = "0rq3dw6p9rcqc99jk93j0qwg1p8fh4pwqvzylcqlcyqhv46426zf"; + sha256 = "0xyq7rv0lj6bxwh2rnf44w9gjcqbdkfcdff88023b9vlsc8h4k0m"; }; goPackagePath = "github.com/projectatomic/buildah"; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 18ca5d4d8972..2d534435b5f9 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.89.3"; + version = "2.89.4"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0flqd3r1nip9wc8sy0kiqjivgx0zkpzlkbz6n3gb1plc73lpdwbr"; + sha256 = "0lwv3y12r36amkr70fap5g1zfd7vv92809lh9w7178s91sikm28x"; }; buildCommand = '' diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 79a077f4a751..e3c8d7ed014d 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,21 +2,17 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; - sha256 = "0167cgp3kqx336p8dmlxx57bi3lhzyp6ncly28v1s7r2sjxj9krj"; + sha256 = "1rn1vb33zfl9iy80fhqvi9ykdjxz029nah5yfr5xixcx9al0bai3"; }; nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; - - installPhase = '' - mkdir -p $out/bin - cp ${src} $out/bin/coursier - chmod +x $out/bin/coursier + buildCommand = '' + install -Dm555 $src $out/bin/coursier wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ''; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index a7b9976be43c..394169c9cc9d 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liquibase"; - version = "3.5.3"; + version = "3.5.5"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; - sha256 = "04cpnfycv0ms70d70w8ijqp2yacj2svs7v3lk99z1bpq3rzx51gv"; + sha256 = "1ipjbzdb32xigm0vg6zzjnbx9n248rrkr324n5igp53nxbvgf3fs"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index afac17e121ad..7d4cf6ea5d5e 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -5,13 +5,13 @@ , drivers ? [] }: let - version = "3.7.1"; + version = "3.8.1"; in stdenv.mkDerivation rec { name = "squirrel-sql-${version}"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "1v141ply57k5krwbnnmz4mbs9hs8rbys0bkjz69gvxlqjizyiq23"; + sha256 = "1vv38i4rwm8c8h0p9mmz21dyafd71pqprj7b8i5vx7f4q8xns2d2"; }; buildInputs = [ diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 3671a3dcca9b..9a7a600d1343 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "delve-${version}"; - version = "0.12.2"; + version = "1.0.0"; goPackagePath = "github.com/derekparker/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "derekparker"; repo = "delve"; rev = "v${version}"; - sha256 = "1241zqyimgqil4qd72f0yiw935lkdmfr88kvqbkn9n05k7xhdg30"; + sha256 = "08hsairhrifh41d288jhc65zbhs9k0hs738dbdzsbcvlmycrhvgx"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index b88b8e3c82a9..a176c5cb7645 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which -, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext, itstool }: +, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }: stdenv.mkDerivation rec { name = "gtk-doc-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl - gnome_doc_utils dblatex gettext which itstool + gnome-doc-utils dblatex gettext which itstool ]; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 144bd059634f..b6daade32e78 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -4,14 +4,14 @@ with python.pkgs; buildPythonApplication rec { pname = "mkdocs"; - version = "0.16.3"; + version = "0.17.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mkdocs"; repo = "mkdocs"; rev = version; - sha256 = "0gssa5gbd1y2v3azdhf2zh7ayx4ncfag4r2a6fi96jbic64r3qrs"; + sha256 = "0hpjs9qj0nr57a249yv8xvl61d3d2rrdfqxp1fm28z77l2xjj772"; }; checkInputs = [ diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 0df2decef2cb..f2b9348103ab 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: let - version = "1.7.11"; + version = "1.8.2"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.system}"; @@ -10,8 +10,8 @@ let description = "Cross platform desktop application shell"; homepage = https://github.com/electron/electron; license = licenses.mit; - maintainers = [ maintainers.travisbhartwell ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" ]; + maintainers = with maintainers; [ travisbhartwell manveru ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; }; linux = { @@ -20,15 +20,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "0mxrayczs6fc2a53fzfbgs88l71wm7hadq9ir510kicakblmdbyx"; + sha256 = "12q5h6gh9zzhndg6yfka821rblq3l80d2qzqrq4nbq6rlsshjp9d"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "0v22xhzbq9lcbc83laqs45pbx8gzv648qfkj01pxfsmv3lb4myrl"; + sha256 = "07ggq9wgfz3z5z0lwzzgs6im0qs83pz0pcfwr0r42zgmwg7j78b8"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "02n2y69zwzacigqp6f4vg47cmjzf8gvbbispmzkg3pnzk4qc9473"; + sha256 = "1b0p5x9zigyd6d8gz2hxc4scllrpnbx1dzzwlsvw6ilqbj1ypc7i"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; + sha256 = "0k4np2d4y15x1qfay8y9m8v9y223vdpbq5fdxa3ywbbyf8j361zd"; }; }.${stdenv.system} or throwSystem; @@ -56,7 +60,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "19kfb09ap780ayk7miqfr6gmba9rd10f9q9aphj35yk7cl22znbr"; + sha256 = "0pq587vr1i87jdwcpbf6n136i9dp6i39dp5s95kihnm9qglxr42b"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 0ef6e85297c1..11e2c6d2c5a4 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "4.2.0"; + version = "5.0.7"; in stdenv.mkDerivation { name = "flyway-${version}"; src = fetchurl { - url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/4.2.0/flyway-commandline-${version}.tar.gz"; - sha256 = "1fxj760qx6apsz50p60c9n79k6bqkjcv2zfgab0awvmdvdy4k661"; + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.0.7/flyway-commandline-${version}.tar.gz"; + sha256 = "1zmnzz7d5kb2wpmfizryxxhpjs16j5k9mich1hbb2qfkqvygk6sv"; }; buildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index d553a5745524..bbcdc0cd798e 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "galen"; - version = "2.3.0"; + version = "2.3.6"; name = "${pname}-${version}"; inherit jre8; src = fetchurl { url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; - sha256 = "10z7vh3jiq7kbzzp3j0354swkr4xxz9qimi5c5bddbiy671k6cra"; + sha256 = "0kndib3slj7mdvhd36fxin5q87cnsz4hs135yxgjx0nccxq4f2h5"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 8f6e0dde5899..9bc760bf1126 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -1,20 +1,24 @@ { lib -, fetchurl +, fetchFromGitHub , rustPlatform }: with rustPlatform; buildRustPackage rec { - version = "0.19.1"; + version = "unstable-2018-02-24"; name = "geckodriver-${version}"; - src = fetchurl { - url = "https://github.com/mozilla/geckodriver/archive/v${version}.tar.gz"; - sha256 = "04zpv4aiwbig466yj24hhazl5hrapkyvwlhvg0za5599ykzdv47m"; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "gecko-dev"; + rev = "ecb86060b4c5a9808798b81a57e79e821bb47082"; + sha256 = "1am84a60adw0bb12rlhdqbiwyywhza4qp5sf4f4fmssjl2qcr6nl"; }; - cargoSha256 = "1cny8caqcd9p98hra1k7y4d3lb8sxsyaplr0svbwam0d2qc1c257"; + sourceRoot = "${src.name}/testing/geckodriver"; + + cargoSha256 = "0dvcvdb623jla29i93glx20nf8pbpfw6jj548ii6brzkcpafxxm8"; meta = with lib; { description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index c54a924a1a65..99f049314ae8 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "lint-${version}"; - version = "20160428-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "c7bacac2b21ca01afa1dee0acf64df3ce047c28f"; + version = "20180208-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d"; goPackagePath = "github.com/golang/lint"; excludedPackages = "testdata"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://github.com/golang/lint"; - sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg"; + sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix index f03bf9b5b23b..caf3615c666b 100644 --- a/pkgs/development/tools/golint/deps.nix +++ b/pkgs/development/tools/golint/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; - sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + rev = "66487607e2081c7c2af2281c62c14ee000d5024b"; + sha256 = "03wiraqkms4jb5gi7vmp52mpmp4av08yw4gr2nk31c2rnhyd3jv4"; }; } ] diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 8032b256905b..9e41ef381318 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "leaps-${version}"; - version = "0.5.1"; + version = "0.9.0"; - goPackagePath = "github.com/jeffail/leaps"; + goPackagePath = "github.com/Jeffail/leaps"; src = fetchFromGitHub { - owner = "jeffail"; + owner = "Jeffail"; repo = "leaps"; - sha256 = "0w63y777h5qc8fwnkrbawn3an9px0l1zz3649x0n8lhk125fvchj"; + sha256 = "1bzas7ixyfsfh81lnvplhx59yghkmnmy5p7jv9rnwp219dwbylpz"; rev = "v${version}"; }; diff --git a/pkgs/development/tools/leaps/deps.nix b/pkgs/development/tools/leaps/deps.nix index d611d9b49540..afaf42779b3e 100644 --- a/pkgs/development/tools/leaps/deps.nix +++ b/pkgs/development/tools/leaps/deps.nix @@ -1,94 +1,185 @@ -[ - { - goPackagePath = "github.com/amir/raidman"; - fetch = { - type = "git"; - url = "https://github.com/amir/raidman"; - rev = "91c20f3f475cab75bb40ad7951d9bbdde357ade7"; - sha256 = "0pkqy5hzjkk04wj1ljq8jsyla358ilxi4lkmvkk73b3dh2wcqvpp"; - }; - } - { - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/go-bindata-assetfs"; - rev = "57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2"; - sha256 = "1za29pa15y2xsa1lza97jlkax9qj93ks4a2j58xzmay6rczfkb9i"; - }; - } - { - goPackagePath = "github.com/garyburd/redigo"; - fetch = { - type = "git"; - url = "https://github.com/garyburd/redigo"; - rev = "8873b2f1995f59d4bcdd2b0dc9858e2cb9bf0c13"; - sha256 = "1lzhb99pcwwf5ddcs0bw00fwf9m1d0k7b92fqz2a01jlij4pm5l2"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "7ebe0a500653eeb1859664bed5e48dec1e164e73"; - sha256 = "1gyan3lyn2j00di9haq7zm3zcwckn922iigx3fvml6s2bsp6ljas"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "bf531ff1a004f24ee53329dfd5ce0b41bfdc17df"; - sha256 = "10lnvmq28jp2wk1xc32mdk4745lal2bmdvbjirckb9wlv07zzzf0"; - }; - } - { - goPackagePath = "github.com/jeffail/gabs"; - fetch = { - type = "git"; - url = "https://github.com/jeffail/gabs"; - rev = "ee1575a53249b51d636e62464ca43a13030afdb5"; - sha256 = "0svv57193n8m86r7v7n0y9lny0p6nzr7xvz98va87h00mg146351"; - }; - } - { - goPackagePath = "github.com/jeffail/util"; - fetch = { - type = "git"; - url = "https://github.com/jeffail/util"; - rev = "48ada8ff9fcae546b5986f066720daa9033ad523"; - sha256 = "0k8zz7gdv4hb691fdyb5mhlixppcq8x4ny84fanflypnv258a3i0"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "3cd0097429be7d611bb644ef85b42bfb102ceea4"; - sha256 = "1q7qfzyfgjk6rvid548r43fi4jhvsh4dhfvfjbp2pz4xqsvpsm7a"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "f9ab0dce87d815821e221626b772e3475a0d2749"; - sha256 = "0z18j6zxq9kw4lgcpmhh3k7jrb9gy1lx252xz5qhs4ywi9w77xwi"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; - sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; - }; - } -] + # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) + [ + + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722"; + sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r"; + }; + } + + { + goPackagePath = "github.com/Jeffail/gabs"; + fetch = { + type = "git"; + url = "https://github.com/Jeffail/gabs"; + rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c"; + sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr"; + }; + } + + { + goPackagePath = "github.com/amir/raidman"; + fetch = { + type = "git"; + url = "https://github.com/amir/raidman"; + rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; + sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; + }; + } + + { + goPackagePath = "github.com/azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/azure/azure-sdk-for-go"; + rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f"; + sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq"; + }; + } + + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "61153c768f31ee5f130071d08fc82b85208528de"; + sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; + }; + } + + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } + + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; + sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; + }; + } + + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "d1ed5c67e5794de818ea85e6b522fda02623a484"; + sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24"; + }; + } + + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "a0583e0143b1624142adab07e0e97fe106d99561"; + sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; + sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + }; + } + + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "88edab0803230a3898347e77b474f8c1820a1f20"; + sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p"; + }; + } + + { + goPackagePath = "github.com/marstr/guid"; + fetch = { + type = "git"; + url = "https://github.com/marstr/guid"; + rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca"; + sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x"; + }; + } + + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; + sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; + }; + } + + { + goPackagePath = "gopkg.in/alexcesaro/statsd.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alexcesaro/statsd.v2"; + rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90"; + sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj"; + }; + } + + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } + +] \ No newline at end of file diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 00c2663e3a46..d569b8d30687 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.0.14"; + version = "2.1.7"; in stdenv.mkDerivation { name = "minizinc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "${version}"; owner = "MiniZinc"; repo = "libminizinc"; - sha256 = "02wy91nv79lrvvhhimcxp7sqz5wd457n1n68zl7qcsm5vfn1hm4q"; + sha256 = "05rifsgzfaalv5ymv59sjcvhr6i1byzbmq5p36hj3hpi5f929kip"; }; # meta is all the information about the package.. diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 2adc61ce6456..d4a8d483e2e5 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { - name = "babeltrace-1.5.3"; + name = "babeltrace-1.5.4"; src = fetchurl { url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2"; - sha256 = "0z0k4qvz4ypxs4dmgrzv9da7ylf6jr94ra6nylqpfrdspvjzwj92"; + sha256 = "1h8zi7afilbfx4jvdlhhgysj6x01w3799mdk4mdcgax04fch6hwn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index ff4ad83b642c..34d1d8a829b1 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, zlib, makeWrapper }: +{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.3.5"; + version = "3.4.1"; src = fetchurl { - sha256 = "1iih5d171rq29366c1z90dri2h8173yyc8rm2740wxiqx6k7c18r"; + sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; url = "mirror://samba/ccache/${name}.tar.xz"; }; + nativeBuildInputs = [ perl ]; + buildInputs = [ zlib ]; + outputs = [ "out" "man" ]; + # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) - patches = [ ./skip-fs-dependent-test.patch ]; + patches = [ + ./fix-debug-prefix-map-suite.patch + ./skip-fs-dependent-test.patch + ]; postPatch = '' substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' diff --git a/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch b/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch new file mode 100644 index 000000000000..98a6fbf10bf1 --- /dev/null +++ b/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch @@ -0,0 +1,42 @@ +--- a/test/suites/debug_prefix_map.bash ++++ b/test/suites/debug_prefix_map.bash +@@ -29,7 +29,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + +@@ -39,7 +39,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + +@@ -52,10 +52,10 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi +- if ! grep "name" test.o >/dev/null 2>&1; then ++ if ! objdump -g test.o | grep ": name$" >/dev/null 2>&1; then + test_failed "Relocation (name) not found in test.o" + fi + +@@ -65,7 +65,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + } diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch index 3bc3a95e4204..7b233df6531b 100644 --- a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch +++ b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch @@ -1,6 +1,6 @@ ---- a/test.sh -+++ b/test.sh -@@ -2669,23 +2669,6 @@ SUITE_cleanup() { +--- a/test/suites/cleanup.bash ++++ b/test/suites/cleanup.bash +@@ -94,23 +94,6 @@ $CCACHE -F 0 -M 256K >/dev/null CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 28b108c743f0..928f12602909 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation { - name = "doclifter-2.15"; + name = "doclifter-2.17"; src = fetchurl { - url = http://www.catb.org/~esr/doclifter/doclifter-2.15.tar.gz; - sha256 = "14k750bxp0kpnm130pp22vx3vmppfnzwisc042din1416ka07yv0"; + url = http://www.catb.org/~esr/doclifter/doclifter-2.17.tar.gz; + sha256 = "1m8yfjbl8wzcml9q4k7m1crwid0a14r07fqf33bmmgx1zpjk8kmv"; }; buildInputs = [ python ]; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 27dadd08e560..9f0ea147b585 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus dbus_glib ]; + buildInputs = [ glib dbus dbus-glib ]; meta = { homepage = https://hal.freedesktop.org/releases/; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 6d5bfef2f80e..de66bf5da14e 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -5,14 +5,14 @@ in python27Packages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "gdbgui"; - version = "0.11.0.0"; + version = "0.11.1.2"; buildInputs = [ gdb ]; propagatedBuildInputs = builtins.attrValues deps.packages; src = python27Packages.fetchPypi { inherit pname version; - sha256 = "09bfrln16ai5azpjan1q24xz700sxsaa3ndynq8c8qdan82bfi1g"; + sha256 = "15502fg90df183mcg6nic8fakf111pgrlp7f044g3136wpwgfln7"; }; postPatch = '' diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 50f451ebae23..02b4d1557678 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig, hicolor_icon_theme }: +{stdenv, fetchurl, gtk2, pkgconfig, hicolor-icon-theme }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; meta = { homepage = https://code.google.com/archive/p/gtkdialog/; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 9c131b72a316..3d8b29e4ebc2 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,22 +1,28 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, autoreconfHook, utilmacros }: +, procps, autoreconfHook, utilmacros, gnome2 }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.19"; + name = "intel-gpu-tools-1.21"; src = fetchurl { - url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "1wdhwf3im6ids95qw5r9hjj9hvp0qhzgi4llrlriy723q3kqm754"; + url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz"; + sha256 = "0gvh317dg5c7kvjxxkh8g70hh3r3dc73mc4dzyvfa8nb4ix6xbyr"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook utilmacros ]; + nativeBuildInputs = [ pkgconfig utilmacros ]; buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod - libXext libXv libXrandr glib bison libunwind python3 procps ]; + libXext libXv libXrandr glib bison libunwind python3 procps + gnome2.gtkdoc ]; + + preConfigure = '' + ./autogen.sh + ''; preBuild = '' patchShebangs debugger/system_routine/pre_cpp.py substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' + substituteInPlace tests/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index e1602b0d24e7..66fbed514dc5 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elfutils }: +{ stdenv, fetchurl, elfutils, libunwind }: stdenv.mkDerivation rec { name = "ltrace-0.7.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"; }; - buildInputs = [ elfutils ]; + buildInputs = [ elfutils libunwind ]; preConfigure = '' @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { makeFlagsArray=(INSTALL="install -c") ''; - meta = { + meta = with stdenv.lib; { description = "Library call tracer"; - homepage = http://www.ltrace.org/; + homepage = https://www.ltrace.org/; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 3591cdc0f529..eea54dbdf8be 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lttng-tools-${version}"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "005axllajfbxh73vh1cacbapdvbxjsi3pkzq40giih4ps9x4pg10"; + sha256 = "17wsdhkw8c8gb0d1bcgw4dfx2ljrq4rzgpi8sb9y9hs6pbwqy0xk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index bfdebec154ad..edfc7dc30ca6 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "lttng-ust-${version}"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "1avx4p71g9m3zvynhhhysxnpkqyhhlv42xiv9502bvp3nwfkgnqs"; + sha256 = "17gfi1dn6bgg59qn4ihf8hag96lalx0g7dym2ccpzdz7f45krk07"; }; buildInputs = [ python ]; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index acfc8c54f641..ecee27c13858 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2}: stdenv.mkDerivation rec { - version = "0.94"; + version = "0.97"; name = "msitools-${version}"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.94/${name}.tar.xz"; - sha256 = "0bndnm3mgcqkw5dhwy5l1zri4lqvjbhbn5rxz651fkxlkhab8bhm"; + url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz"; + sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs"; }; nativeBuildInputs = [ pkgconfig ]; @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = https://wiki.gnome.org/msitools; license = [licenses.gpl2 licenses.lgpl21]; - maintainers = [maintainers.vcunat]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 7cfd78a39a28..15d00b0a2a52 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { patches = optional (!vanilla) ./requires-private.patch ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; - preConfigure = optionalString (stdenv.system == "mips64el-linux") - ''cp -v ${automake}/share/automake*/config.{sub,guess} .''; + preConfigure = ""; # TODO(@Ericson2314): Remove next mass rebuild buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; configureFlags = [ "--with-internal-glib" ] diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index e5f298a1cabc..80d1a75e801d 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "4.21"; src = fetchurl { - url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "1dvrwi6v9j6b9j6852zzlc61hxgiciadi1xsl89wzbzqlkxnahbd"; + url = "https://strace.io/files/${version}/${name}.tar.xz"; + sha256 = "0dsw6xcfrmygidp1dj2ch8cl8icrar7789snkb2r8gh78kdqhxjw"; }; nativeBuildInputs = [ perl ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 "--enable-mpers=check"; meta = with stdenv.lib; { - homepage = http://strace.sourceforge.net/; + homepage = http://strace.io/; description = "A system call tracer for Linux"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 612df55471ba..d72fc86d7ee5 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -2,7 +2,7 @@ , libaio }: stdenv.mkDerivation rec { - name = "sysbench-1.0.6"; + name = "sysbench-1.0.13"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ vim mysql.connector-c libaio ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "akopytov"; repo = "sysbench"; - rev = "1.0.6"; - sha256 = "0y3hlhzrggyyxwf378n006zlg2kwhmhh6vq6il0qn9agjmjmhl5l"; + rev = "1.0.13"; + sha256 = "1inxyjpcyv2ag3k5riwlaq91362y16yks75vs2crmhjxlxdspy8c"; }; meta = { diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 6c27ad408603..3cf707c6bebb 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.66"; + version = "0.66.1"; src = fetchFromGitHub { owner = product; repo = product; rev = name; - sha256 = "156y71yf2xxskvikbn6yjfv8xgnsrrjij08irv21z0n7nx35jgmm"; + sha256 = "1y69b0g07ksynf1fwfh5qqwmscxfbvs1yi3n3lbdd4vplb9zakyx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 8a1ce7c08868..d34a94e04670 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "usb-modeswitch-${version}"; - version = "2.5.0"; + version = "2.5.2"; src = fetchurl { url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; - sha256 = "0cvnd16n2sp3w46fy507nl29q39jxxdk5qqbvk1rxaa91llbxh1i"; + sha256 = "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb"; }; makeFlags = [ diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 0acd70b424a8..31cd7ccfd2c0 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -6,15 +6,22 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-7.03"; + name = "camlp5${if transitional then "_transitional" else ""}-7.05"; src = fetchzip { - url = https://github.com/camlp5/camlp5/archive/rel703.tar.gz; - sha256 = "0bwzhp4qjypfa0x8drp8w434dfixm1nzrm6pcy9s5akpmqvb50a8"; + url = https://github.com/camlp5/camlp5/archive/rel705.tar.gz; + sha256 = "16igfyjl2jja4f1mibjfzk0c2jr09nxsz6lb63x1jkccmy6430q2"; }; buildInputs = [ ocaml ]; + postPatch = '' + for p in compile/compile.sh config/Makefile.tpl test/Makefile test/check_ocaml_versions.sh + do + substituteInPlace $p --replace '/bin/rm' rm + done + ''; + prefixKey = "-prefix "; preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index bef994f30b7c..d48bc4101113 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchzip, ocaml, opam }: +{ stdenv, fetchFromGitHub, ocaml, opam }: -stdenv.mkDerivation { - name = "jbuilder-1.0+beta14"; - src = fetchzip { - url = http://github.com/janestreet/jbuilder/archive/1.0+beta14.tar.gz; - sha256 = "0vq4chqp7bm3rd5n6ry1j1ia6xqlz463059ljd1jmawa4dcyilvl"; +stdenv.mkDerivation rec { + name = "jbuilder-${version}"; + version = "1.0+beta17"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "dune"; + rev = "${version}"; + sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 821401d578c7..cdd599c451f8 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "omniorb-${version}"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl rec { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl"; + sha256 = "1klf6ivhsisdnqxcbf161jxva0xzmfgmwypnxfzf4jq16770knfx"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index d97d67c9851a..b7757b474716 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.1.3"; + version = "1.2.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0bfjv4sqci10jzy11qg6q1xyik36v98vd6ck91sarawvgbaprsp2"; + sha256 = "05qsyh6d4qsvabr543ggd4b09fipxzr270cawsx0glmkgw82nkzi"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index 16fc48174175..6eb3e88a0d13 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pew"; - version = "1.1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0b8z1vjsll1kgnh3mmdjps5rr9gayy091rapp2dra71jrwkx3yfh"; + sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; }; propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index b017b1dc24b5..de2e6eb96a81 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "9.0.1"; + version = "10.1.0"; src = fetchPypi { inherit pname version; - sha256 = "16k77iy1apbc1s5j78aimhjrcw89vbkq5irs80dmm70wayi0myz1"; + sha256 = "3732350e3cd8cc033d66748c418bab4b018dc0a4fcf1687f17a103ac44eac0c6"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index eb82cf849660..326fa84f472a 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sassc-${version}"; - version = "3.4.5"; + version = "3.4.8"; src = fetchurl { url = "https://github.com/sass/sassc/archive/${version}.tar.gz"; - sha256 = "1xk4kmmvziz9sal3swpqa10q0s289xjpcz8aggmly8mvxvmngsi9"; + sha256 = "02lnibrl6zgczkhvz01bdp0d2b0rbl69dfv5mdnbr4l8km7sa7b1"; }; patchPhase = '' diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index deb5c8106282..279bce20d142 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, perl, makeWrapper, openssl }: stdenv.mkDerivation rec { - name = "sslmate-1.5.0"; + name = "sslmate-1.6.0"; src = fetchurl { url = "https://packages.sslmate.com/other/${name}.tar.gz"; - sha256 = "1vxdkydwww4awi6ishvq68jvlj6vkbfw7pin1cdqpl84vs9q7ycg"; + sha256 = "1ypabdk0nlqjzpmn3m1szjyw7yq20svgbm92sqd5wqmsapyn3a6s"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 5d967ba81271..7f62102621ea 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,9 +1,9 @@ { lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }: let - version = "2.0.1"; + version = "2.0.2"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1fjfl00n4rsq6khypm56g0vq6l153q128r35zky2ba30bz292ar1"; + sha256 = "1sjfwgy2y6q5s1drd8h8xgz2a0sv1l3kx9jilgc02hlcdz070iir"; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index f8134a88643c..96307c8d134c 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { name = "vim-vint-${version}"; - version = "0.3.11"; + version = "0.3.18"; src = fetchFromGitHub { owner = "kuniwak"; repo = "vint"; rev = "v${version}"; - sha256 = "0xl166xs7sm404f1qz2s0xcry7fr1hgyvhqhyj1qj0dql9i3xx8v"; + sha256 = "0qrlimg385sxq4y6vqbanby31inaa1q47w9qcw5knwffbz96whrs"; }; # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index ffa6d4aac0ca..df32d68767fb 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "wiggle-1.0"; + name = "wiggle-1.1"; src = fetchurl { - url = "https://github.com/neilbrown/wiggle/archive/v1.0.tar.gz"; - sha256 = "0552dkdvl001b2jasj0jwb69s7zy6wbc8gcysqj69b4qgl9c54cs"; + url = "https://github.com/neilbrown/wiggle/archive/v1.1.tar.gz"; + sha256 = "0gg1c0zcrd5fgawvjccmdscm3fka8h1qz4v807kvy1b2y1cf9c4w"; }; buildInputs = [ ncurses groff ]; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 72b0fe2adaf7..bd7dd5924c06 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.3.2"; + version = "1.5.1"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0lyh24ais8xqfmzbb4sszd2002xl6qbsg9sdjnpwh6aysrwp56r8"; + sha256 = "13m1y1c2h1fvq8fw1vlmnmnh3jx3l2cx7mz3x55sbgwcinzhkz9m"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index eafaf956ee02..22eb772da1f9 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -26,6 +26,11 @@ let */ ]) (builtins.attrNames sharedLibDeps); + copyLibHeaders = + map + (name: "${getDev sharedLibDeps.${name}}/include/*") + (builtins.attrNames sharedLibDeps); + extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; in @@ -74,13 +79,16 @@ in mkdir -p $out/share/bash-completion/completions/ $out/bin/npm completion > $out/share/bash-completion/completions/npm ''} + + # install the missing headers for node-gyp + cp -r ${concatStringsSep " " copyLibHeaders} $out/include/node ''; meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = https://nodejs.org; license = licenses.mit; - maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; + maintainers = with maintainers; [ goibhniu gilligan cko ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix deleted file mode 100644 index 64674066b295..000000000000 --- a/pkgs/development/web/nodejs/v4.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, callPackage, lib, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix {}; -in - buildNodejs { - inherit enableNpm; - version = "4.8.7"; - sha256 = "1y21wq092d3gmccm2zldbflbbbx7a71wi9l0bpkxvzmgws69liq3"; - patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; - } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index 79f364be2000..af3a8b4d22fd 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.5.0"; - sha256 = "0v8lspfca820mf45dj9hb56q00syhrqw5wmqmy1vnrcb6wx4csv6"; + version = "9.6.1"; + sha256 = "04hi7lwdizwqqbyi77f4z12gnsh673h92brmbssrmw5kjx6h4k5q"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 751638e02da8..dde8ada0db93 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ../../node-packages/node-env.nix { @@ -13,4 +13,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 34b31cdf7ec8..317550059b45 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: stdenv.mkDerivation rec { - version = "4.0.5"; + version = "4.1.2"; name = "angband-${version}"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "1l7ybqmsxpsijm7iqiqjpa7lhjafxml743q4crxn8wnwrbjzbi86"; + sha256 = "1n18i8ni154ym3d32zlbxcw0zz62h66iifr0h1yvvv2kp13p5zix"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 430da66c21c5..39d98f4f8b56 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.20.1"; + version = "0.21.1"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26"; + sha256 = "191pmd7vpp9qni5l13fb5s8g1axniah8a6hhi31gp0848c8n7hlh"; }; patches = [ ./crawl_purify.patch ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; - makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" + makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] ++ lib.optional tileMode "TILES=y"; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 71938874057a..ca64045b185b 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -5,12 +5,12 @@ let dfVersion = "0.44.05"; - version = "${dfVersion}-alpha1"; + version = "${dfVersion}-r2"; rev = "refs/tags/${version}"; sha256 = "1hr3qsx7rd36syw7dfp4lh8kpmz1pvva757za2yn34hj1jm4nh52"; # revision of library/xml submodule - xmlRev = "3a9f401d196ee8ebc53edb9e15a13bfcb0879b4e"; + xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 20f7502f27dd..8cdfc426d830 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "39.2.0"; + version = "39.2.1"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "1ddy9b9ly1231pnjs43gj7pvc77wjvs4j2rlympal81vyabaphmy"; + sha256 = "1dgcn1a4sz649kj94ldqy4ms7zhwpaj3q4r86b0yfh6dda8jzlgp"; }; outputs = [ "out" "layouts" ]; diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index dd14edf8eb12..263bf5c29dfc 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "freecell-solver-${version}"; - version = "4.8.0"; + version = "4.16.0"; src = fetchurl { url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz"; - sha256 = "0274l1p71ps222i62whqfkg80fcc8m4w2hmpbrbbd5gh8kfpman3"; + sha256 = "1ihrmxbsli7c1lm5gw9xgrakyn4nsmaj1zgk5gza2ywnfpgdb0ac"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index ffa414cac3a1..343b2948d5ea 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }: let - version = "3.0.1"; + version = "3.2.0"; # I took several games at random from http://instead.syscall.ru/games/ games = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; - sha256 = "0ynqzmr35zd1vbbv8n3vk93zj0njhs45w9z33wwkphg2zlniwnzb"; + sha256 = "0l57qdngxv9nbfj4ixr4fyanlazmdib2kr1nzv3g578308xzjv6a"; }; NIX_LDFLAGS = "-llua -lgcc_s"; diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index c857ccc47a85..ba273cfb6b97 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lgogdownloader-${version}"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - sha256 = "0p1zh2l8g4y2z02xj0fndbfhcxgcpwhf5d9izwsdi3yljvqv23np"; + sha256 = "056idwwxjcp2zjqk5h7l3py1h45sax4vbsm93bz9shnfx1s1h3gc"; }; nativeBuildInputs = [ cmake pkgconfig help2man ]; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index 0b0561afd24d..d3fb8c7bc58e 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, gnome3, pcre, freetype, glew, gtk3, libjpeg, libpng, SDL, SDL_mixer, libupnp, xorg, pkgconfig, gtest, tinyxml, gmock, readline, - libxkbcommon, epoxy, at_spi2_core, dbus, libxml2, + libxkbcommon, epoxy, at-spi2-core, dbus, libxml2, enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake gnome3.gtksourceview pcre freetype glew gtk3 libjpeg libpng SDL SDL_mixer libupnp tinyxml xorg.libpthreadstubs libxkbcommon xorg.libXdmcp - pkgconfig gtest gmock readline epoxy at_spi2_core dbus libxml2 + pkgconfig gtest gmock readline epoxy at-spi2-core dbus libxml2 ]; meta = with stdenv.lib; { diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 53c2cc5d073a..f64bbe4c1255 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -6,12 +6,12 @@ let src = fetchFromGitHub { owner = "OpenMW"; repo = "osg"; - rev = "35f1a459a4ab6da9d70427e6539bdf4faae4cc91"; - sha256 = "1s3a9dpbcc6v8d05pqin4xfv36i2031xpdja1vl8x11cw05fln91"; + rev = "2b4c8e37268e595b82da4b9aadd5507852569b87"; + sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb"; }; }); in stdenv.mkDerivation rec { - version = "0.42.0"; + version = "0.43.0"; name = "openmw-${version}"; src = fetchFromGitHub { diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 02e4e9c608f0..6257ce484ecf 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { name = "openspades-${version}"; - version = "0.1.1b"; + version = "0.1.2"; devPakVersion = "33"; src = fetchFromGitHub { owner = "yvt"; repo = "openspades"; rev = "v${version}"; - sha256 = "1xk3il5ykxg68hvwb42kpspcxppdib7y3ysaxb8anmmcsk1m3drn"; + sha256 = "1mfj46c3pnn1f6awy3b6faxs26i93a5jsrvkdlr12ndsykvi6ng6"; }; nativeBuildInputs = [ cmake imagemagick unzip zip file ]; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index c0053088db76..071218c1600e 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "pioneer-${version}"; - version = "20171001"; + version = "20180203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "0yxw1zdvidrwc28vxfi3qpx2nq2dix2d6ylwgzq9ph8kgwv9fl5n"; + sha256 = "0hp2mf36kj2v93hka8m8lxw2qhmnjc62wjlpw7c7ix0r8xa01i6h"; }; nativeBuildInputs = [ autoconf automake pkgconfig ]; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index d94a1f9a8d4d..bae26dfbad8c 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, which, pkgconfig, xlibsWrapper, SDL2, mesa, openalSoft -, curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype +{ stdenv, fetchFromGitHub, which, pkgconfig, SDL2, mesa, openalSoft +, curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype }: stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2017-07-25"; + version = "2018-02-23"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "356ae10ef65d4401958d50f03288dcb22d957c96"; - sha256 = "0dz4zqlb9n3skaicj0vfvq4nr3ig80s8nwj9m87b39wc9wq34c5j"; + rev = "0d6edd227a13f1447938da1d1b020303c2545eb2"; + sha256 = "1nsagyzrai8cxhabcv2my8bbwmwckvri288j6x4qi5bmp78xl4hx"; }; nativeBuildInputs = [ which pkgconfig ]; - buildInputs = [ xlibsWrapper SDL2 mesa openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ]; + buildInputs = [ + SDL2 mesa openalSoft curl speex opusfile libogg libvorbis libopus libjpeg + freetype mumble + ]; enableParallelBuilding = true; @@ -28,11 +31,11 @@ stdenv.mkDerivation rec { mkdir -p $out/baseq3 ''; - meta = { + meta = with stdenv.lib; { homepage = https://ioquake3.org/; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.eelco lib.maintainers.abbradar ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ eelco abbradar ]; }; } diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index caaedc44ee0c..d563a8265b5d 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.0.2"; + version = "4.0.1.1"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz"; - sha256 = "0dzn6vlayvnkjm64zwva337rn07lc21kq93m2h8zz8j3wpl11pb4"; + sha256 = "0f2m29m53sngg2kv4km91nxbr53rzhchbpqx5dzrv3p5hq1hp936"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 05fd9ab523b6..40f0b1754941 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; + # Fix build for recent ncurses versions + NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + meta = { homepage = http://rogue.rogueforge.net/rogue-5-4/; description = "The final version of the original Rogue game developed for the UNIX operating system"; diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix new file mode 100644 index 000000000000..de91f26d95de --- /dev/null +++ b/pkgs/games/sil/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchzip, ncurses, libX11, libXaw, libXt, libXext, libXmu, makeWrapper, writeScript, ... }: +let + setup = writeScript "setup" '' + mkdir -p "$ANGBAND_PATH" + # Copy all the data files into place + cp -ar $1/* "$ANGBAND_PATH" + # The copied files are not writable, make them so + chmod +w -R "$ANGBAND_PATH" + ''; +in +stdenv.mkDerivation rec { + name = "Sil-${version}"; + version = "1.3.0"; + + src = fetchzip { + url = "http://www.amirrorclear.net/flowers/game/sil/Sil-130-src.zip"; + sha256 = "1amp2mr3fxascra0k76sdsvikjh8g76nqh46kka9379zd35lfq8w"; + stripRoot=false; + }; + + buildInputs = [ makeWrapper ncurses libX11 libXaw libXt libXext libXmu ]; + + sourceRoot = "source/Sil/src"; + + makefile = "Makefile.std"; + + prePatch = '' + # Allow usage of ANGBAND_PATH + substituteInPlace config.h --replace "#define FIXED_PATHS" "" + ''; + + preConfigure = '' + buildFlagsArray+=("LIBS=-lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses") + ''; + + installPhase = '' + # the makefile doesn't have a sensible install target, so we hav to do it ourselves + mkdir -p $out/bin + cp sil $out/bin/sil + # Wrap the program to set a user-local ANGBAND_PATH, and run the setup script to copy files into place + # We could just use the options for a user-local save and scores dir, but it tried to write to the + # lib directory anyway, so we might as well give everyone a copy + wrapProgram $out/bin/sil \ + --run "set -u" \ + --run "export ANGBAND_PATH=\$HOME/.sil" \ + --run "${setup} ${src}/Sil/lib" + ''; + + meta = { + description = "A rouge-like game set in the first age of Middle-earth"; + longDescription = '' + A game of adventure set in the first age of Middle-earth, when the world still + rang with elven song and gleamed with dwarven mail. + + Walk the dark halls of Angband. Slay creatures black and fell. Wrest a shining + Silmaril from Morgoth’s iron crown. + ''; + homepage = http://www.amirrorclear.net/flowers/game/sil/index.html; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.michaelpj ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index c5e5e525f365..c5633bedf39f 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -38,7 +38,7 @@ let libcap SDL2 libusb1 - dbus_glib + dbus-glib libav atk # Only libraries are needed from those two diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index ffbcd595cc35..c70feca0860f 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "the-powder-toy-${version}"; - version = "92.0.331"; + version = "92.5"; src = fetchFromGitHub { owner = "simtr"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "185zlg20qk6ic9llyf4xka923snqrpdazg568raz0jiafzzsirax"; + sha256 = "1n15kgl4qnz55b32ddgmhrv64cl3awbds8arycn7mkf7akwdg1g6"; }; patches = [ ./fix-env.patch ]; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 4514735bb709..286e408e2555 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.01.1"; + name = "tintin-2.01.4"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "195wrfcys8yy953gdrl1gxryhjnx9lg1vqgxm3dyzm8bi18aa2yc"; + sha256 = "1g7bh8xs1ml0iyraps3a3dzaycci922y7fk5j0wyr4ssyjzsy8nx"; }; buildInputs = [ zlib pcre ]; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index f07fd88fbaf3..1e529fb15817 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -1,43 +1,86 @@ -{stdenv, fetchurl, openal, libpng, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf }: +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, premake4, unzip +, openal, libpng, libvorbis, mesa_glu, SDL2, SDL2_image, SDL2_ttf }: + +let + pname = "tome4"; + + desktop = makeDesktopItem { + desktopName = pname; + name = pname; + exec = "@out@/bin/${pname}"; + icon = "${pname}"; + terminal = "False"; + comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal."; + type = "Application"; + categories = "Game;RolePlaying;"; + genericName = pname; + }; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "1.5.5"; -stdenv.mkDerivation rec { - version = "1.4.9"; - name = "tome4-${version}"; src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "0c82m0g1ps64zghgdrp78m6bvfngcb75whhknqiailld7kz1g9xl"; + sha256 = "0v2qgdfpvdzd1bcbp9v8pfahj1bgczsq2d4xfhh5wg11jgjcwz03"; }; - nativeBuildInputs = [ premake4 ]; + + nativeBuildInputs = [ premake4 makeWrapper unzip ]; + + # tome4 vendors quite a few libraries so someone might want to look into avoiding that... buildInputs = [ mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image ]; + + enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" "-I${SDL2_ttf}/include/SDL2" ]; - preConfigure = '' + + postPatch = '' substituteInPlace premake4.lua \ --replace "/opt/SDL-2.0/include/SDL2" "${SDL2.dev}/include/SDL2" \ --replace "/usr/include/GL" "/run/opengl-driver/include" + ''; + + preConfigure = '' premake4 gmake ''; + makeFlags = [ "config=release" ]; + + # The wrapper needs to cd into the correct directory as tome4's detection of + # the game asset root directory is faulty. + installPhase = '' - install -Dm755 t-engine $out/opt/tome4/t-engine - cat > tome4 <3.0.0 + (fetchpatch { + url = https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch; + sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np"; + }) + ]; + buildInputs = [ Carbon Cocoa ]; buildPhase = '' diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix index ac231f2dfe3d..3076392ecb26 100644 --- a/pkgs/os-specific/darwin/kwm/default.nix +++ b/pkgs/os-specific/darwin/kwm/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "kwm-${version}"; - version = "4.0.4"; + version = "4.0.5"; src = fetchzip { stripRoot = false; url = "https://github.com/koekeishiya/kwm/releases/download/v${version}/Kwm-${version}.zip"; - sha256 = "07rf4ichq511w8qmvd6s602s7xcyjhjp73d5c615sj82cxvgirwc"; + sha256 = "1ld1vblg3hmc6lpb8p2ljvisbkijjkijf4y87z5y1ia4k8pk7mxb"; }; # TODO: Build this properly once we have swiftc. diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index ff32ca01a97f..88e8a9665586 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20171113"; + version = "20180112"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "11gcnk6wjc2sw05hwi4xphvx9ksmkpvsdziaczymqxkaads3f1dy"; + sha256 = "13gj79nnd04szqlrrzzkdr6wi1fky08pi7x8xfbg0jj3d3v0giah"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index 886aa503abbb..4ae449c19aa8 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libaio }: stdenv.mkDerivation { - name = "blktrace-1.1.0"; + name = "blktrace-1.2.0"; # Official source # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { - url = "http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2"; - sha256 = "15cj9aki7z5i5y6bnchqry6yp40r4lmgmam6ar5gslnx0smgm8jl"; + url = "http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2"; + sha256 = "0i9z7ayh9qx4wi0ihyz15bhr1c9aknjl8v5i8c9mx3rhyy41i5i6"; }; buildInputs = [ libaio ]; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index c83a526b2460..744f37b8b8c4 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.28.0"; + name = "busybox-1.28.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1701carjf02y7r3djm1yvyd5kzrcxm4szinp7agfv7fmvfvm6ib0"; + sha256 = "0bk52cxxlya5hg9va87snr9caz9ppdrpdyjwrnbwamhi64y1vzlq"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix index 6ef5476f8e83..d77539fb89ed 100644 --- a/pkgs/os-specific/linux/cachefilesd/default.nix +++ b/pkgs/os-specific/linux/cachefilesd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cachefilesd-${version}"; - version = "0.10.9"; + version = "0.10.10"; src = fetchurl { url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2"; - sha256 = "1jkb3qd8rcmli3g2qgcpp1f9kklil4qgy86w7pg2cpv10ikyr5y8"; + sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd"; }; installFlags = [ diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index f561a65ea5ca..55be85d33f05 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -11,17 +11,17 @@ let in stdenv.mkDerivation rec { name = "displaylink-${version}"; - version = "1.3.52"; + version = "4.1.9"; src = requireFile rec { name = "displaylink.zip"; - sha256 = "0ridpsxcf761vym0nlpq702qa46ynddzci17bjmyax2pph7khr0k"; + sha256 = "d762145014df7fea8ca7af12206a077d73d8e7f2259c8dc2ce7e5fb1e69ef9a3"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - http://www.displaylink.com/downloads/file?id=744 + http://www.displaylink.com/downloads/file?id=1087 Once you have downloaded the file, please use the following commands and re-run the installation: @@ -57,6 +57,9 @@ in stdenv.mkDerivation rec { fixupPhase ''; + dontStrip = true; + dontPatchELF = true; + meta = with stdenv.lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 76f9d8c128c3..534e57354474 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dmtcp-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "dmtcp"; repo = "dmtcp"; rev = version; - sha256 = "1z6cc7avs2sj8csf7rapf7nbw0giva6xpj0cshv7p9s643y8yxmi"; + sha256 = "1sq38in4wk855yhfnzbs9xpnps97fhja93w08xjmx7szzm33g5a8"; }; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 5db64e15e048..730df56a6429 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "evdi-${version}"; - version = "unstable-2018-01-12"; + version = "1.5.0"; src = fetchFromGitHub { owner = "DisplayLink"; repo = "evdi"; - rev = "e7a08d08e3876efba8007e91df1b296f2447b8de"; + rev = "v${version}"; sha256 = "01z7bx5rgpb5lc4c6dxfiv52ni25564djxmvmgy3d7r1x1mqhxgs"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; - hardeningDisable = [ "pic" "format" ]; + hardeningDisable = [ "format" "pic" "fortify" ]; installPhase = '' install -Dm755 module/evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; homepage = http://www.displaylink.com/; - broken = versionOlder kernel.version "4.9"; + broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "4.15"; }; } diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index cd11a79c8f82..e2647112f1b2 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "eventstat-${version}"; - version = "0.03.04"; + version = "0.04.03"; src = fetchzip { url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "1sqf1mfafrw6402qx457gh8yxgsw80311qi0lp4cjl9dfz7vl2x1"; + sha256 = "0yv7rpdg07rihw8iilvigib963nxf16mn26hzlb6qd1wv54k6dbr"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 858f1448dfac..646c18860c5d 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,50 +1,40 @@ -{ stdenv, fetchurl, fetchpatch, gtk_doc, pkgconfig, gobjectIntrospection, intltool -, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking +{ stdenv, fetchurl, fetchpatch, gtk-doc, pkgconfig, gobjectIntrospection, intltool +, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib-networking , libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales , fwupdate, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl -, ninja, gcab, gnutls, python3, wrapGAppsHook, json_glib -, shared_mime_info, umockdev +, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib +, shared-mime-info, umockdev }: let - version = "1.0.4"; + # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc + version = "1.0.5"; python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]); installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]); in stdenv.mkDerivation { name = "fwupd-${version}"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "1n4d6fw3ffg051072hbxn106s52x2wlh5dh2kxwdfjsb5kh03ra3"; + sha256 = "0wm195vkf6x1kg1dz0sbfwpdcn9f6638l7vyzplcfrb3v07pqxpq"; }; outputs = [ "out" "devdoc" "man" "installedTests" ]; nativeBuildInputs = [ - meson ninja gtk_doc pkgconfig gobjectIntrospection intltool glibcLocales shared_mime_info + meson ninja gtk-doc pkgconfig gobjectIntrospection intltool glibcLocales shared-mime-info valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook ]; buildInputs = [ polkit appstream-glib gusb sqlite libarchive libsoup elfutils libsmbios fwupdate libyaml - libgudev colord gpgme libuuid gnutls glib_networking efivar json_glib umockdev + libgudev colord gpgme libuuid gnutls glib-networking efivar json-glib umockdev ]; LC_ALL = "en_US.UTF-8"; # For po/make-images patches = [ ./fix-missing-deps.patch - # https://github.com/hughsie/fwupd/issues/403 (fetchpatch { - url = https://github.com/hughsie/fwupd/commit/bd6082574989e4f48b66c7270bb408d439b77a06.patch; - sha256 = "17pixyizkmn6wlsjmr1wwya17ivn770hdv9mp769vifxinya8w9y"; - }) - # drop docbook2man - (fetchpatch { - url = https://github.com/hughsie/fwupd/commit/2c43d3e6e65868b66a9a64a76123697e259ec7c2.patch; - sha256 = "0vjv7jnai0g96frlipk2sc59pj3mhq9di01hajycjv7y5v6qqrmc"; - }) - # https://github.com/hughsie/fwupd/issues/405 - (fetchpatch { - url = https://github.com/hughsie/fwupd/pull/407.patch; - sha256 = "1dxhqps12x7bz0s974xk5hfpk4nwn1gs29vl0dfi9j54wy18f688"; + url = https://github.com/hughsie/fwupd/commit/767210e4b1401d5d5bb7ac1e7c052a60b6529d88.patch; + sha256 = "00adfabxpgdg74jx7i6jihhh8njjk2r7v3fxqs4scj3vn06k5fmw"; }) ]; @@ -60,7 +50,7 @@ in stdenv.mkDerivation { doCheck = true; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; mesonFlags = [ @@ -77,7 +67,20 @@ in stdenv.mkDerivation { --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0" ''; - enableParallelBuilding = true; + passthru = { + filesInstalledToEtc = [ + "fwupd/remotes.d/fwupd.conf" + "fwupd/remotes.d/lvfs-testing.conf" + "fwupd/remotes.d/lvfs.conf" + "fwupd/remotes.d/vendor.conf" + "pki/fwupd/GPG-KEY-Hughski-Limited" + "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" + "pki/fwupd/LVFS-CA.pem" + "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" + "pki/fwupd-metadata/LVFS-CA.pem" + ]; + }; + meta = with stdenv.lib; { homepage = https://fwupd.org/; maintainers = with maintainers; []; diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index f2bb9bddd578..fd0d222eaac8 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -1,37 +1,62 @@ -{ stdenv, fetchurl, gnu-efi, efivar, libsmbios, popt, pkgconfig -, gettext }: -let version = "8"; in - stdenv.mkDerivation - { name = "fwupdate-${version}"; - src = fetchurl - { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; - sha256 = "10q8k1kghvbcb5fwcl2smzp8vqdfzimx9dkk0c3hz39py1phy4n8"; - }; - makeFlags = - [ "EFIDIR=nixos" - "LIBDIR=$(out)/lib" - "GNUEFIDIR=${gnu-efi}/lib" - "TARGETDIR=$(out)/boot/efi/nixos/" - "prefix=$(out)/" - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnu-efi libsmbios popt gettext ]; - propagatedBuildInputs = [ efivar ]; - # TODO: Just apply the disable to the efi subdir - hardeningDisable = [ "all" ]; - patchPhase = '' - sed -i 's|/usr/include/smbios_c/token.h|smbios_c/token.h|' \ - linux/libfwup.c - sed -i 's|/usr/share|$(prefix)share|' linux/Makefile - sed -i "s|/usr/include|$out/include|" linux/fwup.pc.in - find . -type f -print0 | xargs -0 sed -i -e 's|/boot/efi|/boot|g' -e 's|/boot/efi/EFI|/boot/EFI|g' - ''; - configurePhase = '' - arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' ) - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi -I${efivar}/include/efivar -I${gnu-efi}/include/efi/$arch" - ''; - meta = - { license = [ stdenv.lib.licenses.gpl2 ]; - platforms = stdenv.lib.platforms.linux; - }; - } +{ efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }: +let + version = "10"; +in stdenv.mkDerivation { + name = "fwupdate-${version}"; + src = fetchurl { + url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; + sha256 = "0fpk3q0msq2l0bs2mvk0cqp8jbwnmi17ggc81r4v96h4jxh2rx3k"; + }; + + patches = [ + # https://github.com/rhboot/fwupdate/pull/99 + ./fix-paths.patch + ./do-not-create-sharedstatedir.patch + ]; + + NIX_CFLAGS_COMPILE = [ "-I${gnu-efi}/include/efi" ]; + + # TODO: Just apply the disable to the efi subdir + hardeningDisable = [ "stackprotector" ]; + + makeFlags = [ + "EFIDIR=nixos" + "prefix=$(out)" + "LIBDIR=$(out)/lib" + "GNUEFIDIR=${gnu-efi}/lib" + "ESPMOUNTPOINT=$(out)/boot" + ]; + + nativeBuildInputs = [ + pkgconfig + gettext + ]; + + buildInputs = [ + gnu-efi + libsmbios + popt + ]; + + propagatedBuildInputs = [ + efivar + ]; + + # TODO: fix wrt cross-compilation + preConfigure = '' + arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' ) + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi/$arch" + ''; + + postInstall = '' + rm -rf $out/src + rm -rf $out/lib/debug + ''; + + meta = with stdenv.lib; { + description = "Tools for using the ESRT and UpdateCapsule() to apply firmware updates"; + maintainers = with maintainers; [ ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch b/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch new file mode 100644 index 000000000000..b8588ef2b11a --- /dev/null +++ b/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch @@ -0,0 +1,10 @@ +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -131,7 +131,6 @@ + ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so.1,$(DESTDIR)$(libdir)/$(x)) ;\ + ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so,$(DESTDIR)$(libdir)/$(x)) ;\ + ) +- $(INSTALL) -d -m 755 $(DESTDIR)$(sharedstatedir)/fwupdate/ + $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)/fwupdate/ + $(INSTALL) -m 755 cleanup $(DESTDIR)$(libexecdir)/fwupdate/cleanup + $(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system diff --git a/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch new file mode 100644 index 000000000000..b01dfa355ef7 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch @@ -0,0 +1,116 @@ +--- a/Make.defaults ++++ b/Make.defaults +@@ -18,19 +18,20 @@ + ABIDIFF := abidiff + ABIDW := abidw + prefix ?= /usr/ +-prefix := $(abspath $(prefix))/ ++prefix := $(abspath $(prefix)) ++exec_prefix ?= $(prefix) + ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,) + ifeq ($(ARCH),x86_64) +- LIBDIR ?= $(prefix)lib64 ++ LIBDIR ?= $(exec_prefix)/lib64 + endif + ifeq ($(ARCH),ia32) +- LIBDIR ?= $(prefix)lib ++ LIBDIR ?= $(exec_prefix)/lib + endif + ifeq ($(ARCH),aarch64) +- LIBDIR ?= $(prefix)lib64 ++ LIBDIR ?= $(exec_prefix)/lib64 + endif + ifeq ($(ARCH),arm) +- LIBDIR ?= $(prefix)lib ++ LIBDIR ?= $(exec_prefix)/lib + endif + LIBDIR ?= unknown + ifeq ($(LIBDIR),unknown) +@@ -45,13 +46,13 @@ + GNUEFIDIR ?= $(LIBDIR)/gnuefi + libdir ?= $(LIBDIR) + pcdir ?= $(libdir)/pkgconfig +-mandir ?= $(prefix)share/man +-includedir ?= $(prefix)include +-bindir ?= $(prefix)bin +-datadir ?= $(prefix)share ++mandir ?= $(prefix)/share/man ++includedir ?= $(prefix)/include ++bindir ?= $(exec_prefix)/bin ++datadir ?= $(prefix)/share + localedir ?= $(datadir)/locale +-libexecdir ?= $(prefix)libexec +-libdatadir ?= $(prefix)lib ++libexecdir ?= $(exec_prefix)/libexec ++libdatadir ?= $(exec_prefix)/lib + sharedstatedir ?= /var/lib + + EFIDIR ?= $(shell x=$$(which --skip-alias --skip-functions git 2>/dev/null) ; [ -n "$$x" ] && git config --get fwupdate.efidir) +@@ -63,8 +64,8 @@ + ESPMOUNTPOINT = "/boot/efi" + endif + +-DEBUGINFO ?= $(prefix)lib/debug +-DEBUGSOURCE ?= $(prefix)src/debug ++DEBUGINFO ?= $(exec_prefix)/lib/debug ++DEBUGSOURCE ?= $(prefix)/src/debug + TARGETDIR ?= $(ESPMOUNTPOINT)/EFI/$(EFIDIR) + + .PHONY: check_efidir_error +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -93,16 +93,19 @@ + sed -e "s,@@VERSION@@,$(VERSION),g" \ + -e "s,@@FWUP_MAJOR_VERSION@@,$(MAJOR_VERSION),g" \ + -e "s,@@FWUP_MINOR_VERSION@@,$(MINOR_VERSION),g" \ ++ -e "s,@@PREFIX@@,$(prefix),g" \ ++ -e "s,@@EXEC_PREFIX@@,$(exec_prefix),g" \ + -e "s,@@SHAREDSTATEDIR@@,$(sharedstatedir),g" \ + -e "s,@@ESPMOUNTPOINT@@,$(ESPMOUNTPOINT),g" \ + -e "s,@@EFIDIR@@,$(EFIDIR),g" \ + -e "s,@@LIBDIR@@,$(libdir),g" \ + -e "s,@@LIBEXECDIR@@,$(libexecdir),g" \ ++ -e "s,@@INCLUDEDIR@@,$(includedir),g" \ + $< > $@ + + tester : tester.c +- $(CC) -Wall -Werror -ggdb -L. -I./include -I/usr/include/efivar \ +- -lefivar -lfwup -o $@ $^ ++ $(CC) -Wall -Werror -ggdb -L. -I./include $(shell $(PKG_CONFIG) --cflags efivar) \ ++ $(shell $(PKG_CONFIG) --libs efivar) -lfwup -o $@ $^ + + test : tester + LD_LIBRARY_PATH=$(shell pwd) ./tester +@@ -134,6 +137,6 @@ + $(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system + $(INSTALL) -m 644 cleanup.service \ + $(DESTDIR)$(libdatadir)/systemd/system/fwupdate-cleanup.service +- $(INSTALL) -d -m 755 $(DESTDIR)/usr/share/bash-completion/completions/ ++ $(INSTALL) -d -m 755 $(DESTDIR)$(datadir)/bash-completion/completions/ + $(INSTALL) -m 755 $(VPATH)/bash-completion \ +- $(DESTDIR)/usr/share/bash-completion/completions/fwupdate ++ $(DESTDIR)$(datadir)/bash-completion/completions/fwupdate +--- a/linux/fwup.pc.in ++++ b/linux/fwup.pc.in +@@ -1,7 +1,7 @@ +-prefix=/usr +-exec_prefix=/usr ++prefix=@@PREFIX@@ ++exec_prefix=@@EXEC_PREFIX@@ + libdir=@@LIBDIR@@ +-includedir=/usr/include ++includedir=@@INCLUDEDIR@@ + + Name: fwup + Description: Library for deployment of UEFI firmware updates. +--- a/linux/libfwup.c ++++ b/linux/libfwup.c +@@ -35,7 +35,7 @@ + + #include + #ifdef FWUPDATE_HAVE_LIBSMBIOS__ +-#include ++#include + #include + #endif + diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index a299fd0f4338..27b85fbfc89a 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }: stdenv.mkDerivation { - name = "hal-flash-0.3.0"; + name = "hal-flash-0.3.3"; src = fetchurl { - url = "https://github.com/cshorler/hal-flash/archive/v0.3.0.tar.gz"; - sha256 = "163pqy39cca8cnf8rm8zr63ndsnr7rki9pf9j7dl9gyxmi7sx88s"; + url = "https://github.com/cshorler/hal-flash/archive/v0.3.3.tar.gz"; + sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 8ebce1965301..6f2dc807fbab 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.308"; + version = "0.309"; src = fetchurl { - url = "https://github.com/vcrhonek/hwdata/archive/v0.308.tar.gz"; - sha256 = "17zcwplw41dfwb2l9jfgvm65rjzlsbv30f56d6vgiix042f92vcq"; + url = "https://github.com/vcrhonek/hwdata/archive/v0.309.tar.gz"; + sha256 = "1njx4lhg7a0cawz82x535vk4mslmnfj7nmf8dbq8kgqxiqh6h2c7"; }; preConfigure = "patchShebangs ./configure"; diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index cdcae22a18e9..0ccc8acfdca9 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake -, glib, gtk3, gtk_doc, libgudev, pkgconfig, systemd }: +, glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }: stdenv.mkDerivation rec { name = "iio-sensor-proxy-${version}"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { owner = "hadess"; repo = "iio-sensor-proxy"; rev = version; - sha256 = "1x0whwm2r9g50hq5px0bgsrigy8naihqgi6qm0x5q87jz5lkhrnv"; + sha256 = "1c8izq73c00gvv0jc6zby5hcircs4cb16a1d3ivp1i1iflknj46n"; }; configurePhase = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - gtk_doc + gtk-doc libgudev systemd ]; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 6039ada44e24..c78a4eadfa4e 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "ipset-6.34"; + name = "ipset-6.35"; src = fetchurl { url = "http://ipset.netfilter.org/${name}.tar.bz2"; - sha256 = "106nv1ngcvap0mqmb6jm07lc1q3w796rkzc1vrfs4yhbcwdq63np"; + sha256 = "1p7l1fj3lbv6rr24zxjiwq7jk1yvazk8db6yyni0qbprw49i01rp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index b97f48af414a..d1e40371e370 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. - ${stdenv.lib.optionalString (stdenv.isArm || stdenv.system == "mips64el-linux") '' + ${stdenv.lib.optionalString (stdenv.isArm || stdenv.hostPlatform.isMips) '' sed -i s/-Werror// src/Makefile.am ''} ''; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2fa343412019..5fbd9955c2a3 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -134,6 +134,7 @@ with stdenv.lib; ''} NETFILTER y NETFILTER_ADVANCED y + CGROUP_BPF? y # Required by systemd per-cgroup firewalling IP_ROUTE_VERBOSE y IP_MROUTE_MULTIPLE_TABLES y IP_VS_PROTO_TCP y diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix deleted file mode 100644 index e89222b2c629..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -buildLinux (args // rec { - version = "4.13.16"; - extraMeta.branch = "4.13"; - - # TODO: perhaps try being more concrete (ideally CVE numbers). - extraMeta.knownVulnerabilities = [ - "ALSA: usb-audio: Fix potential out-of-bound access at parsing SU" - "eCryptfs: use after free in ecryptfs_release_messaging()" - ]; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0cf7prqzl1ajbgl98w0symdyn0k5wl5xaf1l5ldgy6l083yg69dh"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index b5fd5168cf82..ab2201953864 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.20"; + version = "4.14.23"; # 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 = "14njnspxmyzpapjzm8macrv411ss63xb39nb00xix75glqmg9dsa"; + sha256 = "1jhjazzaw5m92jl7cbchzfg5fyci7fp285bilydfvaibb9avb5ws"; }; } // (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 4bdcfba5db73..1c4889892439 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.4"; + version = "4.15.7"; # 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 = "0fla9k90y6vaqvyjk81f59smcifcwickx4yr662m4whzkhd7wgd2"; + sha256 = "1in8gy82ccpri7xhbgim3jrh15lbfrfzjgg69g0yvq534d5xyi6d"; }; } // (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 94425f4d1e47..5d7f2fbfe74d 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.116"; + version = "4.4.119"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18sz68gbms5rvjiy51b1dg1jlr7pwazw9fg6q5ffczk22icflvsn"; + sha256 = "1rj3hk31bx9nvpx0dmwiijyixiv0dcxvp2cx4fbkbs9fddxrn7sg"; }; } // (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 80db885170e4..5c5363ccded7 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.82"; + version = "4.9.85"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "105im51ax2cwfqkljfi1sqh6sap6sc76zh5l9n7fpbys04khnwab"; + sha256 = "1hb5v5ycgg5wbv28s8vxw804blfshpf82chrwspdbl2vwkp17zl0"; }; } // (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 0e39bc421c95..85d31048ffc2 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.4"; + version = "4.15.7"; revision = "a"; - sha256 = "0j7nla8vjrxr82nfx8dl34qk8b56piwqbndqch9rv7plgl30hkj7"; + sha256 = "19kgy1fa4flnqm3a50hilgjczqkscay10183cvkzy3vxrnf8fl0f"; # 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/kernel/linux-riscv.nix b/pkgs/os-specific/linux/kernel/linux-riscv.nix index b2eb0a69a8ec..45795e24c542 100644 --- a/pkgs/os-specific/linux/kernel/linux-riscv.nix +++ b/pkgs/os-specific/linux/kernel/linux-riscv.nix @@ -1,15 +1,15 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.16-rc1"; - modDirVersion = "4.16.0-rc1"; + version = "4.16-rc2"; + modDirVersion = "4.16.0-rc2"; extraMeta.branch = "4.16"; src = fetchFromGitHub { - owner = "riscv"; + owner = "shlevy"; repo ="riscv-linux"; - rev = "a31991a9c6ce2c86fd676cf458a0ec10edc20d37"; - sha256 = "0n97wfbi3pnp5c70xfj7s0fk8zjjkjz6ldxh7n54kbf64l4in01f"; + rev = "f0c42cff9292c0a8e6ca702a54aafa04b35758a6"; + sha256 = "050mdciyz1595z81zsss0v9vqsaysppyzqaqpfs5figackifv3iv"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 42e14ad7c40b..e163459d7f4f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -73,33 +73,4 @@ rec { }; }; - riscv_modules = { - name = "riscv-modules"; - patch = ./riscv-modules.patch; - }; - - # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000054.html - riscv_irq_busy = { - name = "riscv-irq-busy"; - patch = ./riscv-irq-busy.patch; - }; - - # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000059.html - riscv_install = { - name = "riscv-install"; - patch = ./riscv-install.patch; - }; - - # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000056.html - riscv_initrd = { - name = "riscv-initrd"; - patch = ./riscv-initrd.patch; - }; - - # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000058.html - riscv_initrd_free = { - name = "riscv-initrd-free"; - patch = ./riscv-initrd-free.patch; - }; - } diff --git a/pkgs/os-specific/linux/kernel/riscv-initrd-free.patch b/pkgs/os-specific/linux/kernel/riscv-initrd-free.patch deleted file mode 100644 index 680448385246..000000000000 --- a/pkgs/os-specific/linux/kernel/riscv-initrd-free.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit b1fbec8b74ace263ce1371e6bcfdd1dd71b52070 -Author: Shea Levy -Date: Tue Feb 20 08:48:12 2018 -0500 - - riscv: Implement free_initrd_mem. - - v2: Remove incorrect page alignment. - - Signed-off-by: Shea Levy - -diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c -index c77df8142be2..1b6daa5184e0 100644 ---- a/arch/riscv/mm/init.c -+++ b/arch/riscv/mm/init.c -@@ -66,5 +66,6 @@ void free_initmem(void) - #ifdef CONFIG_BLK_DEV_INITRD - void free_initrd_mem(unsigned long start, unsigned long end) - { -+ free_reserved_area((void *)start, (void *)end, -1, "initrd"); - } - #endif /* CONFIG_BLK_DEV_INITRD */ diff --git a/pkgs/os-specific/linux/kernel/riscv-initrd.patch b/pkgs/os-specific/linux/kernel/riscv-initrd.patch deleted file mode 100644 index 2313e7645843..000000000000 --- a/pkgs/os-specific/linux/kernel/riscv-initrd.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 1e5f6473492f41355289d022003a049ebf8995fa -Author: Shea Levy -Date: Tue Feb 20 07:52:14 2018 -0500 - - riscv: Respect the initrd found in the dt, if any. - - Signed-off-by: Shea Levy - -diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c -index 41d34008faf6..c4ebc907af34 100644 ---- a/arch/riscv/kernel/setup.c -+++ b/arch/riscv/kernel/setup.c -@@ -88,15 +88,20 @@ static void __init setup_initrd(void) - extern unsigned long __initramfs_size; - unsigned long size; - -+ if (initrd_start) -+ goto found; -+ - if (__initramfs_size > 0) { - initrd_start = (unsigned long)(&__initramfs_start); - initrd_end = initrd_start + __initramfs_size; - } - -+ initrd_below_start_ok = 1; - if (initrd_start >= initrd_end) { - printk(KERN_INFO "initrd not found or empty"); - goto disable; - } -+found: - if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { - printk(KERN_ERR "initrd extends beyond end of memory"); - goto disable; -@@ -104,13 +109,13 @@ static void __init setup_initrd(void) - - size = initrd_end - initrd_start; - memblock_reserve(__pa(initrd_start), size); -- initrd_below_start_ok = 1; - - printk(KERN_INFO "Initial ramdisk at: 0x%p (%lu bytes)\n", - (void *)(initrd_start), size); - return; - disable: - pr_cont(" - disabling initrd\n"); -+ initrd_below_start_ok = 0; - initrd_start = 0; - initrd_end = 0; - } diff --git a/pkgs/os-specific/linux/kernel/riscv-install.patch b/pkgs/os-specific/linux/kernel/riscv-install.patch deleted file mode 100644 index 707230e9a336..000000000000 --- a/pkgs/os-specific/linux/kernel/riscv-install.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit 365fc1312f4911bfae25c5914c398f9aca21948f -Author: Shea Levy -Date: Mon Feb 19 10:50:58 2018 -0500 - - riscv: Add install target to Makefile. - - Signed-off-by: Shea Levy - -diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile -index 6719dd30ec5b..26892daefa05 100644 ---- a/arch/riscv/Makefile -+++ b/arch/riscv/Makefile -@@ -70,3 +70,7 @@ core-y += arch/riscv/kernel/ arch/riscv/mm/ - libs-y += arch/riscv/lib/ - - all: vmlinux -+ -+PHONY += install -+install: vmlinux -+ sh $(srctree)/arch/riscv/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)" -diff --git a/arch/riscv/install.sh b/arch/riscv/install.sh -new file mode 100644 -index 000000000000..8b3155a11a4a ---- /dev/null -+++ b/arch/riscv/install.sh -@@ -0,0 +1,39 @@ -+#!/bin/sh -+# -+# arch/riscv/install.sh -+# -+# This file is subject to the terms and conditions of the GNU General Public -+# License. See the file "COPYING" in the main directory of this archive -+# for more details. -+# -+# Copyright (C) 1995 by Linus Torvalds -+# -+# Adapted from code in arch/ia64/Makefile by Shea Levy -+# -+# "make install" script for riscv architecture -+# -+# Arguments: -+# $1 - kernel version -+# $2 - kernel image file -+# $3 - kernel map file -+# $4 - default install path (blank if root directory) -+# -+ -+# User may have a custom install script -+ -+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi -+if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi -+ -+# Default install - no bootloader configuration (yet?) -+base=$(basename $2) -+ -+if [ -f $4/$base ]; then -+ mv $4/$base $4/$base.old -+fi -+ -+if [ -f $4/System.map ]; then -+ mv $4/System.map $4/System.old -+fi -+ -+cat $2 > $4/$base -+cp $3 $4/System.map diff --git a/pkgs/os-specific/linux/kernel/riscv-irq-busy.patch b/pkgs/os-specific/linux/kernel/riscv-irq-busy.patch deleted file mode 100644 index 5f5e8f0c8b7b..000000000000 --- a/pkgs/os-specific/linux/kernel/riscv-irq-busy.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit 2603e6087b26e9428b806b267aee6bcb919abcea -Author: Shea Levy -Date: Sun Feb 18 20:08:30 2018 -0500 - - set_handle_irq: Return EBUSY if the handler has already been registered. - - This is what's expected by the comments and at least by irq-riscv-intc.c - - Signed-off-by: Shea Levy - -diff --git a/include/linux/irq.h b/include/linux/irq.h -index 2930fd2572e4..77e97872a13e 100644 ---- a/include/linux/irq.h -+++ b/include/linux/irq.h -@@ -1179,7 +1179,7 @@ int ipi_send_mask(unsigned int virq, const struct cpumask *dest); - * Returns 0 on success, or -EBUSY if an IRQ handler has already been - * registered. - */ --void __init set_handle_irq(void (*handle_irq)(struct pt_regs *)); -+int __init set_handle_irq(void (*handle_irq)(struct pt_regs *)); - - /* - * Allows interrupt handlers to find the irqchip that's been registered as the -diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c -index dee4f9a172ca..3570c715c3e7 100644 ---- a/kernel/irq/handle.c -+++ b/kernel/irq/handle.c -@@ -213,11 +213,12 @@ irqreturn_t handle_irq_event(struct irq_desc *desc) - } - - #ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER --void __init set_handle_irq(void (*handle_irq)(struct pt_regs *)) -+int __init set_handle_irq(void (*handle_irq)(struct pt_regs *)) - { - if (handle_arch_irq) -- return; -+ return -EBUSY; - - handle_arch_irq = handle_irq; -+ return 0; - } - #endif diff --git a/pkgs/os-specific/linux/kernel/riscv-modules.patch b/pkgs/os-specific/linux/kernel/riscv-modules.patch deleted file mode 100644 index 6d5356e0e46f..000000000000 --- a/pkgs/os-specific/linux/kernel/riscv-modules.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur linux-4.15.4-orig/arch/riscv/configs/defconfig linux-4.15.4/arch/riscv/configs/defconfig ---- linux-4.15.4-orig/arch/riscv/configs/defconfig 2018-02-16 14:07:01.000000000 -0500 -+++ linux-4.15.4/arch/riscv/configs/defconfig 2018-02-18 18:33:09.488431900 -0500 -@@ -12,6 +12,7 @@ - CONFIG_NAMESPACES=y - CONFIG_USER_NS=y - CONFIG_BLK_DEV_INITRD=y -+CONFIG_MODULES=y - CONFIG_EXPERT=y - CONFIG_CHECKPOINT_RESTORE=y - CONFIG_BPF_SYSCALL=y diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 5d3e0dc8c975..62898675f2be 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,38 +1,37 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libtool, gettext +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext , libxml2, perl, doxygen }: stdenv.mkDerivation rec { name = "libsmbios-${version}"; - version = "2.3.3"; + version = "2.4.1"; src = fetchFromGitHub { owner = "dell"; repo = "libsmbios"; rev = "v${version}"; - sha256 = "1cl5nb6qk8ki87hwqf9n1dd9nlhkjnlpdxlhzvm82za16gs7apkl"; + sha256 = "158w5fz777is7nr5yhpr69b17nn6i1pavycxq1q9899frrpkzbsc"; }; - nativeBuildInputs = [ autoreconfHook doxygen gettext libtool perl pkgconfig ]; - buildInputs = [ libxml2 ]; + nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ]; configureFlags = [ "--disable-python" "--disable-graphviz" ]; enableParallelBuilding = true; - postInstall = - '' - mkdir -p $out/include - cp -a src/include/smbios_c $out/include/ - cp -a out/public-include/smbios_c $out/include/ - ''; + postInstall = '' + mkdir -p $out/include + cp -a src/include/smbios_c $out/include/ + cp -a out/public-include/smbios_c $out/include/ + ''; preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs - meta = { + meta = with stdenv.lib; { homepage = https://github.com/dell/libsmbios; description = "A library to obtain BIOS information"; - license = with stdenv.lib.licenses; [ osl21 gpl2Plus ]; + license = with licenses; [ osl21 gpl2Plus ]; + maintainers = with maintainers; [ ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 200654909c28..a825314683ea 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "mbpfan-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "dgraziotin"; repo = "mbpfan"; rev = "v${version}"; - sha256 = "1iri1py9ym0zz7fcacbf0d9y3i3ay77jmajckchagamkfha16zyp"; + sha256 = "1l8fj92jxfp0sldvznsdsm3pn675b35clq3371h6d5wk4jx67fvg"; }; installPhase = '' mkdir -p $out/bin $out/etc diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index a65f983bb36d..ac176c7d3b36 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "153"; + version = "154"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1wz55dzqdiam511d6p1958al6vzlhrhs73s7gly0mzm6kpji0gxa"; + sha256 = "0vq7r3zknr62rmi9g0zd7mmxframm79vmrdw029pc7z6wrlv40cy"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index f74ac9c41eee..0f8f088945aa 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.18"; + version = "1.1.19"; src = fetchurl { url = "http://www.musl-libc.org/releases/musl-${version}.tar.gz"; - sha256 = "0651lnj5spckqjf83nz116s8qhhydgqdy3rkl4icbh5f05fyw5yh"; + sha256 = "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv"; }; enableParallelBuilding = true; @@ -47,8 +47,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - patches = [ ./few-more-uapi-fixes.patch ]; - dontDisableStatic = true; dontStrip = true; diff --git a/pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch b/pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch deleted file mode 100644 index f84ca2c5aec8..000000000000 --- a/pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://www.openwall.com/lists/musl/2018/01/06/3 - -Date: Sat, 6 Jan 2018 23:32:52 +0100 -From: Hauke Mehrtens -To: musl@...ts.openwall.com -Cc: felix.janda@...teo.de, - Hauke Mehrtens -Subject: [PATCH v2] Add additional uapi guards for Linux kernel header files - -With Linux kernel 4.16 it will be possible to guard more parts of the -Linux header files from a libc. Make use of this in musl to guard all -the structures and other definitions from the Linux header files which -are also defined by the header files provided by musl. This will make -musl compile with the unmodified Linux kernel user space headers. - -This extends the definitions done in commit 04983f227238 ("make -netinet/in.h suppress clashing definitions from kernel headers") - -The needed patches were recently accepted into the netdev tree and will be integrated in Linux 4.16: -https://patchwork.ozlabs.org/patch/854342/ -https://patchwork.ozlabs.org/patch/855293/ ---- - include/net/if.h | 7 +++++++ - include/netinet/if_ether.h | 1 + - include/sys/xattr.h | 2 ++ - 3 files changed, 10 insertions(+) - -diff --git a/include/net/if.h b/include/net/if.h -index 2f2fcc10..0ee48cd7 100644 ---- a/include/net/if.h -+++ b/include/net/if.h -@@ -125,6 +125,13 @@ struct ifconf { - #define ifc_req ifc_ifcu.ifcu_req - #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) - -+#define __UAPI_DEF_IF_IFCONF 0 -+#define __UAPI_DEF_IF_IFMAP 0 -+#define __UAPI_DEF_IF_IFNAMSIZ 0 -+#define __UAPI_DEF_IF_IFREQ 0 -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+ - #endif - - #ifdef __cplusplus -diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h -index d9a131aa..c2c6e944 100644 ---- a/include/netinet/if_ether.h -+++ b/include/netinet/if_ether.h -@@ -133,5 +133,6 @@ do { \ - (enaddr)[5] = ((uint8_t *)ipaddr)[3]; \ - } while(0) - -+#define __UAPI_DEF_ETHHDR 0 - - #endif -diff --git a/include/sys/xattr.h b/include/sys/xattr.h -index 6479fcc6..52e3dd89 100644 ---- a/include/sys/xattr.h -+++ b/include/sys/xattr.h -@@ -24,6 +24,8 @@ int removexattr(const char *, const char *); - int lremovexattr(const char *, const char *); - int fremovexattr(int, const char *); - -+#define __UAPI_DEF_XATTR 0 -+ - #ifdef __cplusplus - } - #endif --- -2.11.0 diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 9d645fb1d848..7edc7b58c6c3 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -2,11 +2,11 @@ , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - name = "nftables-0.8"; + name = "nftables-0.8.2"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "16iq9x0qxikdhp1nan500rk33ycqddl1k57876m4dfv3n7kqhnrz"; + sha256 = "1v370wzh3fzby0cdb9iykkhdj1yjcp5qkp33xyn7w7pii2phlpv7"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index aec6e57e9144..99caa813b2ea 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.10"; + version = "0.01.12"; src = fetchFromGitHub { - sha256 = "04dbcr7bzgp4kvhw1rsn084cz4qbfhf7ifyh3ikgdka9w98057h1"; + sha256 = "0bddn22daf33dbghwfjxxgsn4gmr5knr6h9sbqhs7g7p85dla6wa"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index dfcd53ec7786..c38990bdf8fd 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }: stdenv.mkDerivation rec { - name = "pam_mount-2.15"; + name = "pam_mount-2.16"; src = fetchurl { - url = "mirror://sourceforge/pam-mount/pam_mount/2.15/${name}.tar.xz"; - sha256 = "091aq5zyc60wh21m1ryanjwknwxlaj9nvlswn5vjrmcdir5gnkm5"; + url = "mirror://sourceforge/pam-mount/pam_mount/2.16/${name}.tar.xz"; + sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 57ef22083fe4..523f7382a2cf 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -4,17 +4,16 @@ stdenv.mkDerivation rec { name = "pipework-${version}"; - version = "2015-07-30"; + version = "2017-08-22"; src = fetchFromGitHub { owner = "jpetazzo"; repo = "pipework"; - rev = "5a46ecb5f8f933fd268ef315f58a1eb1c46bd93d"; - sha256 = "02znyg5ir37s8xqjcqqz6xnwyqxapn7c4scyqkcapxr932hf1frh"; + rev = "ae42f1b5fef82b3bc23fe93c95c345e7af65fef3"; + sha256 = "0c342m0bpq6ranr7dsxk9qi5mg3j5aw9wv85ql8gprdb2pz59qy8"; }; buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/bin - cp pipework $out/bin + install -D pipework $out/bin/pipework wrapProgram $out/bin/pipework --prefix PATH : \ ${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]}; ''; diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index c1049d78f42a..63d159e18842 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, intltool, ntfs3g, utillinux +{ stdenv, fetchurl, cryptsetup, dbus, dbus-glib, intltool, ntfs3g, utillinux , mediaDir ? "/media/" , lockDir ? "/var/lock/pmount" , whiteList ? "/etc/pmount.allow" diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index 1cdf9044b8ff..3698b2b281f9 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -3,7 +3,7 @@ , fetchurl , pciutils , confuse -, dbus, dbus_glib +, dbus, dbus-glib , alsaLib , audiofile , pkgconfig @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { dbus alsaLib audiofile - dbus_glib + dbus-glib pkgconfig gtk2 gettext diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 12b361e953ea..b120062295ad 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, requireFile, makeWrapper, substituteAll, p7zip -, gawk, utillinux, xorg, glib, dbus_glib, zlib +, gawk, utillinux, xorg, glib, dbus-glib, zlib , kernel ? null, libsOnly ? false , undmg, fetchurl }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { libPath = with xorg; stdenv.lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ] - ++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]); + ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]); installPhase = '' diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 77f94e544a07..b25ed85ce4b3 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "16.1"; + version = "17"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1fixw6hpf732vzlpczx0b2y84jrhgfjr3cljqxky7makzgh2s7ng"; + sha256 = "1xql46favv8i4ni4zqkk9ra2kcqq2dyn7jyi940c869lndmjw9ni"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix new file mode 100644 index 000000000000..52542aabfded --- /dev/null +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +with lib; + +let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtl8192eu"; + +in stdenv.mkDerivation rec { + name = "rtl8192eu-${kernel.version}-${version}"; + version = "4.4.1"; + + src = fetchFromGitHub { + owner = "Mange"; + repo = "rtl8192eu-linux-driver"; + rev = "4094004"; + sha256 = "0rgcsp8bd5i5ik9b35qipdhq0xd8pva8kdijixxfaxm4vw6kbrvr"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p ${modDestDir} + find . -name '*.ko' -exec cp --parents {} ${modDestDir} \; + find ${modDestDir} -name '*.ko' -exec xz -f {} \; + ''; + + meta = { + description = "Realtek rtl8192eu driver"; + homepage = https://github.com/Mange/rtl8192eu-linux-driver; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ troydm ]; + }; +} diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix new file mode 100644 index 000000000000..99b42fc74007 --- /dev/null +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, fetchpatch, kernel }: + +stdenv.mkDerivation rec { + name = "rtl8814au-${kernel.version}-${version}"; + version = "4.3.21"; + + src = fetchFromGitHub { + owner = "zebulon2"; + repo = "rtl8814au"; + rev = "a58c56a5a6cb99ffb872f07cb67b68197911854f"; + sha256 = "1ffm67da183nz009gm5v9w1bab081hrm113kk8knl9s5qbqnn13q"; + }; + + buildInputs = kernel.moduleBuildDependencies; + + hardeningDisable = [ "pic" ]; + + NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; + + prePatch = '' + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + meta = with stdenv.lib; { + description = "Realtek 8814AU USB WiFi driver"; + homepage = https://github.com/zebulon2/rtl8814au; + license = licenses.gpl2; + maintainers = [ maintainers.lassulus ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 4bf3ef82978e..b29b1f639cf7 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "rtlwifi_new-${version}"; - version = "2017-07-18"; + version = "2018-02-17"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtlwifi_new"; - rev = "a24cb561b4d23187ea103255336daa7ca88791a7"; - sha256 = "1w9rx5wafcp1vc4yh7lj332bv78szl6gmx3ckr8yl6c39alqcv0d"; + rev = "0588ac0cc5f530e7764705416370b70d3c2afedc"; + sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m"; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 8875d7ec4b3e..ca15571d1ede 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2 -, docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison +, docbook_xml_dtd_412, docbook_xsl, gnome-doc-utils, flex, bison , pam ? null, glibcCross ? null , buildPlatform, hostPlatform }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; nativeBuildInputs = [autoreconfHook libxslt libxml2 - docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison + docbook_xml_dtd_412 docbook_xsl gnome-doc-utils flex bison ]; patches = diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index adfcc76c31c1..d8e95ff74c43 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-11.2.5"; + name = "sysstat-11.7.2"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "1r7869pnylamjry5f5l5m1jn68v61js9wdkz8yn37a9a2bcrqp2d"; + sha256 = "169yh9d0ags9xrn5g0k42wd1c895117zbzs257cjxqnb2vk0a38v"; }; buildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9085b1703c0a..fc72728cbabe 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -8,6 +8,7 @@ , ninja, meson, python3Packages, glibcLocales , patchelf , getent +, hostPlatform }: assert stdenv.isLinux; @@ -15,211 +16,206 @@ assert stdenv.isLinux; let pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); -in +in stdenv.mkDerivation rec { + version = "237"; + name = "systemd-${version}"; - stdenv.mkDerivation rec { - version = "237"; - name = "systemd-${version}"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "systemd"; + rev = "98067cc806ae0d2759cdd2334f230cd8548e5317"; + sha256 = "077svfs2xy3g30s62q69wcv5pb9vfhzh8i7lhfri73vvhwbpzd5q"; + }; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "systemd"; - rev = "1e8830dfa77a7dc6976509f4a6edb7e012c50792"; - sha256 = "1cw1k0i68azmzpqzi3r8jm6mbi2wqlql78fhcg0vvnv1ly8bf7vq"; - }; + outputs = [ "out" "lib" "man" "dev" ]; - outputs = [ "out" "lib" "man" "dev" ]; + nativeBuildInputs = + [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 + ninja meson + coreutils # meson calls date, stat etc. + pythonLxmlEnv glibcLocales + patchelf getent + ]; + buildInputs = + [ linuxHeaders libcap kmod xz pam acl + /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2 + libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor + iptables gnu-efi + ]; - nativeBuildInputs = - [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 - ninja meson - coreutils # meson calls date, stat etc. - pythonLxmlEnv glibcLocales - patchelf getent - ]; - buildInputs = - [ linuxHeaders libcap kmod xz pam acl - /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2 - libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor - iptables gnu-efi - ]; + #dontAddPrefix = true; - #dontAddPrefix = true; + mesonFlags = [ + "-Dloadkeys-path=${kbd}/bin/loadkeys" + "-Dsetfont-path=${kbd}/bin/setfont" + "-Dtty-gid=3" # tty in NixOS has gid 3 + # "-Dtests=" # TODO + "-Dlz4=true" + "-Dhostnamed=true" + "-Dnetworkd=true" + "-Dsysusers=false" + "-Dtimedated=true" + "-Dtimesyncd=true" + "-Dfirstboot=false" + "-Dlocaled=true" + "-Dresolve=true" + "-Dsplit-usr=false" + "-Dlibcurl=false" + "-Dlibidn=false" + "-Dlibidn2=true" + "-Dquotacheck=false" + "-Dldconfig=false" + "-Dsmack=true" + "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work + "-Dsystem-gid-max=499" + # "-Dtime-epoch=1" - mesonFlags = [ - "-Dloadkeys-path=${kbd}/bin/loadkeys" - "-Dsetfont-path=${kbd}/bin/setfont" - "-Dtty-gid=3" # tty in NixOS has gid 3 - # "-Dtests=" # TODO - "-Dlz4=true" - "-Dhostnamed=true" - "-Dnetworkd=true" - "-Dsysusers=false" - "-Dtimedated=true" - "-Dtimesyncd=true" - "-Dfirstboot=false" - "-Dlocaled=true" - "-Dresolve=true" - "-Dsplit-usr=false" - "-Dlibcurl=false" - "-Dlibidn=false" - "-Dlibidn2=true" - "-Dquotacheck=false" - "-Dldconfig=false" - "-Dsmack=true" - "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work - "-Dsystem-gid-max=499" - # "-Dtime-epoch=1" + (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + "-Defi-libdir=${toString gnu-efi}/lib" + "-Defi-includedir=${toString gnu-efi}/include/efi" + "-Defi-ldsdir=${toString gnu-efi}/lib" - (if stdenv.isArm then "-Dgnu-efi=false" else "-Dgnu-efi=true") - "-Defi-libdir=${gnu-efi}/lib" - "-Defi-includedir=${gnu-efi}/include/efi" - "-Defi-ldsdir=${gnu-efi}/lib" + "-Dsysvinit-path=" + "-Dsysvrcnd-path=" + ]; - "-Dsysvinit-path=" - "-Dsysvrcnd-path=" - ]; + preConfigure = '' + mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") + mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d) + mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services) + mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services) + mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) + mesonFlagsArray+=(-Drootprefix=$out) + mesonFlagsArray+=(-Dlibdir=$lib/lib) + mesonFlagsArray+=(-Drootlibdir=$lib/lib) + mesonFlagsArray+=(-Dmandir=$man/lib) + mesonFlagsArray+=(-Dincludedir=$dev/include) + mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig) + mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig) - preConfigure = - '' - mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") - mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d) - mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services) - mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services) - mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) - mesonFlagsArray+=(-Dsysconfdir=$out/etc) - mesonFlagsArray+=(-Drootprefix=$out) - mesonFlagsArray+=(-Dlibdir=$lib/lib) - mesonFlagsArray+=(-Drootlibdir=$lib/lib) - mesonFlagsArray+=(-Dmandir=$man/lib) - mesonFlagsArray+=(-Dincludedir=$dev/include) - mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig) - mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig) + # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are? + substituteInPlace meson.build \ + --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \ + "includedir = '$dev/include'" \ + --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \ + "libdir = '$lib/lib'" - # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are? - substituteInPlace meson.build \ - --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \ - "includedir = '$dev/include'" \ - --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \ - "libdir = '$lib/lib'" + export LC_ALL="en_US.UTF-8"; + # FIXME: patch this in systemd properly (and send upstream). + # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do + test -e $i + substituteInPlace $i \ + --replace /usr/bin/getent ${getent}/bin/getent \ + --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ + --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ + --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ + --replace /bin/echo ${coreutils}/bin/echo \ + --replace /bin/cat ${coreutils}/bin/cat \ + --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ + --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ + --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency + done - export LC_ALL="en_US.UTF-8"; - # FIXME: patch this in systemd properly (and send upstream). - # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do - test -e $i - substituteInPlace $i \ - --replace /usr/bin/getent ${getent}/bin/getent \ - --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ - --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ - --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ - --replace /bin/echo ${coreutils}/bin/echo \ - --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ - --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ - --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency - done + for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do + substituteInPlace $i \ + --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python" + done - for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do - substituteInPlace $i \ - --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python" - done + for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do + substituteInPlace $i \ + --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python" + done - for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do - substituteInPlace $i \ - --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python" - done + substituteInPlace src/journal/catalog.c \ + --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ + ''; - substituteInPlace src/journal/catalog.c \ - --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ - ''; + # These defines are overridden by CFLAGS and would trigger annoying + # warning messages + postConfigure = '' + substituteInPlace config.h \ + --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \ + --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \ + --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" + ''; - # These defines are overridden by CFLAGS and would trigger annoying - # warning messages - postConfigure = '' - substituteInPlace config.h \ - --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \ - --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \ - --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" - ''; + hardeningDisable = [ "stackprotector" ]; - hardeningDisable = [ "stackprotector" ]; + NIX_CFLAGS_COMPILE = + [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" - NIX_CFLAGS_COMPILE = - [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would - # lead to a cyclic dependency. - "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + # Set the release_agent on /sys/fs/cgroup/systemd to the + # currently running systemd (/run/current-system/systemd) so + # that we don't use an obsolete/garbage-collected release agent. + "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" - # Set the release_agent on /sys/fs/cgroup/systemd to the - # currently running systemd (/run/current-system/systemd) so - # that we don't use an obsolete/garbage-collected release agent. - "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + ]; - "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" - ]; + postInstall = '' + # sysinit.target: Don't depend on + # systemd-tmpfiles-setup.service. This interferes with NixOps's + # send-keys feature (since sshd.service depends indirectly on + # sysinit.target). + mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ - postInstall = - '' - # sysinit.target: Don't depend on - # systemd-tmpfiles-setup.service. This interferes with NixOps's - # send-keys feature (since sshd.service depends indirectly on - # sysinit.target). - mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ + mkdir -p $out/example/systemd + mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example + mv $out/lib/systemd/{system,user} $out/example/systemd - mkdir -p $out/example/systemd - mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example - mv $out/lib/systemd/{system,user} $out/example/systemd + rm -rf $out/etc/systemd/system - rm -rf $out/etc/systemd/system + # Install SysV compatibility commands. + mkdir -p $out/sbin + ln -s $out/lib/systemd/systemd $out/sbin/telinit + for i in init halt poweroff runlevel reboot shutdown; do + ln -s $out/bin/systemctl $out/sbin/$i + done - # Install SysV compatibility commands. - mkdir -p $out/sbin - ln -s $out/lib/systemd/systemd $out/sbin/telinit - for i in init halt poweroff runlevel reboot shutdown; do - ln -s $out/bin/systemctl $out/sbin/$i - done + # Fix reference to /bin/false in the D-Bus services. + for i in $out/share/dbus-1/system-services/*.service; do + substituteInPlace $i --replace /bin/false ${coreutils}/bin/false + done - # Fix reference to /bin/false in the D-Bus services. - for i in $out/share/dbus-1/system-services/*.service; do - substituteInPlace $i --replace /bin/false ${coreutils}/bin/false - done + rm -rf $out/etc/rpm - rm -rf $out/etc/rpm + # "kernel-install" shouldn't be used on NixOS. + find $out -name "*kernel-install*" -exec rm {} \; - # "kernel-install" shouldn't be used on NixOS. - find $out -name "*kernel-install*" -exec rm {} \; + # Keep only libudev and libsystemd in the lib output. + mkdir -p $out/lib + mv $lib/lib/security $lib/lib/libnss* $out/lib/ + ''; # */ - # Keep only libudev and libsystemd in the lib output. - mkdir -p $out/lib - mv $lib/lib/security $lib/lib/libnss* $out/lib/ - ''; # */ + enableParallelBuilding = true; - enableParallelBuilding = true; + # The rpath to the shared systemd library is not added by meson. The + # functionality was removed by a nixpkgs patch because it would overwrite + # the existing rpath. + postFixup = '' + sharedLib=libsystemd-shared-${version}.so + for prog in `find $out -type f -executable`; do + (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog + ) || true + done + ''; - # The rpath to the shared systemd library is not added by meson. The - # functionality was removed by a nixpkgs patch because it would overwrite - # the existing rpath. - postFixup = '' - sharedLib=libsystemd-shared-${version}.so - for prog in `find $out -type f -executable`; do - (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( - patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog - ) || true - done - ''; + # The interface version prevents NixOS from switching to an + # incompatible systemd at runtime. (Switching across reboots is + # fine, of course.) It should be increased whenever systemd changes + # in a backwards-incompatible way. If the interface version of two + # systemd builds is the same, then we can switch between them at + # runtime; otherwise we can't and we need to reboot. + passthru.interfaceVersion = 2; - # The interface version prevents NixOS from switching to an - # incompatible systemd at runtime. (Switching across reboots is - # fine, of course.) It should be increased whenever systemd changes - # in a backwards-incompatible way. If the interface version of two - # systemd builds is the same, then we can switch between them at - # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 2; - - meta = { - homepage = http://www.freedesktop.org/wiki/Software/systemd; - description = "A system and service manager for Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; + meta = { + homepage = http://www.freedesktop.org/wiki/Software/systemd; + description = "A system and service manager for Linux"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; } diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 9c8bf5597514..25eeb889cc28 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tp_smapi-${version}-${kernel.version}"; - version = "unstable-2017-12-04"; + version = "0.43"; src = fetchFromGitHub { owner = "evgeni"; repo = "tp_smapi"; - rev = "76c5120f7be4880cf2c6801f872327e4e70c449f"; - sha256 = "0g8l7rmylspl17qnqpa2h4yj7h3zvy6xlmj5nlnixds9avnbz2vy"; + rev = "tp-smapi/${version}"; + sha256 = "1rjb0njckczc2mj05cagvj0lkyvmyk6bw7wkiinv81lw8m90g77g"; name = "tp-smapi-${version}"; }; diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 48f6ce4be765..b69bd576ed23 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "trinity-${version}"; - version = "1.8"; + version = "1.8-git-2017-02-13"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "v${version}"; - sha256 = "1ss6ir3ki2hnj4c8068v5bz8bpa43xqg9zlmzhgagi94g9l05qlf"; + rev = "2989c11ce77bc7bec23da62987e2c3a0dd8a83c9"; + sha256 = "19asyrypjhx2cgjdmwfvmgc0hk3xg00zvgkl89vwxngdb40bkwfq"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 8b3ebd46c325..56e237a9fad0 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks, dbus_glib, glib, confuse }: +{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, confuse }: stdenv.mkDerivation { name = "udisks-glue-1.3.5"; @@ -8,8 +8,8 @@ stdenv.mkDerivation { sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf udisks dbus_glib glib confuse ]; + nativeBuildInputs = [ pkgconfig automake autoconf ]; + buildInputs = [ udisks1 dbus-glib glib confuse ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 98cb616e2d5c..aeb9deac89d2 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib +{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm , libxslt, docbook_xsl, utillinux, libgudev }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ sg3_utils udev glib dbus dbus_glib polkit parted libgudev + [ sg3_utils udev glib dbus dbus-glib polkit parted libgudev lvm2 libatasmart intltool libuuid libxslt docbook_xsl ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index a265395f96e5..725b1cd25643 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gnused , expat, acl, systemd, glib, libatasmart, polkit , libxslt, docbook_xsl, utillinux, mdadm, libgudev +, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify"; }; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" "dev" ]; patches = [ ./force-path.patch ]; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { --replace " sed " " ${gnused}/bin/sed " ''; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; buildInputs = [ libxslt docbook_xsl libgudev expat acl systemd glib libatasmart polkit ]; @@ -38,6 +39,11 @@ stdenv.mkDerivation rec { "--with-udevdir=$(out)/lib/udev" ]; + makeFlags = [ + "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0" + "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" + ]; + meta = { homepage = http://www.freedesktop.org/wiki/Software/udisks; description = "A daemon and command-line utility for querying and manipulating storage devices"; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index c46ed2d0c015..713ef974f9fb 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus_glib +{ stdenv, fetchurl, pkgconfig, glib, dbus-glib , intltool, libxslt, docbook_xsl, udev, libgudev, libusb1 , useSystemd ? true, systemd, gobjectIntrospection }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ dbus_glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ] + [ dbus-glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch b/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch deleted file mode 100644 index eb4d5df698ac..000000000000 --- a/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Library/ConfigFilePrivate.cpp b/src/Library/ConfigFilePrivate.cpp -index 8aefa65..40914f7 100644 ---- a/src/Library/ConfigFilePrivate.cpp -+++ b/src/Library/ConfigFilePrivate.cpp -@@ -51,7 +51,7 @@ namespace usbguard - - void ConfigFilePrivate::open(const std::string& path) - { -- _stream.open(path, std::ios::in|std::ios::out); -+ _stream.open(path, std::ios::in); - if (!_stream.is_open()) { - throw std::runtime_error("Can't open " + path); - } diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index b88d96e02a44..2ca825a27d71 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, lib, - libxslt, pandoc, pkgconfig, - dbus_glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg, + libxslt, pandoc, asciidoctor, pkgconfig, + dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg, + audit, libgcrypt ? null, libsodium ? null }: @@ -11,34 +12,31 @@ with stdenv.lib; assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "0.7.0"; + version = "0.7.2"; name = "usbguard-${version}"; - repo = "https://github.com/dkopecek/usbguard"; + repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { url = "${repo}/releases/download/${name}/${name}.tar.gz"; - sha256 = "1e1485a2b47ba3bde9de2851b371d2552a807047a21e0b81553cf80d7f722709"; + sha256 = "5bd3e5219c590c3ae27b21315bd10b60e823cef64e5deff3305ff5b4087fc2d6"; }; - patches = [ - ./daemon_read_only_config.patch - ./documentation.patch - ]; - nativeBuildInputs = [ libxslt + asciidoctor pandoc # for rendering documentation pkgconfig ]; buildInputs = [ - dbus_glib + dbus-glib libcap_ng libqb libseccomp polkit protobuf + audit qtbase qtsvg @@ -61,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "The USBGuard software framework helps to protect your computer against BadUSB."; - homepage = "https://dkopecek.github.io/usbguard/"; + homepage = "https://usbguard.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.tnias ]; }; diff --git a/pkgs/os-specific/linux/usbguard/documentation.patch b/pkgs/os-specific/linux/usbguard/documentation.patch deleted file mode 100644 index 89de627131f5..000000000000 --- a/pkgs/os-specific/linux/usbguard/documentation.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/doc/usbguard-daemon.conf.5.md b/doc/usbguard-daemon.conf.5.md -index ea86ad1..63aec70 100644 ---- a/doc/usbguard-daemon.conf.5.md -+++ b/doc/usbguard-daemon.conf.5.md -@@ -30,21 +30,21 @@ The **usbguard-daemon.conf** file is loaded by the USBGuard daemon after it pars - **RestoreControllerDeviceState**=<*boolean*> - : The USBGuard daemon modifies some attributes of controller devices like the default authorization state of new child device instances. Using this setting, you can control whether the daemon will try to restore the attribute values to the state before modification on shutdown. - -+**DeviceManagerBackend**=<*backend*> -+: Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`. -+ - **IPCAllowedUsers**=<*username*> [<*username*> ...] - : A space delimited list of usernames that the daemon will accept IPC connections from. - - **IPCAllowedGroups**=<*groupname*> [<*groupname*> ...] - : A space delimited list of groupnames that the daemon will accept IPC connections from. - --**IPCAccessControlFiles**=<*path*> --: Path to a directory holding the IPC access control files. -- --**DeviceManagerBackend**=<*backend*> --: Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`. -- - **IPCAccessControlFiles**=<*path*> - : The files at this location will be interpreted by the daemon as IPC access control definition files. See the **IPC ACCESS CONTROL** section for more details. - -+**DeviceRulesWithPort**=<*boolean*> -+: Generate device specific rules including the "via-port" attribute. -+ - **AuditFilePath**=<*filepath*> - : USBGuard audit events log file path. - diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index c5461c06e830..0029353ba20c 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180202"; + version = "0.0.20180218"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "ee3415b482265ad9e8721aa746aaffdf311058a2d1a4d80e7b6d11bbbf71c722"; + sha256 = "4ac4c4e4ad4dc2cf9dcb831b0cf347567ccea675ca524528cf5a4d9dccb2fe52"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index c24780095dbe..ad8aeadeff06 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.10"; + version = "0.10.11"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "1x7f1yz5vnsy9n50ak0vjrm4w8fqc1qvhv8fmqnsc8cgbp7f3p8w"; + sha256 = "04ls0s79dsyxnrpra55qvl0dk9nyvps59l034326r3bzk4jhb3q6"; }; buildFlagsArray = '' diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 59d627901131..fe028cf812e7 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.02.9"; + version = "17.11.3"; src = fetchurl { url = "https://download.schedmd.com/slurm/${name}.tar.bz2"; - sha256 = "0w8v7fzbn7b3f9kg6lcj2jpkzln3vcv9s2cz37xbdifz0m2p1x7s"; + sha256 = "1x3i6z03d9m46fvj1cslrapm1drvgyqch9pn4xf23kvbz4gkhaps"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index dc2f0f6fd709..145052ff8c3a 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "corosync-2.4.2"; + name = "corosync-2.4.3"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; - sha256 = "1aab380mv4ivy5icmwvk7941jbs6ikm21p5ijk7brr4z608k0vpj"; + sha256 = "15y5la04qn2lh1gabyifygzpa4dx3ndk5yhmaf7azxyjx0if9rxi"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 8df584435a2f..f83ef4cef388 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -4,13 +4,13 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "coturn-${version}"; - version = "4.5.0.6"; + version = "4.5.0.7"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = "${version}"; - sha256 = "084c3zgwmmz4s6211i5jbkzsn13703lsg7vhc2cpacazq4sgsrhb"; + sha256 = "1781fx8lqgc54j973xzgq9d7k3g2j03va82jb4217gd3a93pa65l"; }; buildInputs = [ openssl libevent ]; diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 044d4fa50ab2..ee139ea2652c 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (rec { name = "dante-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://www.inet.no/dante/files/${name}.tar.gz"; - sha256 = "0lsg3hk8zd2h9f08s13bn4l4pvyyzkj4gr4ppwa7vj7gdyyk5lmn"; + sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms"; }; configureFlags = [ diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index c530929f79e4..8958daa1a70a 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -2,11 +2,11 @@ , guile, python, pcre, libffi, groff }: stdenv.mkDerivation rec { - name = "dico-2.4"; + name = "dico-2.5"; src = fetchurl { url = "mirror://gnu/dico/${name}.tar.xz"; - sha256 = "13m7vahfbdj7hb38bjgd4cmfswavvxrcpppj9n4m4rar3wyzg52g"; + sha256 = "0szm3z4xvq0pjj8kxl4paq63byamf281kzn1la0cdm5ngavypxxq"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index dcda4e8c0bb4..a233b6ba4cf8 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "diod-${version}"; - version = "1.0.23"; + version = "1.0.24"; src = fetchurl { url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz"; - sha256 = "002vxc9fwdwshda4jydxagr63xd6nnhbc6fh73974gi2pvp6gid3"; + sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl"; }; buildInputs = [ munge lua libcap perl ncurses ]; diff --git a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch index b7e7bfc73bf9..8276c28c3f4b 100644 --- a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch +++ b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 6779cc3..4275520 100755 +index b9ad66b..a2a7382 100755 --- a/configure +++ b/configure -@@ -15707,21 +15707,6 @@ $as_echo "not found" >&6; } +@@ -16033,21 +16033,6 @@ $as_echo "not found" >&6; } *-hp-hpux*) DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto" ;; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index ea4d4f387d8f..c0176db15769 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.11.2-P1"; in +let version = "9.12.0"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "04hjvwvs7ssgj69lqparx0wj0w3xkc0x8y2iv62kzjighd41bhyf"; + sha256 = "10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index 91cae62b1715..5a934056d13d 100644 --- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -1,40 +1,41 @@ diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h -index f354cfb..2aa0cc5 100644 +index 388dc97..3c6135c 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h -@@ -71,7 +71,9 @@ EXTERN const char * ns_g_version INIT(VERSION); - EXTERN const char * ns_g_product INIT(PRODUCT); - EXTERN const char * ns_g_description INIT(DESCRIPTION); - EXTERN const char * ns_g_srcid INIT(SRCID); +@@ -65,7 +65,9 @@ EXTERN const char * named_g_version INIT(VERSION); + EXTERN const char * named_g_product INIT(PRODUCT); + EXTERN const char * named_g_description INIT(DESCRIPTION); + EXTERN const char * named_g_srcid INIT(SRCID); +#if 0 - EXTERN const char * ns_g_configargs INIT(CONFIGARGS); + EXTERN const char * named_g_configargs INIT(CONFIGARGS); +#endif - EXTERN const char * ns_g_builder INIT(BUILDER); - EXTERN in_port_t ns_g_port INIT(0); - EXTERN isc_dscp_t ns_g_dscp INIT(-1); + EXTERN const char * named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); diff --git a/bin/named/main.c b/bin/named/main.c -index 556db54..edab41d 100644 +index 4fb0566..60d56cd 100644 --- a/bin/named/main.c +++ b/bin/named/main.c -@@ -636,8 +636,10 @@ parse_command_line(int argc, char *argv[]) { - (*ns_g_description != '\0') ? " " : "", - ns_g_description, ns_g_srcid); - printf("running on %s\n", ns_os_uname()); -+#if 0 +@@ -672,8 +672,10 @@ parse_command_line(int argc, char *argv[]) { + (*named_g_description != '\0') ? " " : "", + named_g_description, named_g_srcid); + printf("running on %s\n", named_os_uname()); ++ #if 0 printf("built by %s with %s\n", - ns_g_builder, ns_g_configargs); -+#endif + named_g_builder, named_g_configargs); ++ #endif #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); #else -@@ -998,8 +1000,10 @@ setup(void) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, "running on %s", ns_os_uname()); +@@ -1075,9 +1077,11 @@ setup(void) { + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, + "running on %s", named_os_uname()); +#if 0 - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, "built with %s", ns_g_configargs); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, + "built with %s", named_g_configargs); +#endif - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 56b4a1552fe6..a222805fc459 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,11 +12,11 @@ inherit (stdenv.lib) optional optionals optionalString concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "0e90ac37965839705bc2154cb07587cb31dd5816e37a14f3552d65676638fc6a"; + sha256 = "0b9caee03d7cd30e1dc8fa0ce5fafade31fc1785314986bbf77cad446522a1b3"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index d14233016d86..b4bd6175f3e7 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.19"; + name = "nsd-4.1.20"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1i82kvgxv4vz79dqd0ckz6syr1fdf6q60r4b926qh5klnnwjqy5h"; + sha256 = "04zph9zli3a0zx1sfphwbxx6f8whdxcjai6w0k7a565vgcfzd5wa"; }; prePatch = '' diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 05d53d444627..12c475bfc280 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.60.0"; + version = "3.2.70.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0yrbwq5dzzq5047vdpar4vkwzcgd9dj2v9basaw413hzncf2q8gj"; + sha256 = "051mbzh1igcbda43n14aijbvhhh98rqw8i13f06xqsm67afrjjcv"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 15ea30aa16cb..29cb8c2223c0 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "etcd-${version}"; - version = "3.1.6"; # After updating check that nixos tests pass + version = "3.3.1"; # After updating check that nixos tests pass rev = "v${version}"; goPackagePath = "github.com/coreos/etcd"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "etcd"; - sha256 = "1qgi6zxnijzr644w2da2gbn3gw2qwk6a3z3qmdln0r2rjnm70sx0"; + sha256 = "11gzmi05y4kpnzgqc737l0wk5svxai4z17nl92jazqga6zhyavyl"; }; subPackages = [ diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix index 3f600b5a1221..98daab253b3c 100644 --- a/pkgs/servers/fleet/default.nix +++ b/pkgs/servers/fleet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fleet-${version}"; - version = "0.11.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "coreos"; repo = "fleet"; rev = "v${version}"; - sha256 = "13kwaa4hkiic602wnvnk13pflrxqhk2vxwpk1bn52ilwxkjyvkig"; + sha256 = "0j48ajz19aqfzv9iyznnn39aw51y1nqcl270grmvi5cbqycmrfm0"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 4e39b78b89ec..3728ee6c2a8f 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "pure-ftpd-1.0.46"; + name = "pure-ftpd-1.0.47"; src = fetchurl { url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz"; - sha256 = "0p0arcaz63fbb03fkavbc8z6m1f90p5vbnxb8mqlvpma6mrq0286"; + sha256 = "1b97ixva8m10vln8xrfwwwzi344bkgxqji26d0nrm1yzylbc6h27"; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 7670c89f0c6a..b01e94187898 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, scons, pkgconfig, dbus, dbus_glib +{ fetchurl, stdenv, scons, pkgconfig, dbus, dbus-glib , ncurses, libX11, libXt, libXpm, libXaw, libXext , libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python2Packages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext + python2Packages.python dbus dbus-glib ncurses libX11 libXt libXpm libXaw libXext libxslt libusb1 ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 43b2418db771..2b031f33555d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4,435 +4,435 @@ { version = "0.63.3"; components = { - "nuimo_controller" = ps: with ps; [ ]; - "bbb_gpio" = ps: with ps; [ ]; - "doorbird" = ps: with ps; [ ]; - "isy994" = ps: with ps; [ ]; - "notify.html5" = ps: with ps; [ pyjwt ]; - "sensor.mvglive" = ps: with ps; [ ]; - "arduino" = ps: with ps; [ ]; - "xiaomi_aqara" = ps: with ps; [ ]; - "rpi_gpio" = ps: with ps; [ ]; - "remember_the_milk" = ps: with ps; [ httplib2 ]; - "media_player.sonos" = ps: with ps; [ ]; - "sensor.travisci" = ps: with ps; [ ]; - "notify.twitter" = ps: with ps; [ ]; - "notify.yessssms" = ps: with ps; [ ]; "abode" = ps: with ps; [ ]; - "device_tracker.automatic" = ps: with ps; [ ]; - "sensor.dnsip" = ps: with ps; [ aiodns ]; - "emulated_hue" = ps: with ps; [ aiohttp-cors ]; - "http" = ps: with ps; [ aiohttp-cors ]; - "sensor.imap" = ps: with ps; [ aioimaplib ]; - "light.lifx" = ps: with ps; [ ]; - "scene.hunterdouglas_powerview" = ps: with ps; [ ]; + "ads" = ps: with ps; [ ]; + "alarm_control_panel.alarmdotcom" = ps: with ps; [ ]; + "alarm_control_panel.concord232" = ps: with ps; [ ]; + "alarm_control_panel.egardia" = ps: with ps; [ ]; + "alarm_control_panel.ialarm" = ps: with ps; [ ]; + "alarm_control_panel.nx584" = ps: with ps; [ ]; + "alarm_control_panel.simplisafe" = ps: with ps; [ ]; + "alarm_control_panel.totalconnect" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ ]; - "sensor.alpha_vantage" = ps: with ps; [ ]; "amcrest" = ps: with ps; [ ]; - "media_player.anthemav" = ps: with ps; [ ]; + "android_ip_webcam" = ps: with ps; [ ]; "apcupsd" = ps: with ps; [ ]; - "notify.apns" = ps: with ps; [ ]; + "apple_tv" = ps: with ps; [ ]; + "arduino" = ps: with ps; [ ]; + "arlo" = ps: with ps; [ ]; "asterisk_mbox" = ps: with ps; [ ]; - "light.avion" = ps: with ps; [ ]; "axis" = ps: with ps; [ ]; - "tts.baidu" = ps: with ps; [ ]; - "sensor.modem_callerid" = ps: with ps; [ ]; - "sensor.linux_battery" = ps: with ps; [ batinfo ]; - "sensor.eddystone_temperature" = ps: with ps; [ ]; - "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; - "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ]; - "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; - "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ]; - "zha" = ps: with ps; [ ]; + "bbb_gpio" = ps: with ps; [ ]; + "binary_sensor.concord232" = ps: with ps; [ ]; + "binary_sensor.flic" = ps: with ps; [ ]; + "binary_sensor.hikvision" = ps: with ps; [ ]; + "binary_sensor.iss" = ps: with ps; [ ]; + "binary_sensor.nx584" = ps: with ps; [ ]; + "binary_sensor.tapsaff" = ps: with ps; [ ]; + "binary_sensor.trend" = ps: with ps; [ numpy ]; + "binary_sensor.workday" = ps: with ps; [ ]; "blink" = ps: with ps; [ ]; + "calendar.caldav" = ps: with ps; [ ]; + "calendar.todoist" = ps: with ps; [ todoist ]; + "camera.foscam" = ps: with ps; [ ]; + "camera.onvif" = ps: with ps; [ ]; + "camera.synology" = ps: with ps; [ ]; + "camera.uvc" = ps: with ps; [ ]; + "camera.xeoma" = ps: with ps; [ ]; + "canary" = ps: with ps; [ ]; + "climate.daikin" = ps: with ps; [ ]; + "climate.econet" = ps: with ps; [ ]; + "climate.ephember" = ps: with ps; [ ]; + "climate.eq3btsmart" = ps: with ps; [ ]; + "climate.flexit" = ps: with ps; [ ]; + "climate.heatmiser" = ps: with ps; [ ]; + "climate.honeywell" = ps: with ps; [ ]; + "climate.oem" = ps: with ps; [ ]; + "climate.proliphix" = ps: with ps; [ ]; + "climate.radiotherm" = ps: with ps; [ ]; + "climate.sensibo" = ps: with ps; [ ]; + "climate.touchline" = ps: with ps; [ ]; + "climate.venstar" = ps: with ps; [ ]; + "cloud" = ps: with ps; [ ]; + "coinbase" = ps: with ps; [ ]; + "comfoconnect" = ps: with ps; [ ]; + "conversation" = ps: with ps; [ ]; + "cover.myq" = ps: with ps; [ ]; + "daikin" = ps: with ps; [ ]; + "datadog" = ps: with ps; [ datadog ]; + "deconz" = ps: with ps; [ ]; + "device_tracker.aruba" = ps: with ps; [ pexpect ]; + "device_tracker.asuswrt" = ps: with ps; [ pexpect ]; + "device_tracker.automatic" = ps: with ps; [ ]; + "device_tracker.bbox" = ps: with ps; [ ]; + "device_tracker.bluetooth_le_tracker" = ps: with ps; [ ]; + "device_tracker.bluetooth_tracker" = ps: with ps; [ ]; + "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; + "device_tracker.fritz" = ps: with ps; [ ]; + "device_tracker.icloud" = ps: with ps; [ ]; + "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; + "device_tracker.mikrotik" = ps: with ps; [ ]; + "device_tracker.netgear" = ps: with ps; [ ]; + "device_tracker.nmap_tracker" = ps: with ps; [ ]; + "device_tracker.owntracks" = ps: with ps; [ libnacl ]; + "device_tracker.owntracks_http" = ps: with ps; [ libnacl ]; + "device_tracker.snmp" = ps: with ps; [ pysnmp ]; + "device_tracker.tile" = ps: with ps; [ ]; + "device_tracker.trackr" = ps: with ps; [ ]; + "device_tracker.unifi" = ps: with ps; [ pyunifi ]; + "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; + "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; + "digital_ocean" = ps: with ps; [ digital-ocean ]; + "discovery" = ps: with ps; [ netdisco ]; + "dominos" = ps: with ps; [ ]; + "doorbird" = ps: with ps; [ ]; + "dweet" = ps: with ps; [ ]; + "dyson" = ps: with ps; [ ]; + "ecobee" = ps: with ps; [ ]; + "eight_sleep" = ps: with ps; [ ]; + "emulated_hue" = ps: with ps; [ aiohttp-cors ]; + "enocean" = ps: with ps; [ ]; + "envisalink" = ps: with ps; [ ]; + "fan.xiaomi_miio" = ps: with ps; [ ]; + "feedreader" = ps: with ps; [ feedparser ]; + "ffmpeg" = ps: with ps; [ ]; + "frontend" = ps: with ps; [ user-agents ]; + "gc100" = ps: with ps; [ ]; + "goalfeed" = ps: with ps; [ ]; + "google" = ps: with ps; [ google_api_python_client oauth2client ]; + "hdmi_cec" = ps: with ps; [ ]; + "hive" = ps: with ps; [ ]; + "homematic" = ps: with ps; [ pyhomematic ]; + "http" = ps: with ps; [ aiohttp-cors ]; + "hue" = ps: with ps; [ ]; + "ifttt" = ps: with ps; [ ]; + "ihc" = ps: with ps; [ ]; + "image_processing.dlib_face_detect" = ps: with ps; [ ]; + "image_processing.dlib_face_identify" = ps: with ps; [ ]; + "image_processing.opencv" = ps: with ps; [ numpy ]; + "influxdb" = ps: with ps; [ influxdb ]; + "insteon_local" = ps: with ps; [ ]; + "insteon_plm" = ps: with ps; [ ]; + "iota" = ps: with ps; [ ]; + "isy994" = ps: with ps; [ ]; + "joaoapps_join" = ps: with ps; [ ]; + "juicenet" = ps: with ps; [ ]; + "keyboard" = ps: with ps; [ ]; + "keyboard_remote" = ps: with ps; [ ]; + "kira" = ps: with ps; [ ]; + "knx" = ps: with ps; [ ]; + "lametric" = ps: with ps; [ ]; + "light.avion" = ps: with ps; [ ]; "light.blinksticklight" = ps: with ps; [ BlinkStick ]; "light.blinkt" = ps: with ps; [ ]; - "sensor.bitcoin" = ps: with ps; [ ]; "light.decora" = ps: with ps; [ ]; - "sensor.bme680" = ps: with ps; [ ]; + "light.decora_wifi" = ps: with ps; [ ]; + "light.flux_led" = ps: with ps; [ ]; + "light.greenwave" = ps: with ps; [ ]; + "light.iglo" = ps: with ps; [ ]; + "light.lifx" = ps: with ps; [ ]; + "light.lifx_legacy" = ps: with ps; [ ]; + "light.limitlessled" = ps: with ps; [ ]; + "light.mystrom" = ps: with ps; [ ]; + "light.osramlightify" = ps: with ps; [ ]; + "light.piglow" = ps: with ps; [ ]; + "light.rpi_gpio_pwm" = ps: with ps; [ ]; + "light.sensehat" = ps: with ps; [ ]; + "light.tikteck" = ps: with ps; [ ]; + "light.tplink" = ps: with ps; [ ]; + "light.xiaomi_miio" = ps: with ps; [ ]; + "light.yeelight" = ps: with ps; [ ]; + "light.yeelightsunflower" = ps: with ps; [ ]; + "light.zengge" = ps: with ps; [ ]; + "linode" = ps: with ps; [ linode-api ]; + "lirc" = ps: with ps; [ ]; + "litejet" = ps: with ps; [ ]; + "lock.nello" = ps: with ps; [ ]; + "lock.nuki" = ps: with ps; [ ]; + "lock.sesame" = ps: with ps; [ ]; + "lutron" = ps: with ps; [ ]; + "lutron_caseta" = ps: with ps; [ ]; + "maxcube" = ps: with ps; [ ]; + "media_extractor" = ps: with ps; [ ]; + "media_player.anthemav" = ps: with ps; [ ]; + "media_player.aquostv" = ps: with ps; [ ]; + "media_player.bluesound" = ps: with ps; [ xmltodict ]; + "media_player.braviatv" = ps: with ps; [ ]; + "media_player.cast" = ps: with ps; [ PyChromecast ]; + "media_player.clementine" = ps: with ps; [ ]; + "media_player.cmus" = ps: with ps; [ ]; + "media_player.denonavr" = ps: with ps; [ ]; + "media_player.directv" = ps: with ps; [ ]; + "media_player.dunehd" = ps: with ps; [ ]; + "media_player.emby" = ps: with ps; [ ]; + "media_player.frontier_silicon" = ps: with ps; [ ]; + "media_player.gpmdp" = ps: with ps; [ ]; + "media_player.gstreamer" = ps: with ps; [ ]; + "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; + "media_player.lg_netcast" = ps: with ps; [ ]; + "media_player.liveboxplaytv" = ps: with ps; [ ]; + "media_player.mediaroom" = ps: with ps; [ ]; + "media_player.monoprice" = ps: with ps; [ ]; + "media_player.mpd" = ps: with ps; [ mpd2 ]; + "media_player.nad" = ps: with ps; [ ]; + "media_player.nadtcp" = ps: with ps; [ ]; + "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ]; + "media_player.openhome" = ps: with ps; [ ]; + "media_player.panasonic_viera" = ps: with ps; [ wakeonlan ]; + "media_player.pandora" = ps: with ps; [ pexpect ]; + "media_player.philips_js" = ps: with ps; [ ]; + "media_player.plex" = ps: with ps; [ ]; + "media_player.roku" = ps: with ps; [ ]; + "media_player.russound_rio" = ps: with ps; [ ]; + "media_player.russound_rnet" = ps: with ps; [ ]; + "media_player.samsungtv" = ps: with ps; [ wakeonlan ]; + "media_player.snapcast" = ps: with ps; [ ]; + "media_player.sonos" = ps: with ps; [ ]; + "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; + "media_player.spotify" = ps: with ps; [ ]; + "media_player.vizio" = ps: with ps; [ ]; + "media_player.vlc" = ps: with ps; [ ]; + "media_player.webostv" = ps: with ps; [ websockets ]; + "media_player.yamaha" = ps: with ps; [ ]; + "media_player.yamaha_musiccast" = ps: with ps; [ ]; + "media_player.ziggo_mediabox_xl" = ps: with ps; [ ]; + "melissa" = ps: with ps; [ ]; + "mercedesme" = ps: with ps; [ ]; + "mochad" = ps: with ps; [ ]; + "modbus" = ps: with ps; [ ]; + "mqtt" = ps: with ps; [ paho-mqtt ]; + "mqtt.server" = ps: with ps; [ hbmqtt ]; + "mychevy" = ps: with ps; [ ]; + "mycroft" = ps: with ps; [ ]; + "mysensors" = ps: with ps; [ ]; + "neato" = ps: with ps; [ ]; + "nest" = ps: with ps; [ ]; + "netatmo" = ps: with ps; [ ]; + "notify.apns" = ps: with ps; [ ]; "notify.aws_lambda" = ps: with ps; [ boto3 ]; "notify.aws_sns" = ps: with ps; [ boto3 ]; "notify.aws_sqs" = ps: with ps; [ boto3 ]; - "tts.amazon_polly" = ps: with ps; [ boto3 ]; - "sensor.broadlink" = ps: with ps; [ ]; - "switch.broadlink" = ps: with ps; [ ]; - "sensor.buienradar" = ps: with ps; [ ]; - "weather.buienradar" = ps: with ps; [ ]; - "calendar.caldav" = ps: with ps; [ ]; "notify.ciscospark" = ps: with ps; [ ]; - "coinbase" = ps: with ps; [ ]; - "sensor.coinmarketcap" = ps: with ps; [ ]; - "alarm_control_panel.concord232" = ps: with ps; [ ]; - "binary_sensor.concord232" = ps: with ps; [ ]; - "sensor.crimereports" = ps: with ps; [ ]; - "datadog" = ps: with ps; [ datadog ]; - "sensor.metoffice" = ps: with ps; [ ]; - "weather.metoffice" = ps: with ps; [ ]; - "light.decora_wifi" = ps: with ps; [ ]; - "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; - "sensor.deluge" = ps: with ps; [ ]; - "switch.deluge" = ps: with ps; [ ]; - "media_player.denonavr" = ps: with ps; [ ]; - "media_player.directv" = ps: with ps; [ ]; - "sensor.discogs" = ps: with ps; [ discogs_client ]; "notify.discord" = ps: with ps; [ ]; - "updater" = ps: with ps; [ distro ]; - "switch.digitalloggers" = ps: with ps; [ ]; + "notify.free_mobile" = ps: with ps; [ ]; + "notify.gntp" = ps: with ps; [ ]; + "notify.hipchat" = ps: with ps; [ ]; + "notify.html5" = ps: with ps; [ pyjwt ]; + "notify.joaoapps_join" = ps: with ps; [ ]; + "notify.kodi" = ps: with ps; [ jsonrpc-async ]; + "notify.lametric" = ps: with ps; [ ]; + "notify.mailgun" = ps: with ps; [ ]; + "notify.matrix" = ps: with ps; [ matrix-client ]; + "notify.message_bird" = ps: with ps; [ ]; + "notify.pushbullet" = ps: with ps; [ pushbullet ]; + "notify.pushetta" = ps: with ps; [ ]; + "notify.pushover" = ps: with ps; [ ]; + "notify.rocketchat" = ps: with ps; [ ]; + "notify.sendgrid" = ps: with ps; [ ]; + "notify.simplepush" = ps: with ps; [ ]; + "notify.slack" = ps: with ps; [ ]; + "notify.twitter" = ps: with ps; [ ]; + "notify.webostv" = ps: with ps; [ ]; "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; + "notify.yessssms" = ps: with ps; [ ]; + "nuheat" = ps: with ps; [ ]; + "nuimo_controller" = ps: with ps; [ ]; + "pilight" = ps: with ps; [ ]; + "prometheus" = ps: with ps; [ ]; + "python_script" = ps: with ps; [ ]; + "qwikswitch" = ps: with ps; [ ]; + "rainbird" = ps: with ps; [ ]; + "raincloud" = ps: with ps; [ ]; + "raspihats" = ps: with ps; [ ]; + "recorder" = ps: with ps; [ sqlalchemy ]; + "remember_the_milk" = ps: with ps; [ httplib2 ]; + "remote.harmony" = ps: with ps; [ ]; + "remote.itach" = ps: with ps; [ ]; + "remote.xiaomi_miio" = ps: with ps; [ ]; + "rflink" = ps: with ps; [ ]; + "rfxtrx" = ps: with ps; [ ]; + "ring" = ps: with ps; [ ]; + "rpi_gpio" = ps: with ps; [ ]; + "rpi_pfio" = ps: with ps; [ ]; + "satel_integra" = ps: with ps; [ ]; + "scene.hunterdouglas_powerview" = ps: with ps; [ ]; + "scsgate" = ps: with ps; [ ]; + "sensor.airvisual" = ps: with ps; [ ]; + "sensor.alpha_vantage" = ps: with ps; [ ]; + "sensor.bbox" = ps: with ps; [ ]; + "sensor.bh1750" = ps: with ps; [ ]; + "sensor.bitcoin" = ps: with ps; [ ]; + "sensor.blockchain" = ps: with ps; [ ]; + "sensor.bme280" = ps: with ps; [ ]; + "sensor.bme680" = ps: with ps; [ ]; + "sensor.broadlink" = ps: with ps; [ ]; + "sensor.buienradar" = ps: with ps; [ ]; + "sensor.coinmarketcap" = ps: with ps; [ ]; + "sensor.cpuspeed" = ps: with ps; [ ]; + "sensor.crimereports" = ps: with ps; [ ]; + "sensor.cups" = ps: with ps; [ ]; + "sensor.darksky" = ps: with ps; [ ]; + "sensor.deluge" = ps: with ps; [ ]; + "sensor.deutsche_bahn" = ps: with ps; [ ]; + "sensor.dht" = ps: with ps; [ ]; + "sensor.discogs" = ps: with ps; [ discogs_client ]; + "sensor.dnsip" = ps: with ps; [ aiodns ]; "sensor.dovado" = ps: with ps; [ ]; "sensor.dsmr" = ps: with ps; [ ]; - "dweet" = ps: with ps; [ ]; "sensor.dweet" = ps: with ps; [ ]; + "sensor.ebox" = ps: with ps; [ ]; + "sensor.eddystone_temperature" = ps: with ps; [ ]; "sensor.eliqonline" = ps: with ps; [ ]; - "enocean" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; - "sensor.season" = ps: with ps; [ ephem ]; - "keyboard_remote" = ps: with ps; [ ]; - "climate.honeywell" = ps: with ps; [ ]; - "image_processing.dlib_face_detect" = ps: with ps; [ ]; - "image_processing.dlib_face_identify" = ps: with ps; [ ]; + "sensor.etherscan" = ps: with ps; [ ]; "sensor.fastdotcom" = ps: with ps; [ ]; "sensor.fedex" = ps: with ps; [ ]; - "feedreader" = ps: with ps; [ feedparser ]; - "sensor.geo_rss_events" = ps: with ps; [ feedparser ]; + "sensor.fido" = ps: with ps; [ ]; "sensor.fitbit" = ps: with ps; [ ]; "sensor.fixer" = ps: with ps; [ ]; - "light.flux_led" = ps: with ps; [ ]; - "notify.free_mobile" = ps: with ps; [ ]; - "device_tracker.fritz" = ps: with ps; [ ]; "sensor.fritzbox_callmonitor" = ps: with ps; [ ]; "sensor.fritzbox_netmonitor" = ps: with ps; [ ]; - "switch.fritzdect" = ps: with ps; [ ]; - "media_player.frontier_silicon" = ps: with ps; [ ]; - "conversation" = ps: with ps; [ ]; - "tts.google" = ps: with ps; [ ]; - "device_tracker.bluetooth_le_tracker" = ps: with ps; [ ]; "sensor.gearbest" = ps: with ps; [ ]; + "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ]; + "sensor.geo_rss_events" = ps: with ps; [ feedparser ]; "sensor.gitter" = ps: with ps; [ ]; - "notify.gntp" = ps: with ps; [ ]; - "google" = ps: with ps; [ google_api_python_client oauth2client ]; "sensor.google_travel_time" = ps: with ps; [ ]; "sensor.gpsd" = ps: with ps; [ ]; - "light.greenwave" = ps: with ps; [ ]; - "media_player.gstreamer" = ps: with ps; [ ]; - "ffmpeg" = ps: with ps; [ ]; - "media_player.philips_js" = ps: with ps; [ ]; - "mqtt.server" = ps: with ps; [ hbmqtt ]; - "climate.heatmiser" = ps: with ps; [ ]; - "switch.hikvisioncam" = ps: with ps; [ ]; - "notify.hipchat" = ps: with ps; [ ]; - "binary_sensor.workday" = ps: with ps; [ ]; - "frontend" = ps: with ps; [ user-agents ]; - "camera.onvif" = ps: with ps; [ ]; - "sensor.dht" = ps: with ps; [ ]; - "media_player.braviatv" = ps: with ps; [ ]; - "media_player.spotify" = ps: with ps; [ ]; - "netatmo" = ps: with ps; [ ]; - "neato" = ps: with ps; [ ]; - "sensor.sabnzbd" = ps: with ps; [ ]; - "switch.anel_pwrctrl" = ps: with ps; [ ]; - "switch.edimax" = ps: with ps; [ ]; "sensor.gtfs" = ps: with ps; [ ]; - "binary_sensor.flic" = ps: with ps; [ ]; - "media_player.lg_netcast" = ps: with ps; [ ]; - "sensor.bh1750" = ps: with ps; [ ]; - "sensor.bme280" = ps: with ps; [ ]; + "sensor.hp_ilo" = ps: with ps; [ ]; "sensor.htu21d" = ps: with ps; [ ]; - "light.iglo" = ps: with ps; [ ]; - "ihc" = ps: with ps; [ ]; - "influxdb" = ps: with ps; [ influxdb ]; - "sensor.influxdb" = ps: with ps; [ influxdb ]; - "insteon_local" = ps: with ps; [ ]; - "insteon_plm" = ps: with ps; [ ]; - "verisure" = ps: with ps; [ ]; - "media_player.kodi" = ps: with ps; [ ]; - "notify.kodi" = ps: with ps; [ ]; - "device_tracker.owntracks" = ps: with ps; [ libnacl ]; - "device_tracker.owntracks_http" = ps: with ps; [ libnacl ]; - "dyson" = ps: with ps; [ ]; - "camera.foscam" = ps: with ps; [ ]; - "device_tracker.mikrotik" = ps: with ps; [ ]; - "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; - "light.lifx_legacy" = ps: with ps; [ ]; - "light.osramlightify" = ps: with ps; [ ]; - "light.limitlessled" = ps: with ps; [ ]; - "linode" = ps: with ps; [ linode-api ]; - "media_player.liveboxplaytv" = ps: with ps; [ ]; - "lametric" = ps: with ps; [ ]; - "notify.lametric" = ps: with ps; [ ]; - "sensor.luftdaten" = ps: with ps; [ luftdaten ]; - "sensor.lyft" = ps: with ps; [ ]; - "notify.matrix" = ps: with ps; [ matrix-client ]; - "maxcube" = ps: with ps; [ ]; - "mercedesme" = ps: with ps; [ ]; - "notify.message_bird" = ps: with ps; [ ]; - "sensor.mfi" = ps: with ps; [ ]; - "switch.mfi" = ps: with ps; [ ]; - "sensor.miflora" = ps: with ps; [ ]; - "upnp" = ps: with ps; [ ]; - "sensor.mopar" = ps: with ps; [ ]; - "tts" = ps: with ps; [ mutagen ]; - "mychevy" = ps: with ps; [ ]; - "mycroft" = ps: with ps; [ ]; - "usps" = ps: with ps; [ ]; - "media_player.nad" = ps: with ps; [ ]; - "media_player.nadtcp" = ps: with ps; [ ]; - "discovery" = ps: with ps; [ netdisco ]; - "sensor.neurio_energy" = ps: with ps; [ ]; - "sensor.nederlandse_spoorwegen" = ps: with ps; [ ]; - "nuheat" = ps: with ps; [ ]; - "binary_sensor.trend" = ps: with ps; [ numpy ]; - "image_processing.opencv" = ps: with ps; [ numpy ]; - "climate.oem" = ps: with ps; [ ]; - "media_player.onkyo" = ps: with ps; [ ]; - "sensor.openevse" = ps: with ps; [ ]; - "media_player.openhome" = ps: with ps; [ ]; - "switch.orvibo" = ps: with ps; [ ]; - "mqtt" = ps: with ps; [ paho-mqtt ]; - "shiftr" = ps: with ps; [ paho-mqtt ]; - "media_player.panasonic_viera" = ps: with ps; [ ]; - "media_player.dunehd" = ps: with ps; [ ]; - "device_tracker.aruba" = ps: with ps; [ pexpect ]; - "device_tracker.asuswrt" = ps: with ps; [ pexpect ]; - "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; - "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; - "media_player.pandora" = ps: with ps; [ pexpect ]; - "hue" = ps: with ps; [ ]; - "rpi_pfio" = ps: with ps; [ ]; - "light.piglow" = ps: with ps; [ ]; - "pilight" = ps: with ps; [ ]; - "dominos" = ps: with ps; [ ]; - "media_player.plex" = ps: with ps; [ ]; - "sensor.plex" = ps: with ps; [ ]; - "sensor.mhz19" = ps: with ps; [ ]; - "sensor.serial_pm" = ps: with ps; [ ]; - "sensor.pocketcasts" = ps: with ps; [ ]; - "climate.proliphix" = ps: with ps; [ ]; - "prometheus" = ps: with ps; [ ]; - "sensor.systemmonitor" = ps: with ps; [ psutil ]; - "wink" = ps: with ps; [ ]; - "notify.pushbullet" = ps: with ps; [ pushbullet ]; - "sensor.pushbullet" = ps: with ps; [ pushbullet ]; - "notify.pushetta" = ps: with ps; [ ]; - "light.rpi_gpio_pwm" = ps: with ps; [ ]; - "canary" = ps: with ps; [ ]; - "sensor.cpuspeed" = ps: with ps; [ ]; - "melissa" = ps: with ps; [ ]; - "camera.synology" = ps: with ps; [ ]; - "hdmi_cec" = ps: with ps; [ ]; - "light.tplink" = ps: with ps; [ ]; - "switch.tplink" = ps: with ps; [ ]; - "rfxtrx" = ps: with ps; [ ]; - "sensor.tibber" = ps: with ps; [ ]; - "switch.dlink" = ps: with ps; [ ]; - "ads" = ps: with ps; [ ]; - "sensor.airvisual" = ps: with ps; [ ]; - "alarm_control_panel.alarmdotcom" = ps: with ps; [ ]; - "arlo" = ps: with ps; [ ]; - "apple_tv" = ps: with ps; [ ]; - "device_tracker.bbox" = ps: with ps; [ ]; - "sensor.bbox" = ps: with ps; [ ]; - "device_tracker.bluetooth_tracker" = ps: with ps; [ ]; - "media_player.cast" = ps: with ps; [ PyChromecast ]; - "media_player.cmus" = ps: with ps; [ ]; - "comfoconnect" = ps: with ps; [ ]; - "tts.microsoft" = ps: with ps; [ ]; - "sensor.cups" = ps: with ps; [ ]; - "daikin" = ps: with ps; [ ]; - "climate.daikin" = ps: with ps; [ ]; - "deconz" = ps: with ps; [ ]; - "zwave" = ps: with ps; [ pydispatcher ]; - "android_ip_webcam" = ps: with ps; [ ]; - "sensor.ebox" = ps: with ps; [ ]; - "climate.econet" = ps: with ps; [ ]; - "eight_sleep" = ps: with ps; [ ]; - "media_player.emby" = ps: with ps; [ ]; - "envisalink" = ps: with ps; [ ]; - "climate.ephember" = ps: with ps; [ ]; - "sensor.fido" = ps: with ps; [ ]; - "climate.flexit" = ps: with ps; [ ]; - "ifttt" = ps: with ps; [ ]; - "remote.harmony" = ps: with ps; [ ]; - "binary_sensor.hikvision" = ps: with ps; [ ]; - "hive" = ps: with ps; [ ]; - "homematic" = ps: with ps; [ pyhomematic ]; "sensor.hydroquebec" = ps: with ps; [ ]; - "alarm_control_panel.ialarm" = ps: with ps; [ ]; - "device_tracker.icloud" = ps: with ps; [ ]; + "sensor.imap" = ps: with ps; [ aioimaplib ]; + "sensor.influxdb" = ps: with ps; [ influxdb ]; "sensor.irish_rail_transport" = ps: with ps; [ ]; - "binary_sensor.iss" = ps: with ps; [ ]; - "remote.itach" = ps: with ps; [ ]; - "kira" = ps: with ps; [ ]; "sensor.kwb" = ps: with ps; [ ]; "sensor.lacrosse" = ps: with ps; [ ]; "sensor.lastfm" = ps: with ps; [ pylast ]; - "media_player.webostv" = ps: with ps; [ websockets ]; - "notify.webostv" = ps: with ps; [ ]; - "litejet" = ps: with ps; [ ]; + "sensor.linux_battery" = ps: with ps; [ batinfo ]; "sensor.loopenergy" = ps: with ps; [ ]; - "lutron_caseta" = ps: with ps; [ ]; - "lutron" = ps: with ps; [ ]; - "notify.mailgun" = ps: with ps; [ ]; - "media_player.mediaroom" = ps: with ps; [ ]; - "mochad" = ps: with ps; [ ]; - "modbus" = ps: with ps; [ ]; - "media_player.monoprice" = ps: with ps; [ ]; - "media_player.yamaha_musiccast" = ps: with ps; [ ]; - "cover.myq" = ps: with ps; [ ]; - "mysensors" = ps: with ps; [ ]; - "lock.nello" = ps: with ps; [ ]; - "device_tracker.netgear" = ps: with ps; [ ]; - "switch.netio" = ps: with ps; [ ]; - "lock.nuki" = ps: with ps; [ ]; + "sensor.luftdaten" = ps: with ps; [ luftdaten ]; + "sensor.lyft" = ps: with ps; [ ]; + "sensor.metoffice" = ps: with ps; [ ]; + "sensor.mfi" = ps: with ps; [ ]; + "sensor.mhz19" = ps: with ps; [ ]; + "sensor.miflora" = ps: with ps; [ ]; + "sensor.modem_callerid" = ps: with ps; [ ]; + "sensor.mopar" = ps: with ps; [ ]; + "sensor.mvglive" = ps: with ps; [ ]; + "sensor.nederlandse_spoorwegen" = ps: with ps; [ ]; + "sensor.neurio_energy" = ps: with ps; [ ]; "sensor.nut" = ps: with ps; [ ]; - "alarm_control_panel.nx584" = ps: with ps; [ ]; - "binary_sensor.nx584" = ps: with ps; [ ]; - "iota" = ps: with ps; [ ]; - "sensor.otp" = ps: with ps; [ ]; + "sensor.openevse" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ ]; - "weather.openweathermap" = ps: with ps; [ ]; + "sensor.otp" = ps: with ps; [ ]; + "sensor.plex" = ps: with ps; [ ]; + "sensor.pocketcasts" = ps: with ps; [ ]; "sensor.pollen" = ps: with ps; [ ]; - "qwikswitch" = ps: with ps; [ ]; - "rainbird" = ps: with ps; [ ]; - "climate.sensibo" = ps: with ps; [ ]; - "sensor.serial" = ps: with ps; [ ]; - "switch.acer_projector" = ps: with ps; [ pyserial ]; - "lock.sesame" = ps: with ps; [ ]; - "goalfeed" = ps: with ps; [ ]; - "sensor.sma" = ps: with ps; [ ]; - "device_tracker.snmp" = ps: with ps; [ pysnmp ]; - "sensor.snmp" = ps: with ps; [ pysnmp ]; - "switch.snmp" = ps: with ps; [ pysnmp ]; - "sensor.thinkingcleaner" = ps: with ps; [ ]; - "switch.thinkingcleaner" = ps: with ps; [ ]; - "sensor.blockchain" = ps: with ps; [ ]; - "media_player.clementine" = ps: with ps; [ ]; - "digital_ocean" = ps: with ps; [ digital-ocean ]; - "ecobee" = ps: with ps; [ ]; - "climate.eq3btsmart" = ps: with ps; [ ]; - "sensor.etherscan" = ps: with ps; [ ]; - "sensor.darksky" = ps: with ps; [ ]; - "weather.darksky" = ps: with ps; [ ]; - "gc100" = ps: with ps; [ ]; - "sensor.hp_ilo" = ps: with ps; [ ]; - "joaoapps_join" = ps: with ps; [ ]; - "notify.joaoapps_join" = ps: with ps; [ ]; - "juicenet" = ps: with ps; [ ]; - "lirc" = ps: with ps; [ ]; - "fan.xiaomi_miio" = ps: with ps; [ ]; - "light.xiaomi_miio" = ps: with ps; [ ]; - "remote.xiaomi_miio" = ps: with ps; [ ]; - "switch.xiaomi_miio" = ps: with ps; [ ]; - "vacuum.xiaomi_miio" = ps: with ps; [ ]; - "media_player.mpd" = ps: with ps; [ mpd2 ]; - "light.mystrom" = ps: with ps; [ ]; - "switch.mystrom" = ps: with ps; [ ]; - "nest" = ps: with ps; [ ]; - "device_tracker.nmap_tracker" = ps: with ps; [ ]; - "notify.pushover" = ps: with ps; [ ]; - "sensor.ripple" = ps: with ps; [ ]; - "media_player.roku" = ps: with ps; [ ]; - "sensor.sochain" = ps: with ps; [ ]; - "sensor.synologydsm" = ps: with ps; [ ]; - "tado" = ps: with ps; [ ]; - "telegram_bot" = ps: with ps; [ python-telegram-bot ]; - "sensor.twitch" = ps: with ps; [ ]; - "velbus" = ps: with ps; [ ]; - "media_player.vlc" = ps: with ps; [ ]; - "sensor.swiss_public_transport" = ps: with ps; [ ]; - "alarm_control_panel.egardia" = ps: with ps; [ ]; - "sensor.whois" = ps: with ps; [ ]; - "device_tracker.tile" = ps: with ps; [ ]; - "climate.touchline" = ps: with ps; [ ]; - "device_tracker.trackr" = ps: with ps; [ ]; - "tradfri" = ps: with ps; [ ]; - "device_tracker.unifi" = ps: with ps; [ ]; - "keyboard" = ps: with ps; [ ]; - "vera" = ps: with ps; [ ]; - "media_player.vizio" = ps: with ps; [ ]; - "velux" = ps: with ps; [ ]; - "wemo" = ps: with ps; [ ]; - "camera.xeoma" = ps: with ps; [ ]; - "zabbix" = ps: with ps; [ ]; + "sensor.pushbullet" = ps: with ps; [ pushbullet ]; "sensor.qnap" = ps: with ps; [ ]; - "switch.rachio" = ps: with ps; [ ]; - "climate.radiotherm" = ps: with ps; [ ]; - "raincloud" = ps: with ps; [ ]; - "raspihats" = ps: with ps; [ ]; - "switch.rainmachine" = ps: with ps; [ ]; - "python_script" = ps: with ps; [ ]; - "rflink" = ps: with ps; [ ]; - "ring" = ps: with ps; [ ]; - "notify.rocketchat" = ps: with ps; [ ]; - "vacuum.roomba" = ps: with ps; [ ]; - "switch.rpi_rf" = ps: with ps; [ ]; - "media_player.russound_rnet" = ps: with ps; [ ]; - "media_player.russound_rio" = ps: with ps; [ ]; - "media_player.yamaha" = ps: with ps; [ ]; - "media_player.samsungtv" = ps: with ps; [ ]; - "satel_integra" = ps: with ps; [ ]; - "sensor.deutsche_bahn" = ps: with ps; [ ]; - "scsgate" = ps: with ps; [ ]; - "notify.sendgrid" = ps: with ps; [ ]; - "light.sensehat" = ps: with ps; [ ]; + "sensor.ripple" = ps: with ps; [ ]; + "sensor.sabnzbd" = ps: with ps; [ ]; + "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; + "sensor.season" = ps: with ps; [ ephem ]; "sensor.sensehat" = ps: with ps; [ ]; - "media_player.aquostv" = ps: with ps; [ ]; + "sensor.serial" = ps: with ps; [ ]; + "sensor.serial_pm" = ps: with ps; [ ]; "sensor.shodan" = ps: with ps; [ ]; - "notify.simplepush" = ps: with ps; [ ]; - "alarm_control_panel.simplisafe" = ps: with ps; [ ]; - "skybell" = ps: with ps; [ ]; - "notify.slack" = ps: with ps; [ ]; - "sleepiq" = ps: with ps; [ ]; - "media_player.snapcast" = ps: with ps; [ ]; + "sensor.sma" = ps: with ps; [ ]; + "sensor.snmp" = ps: with ps; [ pysnmp ]; + "sensor.sochain" = ps: with ps; [ ]; "sensor.speedtest" = ps: with ps; [ ]; - "recorder" = ps: with ps; [ sqlalchemy ]; "sensor.sql" = ps: with ps; [ sqlalchemy ]; - "statsd" = ps: with ps; [ statsd ]; "sensor.steam_online" = ps: with ps; [ ]; - "tahoma" = ps: with ps; [ ]; + "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ]; + "sensor.swiss_public_transport" = ps: with ps; [ ]; + "sensor.synologydsm" = ps: with ps; [ ]; + "sensor.systemmonitor" = ps: with ps; [ psutil ]; + "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ]; "sensor.tank_utility" = ps: with ps; [ ]; - "binary_sensor.tapsaff" = ps: with ps; [ ]; - "tellstick" = ps: with ps; [ ]; - "tellduslive" = ps: with ps; [ ]; + "sensor.ted5000" = ps: with ps; [ xmltodict ]; "sensor.temper" = ps: with ps; [ ]; - "tesla" = ps: with ps; [ ]; - "thingspeak" = ps: with ps; [ ]; - "light.tikteck" = ps: with ps; [ ]; - "calendar.todoist" = ps: with ps; [ todoist ]; - "toon" = ps: with ps; [ ]; - "alarm_control_panel.totalconnect" = ps: with ps; [ ]; + "sensor.thinkingcleaner" = ps: with ps; [ ]; + "sensor.tibber" = ps: with ps; [ ]; "sensor.transmission" = ps: with ps; [ transmissionrpc ]; - "switch.transmission" = ps: with ps; [ transmissionrpc ]; - "twilio" = ps: with ps; [ twilio ]; + "sensor.travisci" = ps: with ps; [ ]; + "sensor.twitch" = ps: with ps; [ ]; "sensor.uber" = ps: with ps; [ ]; "sensor.ups" = ps: with ps; [ ]; - "camera.uvc" = ps: with ps; [ ]; - "climate.venstar" = ps: with ps; [ ]; - "volvooncall" = ps: with ps; [ ]; "sensor.vasttrafik" = ps: with ps; [ ]; - "vultr" = ps: with ps; [ vultr ]; - "wake_on_lan" = ps: with ps; [ ]; - "switch.wake_on_lan" = ps: with ps; [ ]; "sensor.waqi" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ ]; - "waterfurnace" = ps: with ps; [ ]; - "media_player.gpmdp" = ps: with ps; [ ]; - "spc" = ps: with ps; [ websockets ]; - "zigbee" = ps: with ps; [ ]; + "sensor.whois" = ps: with ps; [ ]; "sensor.xbox_live" = ps: with ps; [ ]; - "knx" = ps: with ps; [ ]; - "media_player.bluesound" = ps: with ps; [ xmltodict ]; - "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ]; - "sensor.ted5000" = ps: with ps; [ xmltodict ]; - "sensor.yr" = ps: with ps; [ xmltodict ]; "sensor.yahoo_finance" = ps: with ps; [ ]; + "sensor.yr" = ps: with ps; [ xmltodict ]; "sensor.yweather" = ps: with ps; [ ]; + "shiftr" = ps: with ps; [ paho-mqtt ]; + "skybell" = ps: with ps; [ ]; + "sleepiq" = ps: with ps; [ ]; + "spc" = ps: with ps; [ websockets ]; + "statsd" = ps: with ps; [ statsd ]; + "switch.acer_projector" = ps: with ps; [ pyserial ]; + "switch.anel_pwrctrl" = ps: with ps; [ ]; + "switch.broadlink" = ps: with ps; [ ]; + "switch.deluge" = ps: with ps; [ ]; + "switch.digitalloggers" = ps: with ps; [ ]; + "switch.dlink" = ps: with ps; [ ]; + "switch.edimax" = ps: with ps; [ ]; + "switch.fritzdect" = ps: with ps; [ ]; + "switch.hikvisioncam" = ps: with ps; [ ]; + "switch.mfi" = ps: with ps; [ ]; + "switch.mystrom" = ps: with ps; [ ]; + "switch.netio" = ps: with ps; [ ]; + "switch.orvibo" = ps: with ps; [ ]; + "switch.rachio" = ps: with ps; [ ]; + "switch.rainmachine" = ps: with ps; [ ]; + "switch.rpi_rf" = ps: with ps; [ ]; + "switch.snmp" = ps: with ps; [ pysnmp ]; + "switch.thinkingcleaner" = ps: with ps; [ ]; + "switch.tplink" = ps: with ps; [ ]; + "switch.transmission" = ps: with ps; [ transmissionrpc ]; + "switch.wake_on_lan" = ps: with ps; [ wakeonlan ]; + "switch.xiaomi_miio" = ps: with ps; [ ]; + "tado" = ps: with ps; [ ]; + "tahoma" = ps: with ps; [ ]; + "telegram_bot" = ps: with ps; [ python-telegram-bot ]; + "tellduslive" = ps: with ps; [ ]; + "tellstick" = ps: with ps; [ ]; + "tesla" = ps: with ps; [ ]; + "thingspeak" = ps: with ps; [ ]; + "toon" = ps: with ps; [ ]; + "tradfri" = ps: with ps; [ ]; + "tts" = ps: with ps; [ mutagen ]; + "tts.amazon_polly" = ps: with ps; [ boto3 ]; + "tts.baidu" = ps: with ps; [ ]; + "tts.google" = ps: with ps; [ ]; + "tts.microsoft" = ps: with ps; [ ]; + "twilio" = ps: with ps; [ twilio ]; + "updater" = ps: with ps; [ distro ]; + "upnp" = ps: with ps; [ ]; + "usps" = ps: with ps; [ ]; + "vacuum.roomba" = ps: with ps; [ ]; + "vacuum.xiaomi_miio" = ps: with ps; [ ]; + "velbus" = ps: with ps; [ ]; + "velux" = ps: with ps; [ ]; + "vera" = ps: with ps; [ ]; + "verisure" = ps: with ps; [ ]; + "volvooncall" = ps: with ps; [ ]; + "vultr" = ps: with ps; [ vultr ]; + "wake_on_lan" = ps: with ps; [ wakeonlan ]; + "waterfurnace" = ps: with ps; [ ]; + "weather.buienradar" = ps: with ps; [ ]; + "weather.darksky" = ps: with ps; [ ]; + "weather.metoffice" = ps: with ps; [ ]; + "weather.openweathermap" = ps: with ps; [ ]; "weather.yweather" = ps: with ps; [ ]; - "light.yeelight" = ps: with ps; [ ]; - "light.yeelightsunflower" = ps: with ps; [ ]; - "media_extractor" = ps: with ps; [ ]; - "light.zengge" = ps: with ps; [ ]; + "wemo" = ps: with ps; [ ]; + "wink" = ps: with ps; [ ]; + "xiaomi_aqara" = ps: with ps; [ ]; + "zabbix" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ zeroconf ]; - "media_player.ziggo_mediabox_xl" = ps: with ps; [ ]; + "zha" = ps: with ps; [ ]; + "zigbee" = ps: with ps; [ ]; + "zwave" = ps: with ps; [ pydispatcher ]; }; } diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 5af794e75fa4..3aa9823dbe8b 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -14,6 +14,7 @@ # Then, a Nix attribute set mapping component name to dependencies is created. from urllib.request import urlopen +from collections import OrderedDict import subprocess import os import sys @@ -73,7 +74,7 @@ version = get_version() print('Generating component-packages.nix for version {}'.format(version)) requirements = fetch_reqs(version=version) build_inputs = {} -for component, reqs in requirements.items(): +for component, reqs in OrderedDict(sorted(requirements.items())).items(): attr_paths = [] for req in reqs: try: diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 2267c07e6f98..99900bbdb3ea 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -12,11 +12,11 @@ assert enableSSL -> openssl !=null; stdenv.mkDerivation rec { name = "hiawatha-${version}"; - version = "10.5"; + version = "10.7"; src = fetchurl { url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz"; - sha256 = "11nqdmmhq1glgsiza8pfh69wmpgwl51vb3xijmpcxv63a7ywp4fj"; + sha256 = "1k0vgpfkmdxmkimq4ab70cqwhj5qwr4pzq7nnv957ah8cw2ijy1z"; }; buildInputs = [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ; diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 4eb74c8cb534..c244b3a1000a 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pshs-${version}"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mgorny"; repo = "pshs"; rev = "v${version}"; - sha256 = "18mhxdjlyr21gghzkrrlp0imicb6bqf741p0a21c2rkvs4bv8c1w"; + sha256 = "1ffdyv5qiqdg3jq8y91fsml046g88d7fyy2k81yii11jw3yx2js0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 08e682aa7169..c234a1ae1ee7 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thttpd-${version}"; - version = "2.27"; + version = "2.28"; src = fetchurl { url = "http://acme.com/software/thttpd/${name}.tar.gz"; - sha256 = "0ykda5k1zzzag59zbd4bkzj1psavq0xnpy7vpk19rhx7mlvvri5i"; + sha256 = "0a03w7wg994dizdb37pf4kd9s5lf2q414721jfqnrqpdshlzjll5"; }; prePatch = '' diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 67172edfd36e..ed7765b15403 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yaws-${version}"; - version = "2.0"; + version = "2.0.4"; src = fetchurl { url = "http://yaws.hyber.org/download/${name}.tar.gz"; - sha256 = "1gwk44a07n7yvg900yrlfc6qpvjl64k2h2hddd1jaaay8lgpcch6"; + sha256 = "1ig6q4waqlb6h1hhrly7hslfnqczlbm79vvhr5j7rp5a2p1pfrns"; }; # The tarball includes a symlink yaws -> yaws-1.95, which seems to be diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 6b2adf572175..0060a59d8071 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.0"; + name = "dovecot-2.3.0.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "10c5myzgys866c3x6jdr1s9x9pqnjd5vpyz8z384sph21m3wnq6y"; + sha256 = "0lzisrdgrj5qqwjb7bv99mf2aljm568r6g108yisp0s644z2nxxb"; }; preConfigure = '' @@ -47,16 +47,6 @@ stdenv.mkDerivation rec { # so we can symlink plugins from several packages there. # The symlinking needs to be done in NixOS. ./2.2.x-module_dir.patch - (fetchpatch { - name = "CVE-2017-14132_part1.patch"; - url = https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060.patch; - sha256 = "1pcfzxr8xlwbpa7z19grp7mlvdnan6ln8zw74dj4pdmynmlk4aw9"; - }) - (fetchpatch { - name = "CVE-2017-14132_part2.patch"; - url = https://github.com/dovecot/core/commit/a9b135760aea6d1790d447d351c56b78889dac22.patch; - sha256 = "0082iid5rvjmh003xi9s09jld2rb31hbvni0yai1h1ggbmd5zf8l"; - }) ]; configureFlags = [ diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index ddf4fd5d880d..f11400c190af 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mlmmj-${version}"; - version = "1.2.19.0"; + version = "1.3.0"; src = fetchurl { url = "http://mlmmj.org/releases/${name}.tar.gz"; - sha256 = "18n7b41nfdj7acvmqzkkz984d26xvz14xk8kmrnzv23dkda364m0"; + sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn"; }; postInstall = '' diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index b221bfa0dd4c..1836d0e5cf36 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -8,12 +8,12 @@ let policy-test-flags = mk-perl-flags (with perlPackages; [ ParseSyslog ]); - version = "1.36"; + version = "1.37"; name = "postgrey-${version}"; in runCommand name { src = fetchurl { url = "http://postgrey.schweikert.ch/pub/${name}.tar.gz"; - sha256 = "09jzb246ki988389r9gryigriv9sravk40q75fih5n0q4p2ghax2"; + sha256 = "1xx51xih4711vrvc6d57il9ccallbljj5zhgqdb07jzmz11rakgz"; }; meta = with stdenv.lib; { description = "A postfix policy server to provide greylisting"; diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix new file mode 100644 index 000000000000..d5e410a86c1f --- /dev/null +++ b/pkgs/servers/mail/pypolicyd-spf/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchurl, pyspf }: + +buildPythonApplication rec { + name = "pypolicyd-spf-${version}"; + majorVersion = "2.0"; + version = "${majorVersion}.2"; + + src = fetchurl { + url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; + sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z"; + }; + + propagatedBuildInputs = [ pyspf ]; + + preBuild = '' + substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" + ''; + + meta = with lib; { + homepage = https://launchpad.net/pypolicyd-spf/; + description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 2b81edf48ba3..3e3132798068 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "1idy81absr5w677d4jlzic33hsrn0zjzbfhhdn6viym9vr8dvjx9"; + sha256 = "04jqrki7rlxywdig264kavy1h5882rspi2drkbdzrk35jjq8rh3h"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 4890ed5babf6..f0c1a0fcec55 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,27 +1,32 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage }: +let + version = "4.7.2"; + goPackagePath = "github.com/mattermost/mattermost-server"; + buildFlags = "-ldflags \"-X '${goPackagePath}/model.BuildNumber=nixpkgs-${version}'\""; +in + buildGoPackage rec { name = "mattermost-${version}"; - version = "4.7.0"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "11rw2m26mf4x6xbxkf37c1j16kyxx059jv3cdajkpv31xn82s7iv"; + sha256 = "129rvmwf9c19jbdpiclysb870svs2fbhdybcal0jbmzgx2zr8qma"; }; webApp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz"; - sha256 = "09dzkvrwj4ynk8yqrcbnhmv9hm3z3r3vyjrbzpvmznfrwcccc7lr"; + sha256 = "14gr7zzx77q862qccjcdwrzd6n8g2z8yngw8aa4g3q6hypsqi4v3"; }; - goPackagePath = "github.com/mattermost/mattermost-server"; + inherit goPackagePath; buildPhase = '' runHook preBuild cd go/src/${goPackagePath}/cmd/platform - go install + go install ${buildFlags} runHook postBuild ''; @@ -35,7 +40,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - description = "Open-Source, self-hosted Slack-alternative"; + description = "Open-source, self-hosted Slack-alternative"; homepage = https://www.mattermost.org; license = with licenses; [ agpl3 asl20 ]; maintainers = with maintainers; [ fpletz ryantm ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index c625ce575f2e..66e586a69d94 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.4"; + version = "1.5.5"; name = "memcached-${version}"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "1m03fhzq1f9byk2agccsr0x458niqqjpips5mbcgzhm4kylczhz0"; + sha256 = "1v87gvhxih5jav20cp9zdddna31s968xdm2iskc9mqzb5li6di72"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index b84dd21c3571..f546b0b075e5 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre }: -let version = "6.0"; in +let version = "6.1.3"; in stdenv.mkDerivation rec { name = "subsonic-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/subsonic/subsonic-${version}-standalone.tar.gz"; - sha256 = "0aw7lz7bkhqvjj3lkk68n2aqr5l84s91cgifg2379w2j7dgd056z"; + sha256 = "1v21gfymaqcx6n6d88hvha60q9hgj5z1wsac5gcwq7cjah1893jx"; }; inherit jre; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 2f9a141024b0..876209b9b029 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,28 +1,28 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.6.3"; - name = "grafana-v${version}"; + version = "5.0.0"; + name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "18r35pwarbgamhd7m9z4wpx6x1ymd5qsymvfll58zcgivis6c32j"; + sha256 = "1clkvi651wc4zx9bql5iwwnjgwgrj34dirs7ypi6rdgxissp89p9"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "01f50w57n7p7if37rhj8zy0y0x84qajbxrrdcfrsbi2qi1kzfz03"; + sha256 = "1n2l5ybscc0g1npsa648wjwwb4qrj3f549nf0y6wsifp5k051lhd"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; postInstall = '' tar -xvf $srcStatic mkdir -p $bin/share/grafana - mv grafana-*/{public,conf,vendor} $bin/share/grafana/ - ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/vendor/phantomjs/phantomjs + mv grafana-*/{public,conf,tools} $bin/share/grafana/ + ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 804826941f21..409801e8b7dc 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kapacitor-${version}"; - version = "1.0.0"; + version = "1.4.0"; goPackagePath = "github.com/influxdata/kapacitor"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "14l9bhj6qdif79s4dyqqbnjgj3m4iarvw0ckld1wdhpdgvl8w9qh"; + sha256 = "1qanf7qljzqqkyw2cdazg0ll13q8a3fs3sqydcgfbgpdmf707sj2"; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index b0e2f29a3b48..47bc6d58da90 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.2.4"; + version = "4.3.4"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0w0blbwiw0ps04b7gkyyk89qkgwsxh6gydhmggbm1kl3ar3mq1dh"; + sha256 = "1wa4m952sb23dqi5w759adimsp21bkhp598rpq9dnhz3v497h2y9"; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 64585de51ff3..b930c1ab1f61 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "riemann-${version}"; - version = "0.2.12"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; - sha256 = "1x57gi301rg6faxm4q5scq9dpp0v9nqiwjpsgigdb8whmjr1zwkr"; + sha256 = "151zd8nkhigphdx6g9jhmza6963qvlnki013j1g7lyqaz43qyk1c"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index c907f081e22e..3b875576529f 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.1.2"; + version = "3.3.2"; src = fetchurl { url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; - sha256 = "0kvbsm9mjwqyl3q2myif28a0f11i4rfq3hik07w9cdnrwyd75s40"; + sha256 = "0vjzc38sacnbcw781qzng9lqwwahndfc3wia5yvxji094zqp8ala"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 2f102b58f141..6a65e8d03201 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "11.0"; + version = "11.1"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "0sf92knqkvqmfhrbz4vlsagzqlps72wycpmln5dygicg07a0a8q7"; + sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj"; }; patches = [ ./caps-fix.patch ] diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index 68c9b7a59362..c6f150938ac6 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "quagga-${version}"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { url = "mirror://savannah/quagga/${name}.tar.gz"; - sha256 = "0c99rjjc62xl5kwvx2pwyvs0709vbwax1qydqbqf6r7fpvr24bjj"; + sha256 = "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73"; }; buildInputs = diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 3eba04f44fba..dc3bc22af49c 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.910"; + version = "0.2.0.980"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "0c4msk6hvlqyy81xkjhsvsy4igpc01s4a00zwhqnds2gj4y9yplk"; + sha256 = "1939mmlp9hsmw0hd4c8m8p5fk6igvml30gk9ffi9mfhankas6fnf"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index 82818037072a..dcbfc40d7ddd 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { name = "rt-${version}"; - version = "4.4.0"; + version = "4.4.2"; src = fetchurl { url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; - sha256 = "1hgz50fxv9zdcngww083aqh8vzyk148lm7mcivxflpnsqfw3696x"; + sha256 = "0s5ykc5imcii66zkzcb8lf8adkr8zlbc2ikcpkaxzcccikhndqxj"; }; patches = [ ./override-generated.patch ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 25cd46aa98b2..e3555d0076f6 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "7.1.0"; + version = "8.0.0"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "1v0dyahlq7801bgcyvawj8waw6z84r0sr90x2b8nnrisrac3b8m7"; + sha256 = "14il1biqpx5qs5dkmsrikw33pc8gj8scmr90y639wap87z5i3dcz"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index ead0c095d5c9..7ba23f61fedb 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, - version ? "2.2.8", + version ? "2.2.11", mainSrc ? fetchurl { url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz"; - sha256 = "1q6jdw5g81k7ciw9fhwklb5ifgb8zna39795m0x0lbvwjbk3ampv"; + sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6"; } }: diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index d9a4f4733f73..b1d614bc5cf0 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "smcroute-${version}"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "0a1sgf9p39gbfrh7bhfg1hjqa6y18i7cig7bffmv7spqnvb50zx5"; + sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/softether/4.18.nix b/pkgs/servers/softether/4.18.nix index 69c6cbe2c864..5b0d15136f89 100644 --- a/pkgs/servers/softether/4.18.nix +++ b/pkgs/servers/softether/4.18.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl -, openssl, readline, ncurses, zlib }: +, openssl, readline, ncurses, zlib +, dataDir ? "/var/lib/softether" }: let os = if stdenv.isLinux then "1" @@ -17,7 +18,6 @@ stdenv.mkDerivation rec { version = "4.18"; build = "9570"; compiledDate = "2015.07.26"; - dataDir = "/var/lib/softether"; src = fetchurl { url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = https://www.softether.org/; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; - platforms = platforms.linux; + platforms = filter (p: p != "aarch64-linux") platforms.linux; }; } diff --git a/pkgs/servers/softether/4.20.nix b/pkgs/servers/softether/4.20.nix index c6ef5a3a4df2..91dd0d0411f8 100644 --- a/pkgs/servers/softether/4.20.nix +++ b/pkgs/servers/softether/4.20.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl -, openssl, readline, ncurses, zlib }: +, openssl, readline, ncurses, zlib +, dataDir ? "/var/lib/softether" }: let os = if stdenv.isLinux then "1" @@ -17,7 +18,6 @@ stdenv.mkDerivation rec { version = "4.20"; build = "9608"; compiledDate = "2016.04.17"; - dataDir = "/var/lib/softether"; src = fetchurl { url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = https://www.softether.org/; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; - platforms = platforms.linux; + platforms = filter (p: p != "aarch64-linux") platforms.linux; }; } diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix index b1e9c5c1a455..04053174f4e4 100644 --- a/pkgs/servers/softether/4.25.nix +++ b/pkgs/servers/softether/4.25.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl -, openssl, readline, ncurses, zlib }: +, openssl, readline, ncurses, zlib +, dataDir ? "/var/lib/softether" }: let os = if stdenv.isLinux then "1" @@ -17,7 +18,6 @@ stdenv.mkDerivation rec { version = "4.25"; build = "9656"; compiledDate = "2018.01.15"; - dataDir = "/var/lib/softether"; src = fetchurl { url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = https://www.softether.org/; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; - platforms = platforms.linux; + platforms = filter (p: p != "aarch64-linux") platforms.linux; }; } diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index e97b483fa062..f40a5df0f5c0 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "cockroach-${version}"; - version = "1.1.2"; + version = "1.1.5"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0h1fijzihp85a18flq4brdc3b38gj867kfkp31gncnmff0xb8kam"; + sha256 = "0i2lg60424i1yg9dhapfsy3majnlbad2wlf93d9l161jf5lp9a2d"; }; nativeBuildInputs = [ cmake xz which autoconf ]; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 5a747fb85abd..29d25b77afc8 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -49,6 +49,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7 NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 0b2778218760..0c04f910e5bb 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -49,6 +49,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; + CXXFLAGS = "-fpermissive"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 046eb6cfca98..7125f9ef8e96 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation rec { - name = "mysql-connector-java-5.1.39"; + name = "mysql-connector-java-5.1.45"; builder = ./builder.sh; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip"; - sha256 = "0d0g51hfx7a2r6nbni8yramg4vpqk0sql0aaib6q576a0nnrq78r"; + sha256 = "1x3dygygj15p7zk825mqr0g80wlm3rfsqgbqnb11l133rk4s1ylw"; }; buildInputs = [ unzip ant ]; diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 78ad88bc9047..1e995537c88b 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 = "1.1.9"; + version = "2.0.2"; src = fetchurl { url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag"; + sha256 = "0023747i2x3j50z54l78maq7dya5ldd2sdydn6l5l7k6b6g4yr2d"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 0c6a197b1da5..0f08d94a052f 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -3,14 +3,14 @@ buildGoPackage rec { name = "teleport-${version}"; - version = "2.4.0"; + version = "2.4.1"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "1x4xnqjyb87pzmn2c59fwmzfx1f2k0xhqn2xgki3722qmj2ss846"; + sha256 = "09kmlihv4aqc39f9cyv2vm0kqgdf9vmdrgds5krnzqdgy3svyg7y"; }; goPackagePath = "github.com/gravitational/teleport"; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 72f5d3aa9d87..d38405688fc5 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.5.0"; + version = "1.5.2"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "0yvmw99knjdfgaa3snk4fmrbf3bqnj78ix5hr0mcqj5pwjx1dihb"; + sha256 = "0cv05nm7jj1g2630l5zmzpmsrjx712ba3l7klh8nqs02mzykzsha"; }; buildInputs = [ go-bindata bash ]; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index d8cfadbfab2f..c5e2b45fe96d 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -3,7 +3,7 @@ , which, zlib }: let - version = "4.2.4"; + version = "4.2.5"; in stdenv.mkDerivation rec { name = "tvheadend-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "tvheadend"; repo = "tvheadend"; rev = "v${version}"; - sha256 = "1kydjmgv0nrllgi2s6aczq4x9ag01c8qm8w962qb52fzdfw7fs6k"; + sha256 = "199b0xm4lfdspmrirvzzg511yh358awciz23zmccvlvq86b548pz"; }; buildInputs = [ diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 102868c0d46c..40bcbc50f0ca 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "1npfl7n1w2l0j6c6iizw1szzq0lz9wy6jb55qmwhfkzwj0zd7mqp"; + sha256 = "1alsha0mhscp0jha2wlb5mqqkx2967s7rpm0x8c2v7jws1d0m1w3"; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 4614a9768b05..b420c673850b 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation rec { name = "uwsgi-${version}"; - version = "2.0.15"; + version = "2.0.16"; src = fetchurl { url = "http://projects.unbit.it/downloads/${name}.tar.gz"; - sha256 = "1zvj28wp3c1hacpd4c6ra5ilwvvfq3l8y6gn8i7mnncpddlzjbjp"; + sha256 = "1x61vipgzhzb6flbbgl0hq96j9d330gh0kmwv8pwh6n57j7z84d9"; }; nativeBuildInputs = [ python3 pkgconfig ]; diff --git a/pkgs/servers/web-apps/piwik/bootstrap.php b/pkgs/servers/web-apps/matomo/bootstrap.php similarity index 100% rename from pkgs/servers/web-apps/piwik/bootstrap.php rename to pkgs/servers/web-apps/matomo/bootstrap.php diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix new file mode 100644 index 000000000000..c99b20a46bd5 --- /dev/null +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, makeWrapper, php }: + +stdenv.mkDerivation rec { + name = "matomo-${version}"; + version = "3.3.0"; + + src = fetchurl { + # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again + # url = "https://builds.matomo.org/${name}.tar.gz"; + url = "https://builds.matomo.org/piwik-${version}.tar.gz"; + sha256 = "1ybzj3kk0x29nv8c6xnhir5d9dr0q0fl1vnm4i7zvhml73ryqk0f"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # make-localhost-default-database-server.patch: + # This changes the default value of the database server field + # from 127.0.0.1 to localhost. + # unix socket authentication only works with localhost, + # but password-based SQL authentication works with both. + # TODO: is upstream interested in this? + patches = [ ./make-localhost-default-database-host.patch ]; + + # this bootstrap.php adds support for getting PIWIK_USER_PATH + # from an environment variable. Point it to a mutable location + # to be able to use matomo read-only from the nix store + postPatch = '' + cp ${./bootstrap.php} bootstrap.php + ''; + + # TODO: future versions might rename the PIWIK_… variables to MATOMO_… + # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH. + # See https://forum.matomo.org/t/bootstrap-php/5926/10 and + # https://github.com/matomo-org/matomo/issues/11654#issuecomment-297730843 + installPhase = '' + runHook preInstall + + # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed + mkdir -p $out/share + cp -ra * $out/share/ + # tmp/ is created by matomo in PIWIK_USER_PATH + rmdir $out/share/tmp + # config/ needs to be copied to PIWIK_USER_PATH anyway + mv $out/share/config $out/ + + makeWrapper ${php}/bin/php $out/bin/matomo-console \ + --add-flags "$out/share/console" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A real-time web analytics application"; + license = licenses.gpl3Plus; + homepage = https://matomo.org/; + platforms = platforms.all; + maintainers = [ maintainers.florianjacob ]; + }; +} diff --git a/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch b/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch new file mode 100644 index 000000000000..48808ac2ccca --- /dev/null +++ b/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php +index 9364f49870..2625cbb91b 100644 +--- a/plugins/Installation/FormDatabaseSetup.php ++++ b/plugins/Installation/FormDatabaseSetup.php +@@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2 + + // default values + $this->addDataSource(new HTML_QuickForm2_DataSource_Array(array( +- 'host' => '127.0.0.1', ++ 'host' => 'localhost', + 'type' => $defaultDatabaseType, + 'tables_prefix' => 'matomo_', + ))); diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix deleted file mode 100644 index 697240e81c75..000000000000 --- a/pkgs/servers/web-apps/piwik/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, php }: - -stdenv.mkDerivation rec { - name = "piwik-${version}"; - version = "3.2.1"; - - src = fetchurl { - url = "https://builds.piwik.org/${name}.tar.gz"; - sha512 = "1yisgywz7dm6kygh9mc207xnqpvdxbw4pa2l9gjh495a6979x3chi7z5rf410z4dmrg0kbj8wqm8mmmslfn276xvw37l2d4h73ij1h2"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - # regarding the 127.0.0.1 substitute: - # This replaces the default value of the database server field. - # unix socket authentication only works with localhost, - # but password-based SQL authentication works with both. - postPatch = '' - substituteInPlace plugins/Installation/FormDatabaseSetup.php \ - --replace "=> '127.0.0.1'," "=> 'localhost'," - cp ${./bootstrap.php} bootstrap.php - ''; - - # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH. - # See https://forum.piwik.org/t/bootstrap-php/5926/10 and - # https://github.com/piwik/piwik/issues/11654#issuecomment-297730843 - installPhase = '' - runHook preInstall - - # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed - mkdir -p $out/share - cp -ra * $out/share/ - # tmp/ is created by piwik in PIWIK_USER_PATH - rmdir $out/share/tmp - # config/ needs to be copied to PIWIK_USER_PATH anyway - mv $out/share/config $out/ - - makeWrapper ${php}/bin/php $out/bin/piwik-console \ - --add-flags "$out/share/console" - - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "A real-time web analytics application"; - license = licenses.gpl3Plus; - homepage = https://piwik.org/; - platforms = platforms.all; - maintainers = [ maintainers.florianjacob ]; - }; -} diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix index ee4dab5ad64a..da8cc0e73b13 100644 --- a/pkgs/servers/web-apps/pump.io/composition.nix +++ b/pkgs/servers/web-apps/pump.io/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { @@ -13,4 +13,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index ac60827aeb7b..3835f5ae3324 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -4,14 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "searx"; - version = "0.13.1"; + version = "0.14.0"; # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "0nizxq9ggf9g8f8pxn2hfm0kn20356v65h4cj9s73n742nkv6ani"; + sha256 = "046xg6xcs1mxgahz7kwf3fsmwd99q3hhms6pdjlvyczidlfhpmxl"; }; postPatch = '' diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index a74221cfbd33..4c4cd21cddf4 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.2"; + version = "0.9.5"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "07wn5pg7pkya8d4k2khp2jyvkdkmm5431fj1k0m1i5k65yyvfqzr"; + sha256 = "133ffxyw9bf61rky01d3rkkm34np5z4kwmgwx6ygshl83y0ylnwf"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 07b530f4ef72..c0d5876a3a2d 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.3.1"; + version = "2.3.2"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "1qk7jicni5g8acpjybrwnwf7zknk3b0mxiv5876lrsajcxdxwnf4"; + sha256 = "17yczdvgl43j6wa7hksxi2b51afvyd56vdya6hbbv68iiba4jyh4"; }; outputs = [ "out" ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index cc2cade8ba13..d22565ae8db9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,6 +1,6 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig -, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol +, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 1f3557dff66e..acf234a1683e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -230,7 +230,7 @@ print OUT ""; print OUT < ++#include + #include + #include + #include diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index a18051f9c126..32b85eaa6815 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -86,12 +86,17 @@ let }; ceph-python-env = python2Packages.python.withPackages (ps: [ - ps.sphinx - ps.flask - ps.argparse - ps.cython - ps.setuptools - ps.pip + ps.sphinx + ps.flask + ps.argparse + ps.cython + ps.setuptools + ps.pip + # Libraries needed by the python tools + ps.Mako + ps.pecan + ps.prettytable + ps.webob ]); in @@ -103,11 +108,13 @@ stdenv.mkDerivation { patches = [ # ./ceph-patch-cmake-path.patch ./0001-kv-RocksDBStore-API-break-additional.patch + ] ++ optionals stdenv.isLinux [ + ./0002-fix-absolute-include-path.patch ]; nativeBuildInputs = [ cmake - pkgconfig which git + pkgconfig which git python2Packages.wrapPython (ensureNewerSourcesHook { year = "1980"; }) ]; @@ -122,6 +129,7 @@ stdenv.mkDerivation { ] ++ optionals hasKinetic [ optKinetic-cpp-client ]; + preConfigure ='' # rip off submodule that interfer with system libs @@ -149,6 +157,10 @@ stdenv.mkDerivation { "-DWITH_LIBCEPHFS=OFF" ]; + postFixup = '' + wrapPythonPrograms + ''; + enableParallelBuilding = true; outputs = [ "dev" "lib" "out" "doc" ]; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index e415f57e707e..03da84f7c733 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { name = "encfs-${version}"; - version = "1.9.2"; + version = "1.9.4"; src = fetchFromGitHub { - sha256 = "0isx7n4r8znk02464s0wvlzk6ry5mlnq3kgnd0rapnhjwdvwqr5y"; + sha256 = "1hp2l4yk7fsimlrrd6a675vigmyikd323l1n3mybcdng58skj2ag"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index e9d3df026b08..4594aa9370ca 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hubicfuse-${version}"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "TurboGit"; repo = "hubicfuse"; rev = "v${version}"; - sha256 = "1y4n63bk9vd6n1l5psjb9xm9h042kw4yh2ni33z7agixkanajv1s"; + sha256 = "1x988hfffxgvqxh083pv3lj5031fz03sbgiiwrjpaiywfbhm8ffr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 681fc1c80ef0..59d8e8aa4389 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libaal}: -let version = "1.1.0"; in +let version = "1.2.1"; in stdenv.mkDerivation rec { name = "reiser4progs-${version}"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz"; - sha256 = "18bgv0wd75q53642x5dsk4g0mil1hw1zrp7a4xkb0pxx4bzjlbqg"; + sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7"; }; buildInputs = [libaal]; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 9d7e9eaee95e..11d836e66bcc 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "s3fs-fuse-${version}"; - version = "1.82"; + version = "1.83"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "0bammbb8h10n51qk5141gabsd5p91qbaqq7cwa1q8yf5qglwlp10"; + sha256 = "0rh0lkvjjy19lixqq07hjp4k9mhahmwc0pbp5cr3m59qbwwcprvx"; }; buildInputs = [ curl openssl libxml2 fuse ]; diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 233034792e15..6fc7ba6499ea 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "securefs-${version}"; - version = "0.3.2"; + version = "0.8.1"; src = fetchFromGitHub { - sha256 = "1drksvwfgfpgcn2mzb65ljqlg2kgn6nald9fnz60hliw8f1wiqvh"; + sha256 = "065n3mskv0b2dlk9w4b3pa70h5ymrnanydbanwyx74mf7n8c80r2"; rev = version; repo = "securefs"; owner = "netheril96"; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 593715b2068d..3283d6789f73 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zerofree-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "http://frippery.org/uml/${name}.tgz"; - sha256 = "059g29x5r1xj6wcj4xj85l8w6qrxyl86yqbybjqqz6nxz4falxzf"; + sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm"; }; buildInputs = [ e2fsprogs ]; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 8c53882ff1b2..a4d49edcb447 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { name = "cfdg-${version}"; - version = "3.0.2"; + version = "3.0.9"; src = fetchurl { - sha256 = "1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; + sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl"; url = "http://www.contextfreeart.org/download/ContextFreeSource${version}.tgz"; }; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 7261326633a1..dc703cf02f75 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp -, libxkbcommon, epoxy, at_spi2_core, dbus, libdbusmenu-glib +, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake autoreconfHook gtk glib pcre libappindicator libpthreadstubs - libXdmcp libxkbcommon epoxy at_spi2_core + libXdmcp libxkbcommon epoxy at-spi2-core dbus libdbusmenu-glib ]; diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 69ae03d67503..e9f1ad5dacd7 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -2,14 +2,14 @@ let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.4"; name = "imgur-screenshot-${version}"; src = fetchFromGitHub { owner = "jomo"; repo = "imgur-screenshot"; rev = "v${version}"; - sha256 = "01wiqrc7xxvk7kzgw756jahwa0szb200l8030iwfcgxb679k3v0j"; + sha256 = "1bhi9sk8v7szh2fj13qwvdwzy5dw2w4kml86sy1ns1rn0xin0cgr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 2f18857b2a16..5887c82af130 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "logstalgia-${version}"; - version = "1.0.7"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz"; - sha256 = "1qghz1j3jmfj093br2hfyibayg3fmhg8fvp5ix9n9rbvzc1zslsm"; + sha256 = "0nvnk8q9m2ignzwxak0vch88blywbx4znk70xf9fg38xa4rf94yn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 1a2b5b19e37a..21d86f4c44b6 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "1.0.0"; + version = "1.0.1"; name = "oxipng-${version}"; src = fetchFromGitHub { owner = "shssoichiro"; repo = "oxipng"; rev = "v${version}"; - sha256 = "1w3y9qy72sfz6zv1iizp843fd39rf1qfh7b9mllbn5w8w4hd658w"; + sha256 = "0w39f0dhq9cxk25vy0wh8vicxyckvj1vmglx5va4550i3q0hsrws"; }; - cargoSha256 = "0mj45svb0nly3cl5d1fmm7nh2zswxpgb56g9xnb4cks5186sn5fi"; + cargoSha256 = "00nbx6n73yl4ax05pqkmim1vhy0pymgz5la1cc4y18gjbjjj9w4h"; meta = with stdenv.lib; { homepage = https://github.com/shssoichiro/oxipng; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 42ca4cf2e270..5dfed3722e09 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "povray-${version}"; - version = "3.7.0.4"; + version = "3.7.0.7"; src = fetchFromGitHub { owner = "POV-Ray"; repo = "povray"; rev = "v${version}"; - sha256 = "1wkwb43w5r9pa79yazy4w4s8n6g280igag97hgl7dyi289q39n0q"; + sha256 = "0gqbc4ycjfqpnixzzqxlygmargk6sm77b0k3xzff9dxdrak3xng7"; }; diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index ba376af1c3cd..402628f0fc8f 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "scanbd-${version}"; - version = "1.4.4"; + version = "1.5.1"; src = fetchurl { - sha256 = "07a59jk9b2hh49v5lcpckp64f5lny9sq8h0h2p2jcs9cqazf6q9s"; + sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n"; url = "mirror://sourceforge/scanbd/${name}.tgz"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index e9e2e29f7fad..2bd4bf1c878c 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor_icon_theme }: +{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "fcitx-rime-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr"; }; - buildInputs = [ cmake pkgconfig fcitx librime brise hicolor_icon_theme ]; + buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ]; # cmake cannont automatically find our nonstandard brise install location cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index 1ea7ef4251fe..e31d1ddfaa80 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "121zh3q0li1k537fcvbd4ns4jgl9bbb9gm9ihy8cfxgirv38lcfa"; }; - propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ]; + propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein pygobject3 ]; nativeBuildInputs = [ python3Packages.wrapPython ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index f71a21b914f3..59ddab7294f5 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig , vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 -, gtk3, gtk_doc, isocodes, python3, json_glib, libnotify ? null, enablePythonLibrary ? true +, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { substituteInPlace data/dconf/Makefile.am --replace "dconf update" true substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh - cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make . + cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; preAutoreconf = "touch ChangeLog"; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gconf - gtk_doc + gtk-doc intltool makeWrapper pkgconfig @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { gtk2 gtk3 isocodes - json_glib + json-glib libnotify ] ++ optionals withWayland [ libxkbcommon diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index d41ba1e791f9..2b93274b79a2 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, runCommand, makeWrapper, lndir -, dconf, hicolor_icon_theme, ibus, librsvg, plugins +, dconf, hicolor-icon-theme, ibus, librsvg, plugins }: let @@ -7,7 +7,7 @@ let env = { buildInputs = [ ibus ] ++ plugins; nativeBuildInputs = [ lndir makeWrapper ]; - propagatedUserEnvPackages = [ hicolor_icon_theme ]; + propagatedUserEnvPackages = [ hicolor-icon-theme ]; paths = [ ibus ] ++ plugins; inherit (ibus) meta; }; @@ -37,7 +37,7 @@ let --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" done for prog in ibus-daemon; do @@ -56,7 +56,7 @@ let --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \ + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --add-flags "--cache=refresh" done ''; diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch new file mode 100644 index 000000000000..b694fcabbd0d --- /dev/null +++ b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch @@ -0,0 +1,13 @@ +diff --git a/libinput-gestures b/libinput-gestures +index f337ba3..fe56d66 100755 +--- a/libinput-gestures ++++ b/libinput-gestures +@@ -6,7 +6,7 @@ from collections import OrderedDict + from pathlib import Path + from distutils.version import LooseVersion as Version + +-PROG = Path(sys.argv[0]).stem ++PROG = "libinput-gestures" + + # Conf file containing gesture commands. + # Search first for user file then system file. diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch new file mode 100644 index 000000000000..c6ee123db8b6 --- /dev/null +++ b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch @@ -0,0 +1,43 @@ +diff --git a/libinput-gestures b/libinput-gestures +index f337ba3..5f5b05d 100755 +--- a/libinput-gestures ++++ b/libinput-gestures +@@ -75,17 +75,13 @@ def get_libinput_vers(): + 'Return the libinput installed version number string' + # Try to use newer libinput interface then fall back to old + # (depreciated) interface. +- res = run(('libinput', '--version'), check=False) ++ res = run(('@libinput@', '--version'), check=False) + return res.strip() if res else run(('libinput-list-devices', '--version')) + + # Libinput changed the way in which it's utilities are called + libvers = get_libinput_vers() +-if Version(libvers) >= Version('1.8'): +- cmd_debug_events = 'libinput debug-events' +- cmd_list_devices = 'libinput list-devices' +-else: +- cmd_debug_events = 'libinput-debug-events' +- cmd_list_devices = 'libinput-list-devices' ++cmd_debug_events = '@libinput@ debug-events' ++cmd_list_devices = '@libinput@ list-devices' + + def get_devices_list(): + 'Get list of devices and their attributes (as a dict) from libinput' +@@ -187,7 +183,7 @@ class COMMAND_internal(COMMAND): + + def run(self): + 'Get list of current workspaces and select next one' +- stdout = run(('wmctrl', '-d'), check=False) ++ stdout = run(('@wmctrl@', '-d'), check=False) + if not stdout: + # This command can fail on GNOME when you have only a single + # dynamic workspace using Xorg (probably a GNOME bug) so let's +@@ -220,7 +216,7 @@ class COMMAND_internal(COMMAND): + + # Switch to desired workspace + if index >= minindex and index < maxindex: +- run(('wmctrl', '-s', str(index))) ++ run(('@wmctrl@', '-s', str(index))) + + # Table of gesture handlers + handlers = OrderedDict() diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix new file mode 100644 index 000000000000..e58cabc6791a --- /dev/null +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, + libinput, wmctrl, + xdotool ? null, + extraUtilsPath ? lib.optional (xdotool != null) xdotool +}: +stdenv.mkDerivation rec { + pname = "libinput-gestures"; + version = "2.32"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "bulletmark"; + repo = "libinput-gestures"; + rev = version; + sha256 = "1by6sabx0s8sd9w5675gc26q7yccxnxxsjg4dqlb6nbs0vcg81s7"; + }; + patches = [ + ./0001-hardcode-name.patch + ./0002-paths.patch + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = + '' + substituteInPlace libinput-gestures-setup --replace /usr/ / + + substituteInPlace libinput-gestures \ + --replace /etc "$out/etc" \ + --subst-var-by libinput "${libinput}/bin/libinput" \ + --subst-var-by wmctrl "${wmctrl}/bin/wmctrl" + ''; + installPhase = + '' + runHook preInstall + ${stdenv.shell} libinput-gestures-setup -d "$out" install + runHook postInstall + ''; + postFixup = + '' + rm "$out/bin/libinput-gestures-setup" + substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out" + chmod +x "$out/share/applications/libinput-gestures.desktop" + wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath extraUtilsPath}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/bulletmark/libinput-gestures; + description = "Gesture mapper for libinput"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ teozkr ]; + }; +} diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 6214bc216f8b..168a3f887728 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -2,14 +2,14 @@ let - version = "1.1.1"; + version = "1.2.0"; rev = "v${version}"; aptlySrc = fetchFromGitHub { inherit rev; owner = "smira"; repo = "aptly"; - sha256 = "197a7nh8li20slqxgn8s8xm13x5b8ansmabk8rx32sngb73hp4av"; + sha256 = "1acnkmgarz9rp0skkh7zzwkhisjlmbl74jqjmqd3mn42y528c34b"; }; aptlyCompletionSrc = fetchFromGitHub { diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 4d6e90a347e7..0808704ecb78 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -4,7 +4,7 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { name = "asciinema-${version}"; - version = "1.4.0"; + version = "2.0.0"; buildInputs = with pythonPackages; [ nose ]; propagatedBuildInputs = with pythonPackages; [ requests ]; @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { owner = "asciinema"; repo = "asciinema"; rev = "v${version}"; - sha256 = "1m2gjqxb5gqyz19lvp7jmwp7cxjc6nb0b2rrlsg3z2bl6vmi1xn2"; + sha256 = "1f92hv9w58jf1f7igspjxvrxqn3n21kgya2zb56spqyydr4jzwdk"; }; patchPhase = '' diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 974b7691cb93..859112d29bc2 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,42 +1,27 @@ -{ stdenv, fetchurl, - boost, clasp, cmake, gringo, re2c +{ stdenv, fetchzip +, boost, clasp, cmake, gringo, re2c }: -let - version = "1.9.1"; -in - stdenv.mkDerivation rec { + version = "1.9.4"; name = "aspcud-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz"; - sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0"; + src = fetchzip { + url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; + sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw"; }; buildInputs = [ boost clasp cmake gringo re2c ]; - buildPhase = '' - cmake -DCMAKE_BUILD_TYPE=Release \ - -DGRINGO_LOC=${gringo}/bin/gringo \ - -DCLASP_LOC=${clasp}/bin/clasp \ - -DENCODING_LOC=$out/share/aspcud/specification.lp \ - . - - make - ''; - - installPhase = '' - mkdir -p $out/bin - cp bin/{aspcud,cudf2lp,lemon} $out/bin - - mkdir -p $out/share/aspcud - cp ../share/aspcud/specification.lp $out/share/aspcud - ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DASPCUD_GRINGO_PATH=${gringo}/bin/gringo" + "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp" + ]; meta = with stdenv.lib; { description = "Solver for package problems in CUDF format using ASP"; - homepage = http://potasssco.sourceforge.net/; + homepage = "https://potassco.org/aspcud/"; platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ba38a55dda02..4d3376108b7e 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, python, bash }: let - version = "22.5.0"; + version = "22.5.1"; in stdenv.mkDerivation rec { name = "autojump-${version}"; @@ -9,7 +9,7 @@ in src = fetchurl { url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz"; name = "autojump-${version}.tar.gz"; - sha256 = "00ai0j37ka3557a8m7ig44dby7v01pckwi8gl479vz5b5pw1z8cd"; + sha256 = "17z9j9936x0nizwrzf664bngh60x5qbvrrf1s5qdzd0f2gdanpvn"; }; buildInputs = [ python bash ]; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index 02caf6e33f99..75c7b258a449 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "autorevision-${version}"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; - sha256 = "1xlp7wn2vv17rp848ai272sifi6fmwdr6dg4im53hrf32j3gzlhy"; + sha256 = "07ssirjy2mgbqxr792n3rqa408hm7qnhwfjzd73rqfwvjcahy1q8"; }; buildInputs = [ diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 899fb5f643ab..a8b6d5f3c252 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "bandwidth-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { url = "http://zsmith.co/archives/${name}.tar.gz"; - sha256 = "1p1kp5s3fdgy667q7mc9ywnps0sbj4lpr42561yhi59m69n8c3kd"; + sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; buildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 7ea3b1fd279c..e06c2dee000d 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.175"; + version = "1.178"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1bbj6wxdpjhy7n2614z0qx2310vhaxlvism6v6lxancb5bwwgdnf"; + sha256 = "1ngxa7hzfhvfhkvyc2qib3qyql5zz8rjg559wpi2jsi4hibj84vc"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 8dbcd08fba6e..6635f2931955 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -4,11 +4,11 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-5.5"; + name = "brltty-5.6"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; + sha256 = "06by51n35w0jq14w1vimxk3ssrlmiiw49wpxw29rasc106mpysfn"; }; nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 6a76906a805f..e6ff7e99353b 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "convmv-1.15"; + name = "convmv-2.04"; src = fetchurl { url = "http://www.j3e.de/linux/convmv/${name}.tar.gz"; - sha256 = "0daiiapsrca8zlbmlz2kw2fn4vmkh48cblb70h08idchhk3sw5f3"; + sha256 = "075xn1ill26hbhg4nl54sp75b55db3ikl7lvhqb9ijvkpi67j6yy"; }; preBuild='' diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index ec9ca37c082e..052f52e2ebd4 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "127a5v545gvfgxqqjxqafsg1p8i4qd5wnpdwccr38jbsphl6yzl4"; + sha256 = "1c4cl9cac90xf9rap6ss2d4yshcmhdq8pdfjz3g4cns789fs1vcf"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index b0c0de996e74..15d8647ff823 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.14.0"; + version = "2.15.1"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0xgb895dda7q7qyl5lg1jfjfb82daaf133dx0vw8lp7d67xqv9r8"; + sha256 = "07kzfkv5ssys788j0f1bp73gd7b53vwv2jsxkd85zwb3kby1145v"; }; postConfigure = '' diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index e1024d70bce9..9449b7759a8c 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diskscan-${version}"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "baruch"; repo = "diskscan"; rev = "${version}"; - sha256 = "0yqpaxfahbjr8hr9xw7nngncwigy7yncdwnyp5wy9s9wdp8mrjra"; + sha256 = "1s2df082yrnr3gqnapdsqz0yd0ld75bin37g0rms83ymzkh4ysgv"; }; buildInputs = [ ncurses zlib ]; diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index d37655134c55..b8791f5f32a2 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.9"; + version = "4.0"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "0xk8y8asy0wxi5jx03c521p9919gjr8053lxpfzn83jkmqc8zmq2"; + sha256 = "12vc3xp0z0abmsy5kbix0wmn0sca39c8miyga6cijydi128zxm2a"; }; postPatch = '' diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 33624302ebcc..1d7c47c2c9ab 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,23 +2,23 @@ python3.pkgs.buildPythonApplication rec { name = "esptool-${version}"; - version = "2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "137p0kcscly95qpjzgx1yxm8k2wf5y9v3srvlhp2ajniirgv8ijv"; + sha256 = "0gwnl6z5s2ax07l3n38h9hdyz71pn8lzn4fybcwyrii0bj2kapvc"; }; - buildInputs = with python3.pkgs; [ flake8 flake8-future-import ]; + checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ]; propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa openssl ]; meta = with stdenv.lib; { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = https://github.com/espressif/esptool; license = licenses.gpl2; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 503f0df331cf..c07420821ed4 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib +, darwin, libiconv +}: with rustPlatform; @@ -16,7 +18,10 @@ buildRustPackage rec { }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv darwin.apple_sdk.frameworks.Security ] + ; # Some tests fail, but Travis ensures a proper build doCheck = false; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 0d1c81c00a65..ed210783db19 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, tcl, makeWrapper }: stdenv.mkDerivation rec { - version = "5.45"; + version = "5.45.4"; name = "expect-${version}"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; - sha256 = "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj"; + sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9"; }; buildInputs = [ tcl ]; diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index b29e76413104..394310e572dd 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fpart-${version}"; - version = "0.9.3"; + version = "1.0.0"; src = fetchurl { url = "http://contribs.martymac.org/fpart/${name}.tar.gz"; - sha256 = "0f1vm7c7v9nrd0mnz6qivpnngni6y53b11kvniclqfd25hhw6ggq"; + sha256 = "1p0ajmry18lcg82znfp8nxs4w3izic775l7df08hywlq4vfa66pg"; }; postInstall = '' diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 71cfedcaec72..99c54b6d3964 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor_icon_theme +, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor-icon-theme , gpart, hdparm, procps, utillinux }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor_icon_theme ]; + buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor-icon-theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; postInstall = '' diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 40d122242ffc..9719ea6fe554 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-12-24"; + version = "0.4.6a-2018-02-20"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "ca0371bb1e2365bfe4e44031a3b8b59e8c58ce0d"; - sha256 = "0a9m7n5la3dmbfx6n5iqlfbm607r1mww0wkimn29mlsc30d8aamr"; + rev = "74f6c862c73a4d21e61832174f4ab2f1d7f8b12a"; + sha256 = "0p85y5adnlcs4cdi9dg6f5fzzc1y12bmfhx13qs0576izx2rma3q"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/homesick/Gemfile.lock b/pkgs/tools/misc/homesick/Gemfile.lock index cac0e8d083ef..42ab916db3e3 100644 --- a/pkgs/tools/misc/homesick/Gemfile.lock +++ b/pkgs/tools/misc/homesick/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - homesick (1.1.3) + homesick (1.1.6) thor (>= 0.14.0) - thor (0.19.1) + thor (0.20.0) PLATFORMS ruby @@ -12,4 +12,4 @@ DEPENDENCIES homesick BUNDLED WITH - 1.10.6 + 1.14.6 diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix index 0997b2268029..d35267fae27e 100644 --- a/pkgs/tools/misc/homesick/default.nix +++ b/pkgs/tools/misc/homesick/default.nix @@ -1,6 +1,6 @@ { lib, bundlerEnv, git}: bundlerEnv { - name = "homesick-1.1.3"; + name = "homesick-1.1.6"; gemdir = ./.; diff --git a/pkgs/tools/misc/homesick/gemset.nix b/pkgs/tools/misc/homesick/gemset.nix index b4a3b608bcb1..f51448276802 100644 --- a/pkgs/tools/misc/homesick/gemset.nix +++ b/pkgs/tools/misc/homesick/gemset.nix @@ -1,16 +1,19 @@ { homesick = { - version = "1.1.3"; + dependencies = ["thor"]; source = { - type = "gem"; - sha256 = "1pqsnbykisc6qamkz1gcbgis4az95sggxfdkq9v5hjr1a46q0s91"; + remotes = ["https://rubygems.org"]; + sha256 = "0lxvnp4ncbx0irlblfxbd1f8h4hl11hgmyiy35q79w137r3prxml"; + type = "gem"; }; + version = "1.1.6"; }; thor = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl"; + type = "gem"; + }; + version = "0.20.0"; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index b8b7666934b8..7fd9897a71bb 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "keychain-${version}"; - version = "2.8.3"; + version = "2.8.5"; src = fetchFromGitHub { owner = "funtoo"; repo = "keychain"; rev = "${version}"; - sha256 = "0za2fi4g7ixzj3izgwlv71b3cviz3qhz43y4bhdkglg16x5cnzcb"; + sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; buildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index d74e2b4e12a7..f511e013f368 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -6,14 +6,14 @@ let pname = "kronometer"; - version = "2.1.3"; + version = "2.2.1"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i"; + sha256 = "18b2qi5b9hn8jy3yhav72n14z5l9w3p5fv5kslhbxc7rfvjr4h3x"; }; meta = with lib; { diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 57d29437a211..b7963c3ed817 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "latex2html-${version}"; - version = "2016"; + version = "2018"; src = fetchurl { url = "http://mirrors.ctan.org/support/latex2html/latex2html-${version}.tar.gz"; - sha256 = "028k0ypbq94mlhydf1sbqlphlfl2fhmlzhgqq5jjzihfmccbq7db"; + sha256 = "1qnlg8ajh0amy9gy8rh8sp1l224ak54264i3dhk7rrv9s4k7bqq9"; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 5ab05c92135a..4d7c27a39445 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "1jdjn64cxgbhhyg73cisrfrk7vjg1hr9nvkmfdk8gxc4g82y3xxc"; + sha256 = "0hq9ri6a18z682gihxlbh1rndka0v6brkdqsyfsgh4c2fgib4fb7"; inherit name; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.2"; + version = "0.8.3"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index fb4093d89b86..f9983cc0a7f6 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mc-${version}"; - version = "4.8.19"; + version = "4.8.20"; src = fetchurl { url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; - sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb"; + sha256 = "072h7n9b3j79fqn48xaw0xhlcjavpsmfpz6nyh20lhmfz3sffzh1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 6289c35f35a7..2116815ed0c3 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoreconfHook, which, txt2man, gnome_doc_utils, scrollkeeper }: + libiconv, autoreconfHook, which, txt2man, gnome-doc-utils, scrollkeeper }: stdenv.mkDerivation { name = "mdbtools-git-2014-07-25"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib readline bison flex autoreconfHook which txt2man - gnome_doc_utils scrollkeeper libiconv + gnome-doc-utils scrollkeeper libiconv ]; preAutoreconf = '' diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 81d6d29b2bf2..52f685b22ca6 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, desktop_file_utils, file, python3Packages }: +{ stdenv, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z"; }; - buildInputs = [ file desktop_file_utils ]; + buildInputs = [ file desktop-file-utils ]; propagatedBuildInputs = [ python3Packages.pyxdg ]; preConfigure = '' substituteInPlace Mimeo.py \ --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \ - "EXE_UPDATE_DESKTOP_DATABASE = '${desktop_file_utils}/bin/update-desktop-database'" \ + "EXE_UPDATE_DESKTOP_DATABASE = '${desktop-file-utils}/bin/update-desktop-database'" \ --replace "EXE_FILE = 'file'" \ "EXE_FILE = '${file}/bin/file'" ''; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index a8332ad494da..3b220153f173 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse , libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - autoconf automake libtool pkgconfig gtk_doc gobjectIntrospection which yacc + autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc libxslt docbook_xsl docbook_xml_dtd_42 ]; diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index de69712eb5ee..49c57ab8dc90 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -1,39 +1,52 @@ -{ buildPythonApplication, lib, fetchFromGitHub +{ buildPythonApplication, lib, fetchFromGitHub, bashInteractive , argcomplete, arxiv2bib, beautifulsoup4, bibtexparser -, configparser, habanero, papis-python-rofi, pylibgen -, prompt_toolkit, pyparser, python_magic, pyyaml -, requests, unidecode, urwid, vobject, tkinter +, configparser, dmenu-python, habanero, papis-python-rofi +, pylibgen, prompt_toolkit, pyparser, pytest, python_magic +, pyyaml, requests, unidecode, urwid, vobject, tkinter , vim }: buildPythonApplication rec { pname = "papis"; - version = "0.5.2"; + version = "0.5.3"; # Missing tests on Pypi src = fetchFromGitHub { - owner = "alejandrogallo"; + owner = "papis"; repo = pname; rev = "v${version}"; - sha256 = "0cw6ajdaknijka3j2bkkkn0bcxqifk825kq0a0rdbbmc6661pgxb"; + sha256 = "1yc4ilb7bw099pi2vwawyf8mi0n1kp87wgwgwcwc841ibq62q8ic"; }; - postPatch = "sed -i 's/configparser>=3.0.0/# configparser>=3.0.0/' setup.py"; + postPatch = '' + sed -i 's/configparser>=3.0.0/# configparser>=3.0.0/' setup.py + patchShebangs tests + ''; propagatedBuildInputs = [ argcomplete arxiv2bib beautifulsoup4 bibtexparser - configparser habanero papis-python-rofi pylibgen - prompt_toolkit pyparser python_magic pyyaml + configparser dmenu-python habanero papis-python-rofi + pylibgen prompt_toolkit pyparser python_magic pyyaml requests unidecode urwid vobject tkinter vim ]; - # Papis tries to create the config folder under $HOME during the tests - preCheck = '' - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; + checkInputs = [ pytest ]; + # Papis tries to create the config folder under $HOME during the tests + checkPhase = '' + mkdir -p check-phase + export PATH=$out/bin:$PATH + # Still don't know why this fails + sed -i 's/--set dir=hello //' tests/bash/test_default.sh + + # This test has been disabled since it requires a network connaction + sed -i 's/test_downloader_getter(self):/disabled_test_downloader_getter(self):/' papis/downloaders/tests/test_main.py + + export HOME=$(pwd)/check-phase + make test + SH=${bashInteractive}/bin/bash make test-non-pythonic + ''; meta = { description = "Powerful command-line document and bibliography manager"; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index cb55226109b4..37073daa699d 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook -, gtk2, hicolor_icon_theme, intltool, pkgconfig +, gtk2, hicolor-icon-theme, intltool, pkgconfig , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; preFixup = '' # Need which and xdotool on path to fix auto-pasting. diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index fd5004302dff..a5e45dc259b9 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.5"; name = "pastebinit-${version}"; src = fetchurl { url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1rl854izwn1fpaaib6zj7a1a9bis8n7w4zfxcapgfffj37zj0dy2"; + sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2"; }; buildInputs = [ python3 ]; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index d5908210cbdd..b4cfe7b26c0e 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "phraseapp-client-${version}"; - version = "1.4.5"; + version = "1.6.0"; goPackagePath = "github.com/phrase/phraseapp-client"; subPackages = [ "." ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "phrase"; repo = "phraseapp-client"; rev = version; - sha256 = "0zky7jcs7h6zmvkb0na4la6h7g63jlrziifqk831fd1gspdzgajp"; + sha256 = "0rgwl0rgkci045hg36s0q8jwkni1hzapqpi0mc0gk3rl7nagw622"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 0f5c15241439..e366a03a7f42 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3, texinfo, makeWrapper }: stdenv.mkDerivation rec { - name = "ponysay-3.0.2"; + name = "ponysay-3.0.3"; src = fetchurl { - url = "https://github.com/erkin/ponysay/archive/3.0.2.tar.gz"; - sha256 = "03avcbl96rv718lgg6yyrq5mvg3xxzccrnnb6brf4g9mcrwqmsb9"; + url = "https://github.com/erkin/ponysay/archive/3.0.3.tar.gz"; + sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; }; buildInputs = [ python3 texinfo makeWrapper ]; diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/quota/default.nix index a13f7160aa69..dfcefe092008 100644 --- a/pkgs/tools/misc/quota/default.nix +++ b/pkgs/tools/misc/quota/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: stdenv.mkDerivation rec { - version = "4.03"; + version = "4.04"; name = "quota-${version}"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "0jv7vhxhjp3gc4hwgmrhg448sbzzqib80gdas9nm0c5zwyd4sv4w"; + sha256 = "1pwfxza923j75z5lx0w89pj09745zi1swy77cm0zalbzgs4f2nvk"; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 2ff86f5cbdf6..640e641dd477 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, - gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }: + gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }: with stdenv.lib; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configurePhase = "scons config"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext glib json_glib libelf scons sphinx utillinux ]; + buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ]; buildPhase = "scons"; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index d6cad51ce753..8c2845dc8ebd 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - libcap, glib, libgsystem, json_glib, libarchive, libsolv, librepo, gtk_doc, elfutils, + libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils, gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: let @@ -31,7 +31,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ which autoconf automake libtool libcap ostree rpm glib libgsystem gperf - json_glib libarchive libsolv librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 + json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 cmake pcre check python # FIXME: get rid of this once libarchive properly propagates this acl diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix new file mode 100644 index 000000000000..a310135727db --- /dev/null +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: + +buildPythonApplication rec { + name = "scfbuild-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "eosrei"; + repo = "scfbuild"; + rev = "c179c8d279b7cc0a9a3536a713ac880ac6010318"; + sha256 = "1bsi7k4kkj914pycp1g92050hjxscyvc9qflqb3cv5yz3c93cs46"; + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + propagatedBuildInputs = [ pyyaml fonttools fontforge ]; + + installPhase = '' + mkdir -p $out/${python.sitePackages} + cp -r scfbuild $out/${python.sitePackages} + cp -r bin $out + ''; + + meta = with lib; { + description = "SVGinOT color font builder"; + homepage = https://github.com/eosrei/scfbuild; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix new file mode 100644 index 000000000000..709cbbe07912 --- /dev/null +++ b/pkgs/tools/misc/skim/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "skim-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lotabout"; + repo = "skim"; + rev = "v${version}"; + sha256 = "0spkkgjjrch1grb0115rn0wxzsh8pzmm96a7j69zy5pc1il2m5lp"; + }; + + outputs = [ "out" "vim" ]; + + cargoSha256 = "0zbjnii8r41ih2m2vqhm3wdiwgi13kipvxx75sg4vm4maf4wpmhv"; + + patchPhase = '' + sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim + ''; + + postInstall = '' + install -D -m 555 bin/sk-tmux -t $out/bin + install -D -m 444 shell/* -t $out/share/skim + install -D -m 444 plugin/skim.vim -t $vim/plugin + + cat <