From 6da6accd303be776bb4e958da52046da86f9cb5c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 May 2018 16:42:02 -0400 Subject: [PATCH 001/600] treewide: Remove uses of builtins.toPath. toPath has confusing semantics and is never necessary; it can always either just be omitted or replaced by pre-concatenating `/.`. It has been marked as "!!! obsolete?" for more than 10 years in a C++ comment, hopefully removing it will let us properly deprecate and, eventually, remove it. --- lib/strings.nix | 5 ++--- lib/tests/misc.nix | 4 ++-- nixos/lib/eval-config.nix | 2 +- .../modules/services/x11/desktop-managers/enlightenment.nix | 2 +- pkgs/build-support/fetchdocker/default.nix | 4 ++-- pkgs/development/mobile/androidenv/androidndk.nix | 2 +- .../apple-source-releases/libsecurity_generic/default.nix | 2 +- pkgs/servers/bird/default.nix | 2 +- pkgs/servers/monitoring/telegraf/default.nix | 2 +- pkgs/servers/nosql/influxdb/default.nix | 2 +- pkgs/tools/typesetting/tex/texlive/combine.nix | 2 +- 11 files changed, 14 insertions(+), 15 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index e09ec42bfea2..2a61b1465cc2 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -492,7 +492,7 @@ rec { isStorePath = x: isCoercibleToString x && builtins.substring 0 1 (toString x) == "/" - && dirOf (builtins.toPath x) == builtins.storeDir; + && dirOf x == builtins.storeDir; /* Convert string to int Obviously, it is a bit hacky to use fromJSON that way. @@ -528,11 +528,10 @@ rec { */ readPathsFromFile = rootPath: file: let - root = toString rootPath; lines = lib.splitString "\n" (builtins.readFile file); removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); relativePaths = removeComments lines; - absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths; + absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths; in absolutePaths; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index c683df7d7ca3..c0e1aaa248eb 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -97,7 +97,7 @@ runTests { storePathAppendix = isStorePath "${goodPath}/bin/python"; nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath))); - asPath = isStorePath (builtins.toPath goodPath); + asPath = isStorePath goodPath; otherPath = isStorePath "/something/else"; otherVals = { attrset = isStorePath {}; @@ -318,7 +318,7 @@ runTests { int = 42; bool = true; string = ''fno"rd''; - path = /. + "/foo"; # toPath returns a string + path = /. + "/foo"; null_ = null; function = x: x; functionArgs = { arg ? 4, foo }: arg; diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 97c79487df4c..d005fc61dc4e 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -28,7 +28,7 @@ let extraArgs_ = extraArgs; pkgs_ = pkgs; extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; - in if e == "" then [] else [(import (builtins.toPath e))]; + in if e == "" then [] else [(import e)]; in let diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index da3287aaea6e..5c083a151ff3 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -61,7 +61,7 @@ in ''; }]; - security.wrappers = (import (builtins.toPath "${e.enlightenment}/e-wrappers.nix")).security.wrappers; + security.wrappers = (import "${e.enlightenment}/e-wrappers.nix").security.wrappers; environment.etc = singleton { source = xcfg.xkbDir; diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix index ae3ae4185e05..b54e4141afc9 100644 --- a/pkgs/build-support/fetchdocker/default.nix +++ b/pkgs/build-support/fetchdocker/default.nix @@ -22,8 +22,8 @@ assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName); let - # Abuse `builtins.toPath` to collapse possible double slashes - repoTag0 = builtins.toString (builtins.toPath "/${stripScheme registry}/${repository}/${imageName}"); + # Abuse paths to collapse possible double slashes + repoTag0 = builtins.toString (/. + "/${stripScheme registry}/${repository}/${imageName}"); repoTag1 = lib.removePrefix "/" repoTag0; layers = builtins.map stripNixStore imageLayers; diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 78e278be2376..1c0f75215e76 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patch -p1 \ --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./. + builtins.toPath ("/make_standalone_toolchain.py_" + "${version}" + ".patch") } + -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_${version}.patch" } wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" '' } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 93857ea792c2..2efdc5abeb31 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -1,7 +1,7 @@ { appleDerivation_, applePackage, pkgs, stdenv }: name: version: sha256: args: let n = stdenv.lib.removePrefix "lib" name; - makeFile = ../. + builtins.toPath "/${name}/GNUmakefile"; + makeFile = ../. + "/${name}/GNUmakefile"; appleDerivation = appleDerivation_ name version sha256; in applePackage name version sha256 (args // { appleDerivation = a: diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 94bd92abb4f8..f44ae83ec03a 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -17,7 +17,7 @@ let buildInputs = [ readline ]; patches = [ - (./. + (builtins.toPath "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch")) + (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch") ]; configureFlags = [ diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index b7879cc763aa..dc219416fcb9 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { -X main.version=${version} '' ]; - goDeps = ./. + builtins.toPath "/deps-${version}.nix"; + goDeps = ./. + "/deps-${version}.nix"; meta = with lib; { description = "The plugin-driven server agent for collecting & reporting metrics."; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 972bd53d95ee..466bf6a60a06 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { excludedPackages = "test"; # Generated with the nix2go - goDeps = ./. + builtins.toPath "/deps-${version}.nix"; + goDeps = ./. + "/deps-${version}.nix"; meta = with lib; { description = "An open-source distributed time series database"; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 35fee64ba54f..f1a20552d382 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -35,7 +35,7 @@ let mkUniquePkgs = pkgs: fastUnique (a: b: a < b) # highlighting hack: > # here we deal with those dummy packages needed for hyphenation filtering - (map (p: if lib.isDerivation p then builtins.toPath p else "") pkgs); + (map (p: if lib.isDerivation p then p.outPath else "") pkgs); in buildEnv { name = "texlive-${extraName}-${bin.texliveYear}"; From 4abb8be7abec422bb221816931148d9465e380f3 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Fri, 3 Aug 2018 12:55:29 -0700 Subject: [PATCH 002/600] haskell-modules: add callCabal2nixWithOptions. Fixes #44377. --- .../haskell-modules/make-package-set.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 95dac230cc55..928c002c3af0 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -170,19 +170,22 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: args: let - filter = path: type: - pkgs.lib.hasSuffix "${name}.cabal" path || - baseNameOf path == "package.yaml"; - expr = self.haskellSrc2nix { - inherit name; - src = if pkgs.lib.canCleanSource src - then pkgs.lib.cleanSourceWith { inherit src filter; } - else src; - }; - in overrideCabal (callPackageKeepDeriver expr args) (orig: { - inherit src; - }); + callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args: + let + filter = path: type: + pkgs.lib.hasSuffix "${name}.cabal" path || + baseNameOf path == "package.yaml"; + expr = self.haskellSrc2nix { + inherit name extraCabal2nixOptions; + src = if pkgs.lib.canCleanSource src + then pkgs.lib.cleanSourceWith { inherit src filter; } + else src; + }; + in overrideCabal (callPackageKeepDeriver expr args) (orig: { + inherit src; + }); + + callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args; # : { root : Path # , source-overrides : Defaulted (Either Path VersionNumber) From cb1e30f84bc1814c693a2e224022a5b528192cae Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 7 Apr 2018 13:09:39 +0300 Subject: [PATCH 003/600] heimdal: refactor lib-prefixed packages to multi-output --- .../libraries/kerberos/heimdal.nix | 65 ++++++++++--------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 24adb2a141e8..134ca4f05b0a 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -2,16 +2,11 @@ , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam , CoreFoundation, Security, SystemConfiguration -# Extra Args -, type ? "" }: -let - libOnly = type == "lib"; -in with stdenv.lib; stdenv.mkDerivation rec { - name = "${type}heimdal-${version}"; + name = "heimdal-${version}"; version = "7.5.0"; src = fetchFromGitHub { @@ -21,15 +16,15 @@ stdenv.mkDerivation rec { sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d"; }; + outputs = [ "out" "bin" "dev" "man" ]; + patches = [ ./heimdal-make-missing-headers.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] - ++ (with perlPackages; [ JSON ]) - ++ optional (!libOnly) texinfo; + nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ] + ++ (with perlPackages; [ JSON ]); buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] - ++ [ db sqlite openssl libedit ] - ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ] - ++ optionals (!libOnly) [ openldap pam ]; + ++ [ db sqlite openssl libedit openldap pam] + ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]; ## ugly, X should be made an option configureFlags = [ @@ -37,12 +32,14 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--enable-hdb-openldap-module" "--with-sqlite3=${sqlite.dev}" - "--with-libedit=${libedit}" + + # ugly, --with-libedit is not enought, it fall back to bundled libedit + "--with-libedit-include=${libedit.dev}/include" + "--with-libedit-lib=${libedit}/lib" "--with-openssl=${openssl.dev}" "--without-x" "--with-berkeley-db" "--with-berkeley-db-include=${db.dev}/include" - ] ++ optionals (!libOnly) [ "--with-openldap=${openldap.dev}" ] ++ optionals (stdenv.isLinux) [ "--with-capng" @@ -50,24 +47,17 @@ stdenv.mkDerivation rec { postUnpack = '' sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common + sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac ''; - buildPhase = optionalString libOnly '' - (cd include; make -j $NIX_BUILD_CORES) - (cd lib; make -j $NIX_BUILD_CORES) - (cd tools; make -j $NIX_BUILD_CORES) - (cd include/hcrypto; make -j $NIX_BUILD_CORES) - (cd lib/hcrypto; make -j $NIX_BUILD_CORES) - ''; - - installPhase = optionalString libOnly '' - (cd include; make -j $NIX_BUILD_CORES install) - (cd lib; make -j $NIX_BUILD_CORES install) - (cd tools; make -j $NIX_BUILD_CORES install) - (cd include/hcrypto; make -j $NIX_BUILD_CORES install) - (cd lib/hcrypto; make -j $NIX_BUILD_CORES install) - rm -rf $out/{libexec,sbin,share} - find $out/bin -type f | grep -v 'krb5-config' | xargs rm + preConfigure = '' + configureFlagsArray+=( + "--bindir=$out/bin" # Put binaries to $out, then move them to $bin, + # otherwise we go a cyclic dependecny + "--sbindir=$out/sbin" + "--mandir=$man/share/man" + "--infodir=$man/share/info" + "--includedir=$dev/include") ''; # We need to build hcrypt for applications like samba @@ -76,14 +66,27 @@ stdenv.mkDerivation rec { (cd lib/hcrypto; make -j $NIX_BUILD_CORES) ''; + # FIXME: share/info hits $bin, IDK why, but I decide is to minor to block postInstall = '' # Install hcrypto (cd include/hcrypto; make -j $NIX_BUILD_CORES install) (cd lib/hcrypto; make -j $NIX_BUILD_CORES install) + # Do we need it? + rm $out/bin/su + # Doesn't succeed with --libexec=$out/sbin, so - mv "$out/libexec/"* $out/sbin/ + mkdir -p $dev/bin + mkdir -p $bin/{,s}bin + mv "$out/libexec/heimdal/"* $dev/bin/ + rmdir $out/libexec/heimdal + mv "$out/libexec/"* $bin/sbin/ rmdir $out/libexec + + mkdir -p $dev/bin && mv $out/bin/krb5-config $dev/bin/ + + # Move remaining binaries to $bin + mv $out/bin/* $bin/bin/ ''; # Issues with hydra diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cd0eb706aea..6e4faf9fa32c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9700,10 +9700,14 @@ with pkgs; hamlib = callPackage ../development/libraries/hamlib { }; + # TODO : Let admin choose. + # We are using mit-krb5 because it is better maintained + kerberos = libkrb5; + heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; - libheimdal = heimdal.override { type = "lib"; }; + libheimdal = heimdal; harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzz-icu = harfbuzz.override { From 4622b765ac9de49526dec7d986243a755b103882 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Tue, 5 Jun 2018 19:07:22 +0300 Subject: [PATCH 004/600] kerberos: heimdal alias moved to aliases.nix --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e4faf9fa32c..9901c7b33e44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9700,10 +9700,6 @@ with pkgs; hamlib = callPackage ../development/libraries/hamlib { }; - # TODO : Let admin choose. - # We are using mit-krb5 because it is better maintained - kerberos = libkrb5; - heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; From 0a72127d57472069b12b080cd89d79917ac54bfe Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Thu, 21 Jun 2018 07:39:53 +0300 Subject: [PATCH 005/600] heimdal: move "info" to own output --- pkgs/development/libraries/kerberos/heimdal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 134ca4f05b0a..11f0ffdad16c 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d"; }; - outputs = [ "out" "bin" "dev" "man" ]; + outputs = [ "out" "bin" "dev" "man" "info" ]; patches = [ ./heimdal-make-missing-headers.patch ]; @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" + "--infodir=$info/share/info" "--enable-hdb-openldap-module" "--with-sqlite3=${sqlite.dev}" @@ -66,7 +67,6 @@ stdenv.mkDerivation rec { (cd lib/hcrypto; make -j $NIX_BUILD_CORES) ''; - # FIXME: share/info hits $bin, IDK why, but I decide is to minor to block postInstall = '' # Install hcrypto (cd include/hcrypto; make -j $NIX_BUILD_CORES install) From 5a59d5e13143129e3e4f6f801874286781efac60 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Thu, 12 Jul 2018 20:01:08 +0300 Subject: [PATCH 006/600] heimdal: simplify build, keep bin/ in $out --- .../libraries/kerberos/heimdal.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 11f0ffdad16c..5b92458d89e9 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d"; }; - outputs = [ "out" "bin" "dev" "man" "info" ]; + outputs = [ "out" "dev" "man" "info" ]; patches = [ ./heimdal-make-missing-headers.patch ]; @@ -53,9 +53,9 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlagsArray+=( - "--bindir=$out/bin" # Put binaries to $out, then move them to $bin, - # otherwise we go a cyclic dependecny + "--bindir=$out/bin" "--sbindir=$out/sbin" + "--libexecdir=$out/libexec/heimdal" "--mandir=$man/share/man" "--infodir=$man/share/info" "--includedir=$dev/include") @@ -75,18 +75,12 @@ stdenv.mkDerivation rec { # Do we need it? rm $out/bin/su - # Doesn't succeed with --libexec=$out/sbin, so mkdir -p $dev/bin - mkdir -p $bin/{,s}bin - mv "$out/libexec/heimdal/"* $dev/bin/ - rmdir $out/libexec/heimdal - mv "$out/libexec/"* $bin/sbin/ - rmdir $out/libexec + mv $out/bin/krb5-config $dev/bin/ - mkdir -p $dev/bin && mv $out/bin/krb5-config $dev/bin/ - - # Move remaining binaries to $bin - mv $out/bin/* $bin/bin/ + # asn1 compilers, move them to $dev + mv $out/libexec/heimdal/heimdal/* $dev/bin + rmdir $out/libexec/heimdal/heimdal ''; # Issues with hydra From e808b7da20c6123bfedc8b5b19ac7386a39b82ab Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 8 Aug 2018 13:35:03 +0300 Subject: [PATCH 007/600] heimdal: adjust daemon paths, they are in libexec now --- nixos/modules/services/system/kerberos.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix index d151385d2f9b..e2c45ed64ac0 100644 --- a/nixos/modules/services/system/kerberos.nix +++ b/nixos/modules/services/system/kerberos.nix @@ -42,7 +42,7 @@ in protocol = "tcp"; user = "root"; server = "${pkgs.tcp_wrappers}/bin/tcpd"; - serverArgs = "${pkgs.heimdalFull}/bin/kadmind"; + serverArgs = "${pkgs.heimdalFull}/libexec/heimdal/kadmind"; }; systemd.services.kdc = { @@ -51,13 +51,13 @@ in preStart = '' mkdir -m 0755 -p ${stateDir} ''; - script = "${heimdalFull}/bin/kdc"; + script = "${heimdalFull}/libexec/heimdal/kdc"; }; systemd.services.kpasswdd = { description = "Kerberos Password Changing daemon"; wantedBy = [ "multi-user.target" ]; - script = "${heimdalFull}/bin/kpasswdd"; + script = "${heimdalFull}/libexec/heimdal/kpasswdd"; }; }; From 7e192a55e7f1da45830bda0911128cad5e3f7804 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 8 Aug 2018 15:23:27 -0400 Subject: [PATCH 008/600] pythonPackages.pytest-timeout: refactor add python 2.7 compatibiliy In version 1.3.1 of `pytest-timeout` (latest) the setup.py file is not compatible with python 2.7 and 3+ due to how `open` is called. A patch has been added that can be removed once a fix and new relase is given. --- .../python-modules/pytest-timeout/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 012226de0532..45e9a4b9e477 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchPypi +, fetchpatch , lib , pexpect , pytest @@ -9,10 +10,20 @@ buildPythonPackage rec { pname = "pytest-timeout"; version = "1.3.1"; + # remove after version 1.3.1 + patches = [ + (fetchpatch { + name = "fix-installation-27-3-with-encoding-issue.patch"; + url = "https://bitbucket.org/pytest-dev/pytest-timeout/commits/9de81d3fc57a71a36d418d4aa181c241a7c5350f/raw"; + sha256 = "0g081j6iyc9825f63ssmmi40rkcgk4p9vvhy9g0lqd0gc6xzwa2p"; + }) + ]; + src = fetchPypi { inherit pname version; sha256 = "4b261bec5782b603c98b4bb803484bc96bf1cdcb5480dae0999d21c7e0423a23"; }; + buildInputs = [ pytest ]; checkInputs = [ pytest pexpect ]; checkPhase = ''pytest -ra''; @@ -21,6 +32,6 @@ buildPythonPackage rec { description = "py.test plugin to abort hanging tests"; homepage = https://bitbucket.org/pytest-dev/pytest-timeout/; license = licenses.mit; - maintainers = with maintainers; [ makefu ]; + maintainers = with maintainers; [ makefu costrouc ]; }; } From 0d3b2b6990f559970f21456ed183f865cac70543 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 12 Aug 2018 23:04:19 +0200 Subject: [PATCH 009/600] cargo-download: init at 0.1.1 Cargo.nix was generated from cargo-download 0.1.1 with this patch applied, which was necessary to not confuse carnix about the version being different between Cargo.toml and Cargo.lock. See https://github.com/Xion/cargo-download/pull/3. From 5efd4cf11ff9d5042712303404169016b1e05c33 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 26 Jul 2018 21:19:06 +0200 Subject: [PATCH] Fix Cargo.lock Running `cargo build` on a clean checkout produces a diff in Cargo.lock, because it wasn't updated after the version number was bumped. After this commit, `cargo build` should no longer produce a modified working tree. --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index cc7357c..c384dc1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "cargo-download" -version = "0.1.0" +version = "0.1.1" dependencies = [ "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.27.1 (registry+https://github.com/rust-lang/crates.io-index)", -- 2.17.1 --- .../cargo-download/Cargo.nix | 3138 +++++++++++++++++ .../cargo-download/default.nix | 5 + pkgs/top-level/all-packages.nix | 1 + 3 files changed, 3144 insertions(+) create mode 100644 pkgs/tools/package-management/cargo-download/Cargo.nix create mode 100644 pkgs/tools/package-management/cargo-download/default.nix diff --git a/pkgs/tools/package-management/cargo-download/Cargo.nix b/pkgs/tools/package-management/cargo-download/Cargo.nix new file mode 100644 index 000000000000..9735bde199dc --- /dev/null +++ b/pkgs/tools/package-management/cargo-download/Cargo.nix @@ -0,0 +1,3138 @@ +# Generated by carnix 0.7.2: carnix nix +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); +in +rec { + cargo_download = f: cargo_download_0_1_1 { features = cargo_download_0_1_1_features { cargo_download_0_1_1 = f; }; }; + __all = [ (cargo_download {}) ]; + adler32_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "adler32"; + version = "1.0.3"; + authors = [ "Remi Rampin " ]; + sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb"; + inherit dependencies buildDependencies features; + }; + aho_corasick_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.5.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; } ]; + inherit dependencies buildDependencies features; + }; + ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + inherit dependencies buildDependencies features; + }; + ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.11.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; + sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; + inherit dependencies buildDependencies features; + }; + arrayvec_0_4_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "arrayvec"; + version = "0.4.7"; + authors = [ "bluss" ]; + sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4"; + inherit dependencies buildDependencies features; + }; + atty_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.11"; + authors = [ "softprops " ]; + sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20"; + inherit dependencies buildDependencies features; + }; + base64_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "base64"; + version = "0.9.2"; + authors = [ "Alice Maz " "Marshall Pierce " ]; + sha256 = "0g4xxl8jhwjhvr69qlxdmbzd521xcn5j67lhkr20nh7ajvl6k0l1"; + inherit dependencies buildDependencies features; + }; + bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.9.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; + inherit dependencies buildDependencies features; + }; + bitflags_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw"; + inherit dependencies buildDependencies features; + }; + build_const_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "build_const"; + version = "0.2.1"; + authors = [ "Garrett Berg " ]; + sha256 = "15249xzi3qlm72p4glxgavwyq70fx2sp4df6ii0sdlrixrrp77pl"; + inherit dependencies buildDependencies features; + }; + byteorder_1_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.2.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1xghv5f5rydzsam8lnfqhfk090i8a1knb77ikbs0ik44bvrw2ij3"; + inherit dependencies buildDependencies features; + }; + bytes_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bytes"; + version = "0.4.9"; + authors = [ "Carl Lerche " ]; + sha256 = "1jiqc94j85la9vs165vqpf6s1sah8n3ivnhsfapcjrvbhjawi6i6"; + inherit dependencies buildDependencies features; + }; + cargo_download_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cargo-download"; + version = "0.1.1"; + authors = [ "Karol Kuczmarski " ]; + sha256 = "1xiffk4df6i9cvwimzwyf1finv6w8f8gr0zjp21fzbiz5c0ksx65"; + crateBin = [ { name = "cargo-download"; } ]; + inherit dependencies buildDependencies features; + }; + case_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "case"; + version = "0.1.0"; + authors = [ "Skyler Lipthay " ]; + sha256 = "06i1x3wqv30rkvlgj134qf9vzxhzz28bz41mm0rgki0i0f7gf96n"; + inherit dependencies buildDependencies features; + }; + cc_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.18"; + authors = [ "Alex Crichton " ]; + sha256 = "0wcnpa54qvm5921wwrrkn8cwxd5y0p5f4gb1qgyh5imii7rdhpjx"; + inherit dependencies buildDependencies features; + }; + cfg_if_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.4"; + authors = [ "Alex Crichton " ]; + sha256 = "0n5baxk53dvqjymzwynq55wb805b24390qx1n16zi8fjzq90j7k4"; + inherit dependencies buildDependencies features; + }; + chrono_0_2_25_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "chrono"; + version = "0.2.25"; + authors = [ "Kang Seonghoon " ]; + sha256 = "0gsvqk8cnmm43qj3xyngqvfqh50cbdbqas7ik0wjgnvknirmmca7"; + inherit dependencies buildDependencies features; + }; + clap_2_32_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.32.0"; + authors = [ "Kevin K. " ]; + sha256 = "1hdjf0janvpjkwrjdjx1mm2aayzr54k72w6mriyr0n5anjkcj1lx"; + inherit dependencies buildDependencies features; + }; + conv_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "conv"; + version = "0.3.3"; + authors = [ "Daniel Keep " ]; + sha256 = "08rl72k1a48xah0ar5l9v1bw19pp8jdw2pdkd3vvj9ijsyyg9yik"; + inherit dependencies buildDependencies features; + }; + core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "core-foundation"; + version = "0.2.3"; + authors = [ "The Servo Project Developers" ]; + sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm"; + inherit dependencies buildDependencies features; + }; + core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "core-foundation-sys"; + version = "0.2.3"; + authors = [ "The Servo Project Developers" ]; + sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + crc_1_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crc"; + version = "1.8.1"; + authors = [ "Rui Hu " ]; + sha256 = "00m9jjqrddp3bqyanvyxv0hf6s56bx1wy51vcdcxg4n2jdhg109s"; + inherit dependencies buildDependencies features; + }; + crossbeam_0_2_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crossbeam"; + version = "0.2.12"; + authors = [ "Aaron Turon " ]; + sha256 = "0jkm95is7bwv4parwfq4aim6cigiwd4w9hz09cpild4hp5ry625i"; + inherit dependencies buildDependencies features; + }; + crossbeam_deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crossbeam-deque"; + version = "0.3.1"; + authors = [ "The Crossbeam Project Developers" ]; + sha256 = "1km0mavyp9ddwb7k7kcdmyryi3bwxf0nmr6jqcpyjzvzmxjlkqap"; + inherit dependencies buildDependencies features; + }; + crossbeam_epoch_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crossbeam-epoch"; + version = "0.4.3"; + authors = [ "The Crossbeam Project Developers" ]; + sha256 = "18xfgi7h9aq4lqqrqzy366xg885z1hlkbhvycl2i3zhkhkvadhv3"; + inherit dependencies buildDependencies features; + }; + crossbeam_utils_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crossbeam-utils"; + version = "0.3.2"; + authors = [ "The Crossbeam Project Developers" ]; + sha256 = "1byx31nkxl48la58571h40ssk94faky26jwz15w40v2gba3v4fql"; + inherit dependencies buildDependencies features; + }; + custom_derive_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "custom_derive"; + version = "0.1.7"; + authors = [ "Daniel Keep " ]; + sha256 = "160q3pzri2fgrr6czfdkwy1sbddki2za96r7ivvyii52qp1523zs"; + inherit dependencies buildDependencies features; + }; + derive_error_0_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "derive-error"; + version = "0.0.3"; + authors = [ "rushmorem " ]; + sha256 = "0239vzxn5xr9nm3i4d6hmqy7dv8llcjblgh1xixfk5dcgcqan77y"; + procMacro = true; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.3"; + authors = [ "David Tolnay " ]; + sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8"; + inherit dependencies buildDependencies features; + }; + either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "either"; + version = "1.5.0"; + authors = [ "bluss" ]; + sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; + inherit dependencies buildDependencies features; + }; + encoding_rs_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "encoding_rs"; + version = "0.7.2"; + authors = [ "Henri Sivonen " ]; + sha256 = "1c23bi3q4qmi2ci8g7p5j4b4i5abyggvyg6hkl7w4p4r527c9g3q"; + inherit dependencies buildDependencies features; + }; + exitcode_1_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "exitcode"; + version = "1.1.2"; + authors = [ "Ben Wilber " ]; + sha256 = "1cw9p4vzbscvyrbzv7z68gv2cairrns2d4wcb4nkahkcjk25phip"; + inherit dependencies buildDependencies features; + }; + filetime_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "filetime"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "1wmbj3jnpl39851lymw64j9ac1nmy1z96h1wymvlvypspl68w5y0"; + inherit dependencies buildDependencies features; + }; + flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "flate2"; + version = "0.2.20"; + authors = [ "Alex Crichton " ]; + sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl"; + inherit dependencies buildDependencies features; + }; + foreign_types_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "foreign-types"; + version = "0.3.2"; + authors = [ "Steven Fackler " ]; + sha256 = "105n8sp2djb1s5lzrw04p7ss3dchr5qa3canmynx396nh3vwm2p8"; + inherit dependencies buildDependencies features; + }; + foreign_types_shared_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "foreign-types-shared"; + version = "0.1.1"; + authors = [ "Steven Fackler " ]; + sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.3"; + authors = [ "Raph Levien " ]; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.3"; + authors = [ "Raph Levien " ]; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; + inherit dependencies buildDependencies features; + }; + futures_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "futures"; + version = "0.1.23"; + authors = [ "Alex Crichton " ]; + sha256 = "075s7sv1iqzf2r3lvb4hk81k5c9xzfcyb8q92h2s35fnypxyqd21"; + inherit dependencies buildDependencies features; + }; + futures_cpupool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "futures-cpupool"; + version = "0.1.8"; + authors = [ "Alex Crichton " ]; + sha256 = "0ficd31n5ljiixy6x0vjglhq4fp0v1p4qzxm3v6ymsrb3z080l5c"; + inherit dependencies buildDependencies features; + }; + httparse_1_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "httparse"; + version = "1.3.2"; + authors = [ "Sean McArthur " ]; + sha256 = "1mm10m2hv1inxzzvm85s6fdmwl9a3q9vik0nzh5qrx2hx5x8fcwl"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + hyper_0_11_27_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hyper"; + version = "0.11.27"; + authors = [ "Sean McArthur " ]; + sha256 = "0q5as4lhvh31bzk4qm7j84snrmxyxyaqk040rfk72b42dn98mryi"; + inherit dependencies buildDependencies features; + }; + hyper_tls_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hyper-tls"; + version = "0.1.3"; + authors = [ "Sean McArthur " ]; + sha256 = "1dr5arj79pdyz9f2jggqmna1qpc578f9pdgsf2ana5amjpsp0j89"; + inherit dependencies buildDependencies features; + }; + idna_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "idna"; + version = "0.1.5"; + authors = [ "The rust-url developers" ]; + sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy"; + inherit dependencies buildDependencies features; + }; + iovec_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "iovec"; + version = "0.1.2"; + authors = [ "Carl Lerche " ]; + sha256 = "0vjymmb7wj4v4kza5jjn48fcdb85j3k37y7msjl3ifz0p9yiyp2r"; + inherit dependencies buildDependencies features; + }; + isatty_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "isatty"; + version = "0.1.8"; + authors = [ "David Tolnay " ]; + sha256 = "1n5wzzkb1kxkfbcyv5vfrsybika0a1k01sp06ngad73ljx4kwj5h"; + inherit dependencies buildDependencies features; + }; + itertools_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itertools"; + version = "0.6.5"; + authors = [ "bluss" ]; + sha256 = "0gbhgn7s8qkxxw10i514fzpqnc3aissn4kcgylm2cvnv9zmg8mw1"; + inherit dependencies buildDependencies features; + }; + itoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "193a744yd74rmk13hl8xvd9p2hqhdkyf8xkvi1mxm5s10bby0h8v"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "language-tags"; + version = "0.2.2"; + authors = [ "Pyfisch " ]; + sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.11"; + authors = [ "Marvin Löbel " ]; + sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; + inherit dependencies buildDependencies features; + }; + lazy_static_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "1.0.2"; + authors = [ "Marvin Löbel " ]; + sha256 = "0ix4dmy6zb4v3m75l4alg84fk06y145z52z9pyysc9labw2x5r3r"; + inherit dependencies buildDependencies features; + }; + lazycell_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazycell"; + version = "0.6.0"; + authors = [ "Alex Crichton " "Nikita Pekin " ]; + sha256 = "1ax148clinbvp6alxcih8s5i2bg3mc5mi69n3hvzvzbwlm6k532r"; + inherit dependencies buildDependencies features; + }; + libc_0_2_42_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.42"; + authors = [ "The Rust Project Developers" ]; + sha256 = "064v49hz1zpl081w8c4vwikrkhaxp06y4i9l7x7wx6bjpwp19pjx"; + inherit dependencies buildDependencies features; + }; + libflate_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libflate"; + version = "0.1.16"; + authors = [ "Takeru Ohta " ]; + sha256 = "0l15g61h10bznxsjirwq9c43w17mjpqx6wz0357agskardkdh14n"; + inherit dependencies buildDependencies features; + }; + log_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.9"; + authors = [ "The Rust Project Developers" ]; + sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2"; + inherit dependencies buildDependencies features; + }; + log_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.4.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1gdmwrbm7s18zcdz4lcdhz975m4gwhi854c7j1rvj1gsr8aca250"; + inherit dependencies buildDependencies features; + }; + maplit_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "maplit"; + version = "0.1.6"; + authors = [ "bluss" ]; + sha256 = "1f8kf5v7xra8ssvh5c10qlacbk4l0z2817pkscflx5s5q6y7925h"; + inherit dependencies buildDependencies features; + }; + matches_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "matches"; + version = "0.1.7"; + authors = [ "Simon Sapin " ]; + sha256 = "0zx9gi5flyzkh9nx52fyc3k2zz08b9ww1c4yndlfrw72kr8m7yfy"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + memchr_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "0.1.11"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8"; + inherit dependencies buildDependencies features; + }; + memoffset_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memoffset"; + version = "0.2.1"; + authors = [ "Gilad Naaman " ]; + sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf"; + inherit dependencies buildDependencies features; + }; + mime_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "mime"; + version = "0.3.8"; + authors = [ "Sean McArthur " ]; + sha256 = "1577adg9zvkd1qdb2nqqg1ryap33p5r4qsw01n9pw162xpisqjm3"; + inherit dependencies buildDependencies features; + }; + mime_guess_2_0_0_alpha_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "mime_guess"; + version = "2.0.0-alpha.6"; + authors = [ "Austin Bonander " ]; + sha256 = "1k2mdq43gi2qr63b7m5zs624rfi40ysk33cay49jlhq97jwnk9db"; + inherit dependencies buildDependencies features; + }; + miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miniz-sys"; + version = "0.1.10"; + authors = [ "Alex Crichton " ]; + sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln"; + libPath = "lib.rs"; + libName = "miniz_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + mio_0_6_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "mio"; + version = "0.6.15"; + authors = [ "Carl Lerche " ]; + sha256 = "0a93wxsmkh8x38wxivhn6qdj08pj9f0j3y46p4wv3xclbq8i4aaa"; + inherit dependencies buildDependencies features; + }; + miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miow"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0"; + inherit dependencies buildDependencies features; + }; + native_tls_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "native-tls"; + version = "0.1.5"; + authors = [ "Steven Fackler " ]; + sha256 = "11f75qmbny5pnn6zp0vlvadrvc9ph9qsxiyn4n6q02xyd93pxxlf"; + inherit dependencies buildDependencies features; + }; + net2_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "net2"; + version = "0.2.33"; + authors = [ "Alex Crichton " ]; + sha256 = "1qnmajafgybj5wyxz9iffa8x5wgbwd2znfklmhqj7vl6lw1m65mq"; + inherit dependencies buildDependencies features; + }; + nodrop_0_1_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nodrop"; + version = "0.1.12"; + authors = [ "bluss" ]; + sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d"; + inherit dependencies buildDependencies features; + }; + num_0_1_42_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num"; + version = "0.1.42"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1632gczzrmmxdsj3jignwcr793jq8vxw3qkdzpdvbip3vaf1ljgq"; + inherit dependencies buildDependencies features; + }; + num_integer_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.39"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1f42ls46cghs13qfzgbd7syib2zc6m7hlmv1qlar6c9mdxapvvbg"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + num_iter_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.37"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1rglyvi4yjfxfvfm2s7i60g1dkl5xmsyi77g6vy53jb11r6wl8ly"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + num_traits_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.2.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0ql203ca6lzppksy4fsfnpz3kq96vwlwvyn3ahvnd9g6k9f5ncj0"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.8.0"; + authors = [ "Sean McArthur " ]; + sha256 = "1y6qnd9r8ga6y8mvlabdrr73nc8cshjjlzbvnanzyj9b8zzkfwk2"; + inherit dependencies buildDependencies features; + }; + openssl_0_9_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl"; + version = "0.9.24"; + authors = [ "Steven Fackler " ]; + sha256 = "0wzm3c11g3ndaqyzq36mcdcm1q4a8pmsyi33ibybhjz28g2z0f79"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + openssl_sys_0_9_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl-sys"; + version = "0.9.33"; + authors = [ "Alex Crichton " "Steven Fackler " ]; + sha256 = "1q5f7ykkxgniwjrqifx1ssrqjzcf8fi4fzh770xrbyp8n6v14qr6"; + build = "build/main.rs"; + inherit dependencies buildDependencies features; + }; + percent_encoding_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "percent-encoding"; + version = "1.0.1"; + authors = [ "The rust-url developers" ]; + sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.22"; + authors = [ "Steven Fackler " ]; + sha256 = "0b58l863rhmqyqsfj2d89nmdzc21g9yvvvq1m4c3a615zpcykb3i"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_codegen_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.22"; + authors = [ "Steven Fackler " ]; + sha256 = "0k8yx4gr9m6cfrvh21s6bhnh1azz13j4xih88bvm06r6blfl89fs"; + inherit dependencies buildDependencies features; + }; + phf_generator_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.22"; + authors = [ "Steven Fackler " ]; + sha256 = "093gla320qb6rbk8z7wqqxl79zrh874sa7sxir31q2p7mrw4b70k"; + inherit dependencies buildDependencies features; + }; + phf_shared_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.22"; + authors = [ "Steven Fackler " ]; + sha256 = "0ij9flicfi0ab5vpzdwbizpdyxhk891qxa8nxsqlv4sg4abqang6"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.12"; + authors = [ "Alex Crichton " ]; + sha256 = "0k343rlyv9qmplxwxn8clzkyx1zbplhnvm0psjl6s111fjqmgsgh"; + inherit dependencies buildDependencies features; + }; + quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quote"; + version = "0.3.15"; + authors = [ "David Tolnay " ]; + sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + inherit dependencies buildDependencies features; + }; + rand_0_3_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.22"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0wrj12acx7l4hr7ag3nz8b50yhp8ancyq988bzmnnsxln67rsys0"; + inherit dependencies buildDependencies features; + }; + rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.4.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; + inherit dependencies buildDependencies features; + }; + redox_syscall_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.40"; + authors = [ "Jeremy Soller " ]; + sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611"; + libName = "syscall"; + inherit dependencies buildDependencies features; + }; + redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + regex_0_1_80_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "0.1.80"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.3.9"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; + inherit dependencies buildDependencies features; + }; + relay_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "relay"; + version = "0.1.1"; + authors = [ "Sean McArthur " ]; + sha256 = "16csfaslbmj25iaxs88p8wcfh2zfpkh9isg9adid0nxjxvknh07r"; + inherit dependencies buildDependencies features; + }; + remove_dir_all_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "remove_dir_all"; + version = "0.5.1"; + authors = [ "Aaronepower " ]; + sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7"; + inherit dependencies buildDependencies features; + }; + reqwest_0_8_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "reqwest"; + version = "0.8.6"; + authors = [ "Sean McArthur " ]; + sha256 = "0ka9ndgybhf65fn44badnjbasn1fi0mvjfa3sfiw485mgg21n3a0"; + inherit dependencies buildDependencies features; + }; + safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "safemem"; + version = "0.2.0"; + authors = [ "Austin Bonander " ]; + sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm"; + inherit dependencies buildDependencies features; + }; + schannel_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "schannel"; + version = "0.1.13"; + authors = [ "Steven Fackler " "Steffen Butzer " ]; + sha256 = "033zavvq2k6z5akk38vzaglzbxzljaixgmhj9am27nr21dgaj6b3"; + inherit dependencies buildDependencies features; + }; + scoped_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped-tls"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "0nblksgki698cqsclsnd6f1pq4yy34350dn2slaah9dlmx9z5xla"; + inherit dependencies buildDependencies features; + }; + scopeguard_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scopeguard"; + version = "0.3.3"; + authors = [ "bluss" ]; + sha256 = "0i1l013csrqzfz6c68pr5pi01hg5v5yahq8fsdmaxy6p8ygsjf3r"; + inherit dependencies buildDependencies features; + }; + security_framework_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "security-framework"; + version = "0.1.16"; + authors = [ "Steven Fackler " ]; + sha256 = "1kxczsaj8gz4922jl5af2gkxh71rasb6khaf3dp7ldlnw9qf2sbm"; + inherit dependencies buildDependencies features; + }; + security_framework_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "security-framework-sys"; + version = "0.1.16"; + authors = [ "Steven Fackler " ]; + sha256 = "0ai2pivdr5fyc7czbkpcrwap0imyy0r8ndarrl3n5kiv0jha1js3"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + semver_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.9.0"; + authors = [ "Steve Klabnik " "The Rust Project Developers" ]; + sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63"; + inherit dependencies buildDependencies features; + }; + semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver-parser"; + version = "0.7.0"; + authors = [ "Steve Klabnik " ]; + sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; + inherit dependencies buildDependencies features; + }; + serde_1_0_70_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "1.0.70"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1z1gyjf5rrs1k3j1civfzqjqs790651bwf8m31bw2pagclhnazs4"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + serde_json_1_0_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.24"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1wvvc3y0202my2p00ah8ygl1794nspar9pf39fz1525jd6m6k8a1"; + inherit dependencies buildDependencies features; + }; + serde_urlencoded_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_urlencoded"; + version = "0.5.2"; + authors = [ "Anthony Ramine " ]; + sha256 = "0m5pigng0665qrk4ii1z84pb4lchbsswhgb863yglljskmm056m0"; + inherit dependencies buildDependencies features; + }; + siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + authors = [ "Frank Denis " ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + inherit dependencies buildDependencies features; + }; + slab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "slab"; + version = "0.3.0"; + authors = [ "Carl Lerche " ]; + sha256 = "0y6lhjggksh57hyfd3l6p9wgv5nhvw9c6djrysq7jnalz8fih21k"; + inherit dependencies buildDependencies features; + }; + slab_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "slab"; + version = "0.4.0"; + authors = [ "Carl Lerche " ]; + sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0"; + inherit dependencies buildDependencies features; + }; + slog_1_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "slog"; + version = "1.7.1"; + authors = [ "Dawid Ciężarkiewicz " ]; + sha256 = "1qhnwv2gbxmnwasaa0vlhddq6cdhq6n3l8d6h3ql73367h7aav65"; + inherit dependencies buildDependencies features; + }; + slog_envlogger_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "slog-envlogger"; + version = "0.5.0"; + authors = [ "The Rust Project Developers" "Dawid Ciężarkiewicz " ]; + sha256 = "0ry9k2ppj7z6prdz2kf924w7l9y2kbysrigca6shni1kz2j163qb"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + slog_extra_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "slog-extra"; + version = "0.1.2"; + authors = [ "Dawid Ciężarkiewicz " ]; + sha256 = "0jrw0xcc81wwcl59xx9qglfcv5l3ad5kbpcyp6ygk94p9kxfrhyj"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + slog_stdlog_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "slog-stdlog"; + version = "1.1.0"; + authors = [ "Dawid Ciężarkiewicz " ]; + sha256 = "0ig4mjixr4y3dn3s53rlnrpplwkqb8b0z2zkaiiiwyv7nhjxdg46"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + slog_stream_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "slog-stream"; + version = "1.2.1"; + authors = [ "Dawid Ciężarkiewicz " ]; + sha256 = "03dwzbydaamfzjpr16gm065i696lk86gqcpspv5qaqyv938fm2yj"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + slog_term_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "slog-term"; + version = "1.5.0"; + authors = [ "Dawid Ciężarkiewicz " ]; + sha256 = "0zq2kyvm7jhqj6sc09w540wqfrrpa46yxf9sgzq7jqpkr66wsiar"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + smallvec_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "smallvec"; + version = "0.2.1"; + authors = [ "Simon Sapin " ]; + sha256 = "0rnsll9af52bpjngz0067dpm1ndqmh76i64a58fc118l4lvnjxw2"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.7.0"; + authors = [ "Danny Guo " ]; + sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; + inherit dependencies buildDependencies features; + }; + syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "syn"; + version = "0.11.11"; + authors = [ "David Tolnay " ]; + sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + inherit dependencies buildDependencies features; + }; + synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "synom"; + version = "0.11.3"; + authors = [ "David Tolnay " ]; + sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + inherit dependencies buildDependencies features; + }; + take_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "take"; + version = "0.1.0"; + authors = [ "Carl Lerche " ]; + sha256 = "17rfh39di5n8w9aghpic2r94cndi3dr04l60nkjylmxfxr3iwlhd"; + inherit dependencies buildDependencies features; + }; + tar_0_4_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tar"; + version = "0.4.16"; + authors = [ "Alex Crichton " ]; + sha256 = "0s36d0nzn2hs20y805wpmpc4asd1jhrpabqwcpqf5ha442fa7f3b"; + inherit dependencies buildDependencies features; + }; + tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.7"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; + inherit dependencies buildDependencies features; + }; + termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + inherit dependencies buildDependencies features; + }; + textwrap_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "textwrap"; + version = "0.10.0"; + authors = [ "Martin Geisler " ]; + sha256 = "1s8d5cna12smhgj0x2y1xphklyk2an1yzbadnj89p1vy5vnjpsas"; + inherit dependencies buildDependencies features; + }; + thread_id_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread-id"; + version = "2.0.0"; + authors = [ "Ruud van Asseldonk " ]; + sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3"; + inherit dependencies buildDependencies features; + }; + thread_local_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.2.7"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7"; + inherit dependencies buildDependencies features; + }; + thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.5"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; + inherit dependencies buildDependencies features; + }; + time_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "time"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m"; + inherit dependencies buildDependencies features; + }; + tokio_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio"; + version = "0.1.7"; + authors = [ "Carl Lerche " ]; + sha256 = "0d5fj90wk05m5vbd924irg1pl1d4fn86jjw5napzanh6vbwsnr66"; + inherit dependencies buildDependencies features; + }; + tokio_codec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-codec"; + version = "0.1.0"; + authors = [ "Carl Lerche " "Bryan Burgers " ]; + sha256 = "0347ygccbj05yn9krjk4ifcy5xbv41xk7yyi9cl2cnxrc285xnm7"; + inherit dependencies buildDependencies features; + }; + tokio_core_0_1_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-core"; + version = "0.1.17"; + authors = [ "Carl Lerche " ]; + sha256 = "1j6c5q3aakvb1hjx4r95xwl5ms8rp19k4qsr6v6ngwbvr6f9z6rs"; + inherit dependencies buildDependencies features; + }; + tokio_executor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-executor"; + version = "0.1.2"; + authors = [ "Carl Lerche " ]; + sha256 = "1y4mwqjw438x6jskigz1knvfbpbinxfv6h43s60w6wdb80xmyg48"; + inherit dependencies buildDependencies features; + }; + tokio_fs_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-fs"; + version = "0.1.2"; + authors = [ "Carl Lerche " ]; + sha256 = "18rxwslv2hdmij6alpqfcm8aywcd28vw12s826ajgvkskh8jsdh2"; + inherit dependencies buildDependencies features; + }; + tokio_io_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-io"; + version = "0.1.7"; + authors = [ "Carl Lerche " ]; + sha256 = "08r46b5lp7929agwal1iaabdhfv309wyvd6cld1g39x5ml8x7hp2"; + inherit dependencies buildDependencies features; + }; + tokio_proto_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-proto"; + version = "0.1.1"; + authors = [ "Carl Lerche " ]; + sha256 = "030q9h8pn1ngm80klff5irglxxki60hf5maw0mppmmr46k773z66"; + inherit dependencies buildDependencies features; + }; + tokio_reactor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-reactor"; + version = "0.1.2"; + authors = [ "Carl Lerche " ]; + sha256 = "11yx7fvyv1c5h097lspfrim1r67axl8y8m22y5mgny8nhly56s4m"; + inherit dependencies buildDependencies features; + }; + tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-service"; + version = "0.1.0"; + authors = [ "Carl Lerche " ]; + sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih"; + inherit dependencies buildDependencies features; + }; + tokio_tcp_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-tcp"; + version = "0.1.0"; + authors = [ "Carl Lerche " ]; + sha256 = "19cyajkqvvbn3qqnak0qzivdq6amfjymbc30k7bbqhx4y1pcgqvh"; + inherit dependencies buildDependencies features; + }; + tokio_threadpool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-threadpool"; + version = "0.1.5"; + authors = [ "Carl Lerche " ]; + sha256 = "04nzjdjlir33s0z5nh3vh2h4v3vb1rwzv45jdjridrk92rqpb2vc"; + inherit dependencies buildDependencies features; + }; + tokio_timer_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-timer"; + version = "0.2.4"; + authors = [ "Carl Lerche " ]; + sha256 = "0imv1k4g583hh61qkh6mpx06ik9accyl4582vq0z61rr484050gi"; + inherit dependencies buildDependencies features; + }; + tokio_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-tls"; + version = "0.1.4"; + authors = [ "Carl Lerche " "Alex Crichton " ]; + sha256 = "07rwv3q6jbg65ln1ahzb4g648l8lcn4hvc0ax3r12bnsi1py7agp"; + inherit dependencies buildDependencies features; + }; + tokio_udp_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-udp"; + version = "0.1.1"; + authors = [ "Carl Lerche " ]; + sha256 = "1zsq3bny959dq7cnhdjrlaglrdcm63zn82jpkjs6nrrcfhb9l6z9"; + inherit dependencies buildDependencies features; + }; + try_lock_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "try-lock"; + version = "0.1.0"; + authors = [ "Sean McArthur " ]; + sha256 = "0kfrqrb2xkjig54s3qfy80dpldknr19p3rmp0n82yk5929j879k3"; + inherit dependencies buildDependencies features; + }; + unicase_1_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicase"; + version = "1.4.2"; + authors = [ "Sean McArthur " ]; + sha256 = "0rbnhw2mnhcwrij3vczp0sl8zdfmvf2dlh8hly81kj7132kfj0mf"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + unicase_2_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicase"; + version = "2.1.0"; + authors = [ "Sean McArthur " ]; + sha256 = "1zzn16hh8fdx5pnbbnl32q8m2mh4vpd1jm9pdcv969ik83dw4byp"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-bidi"; + version = "0.3.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; + libName = "unicode_bidi"; + inherit dependencies buildDependencies features; + }; + unicode_normalization_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.7"; + authors = [ "kwantam " ]; + sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.5"; + authors = [ "kwantam " ]; + sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; + inherit dependencies buildDependencies features; + }; + unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.0.4"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + inherit dependencies buildDependencies features; + }; + unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + authors = [ "Jonathan Reem " ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + inherit dependencies buildDependencies features; + }; + url_1_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "url"; + version = "1.7.1"; + authors = [ "The rust-url developers" ]; + sha256 = "1l36pbvlwdnh3zqz4wp5n6jg332wkis9pi2g3vy12xr8k4nfyk8i"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "0.1.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; + inherit dependencies buildDependencies features; + }; + uuid_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "uuid"; + version = "0.6.5"; + authors = [ "Ashley Mannix" "Christopher Armstrong" "Dylan DPC" "Hunar Roop Kahlon" ]; + sha256 = "1jy15m4yxxwma0jsy070garhbgfprky23i77rawjkk75vqhnnhlf"; + inherit dependencies buildDependencies features; + }; + vcpkg_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.4"; + authors = [ "Jim McGrath " ]; + sha256 = "0xgk5axv1qhj4rfn2rca7768wnvzihccnajkgc6im8ndsx371nml"; + inherit dependencies buildDependencies features; + }; + vec_map_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.1"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi"; + inherit dependencies buildDependencies features; + }; + version_check_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "version_check"; + version = "0.1.4"; + authors = [ "Sergio Benitez " ]; + sha256 = "1ghi6bw2qsj53x2vyprs883dbrq8cjzmshlamjsxvmwd2zp13bck"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + want_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "want"; + version = "0.0.4"; + authors = [ "Sean McArthur " ]; + sha256 = "1l1qy4pvg5q71nrzfjldw9xzqhhgicj4slly1bal89hr2aaibpy0"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.3.5"; + authors = [ "Peter Atashian " ]; + sha256 = "0cfdsxa5yf832r5i2z7dhdvnryyvhfp3nb32gpcaq502zgjdm3w6"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian " ]; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ws2_32-sys"; + version = "0.2.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc"; + libName = "ws2_32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + xattr_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xattr"; + version = "0.2.2"; + authors = [ "Steven Allen " ]; + sha256 = "01zqnn6bhrd58hvpj3y1nqnbmlswrvsdapn2zbi7h1bh5lspiyk5"; + inherit dependencies buildDependencies features; + }; + adler32_1_0_3 = { features?(adler32_1_0_3_features {}) }: adler32_1_0_3_ {}; + adler32_1_0_3_features = f: updateFeatures f (rec { + adler32_1_0_3.default = (f.adler32_1_0_3.default or true); + }) []; + aho_corasick_0_5_3 = { features?(aho_corasick_0_5_3_features {}) }: aho_corasick_0_5_3_ { + dependencies = mapFeatures features ([ memchr_0_1_11 ]); + }; + aho_corasick_0_5_3_features = f: updateFeatures f (rec { + aho_corasick_0_5_3.default = (f.aho_corasick_0_5_3.default or true); + memchr_0_1_11.default = true; + }) [ memchr_0_1_11_features ]; + ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; + ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); + }) []; + ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + }; + ansi_term_0_11_0_features = f: updateFeatures f (rec { + ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); + winapi_0_3_5.consoleapi = true; + winapi_0_3_5.default = true; + winapi_0_3_5.errhandlingapi = true; + winapi_0_3_5.processenv = true; + }) [ winapi_0_3_5_features ]; + arrayvec_0_4_7 = { features?(arrayvec_0_4_7_features {}) }: arrayvec_0_4_7_ { + dependencies = mapFeatures features ([ nodrop_0_1_12 ]); + features = mkFeatures (features.arrayvec_0_4_7 or {}); + }; + arrayvec_0_4_7_features = f: updateFeatures f (rec { + arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or true); + arrayvec_0_4_7.serde = + (f.arrayvec_0_4_7.serde or false) || + (f.arrayvec_0_4_7.serde-1 or false) || + (arrayvec_0_4_7.serde-1 or false); + arrayvec_0_4_7.std = + (f.arrayvec_0_4_7.std or false) || + (f.arrayvec_0_4_7.default or false) || + (arrayvec_0_4_7.default or false); + nodrop_0_1_12.default = (f.nodrop_0_1_12.default or false); + }) [ nodrop_0_1_12_features ]; + atty_0_2_11 = { features?(atty_0_2_11_features {}) }: atty_0_2_11_ { + dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + }; + atty_0_2_11_features = f: updateFeatures f (rec { + atty_0_2_11.default = (f.atty_0_2_11.default or true); + libc_0_2_42.default = (f.libc_0_2_42.default or false); + termion_1_5_1.default = true; + winapi_0_3_5.consoleapi = true; + winapi_0_3_5.default = true; + winapi_0_3_5.minwinbase = true; + winapi_0_3_5.minwindef = true; + winapi_0_3_5.processenv = true; + winapi_0_3_5.winbase = true; + }) [ termion_1_5_1_features libc_0_2_42_features winapi_0_3_5_features ]; + base64_0_9_2 = { features?(base64_0_9_2_features {}) }: base64_0_9_2_ { + dependencies = mapFeatures features ([ byteorder_1_2_3 safemem_0_2_0 ]); + }; + base64_0_9_2_features = f: updateFeatures f (rec { + base64_0_9_2.default = (f.base64_0_9_2.default or true); + byteorder_1_2_3.default = true; + safemem_0_2_0.default = true; + }) [ byteorder_1_2_3_features safemem_0_2_0_features ]; + bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { + features = mkFeatures (features.bitflags_0_9_1 or {}); + }; + bitflags_0_9_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); + bitflags_0_9_1.example_generated = + (f.bitflags_0_9_1.example_generated or false) || + (f.bitflags_0_9_1.default or false) || + (bitflags_0_9_1.default or false); + }) []; + bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ { + features = mkFeatures (features.bitflags_1_0_3 or {}); + }; + bitflags_1_0_3_features = f: updateFeatures f (rec { + bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true); + }) []; + build_const_0_2_1 = { features?(build_const_0_2_1_features {}) }: build_const_0_2_1_ { + features = mkFeatures (features.build_const_0_2_1 or {}); + }; + build_const_0_2_1_features = f: updateFeatures f (rec { + build_const_0_2_1.default = (f.build_const_0_2_1.default or true); + build_const_0_2_1.std = + (f.build_const_0_2_1.std or false) || + (f.build_const_0_2_1.default or false) || + (build_const_0_2_1.default or false); + }) []; + byteorder_1_2_3 = { features?(byteorder_1_2_3_features {}) }: byteorder_1_2_3_ { + features = mkFeatures (features.byteorder_1_2_3 or {}); + }; + byteorder_1_2_3_features = f: updateFeatures f (rec { + byteorder_1_2_3.default = (f.byteorder_1_2_3.default or true); + byteorder_1_2_3.std = + (f.byteorder_1_2_3.std or false) || + (f.byteorder_1_2_3.default or false) || + (byteorder_1_2_3.default or false); + }) []; + bytes_0_4_9 = { features?(bytes_0_4_9_features {}) }: bytes_0_4_9_ { + dependencies = mapFeatures features ([ byteorder_1_2_3 iovec_0_1_2 ]); + features = mkFeatures (features.bytes_0_4_9 or {}); + }; + bytes_0_4_9_features = f: updateFeatures f (rec { + byteorder_1_2_3.default = true; + byteorder_1_2_3.i128 = + (f.byteorder_1_2_3.i128 or false) || + (bytes_0_4_9.i128 or false) || + (f.bytes_0_4_9.i128 or false); + bytes_0_4_9.default = (f.bytes_0_4_9.default or true); + iovec_0_1_2.default = true; + }) [ byteorder_1_2_3_features iovec_0_1_2_features ]; + cargo_download_0_1_1 = { features?(cargo_download_0_1_1_features {}) }: cargo_download_0_1_1_ { + dependencies = mapFeatures features ([ ansi_term_0_9_0 clap_2_32_0 conv_0_3_3 derive_error_0_0_3 exitcode_1_1_2 flate2_0_2_20 isatty_0_1_8 itertools_0_6_5 lazy_static_0_2_11 log_0_3_9 maplit_0_1_6 reqwest_0_8_6 semver_0_9_0 serde_json_1_0_24 slog_1_7_1 slog_envlogger_0_5_0 slog_stdlog_1_1_0 slog_stream_1_2_1 tar_0_4_16 time_0_1_40 ]); + }; + cargo_download_0_1_1_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = true; + cargo_download_0_1_1.default = (f.cargo_download_0_1_1.default or true); + clap_2_32_0.default = true; + conv_0_3_3.default = true; + derive_error_0_0_3.default = true; + exitcode_1_1_2.default = true; + flate2_0_2_20.default = true; + isatty_0_1_8.default = true; + itertools_0_6_5.default = true; + lazy_static_0_2_11.default = true; + log_0_3_9.default = true; + maplit_0_1_6.default = true; + reqwest_0_8_6.default = true; + semver_0_9_0.default = true; + serde_json_1_0_24.default = true; + slog_1_7_1.default = true; + slog_envlogger_0_5_0.default = true; + slog_stdlog_1_1_0.default = true; + slog_stream_1_2_1.default = true; + tar_0_4_16.default = true; + time_0_1_40.default = true; + }) [ ansi_term_0_9_0_features clap_2_32_0_features conv_0_3_3_features derive_error_0_0_3_features exitcode_1_1_2_features flate2_0_2_20_features isatty_0_1_8_features itertools_0_6_5_features lazy_static_0_2_11_features log_0_3_9_features maplit_0_1_6_features reqwest_0_8_6_features semver_0_9_0_features serde_json_1_0_24_features slog_1_7_1_features slog_envlogger_0_5_0_features slog_stdlog_1_1_0_features slog_stream_1_2_1_features tar_0_4_16_features time_0_1_40_features ]; + case_0_1_0 = { features?(case_0_1_0_features {}) }: case_0_1_0_ {}; + case_0_1_0_features = f: updateFeatures f (rec { + case_0_1_0.default = (f.case_0_1_0.default or true); + }) []; + cc_1_0_18 = { features?(cc_1_0_18_features {}) }: cc_1_0_18_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.cc_1_0_18 or {}); + }; + cc_1_0_18_features = f: updateFeatures f (rec { + cc_1_0_18.default = (f.cc_1_0_18.default or true); + cc_1_0_18.rayon = + (f.cc_1_0_18.rayon or false) || + (f.cc_1_0_18.parallel or false) || + (cc_1_0_18.parallel or false); + }) []; + cfg_if_0_1_4 = { features?(cfg_if_0_1_4_features {}) }: cfg_if_0_1_4_ {}; + cfg_if_0_1_4_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = (f.cfg_if_0_1_4.default or true); + }) []; + chrono_0_2_25 = { features?(chrono_0_2_25_features {}) }: chrono_0_2_25_ { + dependencies = mapFeatures features ([ num_0_1_42 time_0_1_40 ]); + }; + chrono_0_2_25_features = f: updateFeatures f (rec { + chrono_0_2_25.default = (f.chrono_0_2_25.default or true); + num_0_1_42.default = (f.num_0_1_42.default or false); + time_0_1_40.default = true; + }) [ num_0_1_42_features time_0_1_40_features ]; + clap_2_32_0 = { features?(clap_2_32_0_features {}) }: clap_2_32_0_ { + dependencies = mapFeatures features ([ bitflags_1_0_3 textwrap_0_10_0 unicode_width_0_1_5 ] + ++ (if features.clap_2_32_0.atty or false then [ atty_0_2_11 ] else []) + ++ (if features.clap_2_32_0.strsim or false then [ strsim_0_7_0 ] else []) + ++ (if features.clap_2_32_0.vec_map or false then [ vec_map_0_8_1 ] else [])) + ++ (if !(kernel == "windows") then mapFeatures features ([ ] + ++ (if features.clap_2_32_0.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []); + features = mkFeatures (features.clap_2_32_0 or {}); + }; + clap_2_32_0_features = f: updateFeatures f (rec { + ansi_term_0_11_0.default = true; + atty_0_2_11.default = true; + bitflags_1_0_3.default = true; + clap_2_32_0.ansi_term = + (f.clap_2_32_0.ansi_term or false) || + (f.clap_2_32_0.color or false) || + (clap_2_32_0.color or false); + clap_2_32_0.atty = + (f.clap_2_32_0.atty or false) || + (f.clap_2_32_0.color or false) || + (clap_2_32_0.color or false); + clap_2_32_0.clippy = + (f.clap_2_32_0.clippy or false) || + (f.clap_2_32_0.lints or false) || + (clap_2_32_0.lints or false); + clap_2_32_0.color = + (f.clap_2_32_0.color or false) || + (f.clap_2_32_0.default or false) || + (clap_2_32_0.default or false); + clap_2_32_0.default = (f.clap_2_32_0.default or true); + clap_2_32_0.strsim = + (f.clap_2_32_0.strsim or false) || + (f.clap_2_32_0.suggestions or false) || + (clap_2_32_0.suggestions or false); + clap_2_32_0.suggestions = + (f.clap_2_32_0.suggestions or false) || + (f.clap_2_32_0.default or false) || + (clap_2_32_0.default or false); + clap_2_32_0.term_size = + (f.clap_2_32_0.term_size or false) || + (f.clap_2_32_0.wrap_help or false) || + (clap_2_32_0.wrap_help or false); + clap_2_32_0.vec_map = + (f.clap_2_32_0.vec_map or false) || + (f.clap_2_32_0.default or false) || + (clap_2_32_0.default or false); + clap_2_32_0.yaml = + (f.clap_2_32_0.yaml or false) || + (f.clap_2_32_0.doc or false) || + (clap_2_32_0.doc or false); + clap_2_32_0.yaml-rust = + (f.clap_2_32_0.yaml-rust or false) || + (f.clap_2_32_0.yaml or false) || + (clap_2_32_0.yaml or false); + strsim_0_7_0.default = true; + textwrap_0_10_0.default = true; + textwrap_0_10_0.term_size = + (f.textwrap_0_10_0.term_size or false) || + (clap_2_32_0.wrap_help or false) || + (f.clap_2_32_0.wrap_help or false); + unicode_width_0_1_5.default = true; + vec_map_0_8_1.default = true; + }) [ atty_0_2_11_features bitflags_1_0_3_features strsim_0_7_0_features textwrap_0_10_0_features unicode_width_0_1_5_features vec_map_0_8_1_features ansi_term_0_11_0_features ]; + conv_0_3_3 = { features?(conv_0_3_3_features {}) }: conv_0_3_3_ { + dependencies = mapFeatures features ([ custom_derive_0_1_7 ]); + }; + conv_0_3_3_features = f: updateFeatures f (rec { + conv_0_3_3.default = (f.conv_0_3_3.default or true); + custom_derive_0_1_7.default = true; + }) [ custom_derive_0_1_7_features ]; + core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ { + dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]); + }; + core_foundation_0_2_3_features = f: updateFeatures f (rec { + core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true); + core_foundation_sys_0_2_3.default = true; + libc_0_2_42.default = true; + }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ]; + core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]); + }; + core_foundation_sys_0_2_3_features = f: updateFeatures f (rec { + core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true); + libc_0_2_42.default = true; + }) [ libc_0_2_42_features ]; + crc_1_8_1 = { features?(crc_1_8_1_features {}) }: crc_1_8_1_ { + buildDependencies = mapFeatures features ([ build_const_0_2_1 ]); + features = mkFeatures (features.crc_1_8_1 or {}); + }; + crc_1_8_1_features = f: updateFeatures f (rec { + build_const_0_2_1.default = true; + crc_1_8_1.default = (f.crc_1_8_1.default or true); + crc_1_8_1.std = + (f.crc_1_8_1.std or false) || + (f.crc_1_8_1.default or false) || + (crc_1_8_1.default or false); + }) [ build_const_0_2_1_features ]; + crossbeam_0_2_12 = { features?(crossbeam_0_2_12_features {}) }: crossbeam_0_2_12_ { + features = mkFeatures (features.crossbeam_0_2_12 or {}); + }; + crossbeam_0_2_12_features = f: updateFeatures f (rec { + crossbeam_0_2_12.default = (f.crossbeam_0_2_12.default or true); + }) []; + crossbeam_deque_0_3_1 = { features?(crossbeam_deque_0_3_1_features {}) }: crossbeam_deque_0_3_1_ { + dependencies = mapFeatures features ([ crossbeam_epoch_0_4_3 crossbeam_utils_0_3_2 ]); + }; + crossbeam_deque_0_3_1_features = f: updateFeatures f (rec { + crossbeam_deque_0_3_1.default = (f.crossbeam_deque_0_3_1.default or true); + crossbeam_epoch_0_4_3.default = true; + crossbeam_utils_0_3_2.default = true; + }) [ crossbeam_epoch_0_4_3_features crossbeam_utils_0_3_2_features ]; + crossbeam_epoch_0_4_3 = { features?(crossbeam_epoch_0_4_3_features {}) }: crossbeam_epoch_0_4_3_ { + dependencies = mapFeatures features ([ arrayvec_0_4_7 cfg_if_0_1_4 crossbeam_utils_0_3_2 memoffset_0_2_1 scopeguard_0_3_3 ] + ++ (if features.crossbeam_epoch_0_4_3.lazy_static or false then [ lazy_static_1_0_2 ] else [])); + features = mkFeatures (features.crossbeam_epoch_0_4_3 or {}); + }; + crossbeam_epoch_0_4_3_features = f: updateFeatures f (rec { + arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or false); + arrayvec_0_4_7.use_union = + (f.arrayvec_0_4_7.use_union or false) || + (crossbeam_epoch_0_4_3.nightly or false) || + (f.crossbeam_epoch_0_4_3.nightly or false); + cfg_if_0_1_4.default = true; + crossbeam_epoch_0_4_3.default = (f.crossbeam_epoch_0_4_3.default or true); + crossbeam_epoch_0_4_3.lazy_static = + (f.crossbeam_epoch_0_4_3.lazy_static or false) || + (f.crossbeam_epoch_0_4_3.use_std or false) || + (crossbeam_epoch_0_4_3.use_std or false); + crossbeam_epoch_0_4_3.use_std = + (f.crossbeam_epoch_0_4_3.use_std or false) || + (f.crossbeam_epoch_0_4_3.default or false) || + (crossbeam_epoch_0_4_3.default or false); + crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or false); + crossbeam_utils_0_3_2.use_std = + (f.crossbeam_utils_0_3_2.use_std or false) || + (crossbeam_epoch_0_4_3.use_std or false) || + (f.crossbeam_epoch_0_4_3.use_std or false); + lazy_static_1_0_2.default = true; + memoffset_0_2_1.default = true; + scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or false); + }) [ arrayvec_0_4_7_features cfg_if_0_1_4_features crossbeam_utils_0_3_2_features lazy_static_1_0_2_features memoffset_0_2_1_features scopeguard_0_3_3_features ]; + crossbeam_utils_0_3_2 = { features?(crossbeam_utils_0_3_2_features {}) }: crossbeam_utils_0_3_2_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); + features = mkFeatures (features.crossbeam_utils_0_3_2 or {}); + }; + crossbeam_utils_0_3_2_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or true); + crossbeam_utils_0_3_2.use_std = + (f.crossbeam_utils_0_3_2.use_std or false) || + (f.crossbeam_utils_0_3_2.default or false) || + (crossbeam_utils_0_3_2.default or false); + }) [ cfg_if_0_1_4_features ]; + custom_derive_0_1_7 = { features?(custom_derive_0_1_7_features {}) }: custom_derive_0_1_7_ { + features = mkFeatures (features.custom_derive_0_1_7 or {}); + }; + custom_derive_0_1_7_features = f: updateFeatures f (rec { + custom_derive_0_1_7.default = (f.custom_derive_0_1_7.default or true); + custom_derive_0_1_7.std = + (f.custom_derive_0_1_7.std or false) || + (f.custom_derive_0_1_7.default or false) || + (custom_derive_0_1_7.default or false); + }) []; + derive_error_0_0_3 = { features?(derive_error_0_0_3_features {}) }: derive_error_0_0_3_ { + dependencies = mapFeatures features ([ case_0_1_0 quote_0_3_15 syn_0_11_11 ]); + }; + derive_error_0_0_3_features = f: updateFeatures f (rec { + case_0_1_0.default = true; + derive_error_0_0_3.default = (f.derive_error_0_0_3.default or true); + quote_0_3_15.default = true; + syn_0_11_11.default = true; + }) [ case_0_1_0_features quote_0_3_15_features syn_0_11_11_features ]; + dtoa_0_4_3 = { features?(dtoa_0_4_3_features {}) }: dtoa_0_4_3_ {}; + dtoa_0_4_3_features = f: updateFeatures f (rec { + dtoa_0_4_3.default = (f.dtoa_0_4_3.default or true); + }) []; + either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.either_1_5_0 or {}); + }; + either_1_5_0_features = f: updateFeatures f (rec { + either_1_5_0.default = (f.either_1_5_0.default or true); + either_1_5_0.use_std = + (f.either_1_5_0.use_std or false) || + (f.either_1_5_0.default or false) || + (either_1_5_0.default or false); + }) []; + encoding_rs_0_7_2 = { features?(encoding_rs_0_7_2_features {}) }: encoding_rs_0_7_2_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); + features = mkFeatures (features.encoding_rs_0_7_2 or {}); + }; + encoding_rs_0_7_2_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + encoding_rs_0_7_2.default = (f.encoding_rs_0_7_2.default or true); + encoding_rs_0_7_2.simd = + (f.encoding_rs_0_7_2.simd or false) || + (f.encoding_rs_0_7_2.simd-accel or false) || + (encoding_rs_0_7_2.simd-accel or false); + }) [ cfg_if_0_1_4_features ]; + exitcode_1_1_2 = { features?(exitcode_1_1_2_features {}) }: exitcode_1_1_2_ {}; + exitcode_1_1_2_features = f: updateFeatures f (rec { + exitcode_1_1_2.default = (f.exitcode_1_1_2.default or true); + }) []; + filetime_0_2_1 = { features?(filetime_0_2_1_features {}) }: filetime_0_2_1_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []); + }; + filetime_0_2_1_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + filetime_0_2_1.default = (f.filetime_0_2_1.default or true); + libc_0_2_42.default = true; + redox_syscall_0_1_40.default = true; + }) [ cfg_if_0_1_4_features redox_syscall_0_1_40_features libc_0_2_42_features ]; + flate2_0_2_20 = { features?(flate2_0_2_20_features {}) }: flate2_0_2_20_ { + dependencies = mapFeatures features ([ libc_0_2_42 ] + ++ (if features.flate2_0_2_20.miniz-sys or false then [ miniz_sys_0_1_10 ] else [])); + features = mkFeatures (features.flate2_0_2_20 or {}); + }; + flate2_0_2_20_features = f: updateFeatures f (rec { + flate2_0_2_20.default = (f.flate2_0_2_20.default or true); + flate2_0_2_20.futures = + (f.flate2_0_2_20.futures or false) || + (f.flate2_0_2_20.tokio or false) || + (flate2_0_2_20.tokio or false); + flate2_0_2_20.libz-sys = + (f.flate2_0_2_20.libz-sys or false) || + (f.flate2_0_2_20.zlib or false) || + (flate2_0_2_20.zlib or false); + flate2_0_2_20.miniz-sys = + (f.flate2_0_2_20.miniz-sys or false) || + (f.flate2_0_2_20.default or false) || + (flate2_0_2_20.default or false); + flate2_0_2_20.tokio-io = + (f.flate2_0_2_20.tokio-io or false) || + (f.flate2_0_2_20.tokio or false) || + (flate2_0_2_20.tokio or false); + libc_0_2_42.default = true; + miniz_sys_0_1_10.default = true; + }) [ libc_0_2_42_features miniz_sys_0_1_10_features ]; + foreign_types_0_3_2 = { features?(foreign_types_0_3_2_features {}) }: foreign_types_0_3_2_ { + dependencies = mapFeatures features ([ foreign_types_shared_0_1_1 ]); + }; + foreign_types_0_3_2_features = f: updateFeatures f (rec { + foreign_types_0_3_2.default = (f.foreign_types_0_3_2.default or true); + foreign_types_shared_0_1_1.default = true; + }) [ foreign_types_shared_0_1_1_features ]; + foreign_types_shared_0_1_1 = { features?(foreign_types_shared_0_1_1_features {}) }: foreign_types_shared_0_1_1_ {}; + foreign_types_shared_0_1_1_features = f: updateFeatures f (rec { + foreign_types_shared_0_1_1.default = (f.foreign_types_shared_0_1_1.default or true); + }) []; + fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { + dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]); + }; + fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { + bitflags_1_0_3.default = true; + fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); + fuchsia_zircon_sys_0_3_3.default = true; + }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ]; + fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; + fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); + }) []; + futures_0_1_23 = { features?(futures_0_1_23_features {}) }: futures_0_1_23_ { + features = mkFeatures (features.futures_0_1_23 or {}); + }; + futures_0_1_23_features = f: updateFeatures f (rec { + futures_0_1_23.default = (f.futures_0_1_23.default or true); + futures_0_1_23.use_std = + (f.futures_0_1_23.use_std or false) || + (f.futures_0_1_23.default or false) || + (futures_0_1_23.default or false); + futures_0_1_23.with-deprecated = + (f.futures_0_1_23.with-deprecated or false) || + (f.futures_0_1_23.default or false) || + (futures_0_1_23.default or false); + }) []; + futures_cpupool_0_1_8 = { features?(futures_cpupool_0_1_8_features {}) }: futures_cpupool_0_1_8_ { + dependencies = mapFeatures features ([ futures_0_1_23 num_cpus_1_8_0 ]); + features = mkFeatures (features.futures_cpupool_0_1_8 or {}); + }; + futures_cpupool_0_1_8_features = f: updateFeatures f (rec { + futures_0_1_23.default = (f.futures_0_1_23.default or false); + futures_0_1_23.use_std = true; + futures_0_1_23.with-deprecated = + (f.futures_0_1_23.with-deprecated or false) || + (futures_cpupool_0_1_8.with-deprecated or false) || + (f.futures_cpupool_0_1_8.with-deprecated or false); + futures_cpupool_0_1_8.default = (f.futures_cpupool_0_1_8.default or true); + futures_cpupool_0_1_8.with-deprecated = + (f.futures_cpupool_0_1_8.with-deprecated or false) || + (f.futures_cpupool_0_1_8.default or false) || + (futures_cpupool_0_1_8.default or false); + num_cpus_1_8_0.default = true; + }) [ futures_0_1_23_features num_cpus_1_8_0_features ]; + httparse_1_3_2 = { features?(httparse_1_3_2_features {}) }: httparse_1_3_2_ { + features = mkFeatures (features.httparse_1_3_2 or {}); + }; + httparse_1_3_2_features = f: updateFeatures f (rec { + httparse_1_3_2.default = (f.httparse_1_3_2.default or true); + httparse_1_3_2.std = + (f.httparse_1_3_2.std or false) || + (f.httparse_1_3_2.default or false) || + (httparse_1_3_2.default or false); + }) []; + hyper_0_11_27 = { features?(hyper_0_11_27_features {}) }: hyper_0_11_27_ { + dependencies = mapFeatures features ([ base64_0_9_2 bytes_0_4_9 futures_0_1_23 futures_cpupool_0_1_8 httparse_1_3_2 iovec_0_1_2 language_tags_0_2_2 log_0_4_3 mime_0_3_8 net2_0_2_33 percent_encoding_1_0_1 relay_0_1_1 time_0_1_40 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 unicase_2_1_0 want_0_0_4 ] + ++ (if features.hyper_0_11_27.tokio-proto or false then [ tokio_proto_0_1_1 ] else [])); + features = mkFeatures (features.hyper_0_11_27 or {}); + }; + hyper_0_11_27_features = f: updateFeatures f (rec { + base64_0_9_2.default = true; + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + futures_cpupool_0_1_8.default = true; + httparse_1_3_2.default = true; + hyper_0_11_27.default = (f.hyper_0_11_27.default or true); + hyper_0_11_27.http = + (f.hyper_0_11_27.http or false) || + (f.hyper_0_11_27.compat or false) || + (hyper_0_11_27.compat or false); + hyper_0_11_27.server-proto = + (f.hyper_0_11_27.server-proto or false) || + (f.hyper_0_11_27.default or false) || + (hyper_0_11_27.default or false); + hyper_0_11_27.tokio-proto = + (f.hyper_0_11_27.tokio-proto or false) || + (f.hyper_0_11_27.server-proto or false) || + (hyper_0_11_27.server-proto or false); + iovec_0_1_2.default = true; + language_tags_0_2_2.default = true; + log_0_4_3.default = true; + mime_0_3_8.default = true; + net2_0_2_33.default = true; + percent_encoding_1_0_1.default = true; + relay_0_1_1.default = true; + time_0_1_40.default = true; + tokio_core_0_1_17.default = true; + tokio_io_0_1_7.default = true; + tokio_proto_0_1_1.default = true; + tokio_service_0_1_0.default = true; + unicase_2_1_0.default = true; + want_0_0_4.default = true; + }) [ base64_0_9_2_features bytes_0_4_9_features futures_0_1_23_features futures_cpupool_0_1_8_features httparse_1_3_2_features iovec_0_1_2_features language_tags_0_2_2_features log_0_4_3_features mime_0_3_8_features net2_0_2_33_features percent_encoding_1_0_1_features relay_0_1_1_features time_0_1_40_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_proto_0_1_1_features tokio_service_0_1_0_features unicase_2_1_0_features want_0_0_4_features ]; + hyper_tls_0_1_3 = { features?(hyper_tls_0_1_3_features {}) }: hyper_tls_0_1_3_ { + dependencies = mapFeatures features ([ futures_0_1_23 hyper_0_11_27 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 tokio_tls_0_1_4 ]); + }; + hyper_tls_0_1_3_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + hyper_0_11_27.default = true; + hyper_tls_0_1_3.default = (f.hyper_tls_0_1_3.default or true); + native_tls_0_1_5.default = true; + tokio_core_0_1_17.default = true; + tokio_io_0_1_7.default = true; + tokio_service_0_1_0.default = true; + tokio_tls_0_1_4.default = true; + }) [ futures_0_1_23_features hyper_0_11_27_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features tokio_tls_0_1_4_features ]; + idna_0_1_5 = { features?(idna_0_1_5_features {}) }: idna_0_1_5_ { + dependencies = mapFeatures features ([ matches_0_1_7 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]); + }; + idna_0_1_5_features = f: updateFeatures f (rec { + idna_0_1_5.default = (f.idna_0_1_5.default or true); + matches_0_1_7.default = true; + unicode_bidi_0_3_4.default = true; + unicode_normalization_0_1_7.default = true; + }) [ matches_0_1_7_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ]; + iovec_0_1_2 = { features?(iovec_0_1_2_features {}) }: iovec_0_1_2_ { + dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []); + }; + iovec_0_1_2_features = f: updateFeatures f (rec { + iovec_0_1_2.default = (f.iovec_0_1_2.default or true); + libc_0_2_42.default = true; + winapi_0_2_8.default = true; + }) [ libc_0_2_42_features winapi_0_2_8_features ]; + isatty_0_1_8 = { features?(isatty_0_1_8_features {}) }: isatty_0_1_8_ { + dependencies = (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + }; + isatty_0_1_8_features = f: updateFeatures f (rec { + isatty_0_1_8.default = (f.isatty_0_1_8.default or true); + libc_0_2_42.default = true; + redox_syscall_0_1_40.default = true; + winapi_0_3_5.consoleapi = true; + winapi_0_3_5.default = true; + winapi_0_3_5.fileapi = true; + winapi_0_3_5.minwinbase = true; + winapi_0_3_5.minwindef = true; + winapi_0_3_5.processenv = true; + winapi_0_3_5.winbase = true; + winapi_0_3_5.winnt = true; + }) [ redox_syscall_0_1_40_features libc_0_2_42_features winapi_0_3_5_features ]; + itertools_0_6_5 = { features?(itertools_0_6_5_features {}) }: itertools_0_6_5_ { + dependencies = mapFeatures features ([ either_1_5_0 ]); + }; + itertools_0_6_5_features = f: updateFeatures f (rec { + either_1_5_0.default = (f.either_1_5_0.default or false); + itertools_0_6_5.default = (f.itertools_0_6_5.default or true); + }) [ either_1_5_0_features ]; + itoa_0_4_2 = { features?(itoa_0_4_2_features {}) }: itoa_0_4_2_ { + features = mkFeatures (features.itoa_0_4_2 or {}); + }; + itoa_0_4_2_features = f: updateFeatures f (rec { + itoa_0_4_2.default = (f.itoa_0_4_2.default or true); + itoa_0_4_2.std = + (f.itoa_0_4_2.std or false) || + (f.itoa_0_4_2.default or false) || + (itoa_0_4_2.default or false); + }) []; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.language_tags_0_2_2 or {}); + }; + language_tags_0_2_2_features = f: updateFeatures f (rec { + language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true); + language_tags_0_2_2.heapsize = + (f.language_tags_0_2_2.heapsize or false) || + (f.language_tags_0_2_2.heap_size or false) || + (language_tags_0_2_2.heap_size or false); + language_tags_0_2_2.heapsize_plugin = + (f.language_tags_0_2_2.heapsize_plugin or false) || + (f.language_tags_0_2_2.heap_size or false) || + (language_tags_0_2_2.heap_size or false); + }) []; + lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_0_2_11 or {}); + }; + lazy_static_0_2_11_features = f: updateFeatures f (rec { + lazy_static_0_2_11.compiletest_rs = + (f.lazy_static_0_2_11.compiletest_rs or false) || + (f.lazy_static_0_2_11.compiletest or false) || + (lazy_static_0_2_11.compiletest or false); + lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true); + lazy_static_0_2_11.nightly = + (f.lazy_static_0_2_11.nightly or false) || + (f.lazy_static_0_2_11.spin_no_std or false) || + (lazy_static_0_2_11.spin_no_std or false); + lazy_static_0_2_11.spin = + (f.lazy_static_0_2_11.spin or false) || + (f.lazy_static_0_2_11.spin_no_std or false) || + (lazy_static_0_2_11.spin_no_std or false); + }) []; + lazy_static_1_0_2 = { features?(lazy_static_1_0_2_features {}) }: lazy_static_1_0_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_1_0_2 or {}); + }; + lazy_static_1_0_2_features = f: updateFeatures f (rec { + lazy_static_1_0_2.default = (f.lazy_static_1_0_2.default or true); + lazy_static_1_0_2.nightly = + (f.lazy_static_1_0_2.nightly or false) || + (f.lazy_static_1_0_2.spin_no_std or false) || + (lazy_static_1_0_2.spin_no_std or false); + lazy_static_1_0_2.spin = + (f.lazy_static_1_0_2.spin or false) || + (f.lazy_static_1_0_2.spin_no_std or false) || + (lazy_static_1_0_2.spin_no_std or false); + }) []; + lazycell_0_6_0 = { features?(lazycell_0_6_0_features {}) }: lazycell_0_6_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazycell_0_6_0 or {}); + }; + lazycell_0_6_0_features = f: updateFeatures f (rec { + lazycell_0_6_0.clippy = + (f.lazycell_0_6_0.clippy or false) || + (f.lazycell_0_6_0.nightly-testing or false) || + (lazycell_0_6_0.nightly-testing or false); + lazycell_0_6_0.default = (f.lazycell_0_6_0.default or true); + lazycell_0_6_0.nightly = + (f.lazycell_0_6_0.nightly or false) || + (f.lazycell_0_6_0.nightly-testing or false) || + (lazycell_0_6_0.nightly-testing or false); + }) []; + libc_0_2_42 = { features?(libc_0_2_42_features {}) }: libc_0_2_42_ { + features = mkFeatures (features.libc_0_2_42 or {}); + }; + libc_0_2_42_features = f: updateFeatures f (rec { + libc_0_2_42.default = (f.libc_0_2_42.default or true); + libc_0_2_42.use_std = + (f.libc_0_2_42.use_std or false) || + (f.libc_0_2_42.default or false) || + (libc_0_2_42.default or false); + }) []; + libflate_0_1_16 = { features?(libflate_0_1_16_features {}) }: libflate_0_1_16_ { + dependencies = mapFeatures features ([ adler32_1_0_3 byteorder_1_2_3 crc_1_8_1 ]); + }; + libflate_0_1_16_features = f: updateFeatures f (rec { + adler32_1_0_3.default = true; + byteorder_1_2_3.default = true; + crc_1_8_1.default = true; + libflate_0_1_16.default = (f.libflate_0_1_16.default or true); + }) [ adler32_1_0_3_features byteorder_1_2_3_features crc_1_8_1_features ]; + log_0_3_9 = { features?(log_0_3_9_features {}) }: log_0_3_9_ { + dependencies = mapFeatures features ([ log_0_4_3 ]); + features = mkFeatures (features.log_0_3_9 or {}); + }; + log_0_3_9_features = f: updateFeatures f (rec { + log_0_3_9.default = (f.log_0_3_9.default or true); + log_0_3_9.use_std = + (f.log_0_3_9.use_std or false) || + (f.log_0_3_9.default or false) || + (log_0_3_9.default or false); + log_0_4_3.default = true; + log_0_4_3.max_level_debug = + (f.log_0_4_3.max_level_debug or false) || + (log_0_3_9.max_level_debug or false) || + (f.log_0_3_9.max_level_debug or false); + log_0_4_3.max_level_error = + (f.log_0_4_3.max_level_error or false) || + (log_0_3_9.max_level_error or false) || + (f.log_0_3_9.max_level_error or false); + log_0_4_3.max_level_info = + (f.log_0_4_3.max_level_info or false) || + (log_0_3_9.max_level_info or false) || + (f.log_0_3_9.max_level_info or false); + log_0_4_3.max_level_off = + (f.log_0_4_3.max_level_off or false) || + (log_0_3_9.max_level_off or false) || + (f.log_0_3_9.max_level_off or false); + log_0_4_3.max_level_trace = + (f.log_0_4_3.max_level_trace or false) || + (log_0_3_9.max_level_trace or false) || + (f.log_0_3_9.max_level_trace or false); + log_0_4_3.max_level_warn = + (f.log_0_4_3.max_level_warn or false) || + (log_0_3_9.max_level_warn or false) || + (f.log_0_3_9.max_level_warn or false); + log_0_4_3.release_max_level_debug = + (f.log_0_4_3.release_max_level_debug or false) || + (log_0_3_9.release_max_level_debug or false) || + (f.log_0_3_9.release_max_level_debug or false); + log_0_4_3.release_max_level_error = + (f.log_0_4_3.release_max_level_error or false) || + (log_0_3_9.release_max_level_error or false) || + (f.log_0_3_9.release_max_level_error or false); + log_0_4_3.release_max_level_info = + (f.log_0_4_3.release_max_level_info or false) || + (log_0_3_9.release_max_level_info or false) || + (f.log_0_3_9.release_max_level_info or false); + log_0_4_3.release_max_level_off = + (f.log_0_4_3.release_max_level_off or false) || + (log_0_3_9.release_max_level_off or false) || + (f.log_0_3_9.release_max_level_off or false); + log_0_4_3.release_max_level_trace = + (f.log_0_4_3.release_max_level_trace or false) || + (log_0_3_9.release_max_level_trace or false) || + (f.log_0_3_9.release_max_level_trace or false); + log_0_4_3.release_max_level_warn = + (f.log_0_4_3.release_max_level_warn or false) || + (log_0_3_9.release_max_level_warn or false) || + (f.log_0_3_9.release_max_level_warn or false); + log_0_4_3.std = + (f.log_0_4_3.std or false) || + (log_0_3_9.use_std or false) || + (f.log_0_3_9.use_std or false); + }) [ log_0_4_3_features ]; + log_0_4_3 = { features?(log_0_4_3_features {}) }: log_0_4_3_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); + features = mkFeatures (features.log_0_4_3 or {}); + }; + log_0_4_3_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + log_0_4_3.default = (f.log_0_4_3.default or true); + }) [ cfg_if_0_1_4_features ]; + maplit_0_1_6 = { features?(maplit_0_1_6_features {}) }: maplit_0_1_6_ {}; + maplit_0_1_6_features = f: updateFeatures f (rec { + maplit_0_1_6.default = (f.maplit_0_1_6.default or true); + }) []; + matches_0_1_7 = { features?(matches_0_1_7_features {}) }: matches_0_1_7_ {}; + matches_0_1_7_features = f: updateFeatures f (rec { + matches_0_1_7.default = (f.matches_0_1_7.default or true); + }) []; + memchr_0_1_11 = { features?(memchr_0_1_11_features {}) }: memchr_0_1_11_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]); + }; + memchr_0_1_11_features = f: updateFeatures f (rec { + libc_0_2_42.default = true; + memchr_0_1_11.default = (f.memchr_0_1_11.default or true); + }) [ libc_0_2_42_features ]; + memoffset_0_2_1 = { features?(memoffset_0_2_1_features {}) }: memoffset_0_2_1_ {}; + memoffset_0_2_1_features = f: updateFeatures f (rec { + memoffset_0_2_1.default = (f.memoffset_0_2_1.default or true); + }) []; + mime_0_3_8 = { features?(mime_0_3_8_features {}) }: mime_0_3_8_ { + dependencies = mapFeatures features ([ unicase_2_1_0 ]); + }; + mime_0_3_8_features = f: updateFeatures f (rec { + mime_0_3_8.default = (f.mime_0_3_8.default or true); + unicase_2_1_0.default = true; + }) [ unicase_2_1_0_features ]; + mime_guess_2_0_0_alpha_6 = { features?(mime_guess_2_0_0_alpha_6_features {}) }: mime_guess_2_0_0_alpha_6_ { + dependencies = mapFeatures features ([ mime_0_3_8 phf_0_7_22 unicase_1_4_2 ]); + buildDependencies = mapFeatures features ([ phf_codegen_0_7_22 unicase_1_4_2 ]); + features = mkFeatures (features.mime_guess_2_0_0_alpha_6 or {}); + }; + mime_guess_2_0_0_alpha_6_features = f: updateFeatures f (rec { + mime_0_3_8.default = true; + mime_guess_2_0_0_alpha_6.default = (f.mime_guess_2_0_0_alpha_6.default or true); + phf_0_7_22.default = true; + phf_0_7_22.unicase = true; + phf_codegen_0_7_22.default = true; + unicase_1_4_2.default = true; + }) [ mime_0_3_8_features phf_0_7_22_features unicase_1_4_2_features phf_codegen_0_7_22_features unicase_1_4_2_features ]; + miniz_sys_0_1_10 = { features?(miniz_sys_0_1_10_features {}) }: miniz_sys_0_1_10_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]); + buildDependencies = mapFeatures features ([ cc_1_0_18 ]); + }; + miniz_sys_0_1_10_features = f: updateFeatures f (rec { + cc_1_0_18.default = true; + libc_0_2_42.default = true; + miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true); + }) [ libc_0_2_42_features cc_1_0_18_features ]; + mio_0_6_15 = { features?(mio_0_6_15_features {}) }: mio_0_6_15_ { + dependencies = mapFeatures features ([ iovec_0_1_2 lazycell_0_6_0 log_0_4_3 net2_0_2_33 slab_0_4_0 ]) + ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 fuchsia_zircon_sys_0_3_3 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []); + features = mkFeatures (features.mio_0_6_15 or {}); + }; + mio_0_6_15_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_3.default = true; + fuchsia_zircon_sys_0_3_3.default = true; + iovec_0_1_2.default = true; + kernel32_sys_0_2_2.default = true; + lazycell_0_6_0.default = true; + libc_0_2_42.default = true; + log_0_4_3.default = true; + mio_0_6_15.default = (f.mio_0_6_15.default or true); + mio_0_6_15.with-deprecated = + (f.mio_0_6_15.with-deprecated or false) || + (f.mio_0_6_15.default or false) || + (mio_0_6_15.default or false); + miow_0_2_1.default = true; + net2_0_2_33.default = true; + slab_0_4_0.default = true; + winapi_0_2_8.default = true; + }) [ iovec_0_1_2_features lazycell_0_6_0_features log_0_4_3_features net2_0_2_33_features slab_0_4_0_features fuchsia_zircon_0_3_3_features fuchsia_zircon_sys_0_3_3_features libc_0_2_42_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ]; + miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ { + dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_33 winapi_0_2_8 ws2_32_sys_0_2_1 ]); + }; + miow_0_2_1_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + miow_0_2_1.default = (f.miow_0_2_1.default or true); + net2_0_2_33.default = (f.net2_0_2_33.default or false); + winapi_0_2_8.default = true; + ws2_32_sys_0_2_1.default = true; + }) [ kernel32_sys_0_2_2_features net2_0_2_33_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ]; + native_tls_0_1_5 = { features?(native_tls_0_1_5_features {}) }: native_tls_0_1_5_ { + dependencies = mapFeatures features ([ lazy_static_0_2_11 ]) + ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ libc_0_2_42 security_framework_0_1_16 security_framework_sys_0_1_16 tempdir_0_3_7 ]) else []) + ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then mapFeatures features ([ openssl_0_9_24 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_13 ]) else []); + }; + native_tls_0_1_5_features = f: updateFeatures f (rec { + lazy_static_0_2_11.default = true; + libc_0_2_42.default = true; + native_tls_0_1_5.default = (f.native_tls_0_1_5.default or true); + openssl_0_9_24.default = true; + schannel_0_1_13.default = true; + security_framework_0_1_16.OSX_10_8 = true; + security_framework_0_1_16.default = true; + security_framework_sys_0_1_16.default = true; + tempdir_0_3_7.default = true; + }) [ lazy_static_0_2_11_features libc_0_2_42_features security_framework_0_1_16_features security_framework_sys_0_1_16_features tempdir_0_3_7_features openssl_0_9_24_features schannel_0_1_13_features ]; + net2_0_2_33 = { features?(net2_0_2_33_features {}) }: net2_0_2_33_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ]) + ++ (if kernel == "redox" || (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + features = mkFeatures (features.net2_0_2_33 or {}); + }; + net2_0_2_33_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + libc_0_2_42.default = true; + net2_0_2_33.default = (f.net2_0_2_33.default or true); + net2_0_2_33.duration = + (f.net2_0_2_33.duration or false) || + (f.net2_0_2_33.default or false) || + (net2_0_2_33.default or false); + winapi_0_3_5.default = true; + winapi_0_3_5.handleapi = true; + winapi_0_3_5.winsock2 = true; + winapi_0_3_5.ws2def = true; + winapi_0_3_5.ws2ipdef = true; + winapi_0_3_5.ws2tcpip = true; + }) [ cfg_if_0_1_4_features libc_0_2_42_features winapi_0_3_5_features ]; + nodrop_0_1_12 = { features?(nodrop_0_1_12_features {}) }: nodrop_0_1_12_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.nodrop_0_1_12 or {}); + }; + nodrop_0_1_12_features = f: updateFeatures f (rec { + nodrop_0_1_12.default = (f.nodrop_0_1_12.default or true); + nodrop_0_1_12.nodrop-union = + (f.nodrop_0_1_12.nodrop-union or false) || + (f.nodrop_0_1_12.use_union or false) || + (nodrop_0_1_12.use_union or false); + nodrop_0_1_12.std = + (f.nodrop_0_1_12.std or false) || + (f.nodrop_0_1_12.default or false) || + (nodrop_0_1_12.default or false); + }) []; + num_0_1_42 = { features?(num_0_1_42_features {}) }: num_0_1_42_ { + dependencies = mapFeatures features ([ num_integer_0_1_39 num_iter_0_1_37 num_traits_0_2_5 ]); + features = mkFeatures (features.num_0_1_42 or {}); + }; + num_0_1_42_features = f: updateFeatures f (rec { + num_0_1_42.bigint = + (f.num_0_1_42.bigint or false) || + (f.num_0_1_42.default or false) || + (num_0_1_42.default or false); + num_0_1_42.complex = + (f.num_0_1_42.complex or false) || + (f.num_0_1_42.default or false) || + (num_0_1_42.default or false); + num_0_1_42.default = (f.num_0_1_42.default or true); + num_0_1_42.num-bigint = + (f.num_0_1_42.num-bigint or false) || + (f.num_0_1_42.bigint or false) || + (num_0_1_42.bigint or false); + num_0_1_42.num-complex = + (f.num_0_1_42.num-complex or false) || + (f.num_0_1_42.complex or false) || + (num_0_1_42.complex or false); + num_0_1_42.num-rational = + (f.num_0_1_42.num-rational or false) || + (f.num_0_1_42.rational or false) || + (num_0_1_42.rational or false); + num_0_1_42.rational = + (f.num_0_1_42.rational or false) || + (f.num_0_1_42.default or false) || + (num_0_1_42.default or false); + num_0_1_42.rustc-serialize = + (f.num_0_1_42.rustc-serialize or false) || + (f.num_0_1_42.default or false) || + (num_0_1_42.default or false); + num_integer_0_1_39.default = true; + num_iter_0_1_37.default = true; + num_traits_0_2_5.default = true; + }) [ num_integer_0_1_39_features num_iter_0_1_37_features num_traits_0_2_5_features ]; + num_integer_0_1_39 = { features?(num_integer_0_1_39_features {}) }: num_integer_0_1_39_ { + dependencies = mapFeatures features ([ num_traits_0_2_5 ]); + features = mkFeatures (features.num_integer_0_1_39 or {}); + }; + num_integer_0_1_39_features = f: updateFeatures f (rec { + num_integer_0_1_39.default = (f.num_integer_0_1_39.default or true); + num_integer_0_1_39.std = + (f.num_integer_0_1_39.std or false) || + (f.num_integer_0_1_39.default or false) || + (num_integer_0_1_39.default or false); + num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false); + num_traits_0_2_5.i128 = + (f.num_traits_0_2_5.i128 or false) || + (num_integer_0_1_39.i128 or false) || + (f.num_integer_0_1_39.i128 or false); + num_traits_0_2_5.std = + (f.num_traits_0_2_5.std or false) || + (num_integer_0_1_39.std or false) || + (f.num_integer_0_1_39.std or false); + }) [ num_traits_0_2_5_features ]; + num_iter_0_1_37 = { features?(num_iter_0_1_37_features {}) }: num_iter_0_1_37_ { + dependencies = mapFeatures features ([ num_integer_0_1_39 num_traits_0_2_5 ]); + features = mkFeatures (features.num_iter_0_1_37 or {}); + }; + num_iter_0_1_37_features = f: updateFeatures f (rec { + num_integer_0_1_39.default = (f.num_integer_0_1_39.default or false); + num_integer_0_1_39.i128 = + (f.num_integer_0_1_39.i128 or false) || + (num_iter_0_1_37.i128 or false) || + (f.num_iter_0_1_37.i128 or false); + num_integer_0_1_39.std = + (f.num_integer_0_1_39.std or false) || + (num_iter_0_1_37.std or false) || + (f.num_iter_0_1_37.std or false); + num_iter_0_1_37.default = (f.num_iter_0_1_37.default or true); + num_iter_0_1_37.std = + (f.num_iter_0_1_37.std or false) || + (f.num_iter_0_1_37.default or false) || + (num_iter_0_1_37.default or false); + num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false); + num_traits_0_2_5.i128 = + (f.num_traits_0_2_5.i128 or false) || + (num_iter_0_1_37.i128 or false) || + (f.num_iter_0_1_37.i128 or false); + num_traits_0_2_5.std = + (f.num_traits_0_2_5.std or false) || + (num_iter_0_1_37.std or false) || + (f.num_iter_0_1_37.std or false); + }) [ num_integer_0_1_39_features num_traits_0_2_5_features ]; + num_traits_0_2_5 = { features?(num_traits_0_2_5_features {}) }: num_traits_0_2_5_ { + features = mkFeatures (features.num_traits_0_2_5 or {}); + }; + num_traits_0_2_5_features = f: updateFeatures f (rec { + num_traits_0_2_5.default = (f.num_traits_0_2_5.default or true); + num_traits_0_2_5.std = + (f.num_traits_0_2_5.std or false) || + (f.num_traits_0_2_5.default or false) || + (num_traits_0_2_5.default or false); + }) []; + num_cpus_1_8_0 = { features?(num_cpus_1_8_0_features {}) }: num_cpus_1_8_0_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]); + }; + num_cpus_1_8_0_features = f: updateFeatures f (rec { + libc_0_2_42.default = true; + num_cpus_1_8_0.default = (f.num_cpus_1_8_0.default or true); + }) [ libc_0_2_42_features ]; + openssl_0_9_24 = { features?(openssl_0_9_24_features {}) }: openssl_0_9_24_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_3_2 lazy_static_1_0_2 libc_0_2_42 openssl_sys_0_9_33 ]); + features = mkFeatures (features.openssl_0_9_24 or {}); + }; + openssl_0_9_24_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + foreign_types_0_3_2.default = true; + lazy_static_1_0_2.default = true; + libc_0_2_42.default = true; + openssl_0_9_24.default = (f.openssl_0_9_24.default or true); + openssl_sys_0_9_33.default = true; + }) [ bitflags_0_9_1_features foreign_types_0_3_2_features lazy_static_1_0_2_features libc_0_2_42_features openssl_sys_0_9_33_features ]; + openssl_sys_0_9_33 = { features?(openssl_sys_0_9_33_features {}) }: openssl_sys_0_9_33_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]) + ++ (if abi == "msvc" then mapFeatures features ([]) else []); + buildDependencies = mapFeatures features ([ cc_1_0_18 pkg_config_0_3_12 ]); + }; + openssl_sys_0_9_33_features = f: updateFeatures f (rec { + cc_1_0_18.default = true; + libc_0_2_42.default = true; + openssl_sys_0_9_33.default = (f.openssl_sys_0_9_33.default or true); + pkg_config_0_3_12.default = true; + }) [ libc_0_2_42_features cc_1_0_18_features pkg_config_0_3_12_features ]; + percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {}; + percent_encoding_1_0_1_features = f: updateFeatures f (rec { + percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true); + }) []; + phf_0_7_22 = { features?(phf_0_7_22_features {}) }: phf_0_7_22_ { + dependencies = mapFeatures features ([ phf_shared_0_7_22 ]); + features = mkFeatures (features.phf_0_7_22 or {}); + }; + phf_0_7_22_features = f: updateFeatures f (rec { + phf_0_7_22.default = (f.phf_0_7_22.default or true); + phf_shared_0_7_22.core = + (f.phf_shared_0_7_22.core or false) || + (phf_0_7_22.core or false) || + (f.phf_0_7_22.core or false); + phf_shared_0_7_22.default = true; + phf_shared_0_7_22.unicase = + (f.phf_shared_0_7_22.unicase or false) || + (phf_0_7_22.unicase or false) || + (f.phf_0_7_22.unicase or false); + }) [ phf_shared_0_7_22_features ]; + phf_codegen_0_7_22 = { features?(phf_codegen_0_7_22_features {}) }: phf_codegen_0_7_22_ { + dependencies = mapFeatures features ([ phf_generator_0_7_22 phf_shared_0_7_22 ]); + }; + phf_codegen_0_7_22_features = f: updateFeatures f (rec { + phf_codegen_0_7_22.default = (f.phf_codegen_0_7_22.default or true); + phf_generator_0_7_22.default = true; + phf_shared_0_7_22.default = true; + }) [ phf_generator_0_7_22_features phf_shared_0_7_22_features ]; + phf_generator_0_7_22 = { features?(phf_generator_0_7_22_features {}) }: phf_generator_0_7_22_ { + dependencies = mapFeatures features ([ phf_shared_0_7_22 rand_0_4_2 ]); + }; + phf_generator_0_7_22_features = f: updateFeatures f (rec { + phf_generator_0_7_22.default = (f.phf_generator_0_7_22.default or true); + phf_shared_0_7_22.default = true; + rand_0_4_2.default = true; + }) [ phf_shared_0_7_22_features rand_0_4_2_features ]; + phf_shared_0_7_22 = { features?(phf_shared_0_7_22_features {}) }: phf_shared_0_7_22_ { + dependencies = mapFeatures features ([ siphasher_0_2_2 ] + ++ (if features.phf_shared_0_7_22.unicase or false then [ unicase_1_4_2 ] else [])); + features = mkFeatures (features.phf_shared_0_7_22 or {}); + }; + phf_shared_0_7_22_features = f: updateFeatures f (rec { + phf_shared_0_7_22.default = (f.phf_shared_0_7_22.default or true); + siphasher_0_2_2.default = true; + unicase_1_4_2.default = true; + }) [ siphasher_0_2_2_features unicase_1_4_2_features ]; + pkg_config_0_3_12 = { features?(pkg_config_0_3_12_features {}) }: pkg_config_0_3_12_ {}; + pkg_config_0_3_12_features = f: updateFeatures f (rec { + pkg_config_0_3_12.default = (f.pkg_config_0_3_12.default or true); + }) []; + quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {}; + quote_0_3_15_features = f: updateFeatures f (rec { + quote_0_3_15.default = (f.quote_0_3_15.default or true); + }) []; + rand_0_3_22 = { features?(rand_0_3_22_features {}) }: rand_0_3_22_ { + dependencies = mapFeatures features ([ libc_0_2_42 rand_0_4_2 ]) + ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []); + features = mkFeatures (features.rand_0_3_22 or {}); + }; + rand_0_3_22_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_3.default = true; + libc_0_2_42.default = true; + rand_0_3_22.default = (f.rand_0_3_22.default or true); + rand_0_3_22.i128_support = + (f.rand_0_3_22.i128_support or false) || + (f.rand_0_3_22.nightly or false) || + (rand_0_3_22.nightly or false); + rand_0_4_2.default = true; + }) [ libc_0_2_42_features rand_0_4_2_features fuchsia_zircon_0_3_3_features ]; + rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { + dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] + ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_42 ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + features = mkFeatures (features.rand_0_4_2 or {}); + }; + rand_0_4_2_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_3.default = true; + libc_0_2_42.default = true; + rand_0_4_2.default = (f.rand_0_4_2.default or true); + rand_0_4_2.i128_support = + (f.rand_0_4_2.i128_support or false) || + (f.rand_0_4_2.nightly or false) || + (rand_0_4_2.nightly or false); + rand_0_4_2.libc = + (f.rand_0_4_2.libc or false) || + (f.rand_0_4_2.std or false) || + (rand_0_4_2.std or false); + rand_0_4_2.std = + (f.rand_0_4_2.std or false) || + (f.rand_0_4_2.default or false) || + (rand_0_4_2.default or false); + winapi_0_3_5.default = true; + winapi_0_3_5.minwindef = true; + winapi_0_3_5.ntsecapi = true; + winapi_0_3_5.profileapi = true; + winapi_0_3_5.winnt = true; + }) [ fuchsia_zircon_0_3_3_features libc_0_2_42_features winapi_0_3_5_features ]; + redox_syscall_0_1_40 = { features?(redox_syscall_0_1_40_features {}) }: redox_syscall_0_1_40_ {}; + redox_syscall_0_1_40_features = f: updateFeatures f (rec { + redox_syscall_0_1_40.default = (f.redox_syscall_0_1_40.default or true); + }) []; + redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { + dependencies = mapFeatures features ([ redox_syscall_0_1_40 ]); + }; + redox_termios_0_1_1_features = f: updateFeatures f (rec { + redox_syscall_0_1_40.default = true; + redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); + }) [ redox_syscall_0_1_40_features ]; + regex_0_1_80 = { features?(regex_0_1_80_features {}) }: regex_0_1_80_ { + dependencies = mapFeatures features ([ aho_corasick_0_5_3 memchr_0_1_11 regex_syntax_0_3_9 thread_local_0_2_7 utf8_ranges_0_1_3 ]); + features = mkFeatures (features.regex_0_1_80 or {}); + }; + regex_0_1_80_features = f: updateFeatures f (rec { + aho_corasick_0_5_3.default = true; + memchr_0_1_11.default = true; + regex_0_1_80.default = (f.regex_0_1_80.default or true); + regex_0_1_80.simd = + (f.regex_0_1_80.simd or false) || + (f.regex_0_1_80.simd-accel or false) || + (regex_0_1_80.simd-accel or false); + regex_syntax_0_3_9.default = true; + thread_local_0_2_7.default = true; + utf8_ranges_0_1_3.default = true; + }) [ aho_corasick_0_5_3_features memchr_0_1_11_features regex_syntax_0_3_9_features thread_local_0_2_7_features utf8_ranges_0_1_3_features ]; + regex_syntax_0_3_9 = { features?(regex_syntax_0_3_9_features {}) }: regex_syntax_0_3_9_ {}; + regex_syntax_0_3_9_features = f: updateFeatures f (rec { + regex_syntax_0_3_9.default = (f.regex_syntax_0_3_9.default or true); + }) []; + relay_0_1_1 = { features?(relay_0_1_1_features {}) }: relay_0_1_1_ { + dependencies = mapFeatures features ([ futures_0_1_23 ]); + }; + relay_0_1_1_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + relay_0_1_1.default = (f.relay_0_1_1.default or true); + }) [ futures_0_1_23_features ]; + remove_dir_all_0_5_1 = { features?(remove_dir_all_0_5_1_features {}) }: remove_dir_all_0_5_1_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + }; + remove_dir_all_0_5_1_features = f: updateFeatures f (rec { + remove_dir_all_0_5_1.default = (f.remove_dir_all_0_5_1.default or true); + winapi_0_3_5.default = true; + winapi_0_3_5.errhandlingapi = true; + winapi_0_3_5.fileapi = true; + winapi_0_3_5.std = true; + winapi_0_3_5.winbase = true; + winapi_0_3_5.winerror = true; + }) [ winapi_0_3_5_features ]; + reqwest_0_8_6 = { features?(reqwest_0_8_6_features {}) }: reqwest_0_8_6_ { + dependencies = mapFeatures features ([ bytes_0_4_9 encoding_rs_0_7_2 futures_0_1_23 hyper_0_11_27 hyper_tls_0_1_3 libflate_0_1_16 log_0_4_3 mime_guess_2_0_0_alpha_6 native_tls_0_1_5 serde_1_0_70 serde_json_1_0_24 serde_urlencoded_0_5_2 tokio_core_0_1_17 tokio_io_0_1_7 tokio_tls_0_1_4 url_1_7_1 uuid_0_6_5 ]); + features = mkFeatures (features.reqwest_0_8_6 or {}); + }; + reqwest_0_8_6_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + encoding_rs_0_7_2.default = true; + futures_0_1_23.default = true; + hyper_0_11_27.default = true; + hyper_tls_0_1_3.default = true; + libflate_0_1_16.default = true; + log_0_4_3.default = true; + mime_guess_2_0_0_alpha_6.default = true; + native_tls_0_1_5.default = true; + reqwest_0_8_6.default = (f.reqwest_0_8_6.default or true); + serde_1_0_70.default = true; + serde_json_1_0_24.default = true; + serde_urlencoded_0_5_2.default = true; + tokio_core_0_1_17.default = true; + tokio_io_0_1_7.default = true; + tokio_tls_0_1_4.default = true; + url_1_7_1.default = true; + uuid_0_6_5.default = true; + uuid_0_6_5.v4 = true; + }) [ bytes_0_4_9_features encoding_rs_0_7_2_features futures_0_1_23_features hyper_0_11_27_features hyper_tls_0_1_3_features libflate_0_1_16_features log_0_4_3_features mime_guess_2_0_0_alpha_6_features native_tls_0_1_5_features serde_1_0_70_features serde_json_1_0_24_features serde_urlencoded_0_5_2_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_tls_0_1_4_features url_1_7_1_features uuid_0_6_5_features ]; + safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {}; + safemem_0_2_0_features = f: updateFeatures f (rec { + safemem_0_2_0.default = (f.safemem_0_2_0.default or true); + }) []; + schannel_0_1_13 = { features?(schannel_0_1_13_features {}) }: schannel_0_1_13_ { + dependencies = mapFeatures features ([ lazy_static_1_0_2 winapi_0_3_5 ]); + }; + schannel_0_1_13_features = f: updateFeatures f (rec { + lazy_static_1_0_2.default = true; + schannel_0_1_13.default = (f.schannel_0_1_13.default or true); + winapi_0_3_5.default = true; + winapi_0_3_5.lmcons = true; + winapi_0_3_5.minschannel = true; + winapi_0_3_5.schannel = true; + winapi_0_3_5.securitybaseapi = true; + winapi_0_3_5.sysinfoapi = true; + winapi_0_3_5.timezoneapi = true; + winapi_0_3_5.winbase = true; + winapi_0_3_5.wincrypt = true; + winapi_0_3_5.winerror = true; + }) [ lazy_static_1_0_2_features winapi_0_3_5_features ]; + scoped_tls_0_1_2 = { features?(scoped_tls_0_1_2_features {}) }: scoped_tls_0_1_2_ { + features = mkFeatures (features.scoped_tls_0_1_2 or {}); + }; + scoped_tls_0_1_2_features = f: updateFeatures f (rec { + scoped_tls_0_1_2.default = (f.scoped_tls_0_1_2.default or true); + }) []; + scopeguard_0_3_3 = { features?(scopeguard_0_3_3_features {}) }: scopeguard_0_3_3_ { + features = mkFeatures (features.scopeguard_0_3_3 or {}); + }; + scopeguard_0_3_3_features = f: updateFeatures f (rec { + scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or true); + scopeguard_0_3_3.use_std = + (f.scopeguard_0_3_3.use_std or false) || + (f.scopeguard_0_3_3.default or false) || + (scopeguard_0_3_3.default or false); + }) []; + security_framework_0_1_16 = { features?(security_framework_0_1_16_features {}) }: security_framework_0_1_16_ { + dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_42 security_framework_sys_0_1_16 ]); + features = mkFeatures (features.security_framework_0_1_16 or {}); + }; + security_framework_0_1_16_features = f: updateFeatures f (rec { + core_foundation_0_2_3.default = true; + core_foundation_sys_0_2_3.default = true; + libc_0_2_42.default = true; + security_framework_0_1_16.OSX_10_10 = + (f.security_framework_0_1_16.OSX_10_10 or false) || + (f.security_framework_0_1_16.OSX_10_11 or false) || + (security_framework_0_1_16.OSX_10_11 or false); + security_framework_0_1_16.OSX_10_11 = + (f.security_framework_0_1_16.OSX_10_11 or false) || + (f.security_framework_0_1_16.OSX_10_12 or false) || + (security_framework_0_1_16.OSX_10_12 or false); + security_framework_0_1_16.OSX_10_8 = + (f.security_framework_0_1_16.OSX_10_8 or false) || + (f.security_framework_0_1_16.OSX_10_9 or false) || + (security_framework_0_1_16.OSX_10_9 or false); + security_framework_0_1_16.OSX_10_9 = + (f.security_framework_0_1_16.OSX_10_9 or false) || + (f.security_framework_0_1_16.OSX_10_10 or false) || + (security_framework_0_1_16.OSX_10_10 or false); + security_framework_0_1_16.default = (f.security_framework_0_1_16.default or true); + security_framework_sys_0_1_16.OSX_10_10 = + (f.security_framework_sys_0_1_16.OSX_10_10 or false) || + (security_framework_0_1_16.OSX_10_10 or false) || + (f.security_framework_0_1_16.OSX_10_10 or false); + security_framework_sys_0_1_16.OSX_10_11 = + (f.security_framework_sys_0_1_16.OSX_10_11 or false) || + (security_framework_0_1_16.OSX_10_11 or false) || + (f.security_framework_0_1_16.OSX_10_11 or false) || + (security_framework_0_1_16.OSX_10_12 or false) || + (f.security_framework_0_1_16.OSX_10_12 or false); + security_framework_sys_0_1_16.OSX_10_8 = + (f.security_framework_sys_0_1_16.OSX_10_8 or false) || + (security_framework_0_1_16.OSX_10_8 or false) || + (f.security_framework_0_1_16.OSX_10_8 or false); + security_framework_sys_0_1_16.OSX_10_9 = + (f.security_framework_sys_0_1_16.OSX_10_9 or false) || + (security_framework_0_1_16.OSX_10_9 or false) || + (f.security_framework_0_1_16.OSX_10_9 or false); + security_framework_sys_0_1_16.default = true; + }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_42_features security_framework_sys_0_1_16_features ]; + security_framework_sys_0_1_16 = { features?(security_framework_sys_0_1_16_features {}) }: security_framework_sys_0_1_16_ { + dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]); + features = mkFeatures (features.security_framework_sys_0_1_16 or {}); + }; + security_framework_sys_0_1_16_features = f: updateFeatures f (rec { + core_foundation_sys_0_2_3.default = true; + libc_0_2_42.default = true; + security_framework_sys_0_1_16.OSX_10_10 = + (f.security_framework_sys_0_1_16.OSX_10_10 or false) || + (f.security_framework_sys_0_1_16.OSX_10_11 or false) || + (security_framework_sys_0_1_16.OSX_10_11 or false); + security_framework_sys_0_1_16.OSX_10_11 = + (f.security_framework_sys_0_1_16.OSX_10_11 or false) || + (f.security_framework_sys_0_1_16.OSX_10_12 or false) || + (security_framework_sys_0_1_16.OSX_10_12 or false); + security_framework_sys_0_1_16.OSX_10_8 = + (f.security_framework_sys_0_1_16.OSX_10_8 or false) || + (f.security_framework_sys_0_1_16.OSX_10_9 or false) || + (security_framework_sys_0_1_16.OSX_10_9 or false); + security_framework_sys_0_1_16.OSX_10_9 = + (f.security_framework_sys_0_1_16.OSX_10_9 or false) || + (f.security_framework_sys_0_1_16.OSX_10_10 or false) || + (security_framework_sys_0_1_16.OSX_10_10 or false); + security_framework_sys_0_1_16.default = (f.security_framework_sys_0_1_16.default or true); + }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ]; + semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ { + dependencies = mapFeatures features ([ semver_parser_0_7_0 ]); + features = mkFeatures (features.semver_0_9_0 or {}); + }; + semver_0_9_0_features = f: updateFeatures f (rec { + semver_0_9_0.default = (f.semver_0_9_0.default or true); + semver_0_9_0.serde = + (f.semver_0_9_0.serde or false) || + (f.semver_0_9_0.ci or false) || + (semver_0_9_0.ci or false); + semver_parser_0_7_0.default = true; + }) [ semver_parser_0_7_0_features ]; + semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; + semver_parser_0_7_0_features = f: updateFeatures f (rec { + semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); + }) []; + serde_1_0_70 = { features?(serde_1_0_70_features {}) }: serde_1_0_70_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_1_0_70 or {}); + }; + serde_1_0_70_features = f: updateFeatures f (rec { + serde_1_0_70.default = (f.serde_1_0_70.default or true); + serde_1_0_70.serde_derive = + (f.serde_1_0_70.serde_derive or false) || + (f.serde_1_0_70.derive or false) || + (serde_1_0_70.derive or false); + serde_1_0_70.std = + (f.serde_1_0_70.std or false) || + (f.serde_1_0_70.default or false) || + (serde_1_0_70.default or false); + serde_1_0_70.unstable = + (f.serde_1_0_70.unstable or false) || + (f.serde_1_0_70.alloc or false) || + (serde_1_0_70.alloc or false); + }) []; + serde_json_1_0_24 = { features?(serde_json_1_0_24_features {}) }: serde_json_1_0_24_ { + dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 ]); + features = mkFeatures (features.serde_json_1_0_24 or {}); + }; + serde_json_1_0_24_features = f: updateFeatures f (rec { + dtoa_0_4_3.default = true; + itoa_0_4_2.default = true; + serde_1_0_70.default = true; + serde_json_1_0_24.default = (f.serde_json_1_0_24.default or true); + serde_json_1_0_24.indexmap = + (f.serde_json_1_0_24.indexmap or false) || + (f.serde_json_1_0_24.preserve_order or false) || + (serde_json_1_0_24.preserve_order or false); + }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features ]; + serde_urlencoded_0_5_2 = { features?(serde_urlencoded_0_5_2_features {}) }: serde_urlencoded_0_5_2_ { + dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 url_1_7_1 ]); + }; + serde_urlencoded_0_5_2_features = f: updateFeatures f (rec { + dtoa_0_4_3.default = true; + itoa_0_4_2.default = true; + serde_1_0_70.default = true; + serde_urlencoded_0_5_2.default = (f.serde_urlencoded_0_5_2.default or true); + url_1_7_1.default = true; + }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features url_1_7_1_features ]; + siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { + dependencies = mapFeatures features ([]); + }; + siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); + }) []; + slab_0_3_0 = { features?(slab_0_3_0_features {}) }: slab_0_3_0_ {}; + slab_0_3_0_features = f: updateFeatures f (rec { + slab_0_3_0.default = (f.slab_0_3_0.default or true); + }) []; + slab_0_4_0 = { features?(slab_0_4_0_features {}) }: slab_0_4_0_ {}; + slab_0_4_0_features = f: updateFeatures f (rec { + slab_0_4_0.default = (f.slab_0_4_0.default or true); + }) []; + slog_1_7_1 = { features?(slog_1_7_1_features {}) }: slog_1_7_1_ { + features = mkFeatures (features.slog_1_7_1 or {}); + }; + slog_1_7_1_features = f: updateFeatures f (rec { + slog_1_7_1.default = (f.slog_1_7_1.default or true); + slog_1_7_1.std = + (f.slog_1_7_1.std or false) || + (f.slog_1_7_1.default or false) || + (slog_1_7_1.default or false); + }) []; + slog_envlogger_0_5_0 = { features?(slog_envlogger_0_5_0_features {}) }: slog_envlogger_0_5_0_ { + dependencies = mapFeatures features ([ log_0_3_9 regex_0_1_80 slog_1_7_1 slog_stdlog_1_1_0 slog_term_1_5_0 ]); + }; + slog_envlogger_0_5_0_features = f: updateFeatures f (rec { + log_0_3_9.default = true; + regex_0_1_80.default = true; + slog_1_7_1.default = true; + slog_envlogger_0_5_0.default = (f.slog_envlogger_0_5_0.default or true); + slog_stdlog_1_1_0.default = true; + slog_term_1_5_0.default = true; + }) [ log_0_3_9_features regex_0_1_80_features slog_1_7_1_features slog_stdlog_1_1_0_features slog_term_1_5_0_features ]; + slog_extra_0_1_2 = { features?(slog_extra_0_1_2_features {}) }: slog_extra_0_1_2_ { + dependencies = mapFeatures features ([ slog_1_7_1 thread_local_0_3_5 ]); + }; + slog_extra_0_1_2_features = f: updateFeatures f (rec { + slog_1_7_1.default = true; + slog_extra_0_1_2.default = (f.slog_extra_0_1_2.default or true); + thread_local_0_3_5.default = true; + }) [ slog_1_7_1_features thread_local_0_3_5_features ]; + slog_stdlog_1_1_0 = { features?(slog_stdlog_1_1_0_features {}) }: slog_stdlog_1_1_0_ { + dependencies = mapFeatures features ([ crossbeam_0_2_12 lazy_static_0_2_11 log_0_3_9 slog_1_7_1 slog_term_1_5_0 ]); + }; + slog_stdlog_1_1_0_features = f: updateFeatures f (rec { + crossbeam_0_2_12.default = true; + lazy_static_0_2_11.default = true; + log_0_3_9.default = true; + slog_1_7_1.default = true; + slog_stdlog_1_1_0.default = (f.slog_stdlog_1_1_0.default or true); + slog_term_1_5_0.default = true; + }) [ crossbeam_0_2_12_features lazy_static_0_2_11_features log_0_3_9_features slog_1_7_1_features slog_term_1_5_0_features ]; + slog_stream_1_2_1 = { features?(slog_stream_1_2_1_features {}) }: slog_stream_1_2_1_ { + dependencies = mapFeatures features ([ slog_1_7_1 slog_extra_0_1_2 thread_local_0_3_5 ]); + }; + slog_stream_1_2_1_features = f: updateFeatures f (rec { + slog_1_7_1.default = true; + slog_extra_0_1_2.default = true; + slog_stream_1_2_1.default = (f.slog_stream_1_2_1.default or true); + thread_local_0_3_5.default = true; + }) [ slog_1_7_1_features slog_extra_0_1_2_features thread_local_0_3_5_features ]; + slog_term_1_5_0 = { features?(slog_term_1_5_0_features {}) }: slog_term_1_5_0_ { + dependencies = mapFeatures features ([ chrono_0_2_25 isatty_0_1_8 slog_1_7_1 slog_stream_1_2_1 thread_local_0_3_5 ]); + }; + slog_term_1_5_0_features = f: updateFeatures f (rec { + chrono_0_2_25.default = true; + isatty_0_1_8.default = true; + slog_1_7_1.default = true; + slog_stream_1_2_1.default = true; + slog_term_1_5_0.default = (f.slog_term_1_5_0.default or true); + thread_local_0_3_5.default = true; + }) [ chrono_0_2_25_features isatty_0_1_8_features slog_1_7_1_features slog_stream_1_2_1_features thread_local_0_3_5_features ]; + smallvec_0_2_1 = { features?(smallvec_0_2_1_features {}) }: smallvec_0_2_1_ {}; + smallvec_0_2_1_features = f: updateFeatures f (rec { + smallvec_0_2_1.default = (f.smallvec_0_2_1.default or true); + }) []; + strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; + strsim_0_7_0_features = f: updateFeatures f (rec { + strsim_0_7_0.default = (f.strsim_0_7_0.default or true); + }) []; + syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ { + dependencies = mapFeatures features ([ ] + ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else []) + ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else []) + ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else [])); + features = mkFeatures (features.syn_0_11_11 or {}); + }; + syn_0_11_11_features = f: updateFeatures f (rec { + quote_0_3_15.default = true; + syn_0_11_11.default = (f.syn_0_11_11.default or true); + syn_0_11_11.parsing = + (f.syn_0_11_11.parsing or false) || + (f.syn_0_11_11.default or false) || + (syn_0_11_11.default or false); + syn_0_11_11.printing = + (f.syn_0_11_11.printing or false) || + (f.syn_0_11_11.default or false) || + (syn_0_11_11.default or false); + syn_0_11_11.quote = + (f.syn_0_11_11.quote or false) || + (f.syn_0_11_11.printing or false) || + (syn_0_11_11.printing or false); + syn_0_11_11.synom = + (f.syn_0_11_11.synom or false) || + (f.syn_0_11_11.parsing or false) || + (syn_0_11_11.parsing or false); + syn_0_11_11.unicode-xid = + (f.syn_0_11_11.unicode-xid or false) || + (f.syn_0_11_11.parsing or false) || + (syn_0_11_11.parsing or false); + synom_0_11_3.default = true; + unicode_xid_0_0_4.default = true; + }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; + synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ { + dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]); + }; + synom_0_11_3_features = f: updateFeatures f (rec { + synom_0_11_3.default = (f.synom_0_11_3.default or true); + unicode_xid_0_0_4.default = true; + }) [ unicode_xid_0_0_4_features ]; + take_0_1_0 = { features?(take_0_1_0_features {}) }: take_0_1_0_ {}; + take_0_1_0_features = f: updateFeatures f (rec { + take_0_1_0.default = (f.take_0_1_0.default or true); + }) []; + tar_0_4_16 = { features?(tar_0_4_16_features {}) }: tar_0_4_16_ { + dependencies = mapFeatures features ([ filetime_0_2_1 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ] + ++ (if features.tar_0_4_16.xattr or false then [ xattr_0_2_2 ] else [])) else []); + features = mkFeatures (features.tar_0_4_16 or {}); + }; + tar_0_4_16_features = f: updateFeatures f (rec { + filetime_0_2_1.default = true; + libc_0_2_42.default = true; + redox_syscall_0_1_40.default = true; + tar_0_4_16.default = (f.tar_0_4_16.default or true); + tar_0_4_16.xattr = + (f.tar_0_4_16.xattr or false) || + (f.tar_0_4_16.default or false) || + (tar_0_4_16.default or false); + xattr_0_2_2.default = true; + }) [ filetime_0_2_1_features redox_syscall_0_1_40_features libc_0_2_42_features xattr_0_2_2_features ]; + tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ { + dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_1 ]); + }; + tempdir_0_3_7_features = f: updateFeatures f (rec { + rand_0_4_2.default = true; + remove_dir_all_0_5_1.default = true; + tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); + }) [ rand_0_4_2_features remove_dir_all_0_5_1_features ]; + termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { + dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 redox_termios_0_1_1 ]) else []); + }; + termion_1_5_1_features = f: updateFeatures f (rec { + libc_0_2_42.default = true; + redox_syscall_0_1_40.default = true; + redox_termios_0_1_1.default = true; + termion_1_5_1.default = (f.termion_1_5_1.default or true); + }) [ libc_0_2_42_features redox_syscall_0_1_40_features redox_termios_0_1_1_features ]; + textwrap_0_10_0 = { features?(textwrap_0_10_0_features {}) }: textwrap_0_10_0_ { + dependencies = mapFeatures features ([ unicode_width_0_1_5 ]); + }; + textwrap_0_10_0_features = f: updateFeatures f (rec { + textwrap_0_10_0.default = (f.textwrap_0_10_0.default or true); + unicode_width_0_1_5.default = true; + }) [ unicode_width_0_1_5_features ]; + thread_id_2_0_0 = { features?(thread_id_2_0_0_features {}) }: thread_id_2_0_0_ { + dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_42 ]); + }; + thread_id_2_0_0_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_42.default = true; + thread_id_2_0_0.default = (f.thread_id_2_0_0.default or true); + }) [ kernel32_sys_0_2_2_features libc_0_2_42_features ]; + thread_local_0_2_7 = { features?(thread_local_0_2_7_features {}) }: thread_local_0_2_7_ { + dependencies = mapFeatures features ([ thread_id_2_0_0 ]); + }; + thread_local_0_2_7_features = f: updateFeatures f (rec { + thread_id_2_0_0.default = true; + thread_local_0_2_7.default = (f.thread_local_0_2_7.default or true); + }) [ thread_id_2_0_0_features ]; + thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { + dependencies = mapFeatures features ([ lazy_static_1_0_2 unreachable_1_0_0 ]); + }; + thread_local_0_3_5_features = f: updateFeatures f (rec { + lazy_static_1_0_2.default = true; + thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); + unreachable_1_0_0.default = true; + }) [ lazy_static_1_0_2_features unreachable_1_0_0_features ]; + time_0_1_40 = { features?(time_0_1_40_features {}) }: time_0_1_40_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + }; + time_0_1_40_features = f: updateFeatures f (rec { + libc_0_2_42.default = true; + redox_syscall_0_1_40.default = true; + time_0_1_40.default = (f.time_0_1_40.default or true); + winapi_0_3_5.default = true; + winapi_0_3_5.minwinbase = true; + winapi_0_3_5.minwindef = true; + winapi_0_3_5.ntdef = true; + winapi_0_3_5.profileapi = true; + winapi_0_3_5.std = true; + winapi_0_3_5.sysinfoapi = true; + winapi_0_3_5.timezoneapi = true; + }) [ libc_0_2_42_features redox_syscall_0_1_40_features winapi_0_3_5_features ]; + tokio_0_1_7 = { features?(tokio_0_1_7_features {}) }: tokio_0_1_7_ { + dependencies = mapFeatures features ([ futures_0_1_23 mio_0_6_15 tokio_executor_0_1_2 tokio_fs_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_tcp_0_1_0 tokio_threadpool_0_1_5 tokio_timer_0_2_4 tokio_udp_0_1_1 ]); + }; + tokio_0_1_7_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + mio_0_6_15.default = true; + tokio_0_1_7.default = (f.tokio_0_1_7.default or true); + tokio_executor_0_1_2.default = true; + tokio_fs_0_1_2.default = true; + tokio_io_0_1_7.default = true; + tokio_reactor_0_1_2.default = true; + tokio_tcp_0_1_0.default = true; + tokio_threadpool_0_1_5.default = true; + tokio_timer_0_2_4.default = true; + tokio_udp_0_1_1.default = true; + }) [ futures_0_1_23_features mio_0_6_15_features tokio_executor_0_1_2_features tokio_fs_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_tcp_0_1_0_features tokio_threadpool_0_1_5_features tokio_timer_0_2_4_features tokio_udp_0_1_1_features ]; + tokio_codec_0_1_0 = { features?(tokio_codec_0_1_0_features {}) }: tokio_codec_0_1_0_ { + dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 tokio_io_0_1_7 ]); + }; + tokio_codec_0_1_0_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + tokio_codec_0_1_0.default = (f.tokio_codec_0_1_0.default or true); + tokio_io_0_1_7.default = true; + }) [ bytes_0_4_9_features futures_0_1_23_features tokio_io_0_1_7_features ]; + tokio_core_0_1_17 = { features?(tokio_core_0_1_17_features {}) }: tokio_core_0_1_17_ { + dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 log_0_4_3 mio_0_6_15 scoped_tls_0_1_2 tokio_0_1_7 tokio_executor_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_timer_0_2_4 ]); + }; + tokio_core_0_1_17_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + iovec_0_1_2.default = true; + log_0_4_3.default = true; + mio_0_6_15.default = true; + scoped_tls_0_1_2.default = true; + tokio_0_1_7.default = true; + tokio_core_0_1_17.default = (f.tokio_core_0_1_17.default or true); + tokio_executor_0_1_2.default = true; + tokio_io_0_1_7.default = true; + tokio_reactor_0_1_2.default = true; + tokio_timer_0_2_4.default = true; + }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features log_0_4_3_features mio_0_6_15_features scoped_tls_0_1_2_features tokio_0_1_7_features tokio_executor_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_timer_0_2_4_features ]; + tokio_executor_0_1_2 = { features?(tokio_executor_0_1_2_features {}) }: tokio_executor_0_1_2_ { + dependencies = mapFeatures features ([ futures_0_1_23 ]); + features = mkFeatures (features.tokio_executor_0_1_2 or {}); + }; + tokio_executor_0_1_2_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + tokio_executor_0_1_2.default = (f.tokio_executor_0_1_2.default or true); + tokio_executor_0_1_2.futures2 = + (f.tokio_executor_0_1_2.futures2 or false) || + (f.tokio_executor_0_1_2.unstable-futures or false) || + (tokio_executor_0_1_2.unstable-futures or false); + }) [ futures_0_1_23_features ]; + tokio_fs_0_1_2 = { features?(tokio_fs_0_1_2_features {}) }: tokio_fs_0_1_2_ { + dependencies = mapFeatures features ([ futures_0_1_23 tokio_io_0_1_7 tokio_threadpool_0_1_5 ]); + }; + tokio_fs_0_1_2_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + tokio_fs_0_1_2.default = (f.tokio_fs_0_1_2.default or true); + tokio_io_0_1_7.default = true; + tokio_threadpool_0_1_5.default = true; + }) [ futures_0_1_23_features tokio_io_0_1_7_features tokio_threadpool_0_1_5_features ]; + tokio_io_0_1_7 = { features?(tokio_io_0_1_7_features {}) }: tokio_io_0_1_7_ { + dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 ]); + }; + tokio_io_0_1_7_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + log_0_4_3.default = true; + tokio_io_0_1_7.default = (f.tokio_io_0_1_7.default or true); + }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features ]; + tokio_proto_0_1_1 = { features?(tokio_proto_0_1_1_features {}) }: tokio_proto_0_1_1_ { + dependencies = mapFeatures features ([ futures_0_1_23 log_0_3_9 net2_0_2_33 rand_0_3_22 slab_0_3_0 smallvec_0_2_1 take_0_1_0 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 ]); + }; + tokio_proto_0_1_1_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + log_0_3_9.default = true; + net2_0_2_33.default = true; + rand_0_3_22.default = true; + slab_0_3_0.default = true; + smallvec_0_2_1.default = true; + take_0_1_0.default = true; + tokio_core_0_1_17.default = true; + tokio_io_0_1_7.default = true; + tokio_proto_0_1_1.default = (f.tokio_proto_0_1_1.default or true); + tokio_service_0_1_0.default = true; + }) [ futures_0_1_23_features log_0_3_9_features net2_0_2_33_features rand_0_3_22_features slab_0_3_0_features smallvec_0_2_1_features take_0_1_0_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features ]; + tokio_reactor_0_1_2 = { features?(tokio_reactor_0_1_2_features {}) }: tokio_reactor_0_1_2_ { + dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 mio_0_6_15 slab_0_4_0 tokio_executor_0_1_2 tokio_io_0_1_7 ]); + }; + tokio_reactor_0_1_2_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + log_0_4_3.default = true; + mio_0_6_15.default = true; + slab_0_4_0.default = true; + tokio_executor_0_1_2.default = true; + tokio_io_0_1_7.default = true; + tokio_reactor_0_1_2.default = (f.tokio_reactor_0_1_2.default or true); + }) [ futures_0_1_23_features log_0_4_3_features mio_0_6_15_features slab_0_4_0_features tokio_executor_0_1_2_features tokio_io_0_1_7_features ]; + tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ { + dependencies = mapFeatures features ([ futures_0_1_23 ]); + }; + tokio_service_0_1_0_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true); + }) [ futures_0_1_23_features ]; + tokio_tcp_0_1_0 = { features?(tokio_tcp_0_1_0_features {}) }: tokio_tcp_0_1_0_ { + dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 mio_0_6_15 tokio_io_0_1_7 tokio_reactor_0_1_2 ]); + features = mkFeatures (features.tokio_tcp_0_1_0 or {}); + }; + tokio_tcp_0_1_0_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + iovec_0_1_2.default = true; + mio_0_6_15.default = true; + tokio_io_0_1_7.default = true; + tokio_reactor_0_1_2.default = true; + tokio_tcp_0_1_0.default = (f.tokio_tcp_0_1_0.default or true); + tokio_tcp_0_1_0.futures2 = + (f.tokio_tcp_0_1_0.futures2 or false) || + (f.tokio_tcp_0_1_0.unstable-futures or false) || + (tokio_tcp_0_1_0.unstable-futures or false); + }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features mio_0_6_15_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ]; + tokio_threadpool_0_1_5 = { features?(tokio_threadpool_0_1_5_features {}) }: tokio_threadpool_0_1_5_ { + dependencies = mapFeatures features ([ crossbeam_deque_0_3_1 futures_0_1_23 log_0_4_3 num_cpus_1_8_0 rand_0_4_2 tokio_executor_0_1_2 ]); + }; + tokio_threadpool_0_1_5_features = f: updateFeatures f (rec { + crossbeam_deque_0_3_1.default = true; + futures_0_1_23.default = true; + log_0_4_3.default = true; + num_cpus_1_8_0.default = true; + rand_0_4_2.default = true; + tokio_executor_0_1_2.default = true; + tokio_threadpool_0_1_5.default = (f.tokio_threadpool_0_1_5.default or true); + }) [ crossbeam_deque_0_3_1_features futures_0_1_23_features log_0_4_3_features num_cpus_1_8_0_features rand_0_4_2_features tokio_executor_0_1_2_features ]; + tokio_timer_0_2_4 = { features?(tokio_timer_0_2_4_features {}) }: tokio_timer_0_2_4_ { + dependencies = mapFeatures features ([ futures_0_1_23 tokio_executor_0_1_2 ]); + }; + tokio_timer_0_2_4_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + tokio_executor_0_1_2.default = true; + tokio_timer_0_2_4.default = (f.tokio_timer_0_2_4.default or true); + }) [ futures_0_1_23_features tokio_executor_0_1_2_features ]; + tokio_tls_0_1_4 = { features?(tokio_tls_0_1_4_features {}) }: tokio_tls_0_1_4_ { + dependencies = mapFeatures features ([ futures_0_1_23 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 ]) + ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else []) + ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else []) + ++ (if kernel == "windows" then mapFeatures features ([]) else []); + }; + tokio_tls_0_1_4_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + native_tls_0_1_5.default = true; + tokio_core_0_1_17.default = true; + tokio_io_0_1_7.default = true; + tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or true); + }) [ futures_0_1_23_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features ]; + tokio_udp_0_1_1 = { features?(tokio_udp_0_1_1_features {}) }: tokio_udp_0_1_1_ { + dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 mio_0_6_15 tokio_codec_0_1_0 tokio_io_0_1_7 tokio_reactor_0_1_2 ]); + }; + tokio_udp_0_1_1_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + log_0_4_3.default = true; + mio_0_6_15.default = true; + tokio_codec_0_1_0.default = true; + tokio_io_0_1_7.default = true; + tokio_reactor_0_1_2.default = true; + tokio_udp_0_1_1.default = (f.tokio_udp_0_1_1.default or true); + }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features mio_0_6_15_features tokio_codec_0_1_0_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ]; + try_lock_0_1_0 = { features?(try_lock_0_1_0_features {}) }: try_lock_0_1_0_ {}; + try_lock_0_1_0_features = f: updateFeatures f (rec { + try_lock_0_1_0.default = (f.try_lock_0_1_0.default or true); + }) []; + unicase_1_4_2 = { features?(unicase_1_4_2_features {}) }: unicase_1_4_2_ { + dependencies = mapFeatures features ([]); + buildDependencies = mapFeatures features ([ version_check_0_1_4 ]); + features = mkFeatures (features.unicase_1_4_2 or {}); + }; + unicase_1_4_2_features = f: updateFeatures f (rec { + unicase_1_4_2.default = (f.unicase_1_4_2.default or true); + unicase_1_4_2.heapsize = + (f.unicase_1_4_2.heapsize or false) || + (f.unicase_1_4_2.heap_size or false) || + (unicase_1_4_2.heap_size or false); + unicase_1_4_2.heapsize_plugin = + (f.unicase_1_4_2.heapsize_plugin or false) || + (f.unicase_1_4_2.heap_size or false) || + (unicase_1_4_2.heap_size or false); + version_check_0_1_4.default = true; + }) [ version_check_0_1_4_features ]; + unicase_2_1_0 = { features?(unicase_2_1_0_features {}) }: unicase_2_1_0_ { + buildDependencies = mapFeatures features ([ version_check_0_1_4 ]); + features = mkFeatures (features.unicase_2_1_0 or {}); + }; + unicase_2_1_0_features = f: updateFeatures f (rec { + unicase_2_1_0.default = (f.unicase_2_1_0.default or true); + version_check_0_1_4.default = true; + }) [ version_check_0_1_4_features ]; + unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ { + dependencies = mapFeatures features ([ matches_0_1_7 ]); + features = mkFeatures (features.unicode_bidi_0_3_4 or {}); + }; + unicode_bidi_0_3_4_features = f: updateFeatures f (rec { + matches_0_1_7.default = true; + unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true); + unicode_bidi_0_3_4.flame = + (f.unicode_bidi_0_3_4.flame or false) || + (f.unicode_bidi_0_3_4.flame_it or false) || + (unicode_bidi_0_3_4.flame_it or false); + unicode_bidi_0_3_4.flamer = + (f.unicode_bidi_0_3_4.flamer or false) || + (f.unicode_bidi_0_3_4.flame_it or false) || + (unicode_bidi_0_3_4.flame_it or false); + unicode_bidi_0_3_4.serde = + (f.unicode_bidi_0_3_4.serde or false) || + (f.unicode_bidi_0_3_4.with_serde or false) || + (unicode_bidi_0_3_4.with_serde or false); + }) [ matches_0_1_7_features ]; + unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {}; + unicode_normalization_0_1_7_features = f: updateFeatures f (rec { + unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true); + }) []; + unicode_width_0_1_5 = { features?(unicode_width_0_1_5_features {}) }: unicode_width_0_1_5_ { + features = mkFeatures (features.unicode_width_0_1_5 or {}); + }; + unicode_width_0_1_5_features = f: updateFeatures f (rec { + unicode_width_0_1_5.default = (f.unicode_width_0_1_5.default or true); + }) []; + unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ { + features = mkFeatures (features.unicode_xid_0_0_4 or {}); + }; + unicode_xid_0_0_4_features = f: updateFeatures f (rec { + unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true); + }) []; + unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { + dependencies = mapFeatures features ([ void_1_0_2 ]); + }; + unreachable_1_0_0_features = f: updateFeatures f (rec { + unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); + void_1_0_2.default = (f.void_1_0_2.default or false); + }) [ void_1_0_2_features ]; + url_1_7_1 = { features?(url_1_7_1_features {}) }: url_1_7_1_ { + dependencies = mapFeatures features ([ idna_0_1_5 matches_0_1_7 percent_encoding_1_0_1 ]); + features = mkFeatures (features.url_1_7_1 or {}); + }; + url_1_7_1_features = f: updateFeatures f (rec { + idna_0_1_5.default = true; + matches_0_1_7.default = true; + percent_encoding_1_0_1.default = true; + url_1_7_1.default = (f.url_1_7_1.default or true); + url_1_7_1.encoding = + (f.url_1_7_1.encoding or false) || + (f.url_1_7_1.query_encoding or false) || + (url_1_7_1.query_encoding or false); + url_1_7_1.heapsize = + (f.url_1_7_1.heapsize or false) || + (f.url_1_7_1.heap_size or false) || + (url_1_7_1.heap_size or false); + }) [ idna_0_1_5_features matches_0_1_7_features percent_encoding_1_0_1_features ]; + utf8_ranges_0_1_3 = { features?(utf8_ranges_0_1_3_features {}) }: utf8_ranges_0_1_3_ {}; + utf8_ranges_0_1_3_features = f: updateFeatures f (rec { + utf8_ranges_0_1_3.default = (f.utf8_ranges_0_1_3.default or true); + }) []; + uuid_0_6_5 = { features?(uuid_0_6_5_features {}) }: uuid_0_6_5_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ] + ++ (if features.uuid_0_6_5.rand or false then [ rand_0_4_2 ] else [])); + features = mkFeatures (features.uuid_0_6_5 or {}); + }; + uuid_0_6_5_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + rand_0_4_2.default = true; + uuid_0_6_5.byteorder = + (f.uuid_0_6_5.byteorder or false) || + (f.uuid_0_6_5.u128 or false) || + (uuid_0_6_5.u128 or false); + uuid_0_6_5.default = (f.uuid_0_6_5.default or true); + uuid_0_6_5.md5 = + (f.uuid_0_6_5.md5 or false) || + (f.uuid_0_6_5.v3 or false) || + (uuid_0_6_5.v3 or false); + uuid_0_6_5.nightly = + (f.uuid_0_6_5.nightly or false) || + (f.uuid_0_6_5.const_fn or false) || + (uuid_0_6_5.const_fn or false); + uuid_0_6_5.rand = + (f.uuid_0_6_5.rand or false) || + (f.uuid_0_6_5.v3 or false) || + (uuid_0_6_5.v3 or false) || + (f.uuid_0_6_5.v4 or false) || + (uuid_0_6_5.v4 or false) || + (f.uuid_0_6_5.v5 or false) || + (uuid_0_6_5.v5 or false); + uuid_0_6_5.sha1 = + (f.uuid_0_6_5.sha1 or false) || + (f.uuid_0_6_5.v5 or false) || + (uuid_0_6_5.v5 or false); + uuid_0_6_5.std = + (f.uuid_0_6_5.std or false) || + (f.uuid_0_6_5.default or false) || + (uuid_0_6_5.default or false) || + (f.uuid_0_6_5.use_std or false) || + (uuid_0_6_5.use_std or false); + }) [ cfg_if_0_1_4_features rand_0_4_2_features ]; + vcpkg_0_2_4 = { features?(vcpkg_0_2_4_features {}) }: vcpkg_0_2_4_ {}; + vcpkg_0_2_4_features = f: updateFeatures f (rec { + vcpkg_0_2_4.default = (f.vcpkg_0_2_4.default or true); + }) []; + vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.vec_map_0_8_1 or {}); + }; + vec_map_0_8_1_features = f: updateFeatures f (rec { + vec_map_0_8_1.default = (f.vec_map_0_8_1.default or true); + vec_map_0_8_1.serde = + (f.vec_map_0_8_1.serde or false) || + (f.vec_map_0_8_1.eders or false) || + (vec_map_0_8_1.eders or false); + }) []; + version_check_0_1_4 = { features?(version_check_0_1_4_features {}) }: version_check_0_1_4_ {}; + version_check_0_1_4_features = f: updateFeatures f (rec { + version_check_0_1_4.default = (f.version_check_0_1_4.default or true); + }) []; + void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { + features = mkFeatures (features.void_1_0_2 or {}); + }; + void_1_0_2_features = f: updateFeatures f (rec { + void_1_0_2.default = (f.void_1_0_2.default or true); + void_1_0_2.std = + (f.void_1_0_2.std or false) || + (f.void_1_0_2.default or false) || + (void_1_0_2.default or false); + }) []; + want_0_0_4 = { features?(want_0_0_4_features {}) }: want_0_0_4_ { + dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 try_lock_0_1_0 ]); + }; + want_0_0_4_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + log_0_4_3.default = true; + try_lock_0_1_0.default = true; + want_0_0_4.default = (f.want_0_0_4.default or true); + }) [ futures_0_1_23_features log_0_4_3_features try_lock_0_1_0_features ]; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_0_3_5 = { features?(winapi_0_3_5_features {}) }: winapi_0_3_5_ { + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); + features = mkFeatures (features.winapi_0_3_5 or {}); + }; + winapi_0_3_5_features = f: updateFeatures f (rec { + winapi_0_3_5.default = (f.winapi_0_3_5.default or true); + winapi_i686_pc_windows_gnu_0_4_0.default = true; + winapi_x86_64_pc_windows_gnu_0_4_0.default = true; + }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; + winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; + winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); + }) []; + winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; + winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); + }) []; + ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + ws2_32_sys_0_2_1_features = f: updateFeatures f (rec { + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true); + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + xattr_0_2_2 = { features?(xattr_0_2_2_features {}) }: xattr_0_2_2_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]); + features = mkFeatures (features.xattr_0_2_2 or {}); + }; + xattr_0_2_2_features = f: updateFeatures f (rec { + libc_0_2_42.default = true; + xattr_0_2_2.default = (f.xattr_0_2_2.default or true); + xattr_0_2_2.unsupported = + (f.xattr_0_2_2.unsupported or false) || + (f.xattr_0_2_2.default or false) || + (xattr_0_2_2.default or false); + }) [ libc_0_2_42_features ]; +} diff --git a/pkgs/tools/package-management/cargo-download/default.nix b/pkgs/tools/package-management/cargo-download/default.nix new file mode 100644 index 000000000000..3459f1db553c --- /dev/null +++ b/pkgs/tools/package-management/cargo-download/default.nix @@ -0,0 +1,5 @@ +{ lib, buildPlatform, buildRustCrate, fetchgit }: + +((import ./Cargo.nix { inherit lib buildPlatform buildRustCrate fetchgit; }).cargo_download {}).override { + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae8b67081225..c80920932dd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7099,6 +7099,7 @@ with pkgs; }; }); + cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; cargo-release = callPackage ../tools/package-management/cargo-release { }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; From 9bd7a4f5208cfa92c0ae8cca1ae6f69f0f8f242d Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 16 Aug 2018 17:23:14 +1000 Subject: [PATCH 010/600] hisat2: init 2.1.0 --- .../science/biology/hisat2/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/science/biology/hisat2/default.nix diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix new file mode 100644 index 000000000000..9ccf54a81133 --- /dev/null +++ b/pkgs/applications/science/biology/hisat2/default.nix @@ -0,0 +1,49 @@ +{stdenv, fetchurl, unzip, which, python}: + +stdenv.mkDerivation rec { + name = "hisat2-${version}"; + version = "2.1.0"; + + src = fetchurl { + url = "ftp://ftp.ccb.jhu.edu/pub/infphilo/hisat2/downloads/hisat2-${version}-source.zip"; + sha256 = "10g73sdf6vqqfhhd92hliw7bbpkb8v4pp5012r5l21zws7p7d8l9"; + }; + + buildInputs = [ unzip which python ]; + + installPhase = '' + mkdir -p $out/bin + cp hisat2 \ + hisat2-inspect-l \ + hisat2-build-s \ + hisat2-align-l \ + hisat2-inspect \ + hisat2-align-s \ + hisat2-inspect-s \ + hisat2-build-l \ + hisat2-build \ + extract_exons.py \ + extract_splice_sites.py \ + hisat2_extract_exons.py \ + hisat2_extract_snps_haplotypes_UCSC.py \ + hisat2_extract_snps_haplotypes_VCF.py \ + hisat2_extract_splice_sites.py \ + hisat2_simulate_reads.py \ + hisatgenotype_build_genome.py \ + hisatgenotype_extract_reads.py \ + hisatgenotype_extract_vars.py \ + hisatgenotype_hla_cyp.py \ + hisatgenotype_locus.py \ + hisatgenotype.py \ + $out/bin + ''; + + meta = with stdenv.lib; { + description = "Graph based aligner"; + license = licenses.gpl3; + homepage = https://ccb.jhu.edu/software/hisat2/index.shtml; + maintainers = with maintainers; [ jbedo ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2846bf49eb82..48eae4eb6c11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20377,6 +20377,8 @@ with pkgs; ezminc = callPackage ../applications/science/biology/EZminc { }; + hisat2 = callPackage ../applications/science/biology/hisat2 { }; + htslib = callPackage ../development/libraries/science/biology/htslib { }; igv = callPackage ../applications/science/biology/igv { }; From de61d0da203889a6ebd07085a406ac8d3e90ee30 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sun, 19 Aug 2018 09:33:14 +0200 Subject: [PATCH 011/600] ydiff: init at 1.1 --- pkgs/development/tools/ydiff/default.nix | 45 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/tools/ydiff/default.nix diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix new file mode 100644 index 000000000000..c2f72138db5f --- /dev/null +++ b/pkgs/development/tools/ydiff/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, pythonPackages, python3Packages, less, patchutils, git +, subversion, coreutils, which }: + +with pythonPackages; + +buildPythonApplication rec { + pname = "ydiff"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + }; + + patchPhase = '' + substituteInPlace tests/test_ydiff.py \ + --replace /bin/rm ${coreutils}/bin/rm \ + --replace /bin/sh ${stdenv.shell} + substituteInPlace Makefile \ + --replace "pep8 --ignore" "# pep8 --ignore" \ + --replace "python3 \`which coverage\`" "${python3Packages.coverage}/bin/coverage3" \ + --replace /bin/sh ${stdenv.shell} \ + --replace tests/regression.sh "${stdenv.shell} tests/regression.sh" + patchShebangs tests/*.sh + ''; + + buildInputs = [ docutils pygments ]; + propagatedBuildInputs = [ less patchutils ]; + checkInputs = [ coverage coreutils git subversion which ]; + + checkTarget = if isPy3k then "test3" else "test"; + + meta = { + homepage = https://github.com/ymattw/ydiff; + description = "View colored, incremental diff in workspace or from stdin"; + longDescription = '' + Term based tool to view colored, incremental diff in a version + controlled workspace (supports Git, Mercurial, Perforce and Svn + so far) or from stdin, with side by side (similar to diff -y) + and auto pager support. + ''; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81841abdddf8..2758719a93e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19416,6 +19416,8 @@ with pkgs; yate = callPackage ../applications/misc/yate { }; + ydiff = callPackage ../development/tools/ydiff { }; + yed = callPackage ../applications/graphics/yed {}; inherit (gnome3) yelp; From d273db48c6e95d6547f02845f1921211f113c0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 29 Aug 2018 16:05:48 +0000 Subject: [PATCH 012/600] nixos/shells: avoid overriding the environment for child shells A shared exported guard `__NIXOS_SET_ENVIRONMENT_DONE` is introduced that can be used to prevent child shells from sourcing `system.build.setEnvironment` the second time. This fixes e.g. `nix run derivation` when run from e.g. ZSH through the console or ssh. Before this Bash would resource the common environment resetting the `PATH` environment variable. We also export `system.build.setEnvironment` to `/etc/set-environment` making it easy to reset the common environment with `. /etc/set-environment` when needed and to grep for environment variables in `/etc` (which was the motivation of #30418). This reverts changes made in b00a3fc6fd82834114771f2115a2b032f0ebfe29 (the original #30418). --- nixos/modules/config/shells-environment.nix | 9 +++++++++ nixos/modules/programs/bash/bash.nix | 4 +++- nixos/modules/programs/fish.nix | 4 +++- nixos/modules/programs/zsh/zsh.nix | 4 +++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 9dc4749b08d1..41b1b32768ff 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -162,8 +162,17 @@ in /bin/sh ''; + # For resetting environment with `. /etc/set-environment` when needed + # and discoverability (see motivation of #30418). + environment.etc."set-environment".source = config.system.build.setEnvironment; + system.build.setEnvironment = pkgs.writeText "set-environment" '' + # DO NOT EDIT -- this file has been generated automatically. + + # Prevent this file from being sourced by child shells. + export __NIXOS_SET_ENVIRONMENT_DONE=1 + ${exportedEnvVars} ${cfg.extraInit} diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 69a1a482d074..e5f5c8d09438 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -126,7 +126,9 @@ in programs.bash = { shellInit = '' - ${config.system.build.setEnvironment.text} + if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then + . ${config.system.build.setEnvironment} + fi ${cfge.shellInit} ''; diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index c8d94a47be28..40b3ff37289f 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -109,7 +109,9 @@ in set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions # source the NixOS environment config - fenv source ${config.system.build.setEnvironment} + if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ] + fenv source ${config.system.build.setEnvironment} + end # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish set -e fish_function_path diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 42d4e1d4ada0..c6ab637160d5 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -103,7 +103,9 @@ in if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi export __ETC_ZSHENV_SOURCED=1 - ${config.system.build.setEnvironment.text} + if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then + . ${config.system.build.setEnvironment} + fi ${cfge.shellInit} From 8952375b484ecb65593be4e81fb8cc5ffde09428 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 29 Aug 2018 16:05:53 +0000 Subject: [PATCH 013/600] nixos/shells: fix indent everywhere to comply with `doc/coding-conventions.xml` --- nixos/modules/config/shells-environment.nix | 18 +++++++++--------- nixos/modules/programs/bash/bash.nix | 8 ++++---- nixos/modules/programs/fish.nix | 15 +++++++-------- nixos/modules/programs/zsh/zsh.nix | 10 +++++----- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 41b1b32768ff..b6dcb9aed4e7 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -167,19 +167,19 @@ in environment.etc."set-environment".source = config.system.build.setEnvironment; system.build.setEnvironment = pkgs.writeText "set-environment" - '' - # DO NOT EDIT -- this file has been generated automatically. + '' + # DO NOT EDIT -- this file has been generated automatically. - # Prevent this file from being sourced by child shells. - export __NIXOS_SET_ENVIRONMENT_DONE=1 + # Prevent this file from being sourced by child shells. + export __NIXOS_SET_ENVIRONMENT_DONE=1 - ${exportedEnvVars} + ${exportedEnvVars} - ${cfg.extraInit} + ${cfg.extraInit} - # ~/bin if it exists overrides other bin directories. - export PATH="$HOME/bin:$PATH" - ''; + # ~/bin if it exists overrides other bin directories. + export PATH="$HOME/bin:$PATH" + ''; system.activationScripts.binsh = stringAfter [ "stdio" ] '' diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index e5f5c8d09438..424e1506b4c5 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -168,11 +168,11 @@ in # Read system-wide modifications. if test -f /etc/profile.local; then - . /etc/profile.local + . /etc/profile.local fi if [ -n "''${BASH_VERSION:-}" ]; then - . /etc/bashrc + . /etc/bashrc fi ''; @@ -193,12 +193,12 @@ in # We are not always an interactive shell. if [ -n "$PS1" ]; then - ${cfg.interactiveShellInit} + ${cfg.interactiveShellInit} fi # Read system-wide modifications. if test -f /etc/bashrc.local; then - . /etc/bashrc.local + . /etc/bashrc.local fi ''; diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 40b3ff37289f..c3f742acde2e 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -27,7 +27,7 @@ in ''; type = types.bool; }; - + vendor.config.enable = mkOption { type = types.bool; default = true; @@ -43,7 +43,7 @@ in Whether fish should use completion files provided by other packages. ''; }; - + vendor.functions.enable = mkOption { type = types.bool; default = true; @@ -107,7 +107,7 @@ in # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions - + # source the NixOS environment config if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ] fenv source ${config.system.build.setEnvironment} @@ -125,7 +125,7 @@ in set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path fenv source /etc/fish/foreign-env/shellInit > /dev/null set -e fish_function_path[1] - + ${cfg.shellInit} # and leave a note so we don't source this config section again from @@ -139,7 +139,7 @@ in set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path fenv source /etc/fish/foreign-env/loginShellInit > /dev/null set -e fish_function_path[1] - + ${cfg.loginShellInit} # and leave a note so we don't source this config section again from @@ -151,12 +151,11 @@ in status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced and begin ${fishAliases} - set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null set -e fish_function_path[1] - + ${cfg.promptInit} ${cfg.interactiveShellInit} @@ -172,7 +171,7 @@ in ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d" ++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d" ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d"; - + environment.systemPackages = [ pkgs.fish ]; environment.shells = [ diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index c6ab637160d5..2ef575f8f642 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -70,7 +70,7 @@ in promptInit = mkOption { default = '' if [ "$TERM" != dumb ]; then - autoload -U promptinit && promptinit && prompt walters + autoload -U promptinit && promptinit && prompt walters fi ''; description = '' @@ -113,7 +113,7 @@ in # Read system-wide modifications. if test -f /etc/zshenv.local; then - . /etc/zshenv.local + . /etc/zshenv.local fi ''; @@ -132,7 +132,7 @@ in # Read system-wide modifications. if test -f /etc/zprofile.local; then - . /etc/zprofile.local + . /etc/zprofile.local fi ''; @@ -158,7 +158,7 @@ in # Tell zsh how to find installed completions for p in ''${(z)NIX_PROFILES}; do - fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) + fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) done ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"} @@ -173,7 +173,7 @@ in # Read system-wide modifications. if test -f /etc/zshrc.local; then - . /etc/zshrc.local + . /etc/zshrc.local fi ''; From d22be10e667d233fe38ae6b8f23dc8505798492b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 9 May 2018 13:44:39 -0400 Subject: [PATCH 014/600] geant4: refactor cmakeFlags to use lists --- .../libraries/physics/geant4/default.nix | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 87af069c18a5..8b3166cdea0b 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -58,24 +58,22 @@ let inherit version src; name = "geant4-${version}"; - multiThreadingFlag = if multiThreadingCapable then "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" else ""; - - cmakeFlags = '' - ${multiThreadingFlag} - -DGEANT4_INSTALL_DATA=OFF - -DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"} - -DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"} - -DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"} - -DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"} - -DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"} - -DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"} - -DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"} - -DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"} - -DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"} - -DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"} - -DINVENTOR_INCLUDE_DIR=${coin3d}/include - -DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so - ''; + cmakeFlags = [ + "-DGEANT4_INSTALL_DATA=OFF" + "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" + "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}" + "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}" + "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}" + "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}" + "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" + "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" + "-DINVENTOR_INCLUDE_DIR=${coin3d}/include" + "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" + ] ++ stdenv.lib.optional multiThreadingCapable + "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"; enableParallelBuilding = true; buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ]; From d7ab0f40266f22781b74ec17f99dd30251f98e7d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 9 May 2018 13:45:57 -0400 Subject: [PATCH 015/600] geant4: only supply requested dependencies, sort out *BuildInputs --- .../libraries/physics/geant4/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 8b3166cdea0b..e80277ec0442 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -70,14 +70,20 @@ let "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" + ] ++ stdenv.lib.optional multiThreadingCapable + "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" + ++ stdenv.lib.optionals enableInventor [ "-DINVENTOR_INCLUDE_DIR=${coin3d}/include" "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" - ] ++ stdenv.lib.optional multiThreadingCapable - "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"; + ]; enableParallelBuilding = true; - buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ]; - propagatedBuildInputs = [ clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ] + ++ stdenv.lib.optionals enableGDML [ xercesc ] + ++ stdenv.lib.optionals enableXM [ motif ] + ++ stdenv.lib.optionals enableQT [ qt ] + ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ]; postFixup = '' # Don't try to export invalid environment variables. From ecfa538e058a9e81155a6ec6ea79c75c5bc26f35 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 9 May 2018 13:51:53 -0400 Subject: [PATCH 016/600] gean4: use motif for enableXM by default (lesstif is deprecated, see #17359) --- pkgs/top-level/all-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e09e89b0b90e..2452b73f9610 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21305,9 +21305,6 @@ with pkgs; # For enableQT. qt = null; # qt4SDK or qt5SDK - - # For enableXM. - motif = null; # motif or lesstif }; cernlib = callPackage ../development/libraries/physics/cernlib { }; From 537de20645479f49d64a6021a062850a3b4d6d64 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 16 May 2018 17:09:07 -0400 Subject: [PATCH 017/600] geant4: remove multi version infrastructure Nobody maintains this and this does not contribute anything towards making reproducible research. Also this was missing recurseIntoAttrs, so Hydra used to not see it. --- .../libraries/physics/geant4/default.nix | 130 ++++++++---------- .../libraries/physics/geant4/fetch.nix | 29 ---- .../libraries/physics/geant4/g4py/default.nix | 93 ++++++------- 3 files changed, 96 insertions(+), 156 deletions(-) delete mode 100644 pkgs/development/libraries/physics/geant4/fetch.nix diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index e80277ec0442..2130e3feffa3 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -50,83 +50,67 @@ assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWra assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; assert enableInventor -> libXpm != null; -let - buildGeant4 = - { version, src, multiThreadingCapable ? false }: +stdenv.mkDerivation rec { + version = "10.4.1"; + name = "geant4-${version}"; - stdenv.mkDerivation rec { - inherit version src; - name = "geant4-${version}"; - - cmakeFlags = [ - "-DGEANT4_INSTALL_DATA=OFF" - "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" - "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}" - "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}" - "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}" - "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}" - "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" - "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" - "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" - "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" - "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" - ] ++ stdenv.lib.optional multiThreadingCapable - "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" - ++ stdenv.lib.optionals enableInventor [ - "-DINVENTOR_INCLUDE_DIR=${coin3d}/include" - "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" - ]; - - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; - buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ] - ++ stdenv.lib.optionals enableGDML [ xercesc ] - ++ stdenv.lib.optionals enableXM [ motif ] - ++ stdenv.lib.optionals enableQT [ qt ] - ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ]; - - postFixup = '' - # Don't try to export invalid environment variables. - sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh - ''; - - setupHook = ./geant4-hook.sh; - - passthru = { - data = import ./datasets.nix { inherit stdenv fetchurl; }; - }; - - # Set the myriad of envars required by Geant4 if we use a nix-shell. - shellHook = '' - source $out/nix-support/setup-hook - ''; - - meta = with stdenv.lib; { - description = "A toolkit for the simulation of the passage of particles through matter"; - longDescription = '' - Geant4 is a toolkit for the simulation of the passage of particles through matter. - Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. - The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. - ''; - homepage = http://www.geant4.org; - license = licenses.g4sl; - maintainers = with maintainers; [ tmplt ]; - platforms = platforms.all; - }; - }; - - fetchGeant4 = import ./fetch.nix { - inherit stdenv fetchurl; + src = fetchurl{ + url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz"; + sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd"; }; -in { - v10_0_2 = buildGeant4 { - inherit (fetchGeant4.v10_0_2) version src; - multiThreadingCapable = true; + cmakeFlags = [ + "-DGEANT4_INSTALL_DATA=OFF" + "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" + "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}" + "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}" + "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}" + "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}" + "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" + "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" + "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" + ] ++ stdenv.lib.optionals enableInventor [ + "-DINVENTOR_INCLUDE_DIR=${coin3d}/include" + "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" + ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ] + ++ stdenv.lib.optionals enableGDML [ xercesc ] + ++ stdenv.lib.optionals enableXM [ motif ] + ++ stdenv.lib.optionals enableQT [ qt ] + ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ]; + + postFixup = '' + # Don't try to export invalid environment variables. + sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh + ''; + + setupHook = ./geant4-hook.sh; + + passthru = { + data = import ./datasets.nix { inherit stdenv fetchurl; }; }; - v10_4_1 = buildGeant4 { - inherit (fetchGeant4.v10_4_1) version src; - multiThreadingCapable = true; + # Set the myriad of envars required by Geant4 if we use a nix-shell. + shellHook = '' + source $out/nix-support/setup-hook + ''; + + meta = with stdenv.lib; { + description = "A toolkit for the simulation of the passage of particles through matter"; + longDescription = '' + Geant4 is a toolkit for the simulation of the passage of particles through matter. + Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. + The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. + ''; + homepage = http://www.geant4.org; + license = licenses.g4sl; + maintainers = with maintainers; [ tmplt ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/physics/geant4/fetch.nix b/pkgs/development/libraries/physics/geant4/fetch.nix deleted file mode 100644 index 5d539b480d7d..000000000000 --- a/pkgs/development/libraries/physics/geant4/fetch.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl }: - -let - fetch = { version, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null }: - { - inherit version src; - }; - -in { - v10_0_2 = fetch { - version = "10.0.2"; - - src = fetchurl{ - url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz"; - sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848"; - }; - }; - - v10_4_1 = fetch { - version = "10.4.1"; - - src = fetchurl{ - url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz"; - sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd"; - }; - }; - -} - diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index ee332171158d..8d6dfdca47d0 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -8,67 +8,52 @@ , boost }: -let - buildG4py = - { version, src, geant4}: +stdenv.mkDerivation rec { + inherit (geant4) version src; + name = "g4py-${version}"; - stdenv.mkDerivation rec { - inherit version src geant4; - name = "g4py-${version}"; + # ./configure overwrites $PATH, which clobbers everything. + patches = [ ./configure.patch ]; + patchFlags = "-p0"; - # ./configure overwrites $PATH, which clobbers everything. - patches = [ ./configure.patch ]; - patchFlags = "-p0"; + configurePhase = '' + export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix - configurePhase = '' - export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix + source ${geant4}/share/Geant4-*/geant4make/geant4make.sh + cd environments/g4py - source ${geant4}/share/Geant4-*/geant4make/geant4make.sh - cd environments/g4py + ./configure linux64 --prefix=$prefix \ + --with-g4install-dir=${geant4} \ + --with-python-incdir=${python}/include/python${python.majorVersion} \ + --with-python-libdir=${python}/lib \ + --with-boost-incdir=${boost.dev}/include \ + --with-boost-libdir=${boost.out}/lib + ''; - ./configure linux64 --prefix=$prefix \ - --with-g4install-dir=${geant4} \ - --with-python-incdir=${python}/include/python${python.majorVersion} \ - --with-python-libdir=${python}/lib \ - --with-boost-incdir=${boost.dev}/include \ - --with-boost-libdir=${boost.out}/lib - ''; + enableParallelBuilding = true; + buildInputs = [ geant4 boost python ]; - enableParallelBuilding = true; - buildInputs = [ geant4 boost python ]; + setupHook = ./setup-hook.sh; - setupHook = ./setup-hook.sh; + # Make sure we set PYTHONPATH + shellHook = '' + source $out/nix-support/setup-hook + ''; - # Make sure we set PYTHONPATH - shellHook = '' - source $out/nix-support/setup-hook - ''; - - meta = { - description = "Python bindings and utilities for Geant4"; - longDescription = '' - Geant4 is a toolkit for the simulation of the passage of particles - through matter. Its areas of application include high energy, - nuclear and accelerator physics, as well as studies in medical and - space science. The two main reference papers for Geant4 are - published in Nuclear Instruments and Methods in Physics Research A - 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 - (2006) 270-278. - ''; - homepage = http://www.geant4.org; - license = stdenv.lib.licenses.g4sl; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; - }; - - fetchGeant4 = import ../fetch.nix { - inherit stdenv fetchurl; - }; - -in { - v10_0_2 = buildG4py { - inherit (fetchGeant4.v10_0_2) version src; - geant4 = geant4.v10_0_2; + meta = { + description = "Python bindings and utilities for Geant4"; + longDescription = '' + Geant4 is a toolkit for the simulation of the passage of particles + through matter. Its areas of application include high energy, + nuclear and accelerator physics, as well as studies in medical and + space science. The two main reference papers for Geant4 are + published in Nuclear Instruments and Methods in Physics Research A + 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 + (2006) 270-278. + ''; + homepage = http://www.geant4.org; + license = stdenv.lib.licenses.g4sl; + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; }; } From 4d33e289b521228c7e0437d4135d132cc56d0236 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 16 May 2018 17:55:07 -0400 Subject: [PATCH 018/600] g4py: fix after bump to 10.04.1 --- .../physics/geant4/g4py/configure.patch | 12 -------- .../libraries/physics/geant4/g4py/default.nix | 29 +++++++------------ 2 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/libraries/physics/geant4/g4py/configure.patch diff --git a/pkgs/development/libraries/physics/geant4/g4py/configure.patch b/pkgs/development/libraries/physics/geant4/g4py/configure.patch deleted file mode 100644 index 886618abd34a..000000000000 --- a/pkgs/development/libraries/physics/geant4/g4py/configure.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- environments/g4py/configure 2014-03-17 22:47:05.000000000 +1100 -+++ environments/g4py/configure 2014-09-01 15:33:46.523637686 +1000 -@@ -4,9 +4,6 @@ - # ====================================================================== - export LANG=C - --PATH=/bin:/usr/bin --export PATH -- - # ====================================================================== - # testing the echo features - # ====================================================================== diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index 8d6dfdca47d0..197b842ff476 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, cmake, xercesc # The target version of Geant4 , geant4 @@ -8,30 +8,23 @@ , boost }: +let + # g4py does not support MT and will fail to build against MT geant + geant4_nomt = geant4.override { enableMultiThreading = false; }; +in + stdenv.mkDerivation rec { - inherit (geant4) version src; + inherit (geant4_nomt) version src; name = "g4py-${version}"; - # ./configure overwrites $PATH, which clobbers everything. - patches = [ ./configure.patch ]; - patchFlags = "-p0"; + sourceRoot = "geant4.10.04.p01/environments/g4py"; - configurePhase = '' - export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix + nativeBuildInputs = [ cmake ]; + buildInputs = [ geant4_nomt xercesc boost python ]; - source ${geant4}/share/Geant4-*/geant4make/geant4make.sh - cd environments/g4py - - ./configure linux64 --prefix=$prefix \ - --with-g4install-dir=${geant4} \ - --with-python-incdir=${python}/include/python${python.majorVersion} \ - --with-python-libdir=${python}/lib \ - --with-boost-incdir=${boost.dev}/include \ - --with-boost-libdir=${boost.out}/lib - ''; + GEANT4_INSTALL = geant4_nomt; enableParallelBuilding = true; - buildInputs = [ geant4 boost python ]; setupHook = ./setup-hook.sh; From f3049d020ab065c61541bb551ad5eab70cdc49f0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 17 May 2018 12:45:41 -0400 Subject: [PATCH 019/600] geant4: move parameter definitions from all-packages, use system zlib, use qt5 --- .../libraries/physics/geant4/default.nix | 41 ++++++------------- pkgs/top-level/all-packages.nix | 21 +--------- 2 files changed, 14 insertions(+), 48 deletions(-) diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 2130e3feffa3..57d6a87b5943 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -1,55 +1,40 @@ -{ enableMultiThreading ? false +{ enableMultiThreading ? true , enableG3toG4 ? false , enableInventor ? false , enableGDML ? false , enableQT ? false , enableXM ? false -, enableOpenGLX11 ? false +, enableOpenGLX11 ? true , enableRaytracerX11 ? false # Standard build environment with cmake. , stdenv, fetchurl, cmake # Optional system packages, otherwise internal GEANT4 packages are used. -, clhep ? null -, expat ? null -, zlib ? null +, clhep ? null # not packaged currently +, expat +, zlib # For enableGDML. -, xercesc ? null +, xercesc # For enableQT. -, qt ? null # qt4SDK or qt5SDK +, qtbase # For enableXM. -, motif ? null # motif or lesstif +, motif # For enableInventor , coin3d , soxt -, libXpm ? null +, libXpm # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. -, libGLU_combined ? null -, xlibsWrapper ? null -, libXmu ? null +, libGLU_combined +, xlibsWrapper +, libXmu }: -# G4persistency library with support for GDML -assert enableGDML -> xercesc != null; - -# If enableQT, Qt4/5 User Interface and Visualization drivers. -assert enableQT -> qt != null; - -# Motif User Interface and Visualisation drivers. -assert enableXM -> motif != null; - -# OpenGL/X11 User Interface and Visualisation drivers. -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined != null; -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null; -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; -assert enableInventor -> libXpm != null; - stdenv.mkDerivation rec { version = "10.4.1"; name = "geant4-${version}"; @@ -82,7 +67,7 @@ stdenv.mkDerivation rec { buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ] ++ stdenv.lib.optionals enableGDML [ xercesc ] ++ stdenv.lib.optionals enableXM [ motif ] - ++ stdenv.lib.optionals enableQT [ qt ] + ++ stdenv.lib.optionals enableQT [ qtbase ] ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ]; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2452b73f9610..e8152077633f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21286,26 +21286,7 @@ with pkgs; fastnlo = callPackage ../development/libraries/physics/fastnlo { }; - geant4 = callPackage ../development/libraries/physics/geant4 { - enableMultiThreading = true; - enableG3toG4 = false; - enableInventor = false; - enableGDML = false; - enableQT = false; - enableXM = false; - enableOpenGLX11 = true; - enableRaytracerX11 = false; - - # Optional system packages, otherwise internal GEANT4 packages are used. - clhep = null; - zlib = null; - - # For enableGDML. - xercesc = null; - - # For enableQT. - qt = null; # qt4SDK or qt5SDK - }; + geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; cernlib = callPackage ../development/libraries/physics/cernlib { }; From fc4f99a8dd0b0e02d453f20e3fc1d60effdf3364 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 16 Aug 2018 14:48:03 -0400 Subject: [PATCH 020/600] g4py: fix for new boost --- .../libraries/physics/geant4/g4py/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index 197b842ff476..551d61af3ada 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -11,6 +11,7 @@ let # g4py does not support MT and will fail to build against MT geant geant4_nomt = geant4.override { enableMultiThreading = false; }; + boost_python = boost.override { enablePython = true; inherit python; }; in stdenv.mkDerivation rec { @@ -20,10 +21,20 @@ stdenv.mkDerivation rec { sourceRoot = "geant4.10.04.p01/environments/g4py"; nativeBuildInputs = [ cmake ]; - buildInputs = [ geant4_nomt xercesc boost python ]; + buildInputs = [ geant4_nomt xercesc boost_python python ]; GEANT4_INSTALL = geant4_nomt; + preConfigure = '' + # Fix for boost 1.67+ + substituteInPlace CMakeLists.txt \ + --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.majorVersion})" + for f in `find . -name CMakeLists.txt`; do + substituteInPlace "$f" \ + --replace "boost_python" "\''${Boost_LIBRARIES}" + done + ''; + enableParallelBuilding = true; setupHook = ./setup-hook.sh; From 97816bed335aaa55e8a897835d96602db9f080d2 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Sep 2018 02:21:45 +0900 Subject: [PATCH 021/600] pythonPackages.alot: install zsh completion --- pkgs/development/python-modules/alot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index dd06d4dde7a6..7c4e15f85683 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -47,6 +47,8 @@ buildPythonPackage rec { mkdir -p $out/share/{applications,alot} cp -r extra/themes $out/share/alot + install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot + sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop ''; From af5430808176d5da4b3d7fcaae41aef242926d76 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 3 Sep 2018 19:09:06 +0200 Subject: [PATCH 022/600] scuttlebot and git-ssb: init at 11.4.3 and 2.3.6 --- .../node-packages/node-packages-v8.json | 2 + .../node-packages/node-packages-v8.nix | 4252 ++++++++++++++--- 2 files changed, 3616 insertions(+), 638 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 6ac941eb7c48..38d5008ad8c5 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -30,6 +30,7 @@ , "fetch-bower" , "forever" , "git-run" +, "git-ssb" , "git-standup" , "graphql-cli" , "grunt-cli" @@ -95,6 +96,7 @@ , "react-tools" , "react-native-cli" , "s3http" +, "scuttlebot" , "semver" , "serve" , "shout" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 0e6970dbea18..3efef820a9b5 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -31,6 +31,15 @@ let sha512 = "QAZIFrfVRkjvMkUHIQKZXZ3La0V5t12w5PWrhihYEabHwzIZV/txQd/kSYHgYPXC4s5OURxsXZop9f0BzI2QIQ=="; }; }; + "@babel/code-frame-7.0.0" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz"; + sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; + }; + }; "@babel/generator-7.0.0-beta.38" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -40,6 +49,15 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; + "@babel/highlight-7.0.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz"; + sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw=="; + }; + }; "@babel/runtime-7.0.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -193,13 +211,13 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.1.4" = { + "@lerna/add-3.2.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.1.4.tgz"; - sha512 = "jC4k1EkniPA003Fj8NQkRjdue29BJRRPfbnTqPCmhjmwQKy2dj71256o28eBYoWcouUivA0voz+r+H9sLMqbfA=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.2.0.tgz"; + sha512 = "qGA7agAWcKlrXZR3FwFJXTr26Q2rqjOVMNhtm8uyawImqfdKp4WJXuGdioiWOSW20jMvzLIFhWZh5lCh0UyMBw=="; }; }; "@lerna/batch-packages-3.1.2" = { @@ -211,22 +229,22 @@ let sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ=="; }; }; - "@lerna/bootstrap-3.1.4" = { + "@lerna/bootstrap-3.2.0" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.1.4.tgz"; - sha512 = "GN3/ll73hXQzsFEKW1d6xgMKf6t4kxTXDGhiMF1uc8DdbrK1arA1MMWhXrjMYJAaMldMzNnGeE3Kb1MxKxXWPw=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.2.0.tgz"; + sha512 = "xh6dPpdzsAEWF7lqASaym5AThkmP3ArR7Q+P/tiPWCT+OT7QT5QI2IQAz1aAYEBQL3ACzpE6kq+VOGi0m+9bxw=="; }; }; - "@lerna/changed-3.1.3" = { + "@lerna/changed-3.2.0" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.1.3.tgz"; - sha512 = "6KyyAl/qcxFeKOfuTDJlgh3aNOf6KQDxckEitmOFRi9scIZd7Igj/V9DQSvKoMORGk8wBwbpeLNJ9TN9xbm4qw=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.2.0.tgz"; + sha512 = "R+vGzzXPN5s5lJT0v1zSTLw43O2ek2yekqCqvw7p9UFqgqYSbxUsyWXMdhku/mOIFWTc6DzrsOi+U7CX3TXmHg=="; }; }; "@lerna/check-working-tree-3.1.0" = { @@ -256,13 +274,13 @@ let sha512 = "XVdcIOjhudXlk5pTXjrpsnNLqeVi2rBu2oWzPH2GHrxWGBZBW8thGIFhQf09da/RbRT3uzBWXpUv+sbL2vbX3g=="; }; }; - "@lerna/cli-3.1.4" = { + "@lerna/cli-3.2.0" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.1.4.tgz"; - sha512 = "e63YpwIgXU87gGDpqxr2mQnkxwIIt03FtgWlAId7uySVwTLT7j5u0yMbFR1CVkWvUSBY76JSCsX5u/Z1CfJUpQ=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.2.0.tgz"; + sha512 = "JdbLyTxHqxUlrkI+Ke+ltXbtyA+MPu9zR6kg/n8Fl6uaez/2fZWtReXzYi8MgLxfUFa7+1OHWJv4eAMZlByJ+Q=="; }; }; "@lerna/collect-updates-3.1.0" = { @@ -463,13 +481,13 @@ let sha512 = "e0sspVUfzEKhqsRIxzWqZ/uMBHzZSzOa4HCeORErEZu+dmDoI145XYhqvCVn7EvbAb407FV2H9GVeoP0JeG8GQ=="; }; }; - "@lerna/npm-publish-3.0.6" = { + "@lerna/npm-publish-3.2.0" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "3.0.6"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.0.6.tgz"; - sha512 = "PlvKr958TowEOOe2yNtmUi/Ot42TS/edlmA7rj+XtDUR51AN3RB9G6b25TElyrnDksj1ayb3mOF7I2uf1gbyOw=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.2.0.tgz"; + sha512 = "x13EGrjZk9w8gCQAE44aKbeO1xhLizLJ4tKjzZmQqKEaUCugF4UU8ZRGshPMRFBdsHTEWh05dkKx2oPMoaf0dw=="; }; }; "@lerna/npm-run-script-3.0.0" = { @@ -526,13 +544,13 @@ let sha512 = "EzvNexDTh//GlpOz68zRo16NdOIqWqiiXMs9tIxpELQubH+kUGKvBSiBrZ2Zyrfd8pQhIf+8qARtkCG+G7wzQQ=="; }; }; - "@lerna/publish-3.1.3" = { + "@lerna/publish-3.2.1" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.1.3"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.1.3.tgz"; - sha512 = "vlHs1ll3HEbTVgO0hVFo9dMKixV9XO3T7OBCK835j8fw4TL/0y+YjmNjH5Y5Uyh02hZxcy/iosZNyGccu/fG3w=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.2.1.tgz"; + sha512 = "SnSBstK/G9qLt5rS56pihNacgsu3UgxXiCexWb57GGEp2eDguQ7rFzxVs4JMQQWmVG97EMJQxfFV54tW2sqtIw=="; }; }; "@lerna/resolve-symlink-3.0.0" = { @@ -562,13 +580,13 @@ let sha512 = "O26WdR+sQFSG2Fpc67nw+m8oVq3R+H6jsscKuB6VJafU+V4/hPURSbuFZIcmnD9MLmzAIhlQiCf0Fy6s/1MPPA=="; }; }; - "@lerna/run-lifecycle-3.0.0" = { + "@lerna/run-lifecycle-3.2.0" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.0.0.tgz"; - sha512 = "kfq6eC5mCreTk7GusZyvF0/BfU9FDEt8JaUgzNKLrK1Sj6z2RO8uSpFsUlj+7OuV4wo0I+rdTdJOAFoW8C0GZw=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.2.0.tgz"; + sha512 = "kGGdHJRyeZF+VTtal1DBptg6qwIsOLg3pKtmRm1rCMNN7j4kgrA9L07ZoRar8LjQXvfuheB1LSKHd5d04pr4Tg=="; }; }; "@lerna/run-parallel-batches-3.0.0" = { @@ -607,13 +625,13 @@ let sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA=="; }; }; - "@lerna/version-3.1.3" = { + "@lerna/version-3.2.0" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.1.3.tgz"; - sha512 = "cKJc0FbSEJWdVLBpWgK1tM4nzwpVJ4IC3ESzEvTWYB0fIU/SAcf+m8x7d/kl8XtlybsKGegdMEgBWvzooaDQ9A=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.2.0.tgz"; + sha512 = "1AVDMpeecSMiG1cacduE+f2KO0mC7F/9MvWsHtp+rjkpficMcsVme7IMtycuvu/F07wY4Xr9ioFKYTwTcybbIA=="; }; }; "@lerna/write-log-file-3.0.0" = { @@ -967,31 +985,31 @@ let sha512 = "TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg=="; }; }; - "@types/node-10.9.2" = { + "@types/node-10.9.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.9.2"; + version = "10.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.9.2.tgz"; - sha512 = "pwZnkVyCGJ3LsQ0/3flQK5lCFao4esIzwUVzzk5NvL9vnkEyDhNf4fhHzUMHvyr56gNZywWTS2MR0euabMSz4A=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz"; + sha512 = "fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw=="; }; }; - "@types/node-6.0.116" = { + "@types/node-6.0.117" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.0.116"; + version = "6.0.117"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.0.116.tgz"; - sha512 = "vToa8YEeulfyYg1gSOeHjvvIRqrokng62VMSj2hoZrwZNcYrp2h3AWo6KeBVuymIklQUaY5zgVJvVsC4KiiLkQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.0.117.tgz"; + sha512 = "sihk0SnN8PpiS5ihu5xJQ5ddnURNq4P+XPmW+nORlKkHy21CoZO/IVHK/Wq/l3G8fFW06Fkltgnqx229uPlnRg=="; }; }; - "@types/node-8.10.28" = { + "@types/node-8.10.29" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.28"; + version = "8.10.29"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.28.tgz"; - sha512 = "iHsAzDg3OLH7JP+wipniUULHoDSWLgEDYOvsar6/mpAkTJd9/n23Ap8ikruMlvRTqMv/LXrflH9v/AfiEqaBGg=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz"; + sha512 = "zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ=="; }; }; "@types/range-parser-1.2.2" = { @@ -1543,6 +1561,15 @@ let sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; }; }; + "abstract-leveldown-4.0.3" = { + name = "abstract-leveldown"; + packageName = "abstract-leveldown"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-4.0.3.tgz"; + sha512 = "qsIHFQy0u17JqSY+3ZUT+ykqxYY17yOfvAsLkFkw8kSQqi05d1jyj0bCuSX6sjYlXuY9cKpgUt5EudQdP4aXyA=="; + }; + }; "abstract-random-access-1.1.2" = { name = "abstract-random-access"; packageName = "abstract-random-access"; @@ -1732,13 +1759,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.2.6" = { + "addons-linter-1.3.1" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.2.6"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.2.6.tgz"; - sha512 = "8WjSUoleic9x3gS8SZF0kIvffrX7WkiRPF8Xs8CZi7Yu/Xq0qX9LOYG2Q66t9ThmTeMItt/24FxirqqdyFLGgw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.3.1.tgz"; + sha512 = "Oaj8q8hXWwGhrzlMTM7LUxj5ZUxi8k8/pg0V/NlA3usgClngl7jXW4GRlobdoOao8KEnW95y/WNNMeoTbxYe4w=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -1957,6 +1984,15 @@ let sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; }; }; + "aligned-block-file-1.1.3" = { + name = "aligned-block-file"; + packageName = "aligned-block-file"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.1.3.tgz"; + sha512 = "ai/S+nZ9XMjC0ReZfq94OLGCICVBJyhNiKWmF1J+/GVZZaXtYV805plMi9obaWjfNl/QljB+VOsT+wQ7R858xA=="; + }; + }; "almond-0.3.3" = { name = "almond"; packageName = "almond"; @@ -2236,13 +2272,13 @@ let sha512 = "gVWKYyXF0SlpMyZ/i//AthzyPjjmAVYciEjwepLqMzIf0+7bzIwekpHDuzME8jf4XQepXcNNY571+BRyYHysmg=="; }; }; - "apollo-cache-control-0.2.2" = { + "apollo-cache-control-0.2.3" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.2.tgz"; - sha512 = "N5A1hO6nHZBCR+OCV58IlE7k6hZrFJZTf/Ab2WD8wduLSa0qLLRlCp3rXvD05+jpWa6sdKw03whW2omJ+SyT+w=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.3.tgz"; + sha512 = "W/SJouLRv1VqVd79yeMbDNrv77zJ+8vKbZW2aDjbzMUEyA1nODdJhsrxqlxlh+naK5L4i12DEEG/YhfQjnzM2w=="; }; }; "apollo-cache-inmemory-1.2.9" = { @@ -2272,22 +2308,22 @@ let sha512 = "jlxz/b5iinRWfh48hXdmMtrjTPn/rDok0Z3b7icvkiaD6I30w4sq9B+JDkFbLnkldzsFLV2BZtBDa/dkZhx8Ng=="; }; }; - "apollo-datasource-0.1.2" = { + "apollo-datasource-0.1.3" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.1.2.tgz"; - sha512 = "AbUxS7Qkz9+T+g19zKRJiA+tBVGVVunzXwd4ftDSYGx1VrF5LJJO7Gc57bk719gWIZneZ02HsVCEZd6NxFF8RQ=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.1.3.tgz"; + sha512 = "yEGEe5Cjzqqu5ml1VV3O8+C+thzdknZri9Ny0P3daTGNO+45J3vBOMcmaANeeI2+OOeWxdqUNa5aPOx/35kniw=="; }; }; - "apollo-engine-reporting-0.0.2" = { + "apollo-engine-reporting-0.0.3" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.2.tgz"; - sha512 = "Fe/1oxC8rUXRrBTMUiqs5PSb6hnMOJHuttJMhs83u5POfplc4QrKJZtEEU4Ui8mxeJGaGNWbWf+D4q645xdQLA=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.3.tgz"; + sha512 = "zkgPDB5w5/v450xOqqcV0/lJuaD1vk0cCeS7pAvaaTPGBGUVpSbZaGcsHUhmh1AJOL0it81u/i/6WVwWS3TJXQ=="; }; }; "apollo-engine-reporting-protobuf-0.0.1" = { @@ -2380,22 +2416,22 @@ let sha512 = "jBRnsTgXN0m8yVpumoelaUq9mXR7YpJ3EE+y/alI7zgXY+0qFDqksRApU8dEfg3q6qUnO7rFxRhdG5eyc0+1ig=="; }; }; - "apollo-server-core-2.0.4" = { + "apollo-server-core-2.0.5" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.0.4.tgz"; - sha512 = "6kNaQYZfX2GvAT1g9ih0rodfRl4hPL1jXb7b+FvQ1foFR5Yyb3oqL2DOcP65gQi/7pGhyNRUAncPU18Vo3u9rQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.0.5.tgz"; + sha512 = "bGeutygUhajJoc1hcuVWbZfHMn6eh0XBZK8evrnZkzG9zwuPSiJRdEu/sXPIeJ2iX7HbhOpHuMVImbhkPq+Haw=="; }; }; - "apollo-server-env-2.0.2" = { + "apollo-server-env-2.0.3" = { name = "apollo-server-env"; packageName = "apollo-server-env"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.2.tgz"; - sha512 = "LsSh2TSF1Sh+TnKxCv2To+UNTnoPpBGCXn6fPsmiNqVaBaSagfZEU/aaSu3ftMlmfXr4vXAfYNUDMKEi+7E6Bg=="; + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.3.tgz"; + sha512 = "uIfKFH8n8xKO0eLb9Fa79+s2DdMuVethgznvW6SrOYq5VzgkIIobqKEuZPKa5wObw9CkCyju/+Sr7b7WWMFxUQ=="; }; }; "apollo-server-errors-2.0.2" = { @@ -2407,22 +2443,22 @@ let sha512 = "zyWDqAVDCkj9espVsoUpZr9PwDznM8UW6fBfhV+i1br//s2AQb07N6ektZ9pRIEvkhykDZW+8tQbDwAO0vUROg=="; }; }; - "apollo-server-express-2.0.4" = { + "apollo-server-express-2.0.5" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.0.4.tgz"; - sha512 = "9mxcFpnTgQTmrsvVRRofEY7N1bJYholjv99IfN8puu5lhNqj8ZbOPZYrw+zd+Yh4rZSonwx76ZzTRzM00Yllfw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.0.5.tgz"; + sha512 = "0Bun2wVflgMMhp9+LKz7tuJXIGmnNbWjvNHwxOtLfz3L6tmG+1Y+dLYBPLA7h1bzwYsACFP+glNTYn6/ErL/tA=="; }; }; - "apollo-tracing-0.2.2" = { + "apollo-tracing-0.2.3" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.2.tgz"; - sha512 = "zrpLRvaAqtzGufc1GfV+691xQtzq5elfBydg/7wzuaFszlMH66hkLas5Dw36drUX21CbCljOuGYvYzqSiKykuQ=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.3.tgz"; + sha512 = "N3CwLGSiTms4BqEz1IpjaJWLNdWiEmdfowU2+vPvvCQj8SN/HuAwK9BxRnr6BH8PD3i5Gzq7tFiMB0D0sN1+LA=="; }; }; "apollo-upload-client-8.1.0" = { @@ -2452,6 +2488,15 @@ let sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; }; }; + "append-batch-0.0.1" = { + name = "append-batch"; + packageName = "append-batch"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/append-batch/-/append-batch-0.0.1.tgz"; + sha1 = "9224858e556997ccc07f11f1ee9a128532aa0d25"; + }; + }; "append-buffer-1.0.2" = { name = "append-buffer"; packageName = "append-buffer"; @@ -2493,7 +2538,7 @@ let packageName = "applicationinsights"; version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz"; + url = "http://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz"; sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3"; }; }; @@ -3163,6 +3208,24 @@ let sha512 = "FadV8UDcyZDjzb6eV7MCJj0bfrNjwKw7/X0QHPFCbYP6T20FXgZCYXpJKlQC8RxEQP1E6Xs8pNHdh3bcrZAuAw=="; }; }; + "async-single-1.0.5" = { + name = "async-single"; + packageName = "async-single"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/async-single/-/async-single-1.0.5.tgz"; + sha1 = "125dd09de95d3ea30a378adbed021092179b03c9"; + }; + }; + "async-write-2.1.0" = { + name = "async-write"; + packageName = "async-write"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-write/-/async-write-2.1.0.tgz"; + sha1 = "1e762817d849ce44bfac07925a42036787061b15"; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -3172,6 +3235,15 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "asyncmemo-1.0.0" = { + name = "asyncmemo"; + packageName = "asyncmemo"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asyncmemo/-/asyncmemo-1.0.0.tgz"; + sha1 = "ef249dc869d6c07e7dfd4a22c8a18850bb39d7f1"; + }; + }; "atob-2.1.2" = { name = "atob"; packageName = "atob"; @@ -3190,6 +3262,33 @@ let sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4"; }; }; + "atomic-file-0.0.1" = { + name = "atomic-file"; + packageName = "atomic-file"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/atomic-file/-/atomic-file-0.0.1.tgz"; + sha1 = "6c36658f6c4ece33fba3877731e7c25fc82999bb"; + }; + }; + "atomic-file-1.1.5" = { + name = "atomic-file"; + packageName = "atomic-file"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/atomic-file/-/atomic-file-1.1.5.tgz"; + sha512 = "TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ=="; + }; + }; + "attach-ware-1.1.1" = { + name = "attach-ware"; + packageName = "attach-ware"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/attach-ware/-/attach-ware-1.1.1.tgz"; + sha1 = "28f51393dd8bb8bdaad972342519bf09621a35a3"; + }; + }; "auto-bind-1.2.1" = { name = "auto-bind"; packageName = "auto-bind"; @@ -3204,17 +3303,17 @@ let packageName = "aws-sdk"; version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.303.0" = { + "aws-sdk-2.307.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.303.0"; + version = "2.307.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.303.0.tgz"; - sha512 = "3AMEO/+aKNKvnIg1StF30Itbhs1SdUrUirCqlggS4bhLLOvyJVTrY+tJwASnPGsye4ffD6Qw8LRnaCytvDKkoQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.307.0.tgz"; + sha512 = "+RTDZvmn2tlyCUCUQvbj7XN3ZtSiqoSuxvQQCqXlrGxUvGbQ9wO4I3zcKQRlSsp1OGBgr5+jgBVjzEPLPGlxOg=="; }; }; "aws-sign-0.2.1" = { @@ -3384,7 +3483,7 @@ let packageName = "azure-arm-network"; version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz"; + url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz"; sha512 = "juitxBWofPBZ+kcmLB8OjW5qPD6+/Ncdq86WjDTIUcH+cyb/GWktdDymv6adbOyz4xZ9/wbThFL7AHgq8cHBig=="; }; }; @@ -3447,7 +3546,7 @@ let packageName = "azure-arm-website"; version = "0.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz"; + url = "http://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz"; sha1 = "51942423e1238ec19e551926353a8e9f73bc534a"; }; }; @@ -3672,7 +3771,7 @@ let packageName = "babel-plugin-syntax-jsx"; version = "6.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + url = "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; }; }; @@ -3681,7 +3780,7 @@ let packageName = "babel-plugin-syntax-object-rest-spread"; version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; + url = "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; }; }; @@ -3717,7 +3816,7 @@ let packageName = "babel-polyfill"; version = "6.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz"; + url = "http://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz"; sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; }; }; @@ -3829,6 +3928,15 @@ let sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; }; }; + "bail-1.0.3" = { + name = "bail"; + packageName = "bail"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz"; + sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg=="; + }; + }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -3928,6 +4036,15 @@ let sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; }; }; + "base64-url-2.2.0" = { + name = "base64-url"; + packageName = "base64-url"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-2.2.0.tgz"; + sha512 = "Y4qHHAE+rWjmAFPQmHPiiD+hWwM/XvuFLlP6kVxlwZJK7rjiE2uIQR9tZ37iEr1E6iCj9799yxMAmiXzITb3lQ=="; + }; + }; "base64id-0.1.0" = { name = "base64id"; packageName = "base64id"; @@ -3946,6 +4063,15 @@ let sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; }; }; + "bash-color-0.0.4" = { + name = "bash-color"; + packageName = "bash-color"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bash-color/-/bash-color-0.0.4.tgz"; + sha1 = "e9be8ce33540cada4881768c59bd63865736e913"; + }; + }; "basic-auth-1.0.4" = { name = "basic-auth"; packageName = "basic-auth"; @@ -4108,13 +4234,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.34" = { + "big-integer-1.6.35" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.34"; + version = "1.6.35"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.34.tgz"; - sha512 = "+w6B0Uo0ZvTSzDkXjoBCTNK0oe+aVL+yPi7kwGZm8hd8+Nj1AFPoxoq1Bl/mEu/G/ivOkUc1LRqVR0XeWFUzuA=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.35.tgz"; + sha512 = "jqLsX6dzmPHOhApAUyGwrpzqn3DXpdTqbOM6baPys7A423ys7IsTpcucDVGP0PmzxGsPYbW3xVOJ4SxAzI0vqQ=="; }; }; "big.js-3.2.0" = { @@ -4248,7 +4374,7 @@ let packageName = "bittorrent-dht"; version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz"; + url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz"; sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6"; }; }; @@ -4261,13 +4387,13 @@ let sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; }; }; - "bittorrent-dht-8.4.0" = { + "bittorrent-dht-9.0.0" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "8.4.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.4.0.tgz"; - sha512 = "FRe/+MYBePev7Yb+BXSclkVuDxb/w+gUbao6nVHYQRaKO7aXE+ARRlL3phqm6Rdhw5CRVoLMbLd49nxmCuUhUQ=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.0.tgz"; + sha512 = "X5ax4G/PLtEPfqOUjqDZ2nmPENndWRMK4sT2jcQ4sXor904zhR40r4KqTyTvWYAljh5/hPPqM9DCUUtqWzRXoQ=="; }; }; "bittorrent-peerid-1.3.0" = { @@ -4360,6 +4486,15 @@ let sha512 = "oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA=="; }; }; + "blake2s-1.0.1" = { + name = "blake2s"; + packageName = "blake2s"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2s/-/blake2s-1.0.1.tgz"; + sha1 = "1598822a320ece6aa401ba982954f82f61b0cd7b"; + }; + }; "blob-0.0.2" = { name = "blob"; packageName = "blob"; @@ -4410,7 +4545,7 @@ let packageName = "bluebird"; version = "2.9.34"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"; sha1 = "2f7b4ec80216328a9fddebdf69c8d4942feff7d8"; }; }; @@ -4419,17 +4554,17 @@ let packageName = "bluebird"; version = "2.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; }; }; - "bluebird-3.5.1" = { + "bluebird-3.5.2" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; - sha512 = "MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz"; + sha512 = "dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg=="; }; }; "blueimp-md5-2.10.0" = { @@ -4684,6 +4819,15 @@ let sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; + "broadcast-stream-0.2.2" = { + name = "broadcast-stream"; + packageName = "broadcast-stream"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/broadcast-stream/-/broadcast-stream-0.2.2.tgz"; + sha1 = "79e7bb14a9abba77f72ac9258220242a8fd3919d"; + }; + }; "broadway-0.3.6" = { name = "broadway"; packageName = "broadway"; @@ -4878,7 +5022,7 @@ let packageName = "buffer"; version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; + url = "http://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; }; }; @@ -4887,17 +5031,17 @@ let packageName = "buffer"; version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + url = "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; - "buffer-5.2.0" = { + "buffer-5.2.1" = { name = "buffer"; packageName = "buffer"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz"; - sha512 = "nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz"; + sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; "buffer-alloc-1.2.0" = { @@ -5476,13 +5620,13 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; - "capture-stack-trace-1.0.0" = { + "capture-stack-trace-1.0.1" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; + sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; }; }; "caseless-0.11.0" = { @@ -5539,6 +5683,15 @@ let sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; }; }; + "ccount-1.0.3" = { + name = "ccount"; + packageName = "ccount"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz"; + sha512 = "Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw=="; + }; + }; "center-align-0.1.3" = { name = "center-align"; packageName = "center-align"; @@ -5580,7 +5733,7 @@ let packageName = "chalk"; version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; }; }; @@ -5589,7 +5742,7 @@ let packageName = "chalk"; version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; + url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; }; }; @@ -5598,7 +5751,7 @@ let packageName = "chalk"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; + url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; }; }; @@ -5607,7 +5760,7 @@ let packageName = "chalk"; version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + url = "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; @@ -5625,7 +5778,7 @@ let packageName = "chalk"; version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; + url = "http://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; sha512 = "QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g=="; }; }; @@ -5656,6 +5809,33 @@ let sha512 = "Mww+SLF6MZ0U6kdg11algyKd5BARbyM4TbFBepwowYSR5ClfQGCGtxNXgykpN0uF/bstWeaGDT4JWaDh8zWAHA=="; }; }; + "character-entities-1.2.2" = { + name = "character-entities"; + packageName = "character-entities"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz"; + sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ=="; + }; + }; + "character-entities-html4-1.1.2" = { + name = "character-entities-html4"; + packageName = "character-entities-html4"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz"; + sha512 = "sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw=="; + }; + }; + "character-entities-legacy-1.1.2" = { + name = "character-entities-legacy"; + packageName = "character-entities-legacy"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz"; + sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA=="; + }; + }; "character-parser-1.2.1" = { name = "character-parser"; packageName = "character-parser"; @@ -5674,6 +5854,15 @@ let sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; }; }; + "character-reference-invalid-1.1.2" = { + name = "character-reference-invalid"; + packageName = "character-reference-invalid"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; + sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ=="; + }; + }; "chardet-0.4.2" = { name = "chardet"; packageName = "chardet"; @@ -5683,13 +5872,13 @@ let sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; }; }; - "chardet-0.5.0" = { + "chardet-0.7.0" = { name = "chardet"; packageName = "chardet"; - version = "0.5.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz"; - sha512 = "9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g=="; + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; "charenc-0.0.2" = { @@ -5701,6 +5890,15 @@ let sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; }; }; + "charwise-3.0.1" = { + name = "charwise"; + packageName = "charwise"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/charwise/-/charwise-3.0.1.tgz"; + sha512 = "RcdumNsM6fJZ5HHbYunqj2bpurVRGsXour3OR+SlLEHFhG6ALm54i6Osnh+OvO7kEoSBzwExpblYFH8zKQiEPw=="; + }; + }; "check-error-1.0.2" = { name = "check-error"; packageName = "check-error"; @@ -5746,6 +5944,24 @@ let sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"; }; }; + "chloride-2.2.10" = { + name = "chloride"; + packageName = "chloride"; + version = "2.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/chloride/-/chloride-2.2.10.tgz"; + sha512 = "CbU1ISGiB2JBV6PDXx7hkl8D94d2TPD1BANUMFbr8rZYKJi8De2d3Hu2XDIOLAhXf+8yhoFOdjtLG6fxz3QByQ=="; + }; + }; + "chloride-test-1.2.2" = { + name = "chloride-test"; + packageName = "chloride-test"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chloride-test/-/chloride-test-1.2.2.tgz"; + sha1 = "178686a85e9278045112e96e8c791793f9a10aea"; + }; + }; "chmodr-1.0.2" = { name = "chmodr"; packageName = "chmodr"; @@ -5953,15 +6169,6 @@ let sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; }; }; - "cli-0.6.6" = { - name = "cli"; - packageName = "cli"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; - sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; - }; - }; "cli-1.0.1" = { name = "cli"; packageName = "cli"; @@ -6412,6 +6619,15 @@ let sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; }; }; + "collapse-white-space-1.0.4" = { + name = "collapse-white-space"; + packageName = "collapse-white-space"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz"; + sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw=="; + }; + }; "collection-visit-1.0.0" = { name = "collection-visit"; packageName = "collection-visit"; @@ -7177,6 +7393,15 @@ let sha1 = "75b91fa9f16663e51f98e863af995b9164068c1a"; }; }; + "cont-1.0.3" = { + name = "cont"; + packageName = "cont"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cont/-/cont-1.0.3.tgz"; + sha1 = "6874f1e935fca99d048caeaaad9a0aeb020bcce0"; + }; + }; "content-disposition-0.5.0" = { name = "content-disposition"; packageName = "content-disposition"; @@ -7223,6 +7448,60 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; + "continuable-1.1.8" = { + name = "continuable"; + packageName = "continuable"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable/-/continuable-1.1.8.tgz"; + sha1 = "dc877b474160870ae3bcde87336268ebe50597d5"; + }; + }; + "continuable-1.2.0" = { + name = "continuable"; + packageName = "continuable"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable/-/continuable-1.2.0.tgz"; + sha1 = "08277468d41136200074ccf87294308d169f25b6"; + }; + }; + "continuable-hash-0.1.4" = { + name = "continuable-hash"; + packageName = "continuable-hash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable-hash/-/continuable-hash-0.1.4.tgz"; + sha1 = "81c74d41771d8c92783e1e00e5f11b34d6dfc78c"; + }; + }; + "continuable-list-0.1.6" = { + name = "continuable-list"; + packageName = "continuable-list"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable-list/-/continuable-list-0.1.6.tgz"; + sha1 = "87cf06ec580716e10dff95fb0b84c5f0e8acac5f"; + }; + }; + "continuable-para-1.2.0" = { + name = "continuable-para"; + packageName = "continuable-para"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable-para/-/continuable-para-1.2.0.tgz"; + sha1 = "445510f649459dd0fc35c872015146122731c583"; + }; + }; + "continuable-series-1.2.0" = { + name = "continuable-series"; + packageName = "continuable-series"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable-series/-/continuable-series-1.2.0.tgz"; + sha1 = "3243397ae93a71d655b3026834a51590b958b9e8"; + }; + }; "conventional-changelog-angular-1.6.6" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; @@ -7718,13 +7997,13 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; - "create-torrent-3.32.1" = { + "create-torrent-3.33.0" = { name = "create-torrent"; packageName = "create-torrent"; - version = "3.32.1"; + version = "3.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.32.1.tgz"; - sha512 = "8spZUeFyVc+2mGnWBRTuLOhuHmHrmUomFWf7QvxztCEvTpn5SIrvF8F+HKdkzBPM9B7v/2w+f/65jqLWBXSndg=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.33.0.tgz"; + sha512 = "KMd0KuvwVUg1grlRd5skG9ZkSbBYDDkAjDUMLnvxdRn0rL7ph3IwoOk7I8u1yLX4HYjGiLVlWYO55YWNNPjJFA=="; }; }; "cron-1.3.0" = { @@ -8006,13 +8285,13 @@ let sha1 = "a6602dff7e04a8306dc0db9a551e92e8b5662ad8"; }; }; - "csslint-0.10.0" = { + "csslint-1.0.5" = { name = "csslint"; packageName = "csslint"; - version = "0.10.0"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; - sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; + url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz"; + sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; }; }; "csso-3.5.1" = { @@ -8798,6 +9077,15 @@ let sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; }; }; + "deferred-leveldown-3.0.0" = { + name = "deferred-leveldown"; + packageName = "deferred-leveldown"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-3.0.0.tgz"; + sha512 = "ajbXqRPMXRlcdyt0TuWqknOJkp1JgQjGB7xOl2V+ebol7/U11E9h3/nCZAtN1M7djmAJEIhypCUc1tIWxdQAuQ=="; + }; + }; "define-properties-1.1.3" = { name = "define-properties"; packageName = "define-properties"; @@ -9014,6 +9302,15 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "detab-1.0.2" = { + name = "detab"; + packageName = "detab"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/detab/-/detab-1.0.2.tgz"; + sha1 = "01bc2a4abe7bc7cc67c3039808edbae47049a0ee"; + }; + }; "detect-file-1.0.0" = { name = "detect-file"; packageName = "detect-file"; @@ -9221,13 +9518,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.21.0" = { + "dispensary-0.22.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.21.0.tgz"; - sha512 = "p7qK1sLukrOGYVVcea63lN9CSiE8wO61cweOjtG6MnKoeC9uKHRIO1iJuE5izcX0BeimhkqrQwEMrFWC1yOyAw=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.22.0.tgz"; + sha512 = "iwpIOQ4T+fJ55PAPE4G7b8MubUN8dGyZa78VrD6A+XqSnqs844npoGvpwSEETnn064JaaS4gqLcgAfTGR4p2+g=="; }; }; "diveSync-0.3.0" = { @@ -9716,13 +10013,22 @@ let sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; }; }; - "ecstatic-3.2.1" = { + "ecstatic-3.3.0" = { name = "ecstatic"; packageName = "ecstatic"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.1.tgz"; - sha512 = "BAdHx9LOCG1fwxY8MIydUBskl8UUQrYeC3WE14FA1DPlBzqoG1aOgEkypcSpmiiel8RAj8gW1s40RrclfrpGUg=="; + url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.0.tgz"; + sha512 = "EblWYTd+wPIAMQ0U4oYJZ7QBypT9ZUIwpqli0bKDjeIIQnXDBK2dXtZ9yzRCOlkW1HkO8gn7/FxLK1yPIW17pw=="; + }; + }; + "ed2curve-0.1.4" = { + name = "ed2curve"; + packageName = "ed2curve"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ed2curve/-/ed2curve-0.1.4.tgz"; + sha1 = "94a44248bb87da35db0eff7af0aa576168117f59"; }; }; "editions-1.3.4" = { @@ -9734,13 +10040,13 @@ let sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg=="; }; }; - "editions-2.0.1" = { + "editions-2.0.2" = { name = "editions"; packageName = "editions"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-2.0.1.tgz"; - sha512 = "GNBqG7eF4lxz/jPGM1A/oazdRW9D86OMeggfvCXuA9kcxBJ8fcWO1O8q73pepQlwR8+KecxrgGduwdNeZJ0R9Q=="; + url = "https://registry.npmjs.org/editions/-/editions-2.0.2.tgz"; + sha512 = "0B8aSTWUu9+JW99zHoeogavCi+lkE5l35FK0OKe0pCobixJYoeof3ZujtqYzSsU2MskhRadY5V9oWUuyG4aJ3A=="; }; }; "editor-1.0.0" = { @@ -9861,6 +10167,15 @@ let sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; + "emoji-named-characters-1.0.2" = { + name = "emoji-named-characters"; + packageName = "emoji-named-characters"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-named-characters/-/emoji-named-characters-1.0.2.tgz"; + sha1 = "cdeb36d0e66002c4b9d7bf1dfbc3a199fb7d409b"; + }; + }; "emoji-regex-6.1.1" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -9870,6 +10185,15 @@ let sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; }; }; + "emoji-server-1.0.0" = { + name = "emoji-server"; + packageName = "emoji-server"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-server/-/emoji-server-1.0.0.tgz"; + sha1 = "d063cfee9af118cc5aeefbc2e9b3dd5085815c63"; + }; + }; "emojis-list-2.1.0" = { name = "emojis-list"; packageName = "emojis-list"; @@ -9906,6 +10230,15 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; + "encoding-down-4.0.1" = { + name = "encoding-down"; + packageName = "encoding-down"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding-down/-/encoding-down-4.0.1.tgz"; + sha512 = "AlSE+ugBIpLL0i9if2SlnOZ4oWj/XvBb8tw2Ie/pFB73vdYs5O/6plRyqIgjbZbz8onaL20AAuMP87LWbP56IQ=="; + }; + }; "end-of-stream-0.1.5" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -10113,6 +10446,15 @@ let sha512 = "yqKl+qfQ849zLua/aRGIs4TzNah6ypvdX6KPmK9LPP54Ea+Hqx2gFzSBmGhka8HvWcmCmffGIshG4INSh0ku6g=="; }; }; + "epidemic-broadcast-trees-6.3.4" = { + name = "epidemic-broadcast-trees"; + packageName = "epidemic-broadcast-trees"; + version = "6.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/epidemic-broadcast-trees/-/epidemic-broadcast-trees-6.3.4.tgz"; + sha512 = "ucs3AI3ebPCDFGw8B0SUBwzcY2WqKrbJeqYeeX9KF+XvsO7GFEe0L+1hXPfJcEScfGPByXJNACkYwUFnNaOueQ=="; + }; + }; "err-code-1.1.2" = { name = "err-code"; packageName = "err-code"; @@ -10437,13 +10779,13 @@ let sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.4.0" = { + "eslint-5.5.0" = { name = "eslint"; packageName = "eslint"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz"; - sha512 = "UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz"; + sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -10694,7 +11036,7 @@ let packageName = "eventemitter2"; version = "0.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; + url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; }; }; @@ -10950,6 +11292,15 @@ let sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; + "explain-error-1.0.4" = { + name = "explain-error"; + packageName = "explain-error"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/explain-error/-/explain-error-1.0.4.tgz"; + sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; + }; + }; "express-2.5.11" = { name = "express"; packageName = "express"; @@ -11157,12 +11508,21 @@ let sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; }; }; + "extend.js-0.0.2" = { + name = "extend.js"; + packageName = "extend.js"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz"; + sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15"; + }; + }; "external-editor-1.1.1" = { name = "external-editor"; packageName = "external-editor"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz"; + url = "http://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz"; sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; }; }; @@ -11171,17 +11531,17 @@ let packageName = "external-editor"; version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; + url = "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A=="; }; }; - "external-editor-3.0.1" = { + "external-editor-3.0.3" = { name = "external-editor"; packageName = "external-editor"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.1.tgz"; - sha512 = "e1neqvSt5pSwQcFnYc6yfGuJD2Q4336cdbHs5VeUO0zTkqPbrHMyw2q1r47fpfLWbvIG8H8A6YO3sck7upTV6Q=="; + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz"; + sha512 = "bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA=="; }; }; "extglob-0.3.2" = { @@ -11346,6 +11706,15 @@ let sha512 = "KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="; }; }; + "fast-future-1.0.2" = { + name = "fast-future"; + packageName = "fast-future"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-future/-/fast-future-1.0.2.tgz"; + sha1 = "8435a9aaa02d79248d17d704e76259301d99280a"; + }; + }; "fast-glob-2.2.2" = { name = "fast-glob"; packageName = "fast-glob"; @@ -11369,17 +11738,17 @@ let packageName = "fast-json-patch"; version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz"; + url = "http://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz"; sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; }; }; - "fast-json-patch-2.0.6" = { + "fast-json-patch-2.0.7" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.6.tgz"; - sha1 = "86fff8f8662391aa819722864d632e603e6ee605"; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.7.tgz"; + sha512 = "DQeoEyPYxdTtfmB3yDlxkLyKTdbJ6ABfFGcMynDqjvGhPYLto/pZyb/dG2Nyd/n9CArjEWN9ZST++AFmgzgbGw=="; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -11823,13 +12192,13 @@ let sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; - "firefox-profile-1.1.0" = { + "firefox-profile-1.2.0" = { name = "firefox-profile"; packageName = "firefox-profile"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.1.0.tgz"; - sha512 = "wUIE4QeAjwoHvFbomWmXgKyYtV4/oZxDcJG4znxtGGa/0BhKkd3HzeOf3tAsMWPq1ExARZxCRRiNw1BL3FuPqA=="; + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.2.0.tgz"; + sha512 = "TTEFfPOkyaz4EWx/5ZDQC1mJAe3a+JgVcchpIfD4Tvx1UspwlTJRJxOYA35x/z2iJcxaF6aW2rdh6oj6qwgd2g=="; }; }; "first-chunk-stream-1.0.0" = { @@ -11949,6 +12318,88 @@ let sha512 = "T0iqfhC40jrs3aDjYOKgzIQjjhsH2Fa6LnXB6naPv0ymW3DeYMUFa89y9aLKMpi1P9nl2vEimK7blx4tVnUWBg=="; }; }; + "flumecodec-0.0.0" = { + name = "flumecodec"; + packageName = "flumecodec"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.0.tgz"; + sha1 = "36ce06abe2e0e01c44dd69f2a165305a2320649b"; + }; + }; + "flumecodec-0.0.1" = { + name = "flumecodec"; + packageName = "flumecodec"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.1.tgz"; + sha1 = "ae049a714386bb83e342657a82924b70364a90d6"; + }; + }; + "flumedb-0.4.9" = { + name = "flumedb"; + packageName = "flumedb"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/flumedb/-/flumedb-0.4.9.tgz"; + sha512 = "z932cCXHteJXKcwoev8/RfJ9tQ10FeRCZ6Jh55UnxN/ayZraYZvNYObl8ujbho7xQZB1CDt2WTHCN5gEYGBqGw=="; + }; + }; + "flumelog-offset-3.3.1" = { + name = "flumelog-offset"; + packageName = "flumelog-offset"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.3.1.tgz"; + sha512 = "4yYdr8tTL0qOkKqhxAxvNnIwDBaBcLEsJWbyc2wU4Ycaewts9xxcBaxNbORp2KBbTwFaqZAV13HVpfZcO1X/AA=="; + }; + }; + "flumeview-hashtable-1.0.4" = { + name = "flumeview-hashtable"; + packageName = "flumeview-hashtable"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-hashtable/-/flumeview-hashtable-1.0.4.tgz"; + sha512 = "4L52hBelX7dYVAQQ9uPjksqxOCxLwI4NsfEG/+sTM423axT2Poq5cnfdvGm3HzmNowzwDIKtdy429r6PbfKEIw=="; + }; + }; + "flumeview-level-3.0.5" = { + name = "flumeview-level"; + packageName = "flumeview-level"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.5.tgz"; + sha512 = "LKW+YdJGemOo7TnUwpFHq4cBBiYAIKtWk+G2CK7zrxbCIiAHemBRudohBOUKuSUZZ0CReR5fJ73peBHW02VerA=="; + }; + }; + "flumeview-query-6.3.0" = { + name = "flumeview-query"; + packageName = "flumeview-query"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-6.3.0.tgz"; + sha512 = "8QBannTFLICARmflhHpXNeR5hh6IzIyJz4XhKTofzmxq/hXEn1un7aF6P6dRQkOwthENDTbSB07eWKqwnYDKtw=="; + }; + }; + "flumeview-query-git://github.com/mmckegg/flumeview-query#map" = { + name = "flumeview-query"; + packageName = "flumeview-query"; + version = "6.2.0"; + src = fetchgit { + url = "git://github.com/mmckegg/flumeview-query"; + rev = "59afdf210dbd8bdf53aeea7dcfaaec1c77e7d733"; + sha256 = "e6f1f768a0911a52c7a4d7f1ee0d60531d174fe30a96879a030a019ff3cb069f"; + }; + }; + "flumeview-reduce-1.3.13" = { + name = "flumeview-reduce"; + packageName = "flumeview-reduce"; + version = "1.3.13"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.13.tgz"; + sha512 = "QN/07+ia3uXpfy8/xWjLI2XGIG67Aiwp9VaOTIqYt6NHP6OfdGfl8nGRPkJRHlkfFbzEouRvJcQBFohWEXMdNQ=="; + }; + }; "flush-write-stream-1.0.3" = { name = "flush-write-stream"; packageName = "flush-write-stream"; @@ -12606,13 +13057,13 @@ let sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; }; }; - "generate-function-2.2.0" = { + "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.2.0.tgz"; - sha512 = "EYWRyUEUdNSsmfMZ2udk1AaxEmJQBaCNgfh+FJo0lcUvP42nyR/Xe30kCyxZs7e6t47bpZw0HftWF+KFjD/Lzg=="; + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz"; + sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; }; }; "generate-object-property-1.2.0" = { @@ -12768,13 +13219,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getmac-1.4.5" = { + "getmac-1.4.6" = { name = "getmac"; packageName = "getmac"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-1.4.5.tgz"; - sha512 = "Y4Zu6i3zXAnH+Q2zSdnV8SSmyu3BisdfQhsH8YLsC/7vTxgNTTT/JzHWmU3tZEim8hvaCtZLaE5E95wo8P4oGQ=="; + url = "https://registry.npmjs.org/getmac/-/getmac-1.4.6.tgz"; + sha512 = "3JPwiIr4P6Sgr6y6SVXX0+l2mrB6pyf4Cdyua7rvEV7SveWQkAp11vrkNym8wvRxzLrBenKRcwe93asdghuwWg=="; }; }; "getpass-0.1.6" = { @@ -12822,6 +13273,15 @@ let sha1 = "6d33f7ed63db0d0e118131503bab3aca47d54664"; }; }; + "git-packidx-parser-1.0.0" = { + name = "git-packidx-parser"; + packageName = "git-packidx-parser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-packidx-parser/-/git-packidx-parser-1.0.0.tgz"; + sha1 = "c57d1145eec16465ab9bfbdf575262b1691624d6"; + }; + }; "git-raw-commits-1.3.6" = { name = "git-raw-commits"; packageName = "git-raw-commits"; @@ -12840,6 +13300,15 @@ let sha1 = "5282659dae2107145a11126112ad3216ec5fa65f"; }; }; + "git-remote-ssb-2.0.4" = { + name = "git-remote-ssb"; + packageName = "git-remote-ssb"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/git-remote-ssb/-/git-remote-ssb-2.0.4.tgz"; + sha1 = "7f51b804924d6c603fc142e3302998d4e0b4d906"; + }; + }; "git-rev-sync-1.9.1" = { name = "git-rev-sync"; packageName = "git-rev-sync"; @@ -12858,6 +13327,15 @@ let sha512 = "2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig=="; }; }; + "git-ssb-web-2.8.0" = { + name = "git-ssb-web"; + packageName = "git-ssb-web"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-ssb-web/-/git-ssb-web-2.8.0.tgz"; + sha512 = "8mqO63M60lCiNR+6ROvXuX4VI6pVAru4wMn3uUfxq0xmpNwrZYC4Rkrt5rSGUPumJ43ZUJyeMXXq60v03PUY/g=="; + }; + }; "gitconfiglocal-1.0.0" = { name = "gitconfiglocal"; packageName = "gitconfiglocal"; @@ -13156,6 +13634,15 @@ let sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; }; + "globby-4.1.0" = { + name = "globby"; + packageName = "globby"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz"; + sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8"; + }; + }; "globby-5.0.0" = { name = "globby"; packageName = "globby"; @@ -13206,7 +13693,7 @@ let packageName = "got"; version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-1.2.2.tgz"; + url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz"; sha1 = "d9430ba32f6a30218243884418767340aafc0400"; }; }; @@ -13215,7 +13702,7 @@ let packageName = "got"; version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz"; + url = "http://registry.npmjs.org/got/-/got-3.3.1.tgz"; sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; }; }; @@ -13224,7 +13711,7 @@ let packageName = "got"; version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + url = "http://registry.npmjs.org/got/-/got-6.7.1.tgz"; sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; }; }; @@ -13332,7 +13819,7 @@ let packageName = "graphql"; version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz"; + url = "http://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz"; sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; }; }; @@ -13408,13 +13895,13 @@ let sha512 = "Mlj/VYshHbwDrVHgNyNAl2cBU7+Rh503S43UYXcBtR9Am2KNvmPPPccXEeP6yist0yY2WM0WTwL8JoIGrWeFOw=="; }; }; - "graphql-extensions-0.1.2" = { + "graphql-extensions-0.1.3" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.1.2.tgz"; - sha512 = "A81kfGtOKG0/1sDQGm23u60bkTuk9VDof0SrQrz7yNpPLY48JF11b8+4LNlYfEBVvceDbLAs1KRfyLQskJjJSg=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.1.3.tgz"; + sha512 = "q+d1bTR7GW4qRiZP17SXN0TZo+k/I1FEKYd6H4JMbxzpY8mqTLbg8MzrLu7LxafF+mPEJwRfipcEcA375k3eXA=="; }; }; "graphql-import-0.4.5" = { @@ -13507,6 +13994,15 @@ let sha1 = "d2c177e2f1b17d87f81072cd05311c0754baa420"; }; }; + "graphreduce-3.0.4" = { + name = "graphreduce"; + packageName = "graphreduce"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/graphreduce/-/graphreduce-3.0.4.tgz"; + sha1 = "bf442d0a878e83901e5ef3e652d23ffb5b831ed7"; + }; + }; "gray-matter-2.1.1" = { name = "gray-matter"; packageName = "gray-matter"; @@ -13849,6 +14345,15 @@ let sha1 = "6414c82913697da51590397dafb12f22967811ce"; }; }; + "has-network-0.0.1" = { + name = "has-network"; + packageName = "has-network"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-network/-/has-network-0.0.1.tgz"; + sha1 = "3eea7b44caa9601797124be8ba89d228c4101499"; + }; + }; "has-symbol-support-x-1.4.2" = { name = "has-symbol-support-x"; packageName = "has-symbol-support-x"; @@ -13975,6 +14480,15 @@ let sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; }; }; + "hashlru-2.2.1" = { + name = "hashlru"; + packageName = "hashlru"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hashlru/-/hashlru-2.2.1.tgz"; + sha1 = "10f2099a0d7c05a40f2beaf5c1d39cf2f7dabf36"; + }; + }; "hashring-3.2.0" = { name = "hashring"; packageName = "hashring"; @@ -14020,6 +14534,15 @@ let sha512 = "miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ=="; }; }; + "he-0.5.0" = { + name = "he"; + packageName = "he"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-0.5.0.tgz"; + sha1 = "2c05ffaef90b68e860f3fd2b54ef580989277ee2"; + }; + }; "he-1.1.1" = { name = "he"; packageName = "he"; @@ -14074,6 +14597,15 @@ let sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88"; }; }; + "highlight.js-9.12.0" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "9.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz"; + sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; + }; + }; "hiredis-0.4.1" = { name = "hiredis"; packageName = "hiredis"; @@ -14164,6 +14696,15 @@ let sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; }; }; + "hoox-0.0.1" = { + name = "hoox"; + packageName = "hoox"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoox/-/hoox-0.0.1.tgz"; + sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094"; + }; + }; "hosted-git-info-2.7.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; @@ -14785,6 +15326,15 @@ let sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; }; + "increment-buffer-1.0.1" = { + name = "increment-buffer"; + packageName = "increment-buffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/increment-buffer/-/increment-buffer-1.0.1.tgz"; + sha1 = "65076d75189d808b39ad13ab5b958e05216f9e0d"; + }; + }; "indent-string-2.1.0" = { name = "indent-string"; packageName = "indent-string"; @@ -15046,6 +15596,15 @@ let sha512 = "vtI2YXBRZBkU6DlfHfd0GtZENfiEiTacAXUd0ZY6HA+X7aPznpFfPmzSC+tHKXAkz9KDSdI4AYfwAMXR5t+isg=="; }; }; + "int53-0.2.4" = { + name = "int53"; + packageName = "int53"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/int53/-/int53-0.2.4.tgz"; + sha1 = "5ed8d7aad6c5c6567cae69aa7ffc4a109ee80f86"; + }; + }; "int64-buffer-0.1.10" = { name = "int64-buffer"; packageName = "int64-buffer"; @@ -15109,6 +15668,24 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "ip-0.3.3" = { + name = "ip"; + packageName = "ip"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-0.3.3.tgz"; + sha1 = "8ee8309e92f0b040d287f72efaca1a21702d3fb4"; + }; + }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -15181,6 +15758,15 @@ let sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79"; }; }; + "irregular-plurals-1.4.0" = { + name = "irregular-plurals"; + packageName = "irregular-plurals"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz"; + sha1 = "2ca9b033651111855412f16be5d77c62a458a766"; + }; + }; "is-3.2.1" = { name = "is"; packageName = "is"; @@ -15235,6 +15821,24 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; + "is-alphabetical-1.0.2" = { + name = "is-alphabetical"; + packageName = "is-alphabetical"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; + sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg=="; + }; + }; + "is-alphanumerical-1.0.2" = { + name = "is-alphanumerical"; + packageName = "is-alphanumerical"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; + sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg=="; + }; + }; "is-arguments-1.0.2" = { name = "is-arguments"; packageName = "is-arguments"; @@ -15343,6 +15947,15 @@ let sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; + "is-decimal-1.0.2" = { + name = "is-decimal"; + packageName = "is-decimal"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz"; + sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg=="; + }; + }; "is-descriptor-0.1.6" = { name = "is-descriptor"; packageName = "is-descriptor"; @@ -15388,6 +16001,15 @@ let sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; }; }; + "is-electron-2.1.0" = { + name = "is-electron"; + packageName = "is-electron"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-electron/-/is-electron-2.1.0.tgz"; + sha512 = "dkg5xT383+M6zIbbXW/z7n2nz4SFUi2OSyhntnFYkRdtV+HVEfdjEK+5AWisfYgkpe3WYjTIuh7toaKmSfFVWw=="; + }; + }; "is-equal-shallow-0.1.3" = { name = "is-equal-shallow"; packageName = "is-equal-shallow"; @@ -15514,6 +16136,15 @@ let sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; }; }; + "is-hexadecimal-1.0.2" = { + name = "is-hexadecimal"; + packageName = "is-hexadecimal"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; + sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A=="; + }; + }; "is-installed-globally-0.1.0" = { name = "is-installed-globally"; packageName = "is-installed-globally"; @@ -15955,6 +16586,15 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; + "is-valid-domain-0.0.5" = { + name = "is-valid-domain"; + packageName = "is-valid-domain"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.5.tgz"; + sha1 = "48e70319fcb43009236e96b37f9843889ce7b513"; + }; + }; "is-valid-glob-1.0.0" = { name = "is-valid-glob"; packageName = "is-valid-glob"; @@ -16423,13 +17063,22 @@ let sha1 = "e421a2a8e20d6b0819df28908f782526b96dd1fe"; }; }; - "jshint-2.8.0" = { + "jshint-2.9.6" = { name = "jshint"; packageName = "jshint"; - version = "2.8.0"; + version = "2.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; - sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz"; + sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA=="; + }; + }; + "json-buffer-2.0.11" = { + name = "json-buffer"; + packageName = "json-buffer"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/json-buffer/-/json-buffer-2.0.11.tgz"; + sha1 = "3e441fda3098be8d1e3171ad591bc62a33e2d55f"; }; }; "json-buffer-3.0.0" = { @@ -16905,7 +17554,7 @@ let packageName = "k-bucket"; version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz"; + url = "http://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz"; sha1 = "afc532545f69d466293e887b00d5fc73377c3abb"; }; }; @@ -16914,7 +17563,7 @@ let packageName = "k-bucket"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz"; + url = "http://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz"; sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; @@ -16936,6 +17585,15 @@ let sha512 = "YvDpmY3waI999h1zZoW1rJ04fZrgZ+5PAlVmvwDHT6YO/Q1AOhdel07xsKy9eAvJjQ9xZV1wz3rXKqEfaWvlcQ=="; }; }; + "k-bucket-5.0.0" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-5.0.0.tgz"; + sha512 = "r/q+wV/Kde62/tk+rqyttEJn6h0jR7x+incdMVSYTqK73zVxVrzJa70kJL49cIKen8XjIgUZKSvk8ktnrQbK4w=="; + }; + }; "k-rpc-3.7.0" = { name = "k-rpc"; packageName = "k-rpc"; @@ -17189,6 +17847,24 @@ let sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw=="; }; }; + "kvgraph-0.1.0" = { + name = "kvgraph"; + packageName = "kvgraph"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kvgraph/-/kvgraph-0.1.0.tgz"; + sha1 = "068eed75b8d9bae75c1219da41eea0e433cd748c"; + }; + }; + "kvset-1.0.0" = { + name = "kvset"; + packageName = "kvset"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kvset/-/kvset-1.0.0.tgz"; + sha1 = "24f68db8ecb155498c9ecb56aef40ae24509872f"; + }; + }; "labeled-stream-splicer-2.0.1" = { name = "labeled-stream-splicer"; packageName = "labeled-stream-splicer"; @@ -17279,6 +17955,15 @@ let sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; }; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; + }; + }; "lead-1.0.0" = { name = "lead"; packageName = "lead"; @@ -17333,6 +18018,51 @@ let sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; }; }; + "level-3.0.2" = { + name = "level"; + packageName = "level"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/level/-/level-3.0.2.tgz"; + sha512 = "2qYbbiptPsPWGUI+AgB1gTNXqIjPpALRqrQyNx1zWYNZxhhuzEj/IE4Unu9weEBnsUEocfYe56xOGlAceb8/Fg=="; + }; + }; + "level-codec-6.2.0" = { + name = "level-codec"; + packageName = "level-codec"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level-codec/-/level-codec-6.2.0.tgz"; + sha1 = "a4b5244bb6a4c2f723d68a1d64e980c53627d9d4"; + }; + }; + "level-codec-8.0.0" = { + name = "level-codec"; + packageName = "level-codec"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level-codec/-/level-codec-8.0.0.tgz"; + sha512 = "gNZlo1HRHz0BWxzGCyNf7xntAs2HKOPvvRBWtXsoDvEX4vMYnSTBS6ZnxoaiX7nhxSBPpegRa8CQ/hnfGBKk3Q=="; + }; + }; + "level-errors-1.1.2" = { + name = "level-errors"; + packageName = "level-errors"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz"; + sha512 = "Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w=="; + }; + }; + "level-iterator-stream-2.0.3" = { + name = "level-iterator-stream"; + packageName = "level-iterator-stream"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz"; + sha512 = "I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig=="; + }; + }; "level-packager-0.18.0" = { name = "level-packager"; packageName = "level-packager"; @@ -17342,6 +18072,15 @@ let sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5"; }; }; + "level-packager-2.1.1" = { + name = "level-packager"; + packageName = "level-packager"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level-packager/-/level-packager-2.1.1.tgz"; + sha512 = "6l3G6dVkmdvHwOJrEA9d9hL6SSFrzwjQoLP8HsvohOgfY/8Z9LyTKNCM5Gc84wtsUWCuIHu6r+S6WrCtTWUJCw=="; + }; + }; "level-post-1.0.7" = { name = "level-post"; packageName = "level-post"; @@ -17369,6 +18108,15 @@ let sha1 = "a1bb751c95263ff60f41bde0f973ff8c1e98bbe9"; }; }; + "leveldown-3.0.2" = { + name = "leveldown"; + packageName = "leveldown"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/leveldown/-/leveldown-3.0.2.tgz"; + sha512 = "+ANRScj1npQQzv6e4DYAKRjVQZZ+ahMoubKrNP68nIq+l9bYgb+WiXF+14oTcQTg2f7qE9WHGW7rBG9nGSsA+A=="; + }; + }; "levelup-0.18.6" = { name = "levelup"; packageName = "levelup"; @@ -17387,6 +18135,15 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; + "levelup-2.0.2" = { + name = "levelup"; + packageName = "levelup"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/levelup/-/levelup-2.0.2.tgz"; + sha512 = "us+nTLUyd/eLnclYYddOCdAVw1hnymGx/9p4Jr5ThohStsjLqMVmbYiz6/SYFZEPXNF+AKQSvh6fA2e2KZpC8w=="; + }; + }; "leven-1.0.2" = { name = "leven"; packageName = "leven"; @@ -17459,6 +18216,24 @@ let sha1 = "e80ad2ef5c081ac677f66515d107537fdc0f5c64"; }; }; + "libsodium-0.7.3" = { + name = "libsodium"; + packageName = "libsodium"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.3.tgz"; + sha512 = "ld+deUNqSsZYbAobUs63UyduPq8ICp/Ul/5lbvBIYpuSNWpPRU0PIxbW+xXipVZtuopR6fIz9e0tTnNuPMNeqw=="; + }; + }; + "libsodium-wrappers-0.7.3" = { + name = "libsodium-wrappers"; + packageName = "libsodium-wrappers"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.3.tgz"; + sha512 = "dw5Jh6TZ5qc5rQVZe3JrSO/J05CE+DmAPnqD7Q2glBUE969xZ6o3fchnUxyPlp6ss3x0MFxmdJntveFN+XTg1g=="; + }; + }; "lie-3.1.1" = { name = "lie"; packageName = "lie"; @@ -17626,7 +18401,7 @@ let packageName = "lodash"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; }; }; @@ -17635,7 +18410,7 @@ let packageName = "lodash"; version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; }; }; @@ -17644,7 +18419,7 @@ let packageName = "lodash"; version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; }; }; @@ -17653,25 +18428,16 @@ let packageName = "lodash"; version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; }; }; - "lodash-3.7.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; - sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; - }; - }; "lodash-4.13.1" = { name = "lodash"; packageName = "lodash"; version = "4.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"; sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68"; }; }; @@ -17680,7 +18446,7 @@ let packageName = "lodash"; version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz"; sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432"; }; }; @@ -17707,7 +18473,7 @@ let packageName = "lodash"; version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"; sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9"; }; }; @@ -18647,6 +19413,15 @@ let sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; }; }; + "log-symbols-1.0.2" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; + sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + }; + }; "log-symbols-2.2.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -18737,6 +19512,15 @@ let sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; }; }; + "longest-streak-1.0.0" = { + name = "longest-streak"; + packageName = "longest-streak"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz"; + sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965"; + }; + }; "longjohn-0.2.12" = { name = "longjohn"; packageName = "longjohn"; @@ -18764,6 +19548,15 @@ let sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; }; }; + "looper-4.0.0" = { + name = "looper"; + packageName = "looper"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/looper/-/looper-4.0.0.tgz"; + sha1 = "7706aded59a99edca06e6b54bb86c8ec19c95155"; + }; + }; "loose-envify-1.4.0" = { name = "loose-envify"; packageName = "loose-envify"; @@ -18782,6 +19575,15 @@ let sha512 = "r4w0WrhIHV1lOTVGbTg4Toqwso5x6C8pM7Q/Nto2vy4c7yUSdTYVYlj16uHVX3MT1StpSELDv8yrqGx41MBsDA=="; }; }; + "lossy-store-1.2.3" = { + name = "lossy-store"; + packageName = "lossy-store"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lossy-store/-/lossy-store-1.2.3.tgz"; + sha1 = "562e2a9203d8661f60e8712de407fbdadf275dc9"; + }; + }; "loud-rejection-1.6.0" = { name = "loud-rejection"; packageName = "loud-rejection"; @@ -18917,6 +19719,15 @@ let sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; }; }; + "lrucache-1.0.3" = { + name = "lrucache"; + packageName = "lrucache"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lrucache/-/lrucache-1.0.3.tgz"; + sha1 = "3b1ded0d1ba82e188b9bdaba9eee6486f864a434"; + }; + }; "lstream-0.0.4" = { name = "lstream"; packageName = "lstream"; @@ -18944,6 +19755,15 @@ let sha1 = "10851a06d9964b971178441c23c9e52698eece34"; }; }; + "ltgt-2.2.1" = { + name = "ltgt"; + packageName = "ltgt"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz"; + sha1 = "f35ca91c493f7b73da0e07495304f17b31f87ee5"; + }; + }; "lunr-0.7.2" = { name = "lunr"; packageName = "lunr"; @@ -18976,7 +19796,7 @@ let packageName = "magnet-uri"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; + url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209"; }; }; @@ -18985,17 +19805,17 @@ let packageName = "magnet-uri"; version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz"; + url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz"; sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8"; }; }; - "magnet-uri-5.2.3" = { + "magnet-uri-5.2.4" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.2.3.tgz"; - sha512 = "INWVwcpWfZTVM+Yb4EXVBpm0FTd8Q98Fn5x7nuHv1hkFDRELgdIM+eJ3zYLbNTFpFPYtHs6B+sx8exs29IYwgA=="; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.2.4.tgz"; + sha512 = "VYaJMxhr8B9BrCiNINUsuhaEe40YnG+AQBwcqUKO66lSVaI9I3A1iH/6EmEwRI8OYUg5Gt+4lLE7achg676lrg=="; }; }; "mailcomposer-2.1.0" = { @@ -19034,13 +19854,13 @@ let sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; }; }; - "make-error-1.3.4" = { + "make-error-1.3.5" = { name = "make-error"; packageName = "make-error"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz"; - sha512 = "0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g=="; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz"; + sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="; }; }; "make-error-cause-1.2.2" = { @@ -19088,6 +19908,33 @@ let sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; }; }; + "map-filter-reduce-2.2.1" = { + name = "map-filter-reduce"; + packageName = "map-filter-reduce"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz"; + sha1 = "632b127c3ae5d6ad9e21cfdd9691b63b8944fcd2"; + }; + }; + "map-filter-reduce-3.1.0" = { + name = "map-filter-reduce"; + packageName = "map-filter-reduce"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-3.1.0.tgz"; + sha512 = "os2GlG1lEWRSAvAb9iqfapQ0I1GRXSA+alSjQl0DB7XxNyDx2/VOVAEVhK7EMsqwDDCWNTBSstoo1roc7U5H0w=="; + }; + }; + "map-merge-1.1.0" = { + name = "map-merge"; + packageName = "map-merge"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz"; + sha1 = "6a6fc58c95d8aab46c2bdde44d515b6ee06fce34"; + }; + }; "map-obj-1.0.1" = { name = "map-obj"; packageName = "map-obj"; @@ -19169,6 +20016,15 @@ let sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; }; }; + "markdown-table-0.4.0" = { + name = "markdown-table"; + packageName = "markdown-table"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz"; + sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; + }; + }; "marked-0.3.19" = { name = "marked"; packageName = "marked"; @@ -19214,6 +20070,15 @@ let sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; }; }; + "mdmanifest-1.0.8" = { + name = "mdmanifest"; + packageName = "mdmanifest"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/mdmanifest/-/mdmanifest-1.0.8.tgz"; + sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; + }; + }; "mdn-data-1.1.4" = { name = "mdn-data"; packageName = "mdn-data"; @@ -19304,6 +20169,15 @@ let sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; }; + "mem-3.0.1" = { + name = "mem"; + packageName = "mem"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-3.0.1.tgz"; + sha512 = "QKs47bslvOE0NbXOqG6lMxn6Bk0Iuw0vfrIeLykmQle2LkCw1p48dZDdzE+D88b/xqRJcZGcMNeDvSVma+NuIQ=="; + }; + }; "mem-fs-1.1.3" = { name = "mem-fs"; packageName = "mem-fs"; @@ -19795,7 +20669,7 @@ let packageName = "minimist"; version = "0.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; }; }; @@ -19804,7 +20678,7 @@ let packageName = "minimist"; version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; @@ -19813,7 +20687,7 @@ let packageName = "minimist"; version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; }; }; @@ -19822,7 +20696,7 @@ let packageName = "minimist"; version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"; sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce"; }; }; @@ -19831,7 +20705,7 @@ let packageName = "minimist"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; @@ -19912,7 +20786,7 @@ let packageName = "mkdirp"; version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; }; }; @@ -19921,7 +20795,7 @@ let packageName = "mkdirp"; version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; @@ -19930,7 +20804,7 @@ let packageName = "mkdirp"; version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; }; }; @@ -19939,7 +20813,7 @@ let packageName = "mkdirp"; version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; @@ -19975,7 +20849,7 @@ let packageName = "mocha"; version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz"; + url = "http://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz"; sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; @@ -20029,7 +20903,7 @@ let packageName = "moment"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; + url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; }; }; @@ -20056,7 +20930,7 @@ let packageName = "moment"; version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.7.0.tgz"; + url = "http://registry.npmjs.org/moment/-/moment-2.7.0.tgz"; sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; }; }; @@ -20083,7 +20957,7 @@ let packageName = "mongoose"; version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc"; }; }; @@ -20096,6 +20970,15 @@ let sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; }; }; + "monotonic-timestamp-0.0.9" = { + name = "monotonic-timestamp"; + packageName = "monotonic-timestamp"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/monotonic-timestamp/-/monotonic-timestamp-0.0.9.tgz"; + sha1 = "5ba5adc7aac85e1d7ce77be847161ed246b39603"; + }; + }; "mooremachine-2.2.1" = { name = "mooremachine"; packageName = "mooremachine"; @@ -20110,7 +20993,7 @@ let packageName = "morgan"; version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; + url = "http://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; }; }; @@ -20155,7 +21038,7 @@ let packageName = "mpath"; version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; + url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46"; }; }; @@ -20164,7 +21047,7 @@ let packageName = "mpath"; version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz"; + url = "http://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz"; sha1 = "3a4e829359801de96309c27a6b2e102e89f9e96e"; }; }; @@ -20339,6 +21222,24 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; + "multiblob-1.13.0" = { + name = "multiblob"; + packageName = "multiblob"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.0.tgz"; + sha1 = "e284d5e4a944e724bee2e3896cb3007f069a41bb"; + }; + }; + "multiblob-http-0.4.2" = { + name = "multiblob-http"; + packageName = "multiblob-http"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-0.4.2.tgz"; + sha512 = "hVaXryaqJ3vvKjRNcOCEadzgO99nR+haxlptswr3vRvgavbK/Y/I7/Nat12WIQno2/A8+nkbE+ZcrsN3UDbtQw=="; + }; + }; "multicast-dns-4.0.1" = { name = "multicast-dns"; packageName = "multicast-dns"; @@ -20429,6 +21330,15 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; + "multiserver-1.13.3" = { + name = "multiserver"; + packageName = "multiserver"; + version = "1.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/multiserver/-/multiserver-1.13.3.tgz"; + sha512 = "9x0bO59YVcfT1jNIBcqz1SUI+mPxQWjjPOTzmLew/VS17yot3JOXLloK6g1+ky+uj+AHqRhKfm1zUFMKhlfqWg=="; + }; + }; "multistream-2.1.1" = { name = "multistream"; packageName = "multistream"; @@ -20528,6 +21438,33 @@ let sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ=="; }; }; + "muxrpc-6.4.1" = { + name = "muxrpc"; + packageName = "muxrpc"; + version = "6.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.4.1.tgz"; + sha512 = "r8+tucKMmQiYd8NWGQqAA5r+SlYuU30D/WbYo7E/PztG/jmizQJY5NfmLIJ+GWo+dEC6kIxkr0eY+U0uZexTNg=="; + }; + }; + "muxrpc-validation-2.0.1" = { + name = "muxrpc-validation"; + packageName = "muxrpc-validation"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/muxrpc-validation/-/muxrpc-validation-2.0.1.tgz"; + sha1 = "cd650d172025fe9d064230aab38ca6328dd16f2f"; + }; + }; + "muxrpcli-1.1.0" = { + name = "muxrpcli"; + packageName = "muxrpcli"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/muxrpcli/-/muxrpcli-1.1.0.tgz"; + sha1 = "4ae9ba986ab825c4a5c12fcb71c6daa81eab5158"; + }; + }; "mv-2.1.1" = { name = "mv"; packageName = "mv"; @@ -20627,13 +21564,13 @@ let sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw=="; }; }; - "nanoid-1.2.1" = { + "nanoid-1.2.2" = { name = "nanoid"; packageName = "nanoid"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.1.tgz"; - sha512 = "S1QSG+TQtsqr2/ujHZcNT0OxygffUaUT755qTc/SPKfQ0VJBlOO6qb1425UYoHXPvCZ3pWgMVCuy1t7+AoCxnQ=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.2.tgz"; + sha512 = "o4eK+NomkjYEn6cN9rImXMz1st/LdRP+tricKyoH834ikDwp/M/PJlYWTd7E7/OhvObzLJpuuVvwjg+jDpD4hA=="; }; }; "nanolru-1.0.0" = { @@ -21114,7 +22051,7 @@ let packageName = "node-fetch"; version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz"; + url = "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz"; sha1 = "ab884e8e7e57e38a944753cec706f788d1768bb5"; }; }; @@ -21217,6 +22154,15 @@ let sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; }; }; + "node-polyglot-1.0.0" = { + name = "node-polyglot"; + packageName = "node-polyglot"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-polyglot/-/node-polyglot-1.0.0.tgz"; + sha1 = "25b4d1d9d8eb02b48271c96000c4e6d366eef689"; + }; + }; "node-pre-gyp-0.6.39" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -21415,13 +22361,13 @@ let sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; - "nodemon-1.18.3" = { + "nodemon-1.18.4" = { name = "nodemon"; packageName = "nodemon"; - version = "1.18.3"; + version = "1.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz"; - sha512 = "XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.4.tgz"; + sha512 = "hyK6vl65IPnky/ee+D3IWvVGgJa/m3No2/Xc/3wanS6Ce1MWjCzH6NnhPJ/vZM+6JFym16jtHx51lmCMB9HDtg=="; }; }; "nodesecurity-npm-utils-6.0.0" = { @@ -21442,6 +22388,15 @@ let sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; }; }; + "non-private-ip-1.4.4" = { + name = "non-private-ip"; + packageName = "non-private-ip"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/non-private-ip/-/non-private-ip-1.4.4.tgz"; + sha512 = "K9nTVFOGUOYutaG8ywiKpCdVu458RFxSgSJ0rribUxtf5iLM9B2+raFJgkID3p5op0+twmoQqFaPnu9KYz6qzg=="; + }; + }; "noop-logger-0.1.1" = { name = "noop-logger"; packageName = "noop-logger"; @@ -21532,6 +22487,15 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; + "normalize-uri-1.1.1" = { + name = "normalize-uri"; + packageName = "normalize-uri"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-uri/-/normalize-uri-1.1.1.tgz"; + sha512 = "bui9/kzRGymbkxJsZEBZgDHK2WJWGOHzR0pCr404EpkpVFTkCOYaRwQTlehUE+7oI70mWNENncCWqUxT/icfHw=="; + }; + }; "normalize-url-2.0.1" = { name = "normalize-url"; packageName = "normalize-url"; @@ -21555,7 +22519,7 @@ let packageName = "npm"; version = "3.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; + url = "http://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; @@ -21649,6 +22613,15 @@ let sha512 = "q9zLP8cTr8xKPmMZN3naxp1k/NxVFsjxN6uWuO1tiw9gxg7wZWQ/b5UTfzD0ANw2q1lQxdLKTeCCksq+bPSgbQ=="; }; }; + "npm-prefix-1.2.0" = { + name = "npm-prefix"; + packageName = "npm-prefix"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-prefix/-/npm-prefix-1.2.0.tgz"; + sha1 = "e619455f7074ba54cc66d6d0d37dd9f1be6bcbc0"; + }; + }; "npm-registry-client-0.2.27" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -21807,7 +22780,7 @@ let packageName = "numeral"; version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz"; + url = "http://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz"; sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; }; }; @@ -21947,6 +22920,15 @@ let sha512 = "05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ=="; }; }; + "object-inspect-1.6.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz"; + sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; + }; + }; "object-keys-1.0.12" = { name = "object-keys"; packageName = "object-keys"; @@ -22046,12 +23028,48 @@ let sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a"; }; }; + "observ-0.2.0" = { + name = "observ"; + packageName = "observ"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/observ/-/observ-0.2.0.tgz"; + sha1 = "0bc39b3e29faa5f9e6caa5906cb8392df400aa68"; + }; + }; + "observ-debounce-1.1.1" = { + name = "observ-debounce"; + packageName = "observ-debounce"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/observ-debounce/-/observ-debounce-1.1.1.tgz"; + sha1 = "304e97c85adda70ecd7f08da450678ef90f0b707"; + }; + }; + "obv-0.0.0" = { + name = "obv"; + packageName = "obv"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/obv/-/obv-0.0.0.tgz"; + sha1 = "edeab8468f91d4193362ed7f91d0b96dd39a79c1"; + }; + }; + "obv-0.0.1" = { + name = "obv"; + packageName = "obv"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/obv/-/obv-0.0.1.tgz"; + sha1 = "cb236106341536f0dac4815e06708221cad7fb5e"; + }; + }; "octicons-3.5.0" = { name = "octicons"; packageName = "octicons"; version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz"; + url = "http://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz"; sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30"; }; }; @@ -22064,6 +23082,15 @@ let sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26"; }; }; + "on-change-network-0.0.2" = { + name = "on-change-network"; + packageName = "on-change-network"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-change-network/-/on-change-network-0.0.2.tgz"; + sha1 = "d977249477f91726949d80e82346dab6ef45216b"; + }; + }; "on-finished-2.2.1" = { name = "on-finished"; packageName = "on-finished"; @@ -22091,6 +23118,15 @@ let sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; }; }; + "on-wakeup-1.0.1" = { + name = "on-wakeup"; + packageName = "on-wakeup"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-wakeup/-/on-wakeup-1.0.1.tgz"; + sha1 = "00d79d987dde7c8117bee74bb4903f6f6dafa52b"; + }; + }; "once-1.1.1" = { name = "once"; packageName = "once"; @@ -22163,13 +23199,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "ono-4.0.6" = { + "ono-4.0.7" = { name = "ono"; packageName = "ono"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/ono/-/ono-4.0.6.tgz"; - sha512 = "fJc3tfcgNzIEpDmZIyPRZkYrhoSoexXNnEN4I0QyVQ9l7NMw3sBFeG26/UpCdSXyAOr4wqr9+/ym/769sZakSw=="; + url = "https://registry.npmjs.org/ono/-/ono-4.0.7.tgz"; + sha512 = "FJiGEETwfSVyOwVTwQZD7XN69FRekvgtlobtvPwtilc7PxIHg3gKUykdNP7E9mC/VTF2cxqKZxUZfNKA3MuQLA=="; }; }; "open-0.0.2" = { @@ -22190,6 +23226,15 @@ let sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; }; }; + "opencollective-postinstall-2.0.0" = { + name = "opencollective-postinstall"; + packageName = "opencollective-postinstall"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.0.tgz"; + sha512 = "XAe80GycLe2yRGnJsUtt+EO5lk06XYRQt4kJJe53O2kJHPZJOZ+XMF/b47HW96e6LhfKVpwnXVr/s56jhV98jg=="; + }; + }; "opener-1.4.2" = { name = "opener"; packageName = "opener"; @@ -22393,7 +23438,7 @@ let packageName = "os-locale"; version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + url = "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; }; }; @@ -22406,6 +23451,15 @@ let sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; }; }; + "os-locale-3.0.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.0.0.tgz"; + sha512 = "4mi6ZXIp4OtcV/Bwzl9p9Cvae7KJv/czGIm/HK0iaXCuRh7BMpy4l4o4CLjN+atsRQpCW9Rs4FdhfnK0zaR1Jg=="; + }; + }; "os-name-1.0.3" = { name = "os-name"; packageName = "os-name"; @@ -22568,6 +23622,15 @@ let sha1 = "bf98fe575705658a9e1351befb85ae4c1f07bdca"; }; }; + "p-pipe-1.2.0" = { + name = "p-pipe"; + packageName = "p-pipe"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz"; + sha1 = "4b1a11399a11520a67790ee5a0c1d5881d6befe9"; + }; + }; "p-reduce-1.0.0" = { name = "p-reduce"; packageName = "p-reduce"; @@ -22685,6 +23748,24 @@ let sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; }; }; + "packet-stream-2.0.4" = { + name = "packet-stream"; + packageName = "packet-stream"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/packet-stream/-/packet-stream-2.0.4.tgz"; + sha512 = "7+oxHdMMs6VhLvvbrDUc8QNuelE9fPKLDdToXBIKLPKOlnoBeMim+/35edp+AnFTLzk3xcogVvQ/jrZyyGsEiw=="; + }; + }; + "packet-stream-codec-1.1.2" = { + name = "packet-stream-codec"; + packageName = "packet-stream-codec"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.1.2.tgz"; + sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; + }; + }; "pacote-9.1.0" = { name = "pacote"; packageName = "pacote"; @@ -22766,6 +23847,15 @@ let sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; }; }; + "parse-entities-1.1.2" = { + name = "parse-entities"; + packageName = "parse-entities"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz"; + sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg=="; + }; + }; "parse-filepath-1.0.2" = { name = "parse-filepath"; packageName = "parse-filepath"; @@ -22964,15 +24054,6 @@ let sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; }; }; - "parserlib-0.2.5" = { - name = "parserlib"; - packageName = "parserlib"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; - sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; - }; - }; "parserlib-1.1.1" = { name = "parserlib"; packageName = "parserlib"; @@ -23225,13 +24306,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "path-loader-1.0.7" = { + "path-loader-1.0.8" = { name = "path-loader"; packageName = "path-loader"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.7.tgz"; - sha512 = "FIorK5Wwz8LzyklCCsPnHI2ieelYbnnGvEtBC4DxW8MkdzBbGKKhxoDH1pDPnQN5ll+gT7t77fac/VD7Vi1kFA=="; + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.8.tgz"; + sha512 = "/JQCrTcrteaPB8IHefEAQbmBQReKj51A+yTyc745TBbO4FOySw+/l3Rh0zyad0Nrd87TMROlmFANQwCRsuvN4w=="; }; }; "path-parse-1.0.6" = { @@ -23523,22 +24604,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-4.17.6" = { + "pino-5.0.4" = { name = "pino"; packageName = "pino"; - version = "4.17.6"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.17.6.tgz"; - sha512 = "LFDwmhyWLBnmwO/2UFbWu1jEGVDzaPupaVdx0XcZ3tIAx1EDEBauzxXf2S0UcFK7oe+X9MApjH0hx9U1XMgfCA=="; - }; - }; - "pino-5.0.0-rc.4" = { - name = "pino"; - packageName = "pino"; - version = "5.0.0-rc.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.0.0-rc.4.tgz"; - sha512 = "n5aJmABDjzZbwrB0AEbUeugz1Rh55c9T62yVGv6YL1vP1GuqpjIcLgwZIM1SI8E4Nfmcoo46SSmPgSSA9mPdog=="; + url = "https://registry.npmjs.org/pino/-/pino-5.0.4.tgz"; + sha512 = "w7UohXesFggN77UyTnt0A7FqkEiq6TbeXgTvY7g1wFGXoGbxmF780uFm8oQKaWlFi7vnzDRkBnYHNaaHFUKEoQ=="; }; }; "pino-std-serializers-2.2.1" = { @@ -23676,6 +24748,15 @@ let sha512 = "L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA=="; }; }; + "plur-2.1.2" = { + name = "plur"; + packageName = "plur"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz"; + sha1 = "7482452c1a0f508e3e344eaec312c91c29dc655a"; + }; + }; "pluralize-1.2.1" = { name = "pluralize"; packageName = "pluralize"; @@ -23811,6 +24892,15 @@ let sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; }; }; + "prebuild-install-4.0.0" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz"; + sha512 = "7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA=="; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -23906,7 +24996,7 @@ let packageName = "printf"; version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/printf/-/printf-0.2.5.tgz"; + url = "http://registry.npmjs.org/printf/-/printf-0.2.5.tgz"; sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f"; }; }; @@ -23946,6 +25036,15 @@ let sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; }; }; + "private-box-0.2.1" = { + name = "private-box"; + packageName = "private-box"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/private-box/-/private-box-0.2.1.tgz"; + sha1 = "1df061afca5b3039c7feaadd0daf0f56f07e3ec0"; + }; + }; "probe-image-size-4.0.0" = { name = "probe-image-size"; packageName = "probe-image-size"; @@ -24450,6 +25549,60 @@ let sha1 = "c00d5c5128bac5806bec15d2b7e7cdabe42531f3"; }; }; + "pull-abortable-4.0.0" = { + name = "pull-abortable"; + packageName = "pull-abortable"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.0.0.tgz"; + sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843"; + }; + }; + "pull-abortable-4.1.1" = { + name = "pull-abortable"; + packageName = "pull-abortable"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.1.1.tgz"; + sha1 = "b3ad5aefb4116b25916d26db89393ac98d0dcea1"; + }; + }; + "pull-block-filter-1.0.0" = { + name = "pull-block-filter"; + packageName = "pull-block-filter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-block-filter/-/pull-block-filter-1.0.0.tgz"; + sha1 = "cf4ef3bbb91ec8b97e1ed31889a6691271e603a7"; + }; + }; + "pull-box-stream-1.0.13" = { + name = "pull-box-stream"; + packageName = "pull-box-stream"; + version = "1.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-box-stream/-/pull-box-stream-1.0.13.tgz"; + sha1 = "c3e240398eab3f5951b2ed1078c5988bf7a0a2b9"; + }; + }; + "pull-buffered-0.3.4" = { + name = "pull-buffered"; + packageName = "pull-buffered"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-buffered/-/pull-buffered-0.3.4.tgz"; + sha512 = "rs5MtSaB1LQfXyer2uderwS4ypsTdmh9VC4wZC0WZsIBKqHiy7tFqNZ0QP1ln544N+yQGXEBRbwYn59iO6Ub9w=="; + }; + }; + "pull-cache-0.0.0" = { + name = "pull-cache"; + packageName = "pull-cache"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-cache/-/pull-cache-0.0.0.tgz"; + sha1 = "f9b81fa689ecf2a2d8f10f78ace63bd58980e7bb"; + }; + }; "pull-cat-1.1.11" = { name = "pull-cat"; packageName = "pull-cat"; @@ -24459,6 +25612,42 @@ let sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b"; }; }; + "pull-cont-0.0.0" = { + name = "pull-cont"; + packageName = "pull-cont"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-cont/-/pull-cont-0.0.0.tgz"; + sha1 = "3fac48b81ac97b75ba01332088b0ce7af8c1be0e"; + }; + }; + "pull-cont-0.1.1" = { + name = "pull-cont"; + packageName = "pull-cont"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-cont/-/pull-cont-0.1.1.tgz"; + sha1 = "df1d580e271757ba9acbaeba20de2421d660d618"; + }; + }; + "pull-core-1.1.0" = { + name = "pull-core"; + packageName = "pull-core"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-core/-/pull-core-1.1.0.tgz"; + sha1 = "3d8127d6dac1475705c9800961f59d66c8046c8a"; + }; + }; + "pull-cursor-3.0.0" = { + name = "pull-cursor"; + packageName = "pull-cursor"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-cursor/-/pull-cursor-3.0.0.tgz"; + sha512 = "95lZVSF2eSEdOmUtlOBaD9p5YOvlYeCr5FBv2ySqcj/4rpaXI6d8OH+zPHHjKAf58R8QXJRZuyfHkcCX8TZbAg=="; + }; + }; "pull-defer-0.2.3" = { name = "pull-defer"; packageName = "pull-defer"; @@ -24468,6 +25657,159 @@ let sha512 = "/An3KE7mVjZCqNhZsr22k1Tx8MACnUnHZZNPSJ0S62td8JtYr/AiRG42Vz7Syu31SoTLUzVIe61jtT/pNdjVYA=="; }; }; + "pull-file-0.5.0" = { + name = "pull-file"; + packageName = "pull-file"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-file/-/pull-file-0.5.0.tgz"; + sha1 = "b3ca405306e082f9d4528288933badb2b656365b"; + }; + }; + "pull-file-1.1.0" = { + name = "pull-file"; + packageName = "pull-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-file/-/pull-file-1.1.0.tgz"; + sha1 = "1dd987605d6357a0d23c1e4b826f7915a215129c"; + }; + }; + "pull-flatmap-0.0.1" = { + name = "pull-flatmap"; + packageName = "pull-flatmap"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-flatmap/-/pull-flatmap-0.0.1.tgz"; + sha1 = "13d494453e8f6d478e7bbfade6f8fe0197fa6bb7"; + }; + }; + "pull-fs-1.1.6" = { + name = "pull-fs"; + packageName = "pull-fs"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-fs/-/pull-fs-1.1.6.tgz"; + sha1 = "f184f6a7728bb4d95641376bead69f6f66df47cd"; + }; + }; + "pull-git-pack-1.0.2" = { + name = "pull-git-pack"; + packageName = "pull-git-pack"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-git-pack/-/pull-git-pack-1.0.2.tgz"; + sha512 = "WZzAAs9ap+QBHliP3E7sCn9kRfMNbdtFVOU0wRRtbY8x6+SUGeCpIkeYUcl9K/KgkL+2XZeyKXzPZ688IyfMbQ=="; + }; + }; + "pull-git-pack-concat-0.2.1" = { + name = "pull-git-pack-concat"; + packageName = "pull-git-pack-concat"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-git-pack-concat/-/pull-git-pack-concat-0.2.1.tgz"; + sha1 = "b7c8334c3a4961fc5b595a34d1d4224da6082d55"; + }; + }; + "pull-git-packidx-parser-1.0.0" = { + name = "pull-git-packidx-parser"; + packageName = "pull-git-packidx-parser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-git-packidx-parser/-/pull-git-packidx-parser-1.0.0.tgz"; + sha1 = "2d8bf0afe4824897ee03840bfe4f5a86afecca21"; + }; + }; + "pull-git-remote-helper-2.0.0" = { + name = "pull-git-remote-helper"; + packageName = "pull-git-remote-helper"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-git-remote-helper/-/pull-git-remote-helper-2.0.0.tgz"; + sha1 = "7285269ca0968466e3812431ddc2ac357df141be"; + }; + }; + "pull-git-repo-1.2.1" = { + name = "pull-git-repo"; + packageName = "pull-git-repo"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-git-repo/-/pull-git-repo-1.2.1.tgz"; + sha512 = "nHOicXiFryxuO9J+EhYY0cFC4n4mvsDabj6ts6BYgRbWAbp/gQUa+Hzfy05uey+HLz7XaR7N8XC+xGBgsYCmsg=="; + }; + }; + "pull-glob-1.0.7" = { + name = "pull-glob"; + packageName = "pull-glob"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-glob/-/pull-glob-1.0.7.tgz"; + sha1 = "eef915dde644bddbea8dd2e0106d544aacbcd5c2"; + }; + }; + "pull-goodbye-0.0.2" = { + name = "pull-goodbye"; + packageName = "pull-goodbye"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.2.tgz"; + sha1 = "8d8357db55e22a710dfff0f16a8c90b45efe4171"; + }; + }; + "pull-handshake-1.1.4" = { + name = "pull-handshake"; + packageName = "pull-handshake"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-handshake/-/pull-handshake-1.1.4.tgz"; + sha1 = "6000a0fd018884cdfd737254f8cc60ab2a637791"; + }; + }; + "pull-hash-1.0.0" = { + name = "pull-hash"; + packageName = "pull-hash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-hash/-/pull-hash-1.0.0.tgz"; + sha1 = "fcad4d2507bf2c2b3231f653dc9bfb2db4f0d88c"; + }; + }; + "pull-hyperscript-0.2.2" = { + name = "pull-hyperscript"; + packageName = "pull-hyperscript"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-hyperscript/-/pull-hyperscript-0.2.2.tgz"; + sha1 = "ca4a65833631854f575a4e2985568c9901f56383"; + }; + }; + "pull-identify-filetype-1.1.0" = { + name = "pull-identify-filetype"; + packageName = "pull-identify-filetype"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-identify-filetype/-/pull-identify-filetype-1.1.0.tgz"; + sha1 = "5f99af15e8846d48ecf625edc248ec2cf57f6b0d"; + }; + }; + "pull-inactivity-2.1.2" = { + name = "pull-inactivity"; + packageName = "pull-inactivity"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.2.tgz"; + sha1 = "37a3d6ebbfac292cd435f5e481e5074c8c1fad75"; + }; + }; + "pull-kvdiff-0.0.0" = { + name = "pull-kvdiff"; + packageName = "pull-kvdiff"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-kvdiff/-/pull-kvdiff-0.0.0.tgz"; + sha1 = "9b6627d0e332d98288e47d471602161f41ff1353"; + }; + }; "pull-level-2.0.4" = { name = "pull-level"; packageName = "pull-level"; @@ -24486,6 +25828,78 @@ let sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; }; }; + "pull-looper-1.0.0" = { + name = "pull-looper"; + packageName = "pull-looper"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-looper/-/pull-looper-1.0.0.tgz"; + sha512 = "djlD60A6NGe5goLdP5pgbqzMEiWmk1bInuAzBp0QOH4vDrVwh05YDz6UP8+pOXveKEk8wHVP+rB2jBrK31QMPA=="; + }; + }; + "pull-many-1.0.8" = { + name = "pull-many"; + packageName = "pull-many"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-many/-/pull-many-1.0.8.tgz"; + sha1 = "3dadd9b6d156c545721bda8d0003dd8eaa06293e"; + }; + }; + "pull-next-1.0.1" = { + name = "pull-next"; + packageName = "pull-next"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-next/-/pull-next-1.0.1.tgz"; + sha1 = "03f4d7d19872fc1114161e88db6ecf4c65e61e56"; + }; + }; + "pull-notify-0.1.1" = { + name = "pull-notify"; + packageName = "pull-notify"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-notify/-/pull-notify-0.1.1.tgz"; + sha1 = "6f86ff95d270b89c3ebf255b6031b7032dc99cca"; + }; + }; + "pull-paginate-1.0.0" = { + name = "pull-paginate"; + packageName = "pull-paginate"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-paginate/-/pull-paginate-1.0.0.tgz"; + sha1 = "63ad58efa1066bc701aa581a98a3c41e6aec7fc2"; + }; + }; + "pull-pair-1.1.0" = { + name = "pull-pair"; + packageName = "pull-pair"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-pair/-/pull-pair-1.1.0.tgz"; + sha1 = "7ee427263fdf4da825397ac0a05e1ab4b74bd76d"; + }; + }; + "pull-paramap-1.2.2" = { + name = "pull-paramap"; + packageName = "pull-paramap"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-paramap/-/pull-paramap-1.2.2.tgz"; + sha1 = "51a4193ce9c8d7215d95adad45e2bcdb8493b23a"; + }; + }; + "pull-ping-2.0.2" = { + name = "pull-ping"; + packageName = "pull-ping"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-ping/-/pull-ping-2.0.2.tgz"; + sha1 = "7bc4a340167dad88f682a196c63485735c7a0894"; + }; + }; "pull-pushable-2.2.0" = { name = "pull-pushable"; packageName = "pull-pushable"; @@ -24495,6 +25909,69 @@ let sha1 = "5f2f3aed47ad86919f01b12a2e99d6f1bd776581"; }; }; + "pull-rate-1.0.2" = { + name = "pull-rate"; + packageName = "pull-rate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-rate/-/pull-rate-1.0.2.tgz"; + sha1 = "17b231ad5f359f675826670172b0e590c8964e8d"; + }; + }; + "pull-reader-1.3.1" = { + name = "pull-reader"; + packageName = "pull-reader"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-reader/-/pull-reader-1.3.1.tgz"; + sha512 = "CBkejkE5nX50SiSEzu0Qoz4POTJMS/mw8G6aj3h3M/RJoKgggLxyF0IyTZ0mmpXFlXRcLmLmIEW4xeYn7AeDYw=="; + }; + }; + "pull-sink-through-0.0.0" = { + name = "pull-sink-through"; + packageName = "pull-sink-through"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-sink-through/-/pull-sink-through-0.0.0.tgz"; + sha1 = "d3c0492f3a80b4ed204af67c4b4f935680fc5b1f"; + }; + }; + "pull-skip-footer-0.1.0" = { + name = "pull-skip-footer"; + packageName = "pull-skip-footer"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-skip-footer/-/pull-skip-footer-0.1.0.tgz"; + sha1 = "95d0c60ce6ea9c8bab8ca0b16e1f518352ed4e4f"; + }; + }; + "pull-stream-2.27.0" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "2.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.27.0.tgz"; + sha1 = "fdf0eb910cdc4041d65956c00bee30dbbd00a068"; + }; + }; + "pull-stream-2.28.4" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "2.28.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz"; + sha1 = "7ea97413c1619c20bc3bdf9e10e91347b03253e4"; + }; + }; + "pull-stream-3.5.0" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; + sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; + }; + }; "pull-stream-3.6.9" = { name = "pull-stream"; packageName = "pull-stream"; @@ -24504,6 +25981,51 @@ let sha512 = "hJn4POeBrkttshdNl0AoSCVjMVSuBwuHocMerUdoZ2+oIUzrWHFTwJMlbHND7OiKLVgvz6TFj8ZUVywUMXccbw=="; }; }; + "pull-stream-to-stream-1.3.4" = { + name = "pull-stream-to-stream"; + packageName = "pull-stream-to-stream"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream-to-stream/-/pull-stream-to-stream-1.3.4.tgz"; + sha1 = "3f81d8216bd18d2bfd1a198190471180e2738399"; + }; + }; + "pull-stringify-1.2.2" = { + name = "pull-stringify"; + packageName = "pull-stringify"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stringify/-/pull-stringify-1.2.2.tgz"; + sha1 = "5a1c34e0075faf2f2f6d46004e36dccd33bd7c7c"; + }; + }; + "pull-through-1.0.18" = { + name = "pull-through"; + packageName = "pull-through"; + version = "1.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-through/-/pull-through-1.0.18.tgz"; + sha1 = "8dd62314263e59cf5096eafbb127a2b6ef310735"; + }; + }; + "pull-traverse-1.0.3" = { + name = "pull-traverse"; + packageName = "pull-traverse"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-traverse/-/pull-traverse-1.0.3.tgz"; + sha1 = "74fb5d7be7fa6bd7a78e97933e199b7945866938"; + }; + }; + "pull-utf8-decoder-1.0.2" = { + name = "pull-utf8-decoder"; + packageName = "pull-utf8-decoder"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-utf8-decoder/-/pull-utf8-decoder-1.0.2.tgz"; + sha1 = "a7afa2384d1e6415a5d602054126cc8de3bcbce7"; + }; + }; "pull-window-2.1.4" = { name = "pull-window"; packageName = "pull-window"; @@ -24513,6 +26035,33 @@ let sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0"; }; }; + "pull-write-1.1.4" = { + name = "pull-write"; + packageName = "pull-write"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-write/-/pull-write-1.1.4.tgz"; + sha1 = "dddea31493b48f6768b84a281d01eb3b531fe0b8"; + }; + }; + "pull-write-file-0.2.4" = { + name = "pull-write-file"; + packageName = "pull-write-file"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-write-file/-/pull-write-file-0.2.4.tgz"; + sha1 = "437344aeb2189f65e678ed1af37f0f760a5453ef"; + }; + }; + "pull-ws-3.3.1" = { + name = "pull-ws"; + packageName = "pull-ws"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-ws/-/pull-ws-3.3.1.tgz"; + sha512 = "kJodbLQT+oKjcRIQO+vQNw6xWBuEo7Kxp51VMOvb6cvPvHYA+aNLzm+NmkB/5dZwbuTRYGMal9QPvH52tzM1ZA=="; + }; + }; "pump-0.3.5" = { name = "pump"; packageName = "pump"; @@ -24585,6 +26134,24 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "push-stream-10.0.3" = { + name = "push-stream"; + packageName = "push-stream"; + version = "10.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/push-stream/-/push-stream-10.0.3.tgz"; + sha1 = "13d6aef4b506c65bbc3aa62409a8da6ce147ef87"; + }; + }; + "push-stream-to-pull-stream-1.0.3" = { + name = "push-stream-to-pull-stream"; + packageName = "push-stream-to-pull-stream"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/push-stream-to-pull-stream/-/push-stream-to-pull-stream-1.0.3.tgz"; + sha512 = "pdE/OKi/jnp9DqGgNRzLY0oVHffn/8TXJmBPzv+ikdvpkeA0J//l5d7TZk1yWwZj9P0JcOIEVDOuHzhXaeBlmw=="; + }; + }; "q-1.0.1" = { name = "q"; packageName = "q"; @@ -24828,15 +26395,6 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "quick-format-unescaped-1.1.2" = { - name = "quick-format-unescaped"; - packageName = "quick-format-unescaped"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz"; - sha1 = "0ca581de3174becef25ac3c2e8956342381db698"; - }; - }; "quick-format-unescaped-3.0.0" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; @@ -25071,6 +26629,15 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; + "rc-0.5.5" = { + name = "rc"; + packageName = "rc"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-0.5.5.tgz"; + sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199"; + }; + }; "rc-1.2.8" = { name = "rc"; packageName = "rc"; @@ -25557,6 +27124,15 @@ let sha1 = "120903040588ec7a4a399c6547fd01d0e3d2dc63"; }; }; + "relative-url-1.0.2" = { + name = "relative-url"; + packageName = "relative-url"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/relative-url/-/relative-url-1.0.2.tgz"; + sha1 = "d21c52a72d6061018bcee9f9c9fc106bf7d65287"; + }; + }; "relaxed-json-1.0.1" = { name = "relaxed-json"; packageName = "relaxed-json"; @@ -25566,6 +27142,24 @@ let sha1 = "7c8d4aa2f095704cd020e32e8099bcae103f0bd4"; }; }; + "remark-3.2.3" = { + name = "remark"; + packageName = "remark"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/remark/-/remark-3.2.3.tgz"; + sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f"; + }; + }; + "remark-html-2.0.2" = { + name = "remark-html"; + packageName = "remark-html"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-html/-/remark-html-2.0.2.tgz"; + sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; + }; + }; "remove-array-items-1.0.0" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -25593,6 +27187,15 @@ let sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523"; }; }; + "remove-markdown-0.1.0" = { + name = "remove-markdown"; + packageName = "remove-markdown"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.1.0.tgz"; + sha1 = "cf8b66e9e6fcb4acc9721048adeee7a357698ba9"; + }; + }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -25697,7 +27300,7 @@ let packageName = "request"; version = "2.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.16.6.tgz"; + url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; }; }; @@ -25706,7 +27309,7 @@ let packageName = "request"; version = "2.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; + url = "http://registry.npmjs.org/request/-/request-2.67.0.tgz"; sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; }; }; @@ -25715,7 +27318,7 @@ let packageName = "request"; version = "2.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + url = "http://registry.npmjs.org/request/-/request-2.74.0.tgz"; sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; @@ -25724,7 +27327,7 @@ let packageName = "request"; version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + url = "http://registry.npmjs.org/request/-/request-2.79.0.tgz"; sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; @@ -25769,7 +27372,7 @@ let packageName = "request"; version = "2.9.203"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz"; + url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz"; sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }; }; @@ -25890,6 +27493,15 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; + "resolve-1.7.1" = { + name = "resolve"; + packageName = "resolve"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz"; + sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; + }; + }; "resolve-1.8.1" = { name = "resolve"; packageName = "resolve"; @@ -26129,7 +27741,7 @@ let packageName = "rimraf"; version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; }; }; @@ -26138,7 +27750,7 @@ let packageName = "rimraf"; version = "2.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; @@ -26147,7 +27759,7 @@ let packageName = "rimraf"; version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"; sha1 = "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82"; }; }; @@ -26156,7 +27768,7 @@ let packageName = "rimraf"; version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; }; }; @@ -26340,22 +27952,22 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "rxjs-5.5.11" = { + "rxjs-5.5.12" = { name = "rxjs"; packageName = "rxjs"; - version = "5.5.11"; + version = "5.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz"; - sha512 = "3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz"; + sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.2.2" = { + "rxjs-6.3.1" = { name = "rxjs"; packageName = "rxjs"; - version = "6.2.2"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz"; - sha512 = "0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.1.tgz"; + sha512 = "hRVfb1Mcf8rLXq1AZEjYpzBnQbO7Duveu1APXkWRTvqzhmkoQ40Pl2F9Btacx+gJCOqsMiugCGG4I2HPQgJRtA=="; }; }; "safe-buffer-5.0.1" = { @@ -26520,6 +28132,24 @@ let sha512 = "MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg=="; }; }; + "secret-handshake-1.1.13" = { + name = "secret-handshake"; + packageName = "secret-handshake"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.13.tgz"; + sha512 = "jDpA1kPJGg+jEUOZGvqksQFGPWIx0aA96HpjU+AqIBKIKzmvZeOq0Lfl/XqVC5jviWTVZZM2B8+NqYR38Blz8A=="; + }; + }; + "secret-stack-4.1.0" = { + name = "secret-stack"; + packageName = "secret-stack"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.1.0.tgz"; + sha512 = "tCxjylkvEvUqxlWSVALtPMGKGyed225oDf7zoxCOsvj5SaVolUzOaixS07IK74mjcq7D1TvEJ4kofcaTMhQq1w=="; + }; + }; "secure-keys-1.0.0" = { name = "secure-keys"; packageName = "secure-keys"; @@ -26529,6 +28159,15 @@ let sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; }; }; + "secure-scuttlebutt-18.2.0" = { + name = "secure-scuttlebutt"; + packageName = "secure-scuttlebutt"; + version = "18.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.2.0.tgz"; + sha512 = "rBK6P3A4MsZI4lrzaf/dbJJDIxuJXO6y3GUeNngb5IJlcagCNJ+zNZcd19rDURfU8tMgOyw+rEwGIs2ExLQTdg=="; + }; + }; "seek-bzip-1.0.5" = { name = "seek-bzip"; packageName = "seek-bzip"; @@ -26781,6 +28420,15 @@ let sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; }; }; + "separator-escape-0.0.0" = { + name = "separator-escape"; + packageName = "separator-escape"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/separator-escape/-/separator-escape-0.0.0.tgz"; + sha1 = "e433676932020454e3c14870c517ea1de56c2fa4"; + }; + }; "sequence-2.2.1" = { name = "sequence"; packageName = "sequence"; @@ -26988,6 +28636,15 @@ let sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; }; + "sha.js-2.4.5" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; + sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; + }; + }; "shallow-clone-0.1.2" = { name = "shallow-clone"; packageName = "shallow-clone"; @@ -27078,6 +28735,15 @@ let sha512 = "pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ=="; }; }; + "shellsubstitute-1.2.0" = { + name = "shellsubstitute"; + packageName = "shellsubstitute"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shellsubstitute/-/shellsubstitute-1.2.0.tgz"; + sha1 = "e4f702a50c518b0f6fe98451890d705af29b6b70"; + }; + }; "shellwords-0.1.1" = { name = "shellwords"; packageName = "shellwords"; @@ -27888,6 +29554,33 @@ let sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw=="; }; }; + "sodium-browserify-1.2.4" = { + name = "sodium-browserify"; + packageName = "sodium-browserify"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.2.4.tgz"; + sha512 = "IYcxKje/uf/c3a7VhZYJLlUxWMcktfbD4AjqHjUD1/VWKjj0Oq5wNbX8wjJOWVO9UhUMqJQiOn2xFbzKWBmy5w=="; + }; + }; + "sodium-browserify-tweetnacl-0.2.3" = { + name = "sodium-browserify-tweetnacl"; + packageName = "sodium-browserify-tweetnacl"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-browserify-tweetnacl/-/sodium-browserify-tweetnacl-0.2.3.tgz"; + sha1 = "b5537ffcbb9f74ebc443b8b6a211b291e8fcbc8e"; + }; + }; + "sodium-chloride-1.1.0" = { + name = "sodium-chloride"; + packageName = "sodium-chloride"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-chloride/-/sodium-chloride-1.1.0.tgz"; + sha1 = "247a234b88867f6dff51332b605f193a65bf6839"; + }; + }; "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -27915,13 +29608,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.5.0" = { + "sonic-boom-0.6.1" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.5.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.5.0.tgz"; - sha512 = "IqUrLNxgsUQGVyMLW8w8vELMa1BZIQ/uBjBuxLK0jg7HqWwedCgmBLqvgMFGihhXCoQ8w5m2vcnMs47C4KYxuQ=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.1.tgz"; + sha512 = "3qx6XXDeG+hPNa+jla1H6BMBLcjLl8L8NRERLVeIf/EuPqoqmq4K8owG29Xu7OypT/7/YT/0uKW6YitsKA+nLQ=="; }; }; "sorcery-0.10.0" = { @@ -28275,6 +29968,15 @@ let sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; }; }; + "split-buffer-1.0.0" = { + name = "split-buffer"; + packageName = "split-buffer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-buffer/-/split-buffer-1.0.0.tgz"; + sha1 = "b7e8e0ab51345158b72c1f6dbef2406d51f1d027"; + }; + }; "split-string-3.1.0" = { name = "split-string"; packageName = "split-string"; @@ -28347,6 +30049,195 @@ let sha1 = "c2b5047c2c297b693d3bab518765e4b7c24d8173"; }; }; + "ssb-avatar-0.2.0" = { + name = "ssb-avatar"; + packageName = "ssb-avatar"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-avatar/-/ssb-avatar-0.2.0.tgz"; + sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; + }; + }; + "ssb-blobs-1.1.5" = { + name = "ssb-blobs"; + packageName = "ssb-blobs"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.5.tgz"; + sha512 = "DeeInkFU8oN1mYlPVrqrm9tupf6wze4HuowK7N2vv/O+UeSLuYPU1p4HrxSqdAPvUabr0OtvbFA6z1T4nw+9fw=="; + }; + }; + "ssb-client-4.6.0" = { + name = "ssb-client"; + packageName = "ssb-client"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.6.0.tgz"; + sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA=="; + }; + }; + "ssb-config-2.2.0" = { + name = "ssb-config"; + packageName = "ssb-config"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.2.0.tgz"; + sha1 = "41cad038a8575af4062d3fd57d3b167be85b03bc"; + }; + }; + "ssb-ebt-5.2.2" = { + name = "ssb-ebt"; + packageName = "ssb-ebt"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.2.2.tgz"; + sha512 = "De3dUnmgs/8aYl2fmi/MtJljR9qw1mUmpdM4qeCf+4uniqlNNhfn1Ux+M5A8XYVuI+TD4GkgmIDeZH6miey2kw=="; + }; + }; + "ssb-friends-2.4.0" = { + name = "ssb-friends"; + packageName = "ssb-friends"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-2.4.0.tgz"; + sha1 = "0d40cd96a12f2339c9064a8ad1d5a713e91c57ae"; + }; + }; + "ssb-git-0.5.0" = { + name = "ssb-git"; + packageName = "ssb-git"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-git/-/ssb-git-0.5.0.tgz"; + sha1 = "5f4f712e42a23b895b128d61bc70dfb3bd5b40b4"; + }; + }; + "ssb-git-repo-2.8.3" = { + name = "ssb-git-repo"; + packageName = "ssb-git-repo"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-git-repo/-/ssb-git-repo-2.8.3.tgz"; + sha512 = "7GVq5Ael/get+3Ot5exLdRWU8psSQNv/SkyO0KUhjoc4VfTdz8XuN1K195LKiyL/7u31A50KmkG9U9twb+1rGQ=="; + }; + }; + "ssb-issues-1.0.0" = { + name = "ssb-issues"; + packageName = "ssb-issues"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-issues/-/ssb-issues-1.0.0.tgz"; + sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5"; + }; + }; + "ssb-keys-7.0.16" = { + name = "ssb-keys"; + packageName = "ssb-keys"; + version = "7.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.0.16.tgz"; + sha512 = "EhLkRzgF7YaRc47L8YZb+TcxEXZy9DPWCF+vCt5nSNm8Oj+Pz8pBVSOlrLKZVbcAKFjIJhqY32oTjknu3E1KVQ=="; + }; + }; + "ssb-links-3.0.3" = { + name = "ssb-links"; + packageName = "ssb-links"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz"; + sha512 = "x09ShIMjwvdZI7aDZm8kc1v5YCGZa9ulCOoxrf/RYJ98s5gbTfO9CBCzeMBAeQ5kRwSuKjiOxJHdeEBkj4Y6hw=="; + }; + }; + "ssb-marked-0.5.4" = { + name = "ssb-marked"; + packageName = "ssb-marked"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-marked/-/ssb-marked-0.5.4.tgz"; + sha1 = "e2f0a17854d968a41e707dee6161c783f907330f"; + }; + }; + "ssb-marked-0.6.0" = { + name = "ssb-marked"; + packageName = "ssb-marked"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-marked/-/ssb-marked-0.6.0.tgz"; + sha1 = "8171472058673e4e76ec187c40c88c1e484bc544"; + }; + }; + "ssb-mentions-0.1.2" = { + name = "ssb-mentions"; + packageName = "ssb-mentions"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-mentions/-/ssb-mentions-0.1.2.tgz"; + sha1 = "d0442708e3af5e245a7af9c1abd8f89ab03c80c0"; + }; + }; + "ssb-msg-schemas-6.3.0" = { + name = "ssb-msg-schemas"; + packageName = "ssb-msg-schemas"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-msg-schemas/-/ssb-msg-schemas-6.3.0.tgz"; + sha1 = "23c12443d4e5a0c4817743638ee0ca93ce6ddc85"; + }; + }; + "ssb-msgs-5.2.0" = { + name = "ssb-msgs"; + packageName = "ssb-msgs"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-msgs/-/ssb-msgs-5.2.0.tgz"; + sha1 = "c681da5cd70c574c922dca4f03c521538135c243"; + }; + }; + "ssb-pull-requests-1.0.0" = { + name = "ssb-pull-requests"; + packageName = "ssb-pull-requests"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-pull-requests/-/ssb-pull-requests-1.0.0.tgz"; + sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118"; + }; + }; + "ssb-query-2.2.1" = { + name = "ssb-query"; + packageName = "ssb-query"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.2.1.tgz"; + sha512 = "eAbTVPHYLJ/Cp8jO7uFFXY7L3RhYKlGIhTEM1xjbz3p4/Dysl6DPyWTz7JF+lXhz5AznfjzZNfZjMnX3GJtIbA=="; + }; + }; + "ssb-ref-2.11.2" = { + name = "ssb-ref"; + packageName = "ssb-ref"; + version = "2.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.11.2.tgz"; + sha512 = "40A+o3iNAgr/sMH4V6/f3l2dhzUb5ZhTwZdrlKFu1ti+uZrKNUkH/E8j5NIZpj2rDq0PDXkACSVJgPGwltfQRA=="; + }; + }; + "ssb-validate-3.0.10" = { + name = "ssb-validate"; + packageName = "ssb-validate"; + version = "3.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-3.0.10.tgz"; + sha512 = "9wJE1i+4vW/F/TYQQl15BVoiZb9kaqIRBhl2I/TXyhjngfx/yBzXFAuiXhaiDfqJ3YnUXzY4JMUSx0gIvpePnQ=="; + }; + }; + "ssb-ws-2.1.1" = { + name = "ssb-ws"; + packageName = "ssb-ws"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-ws/-/ssb-ws-2.1.1.tgz"; + sha512 = "1fK/jXI6lKZadRJDr49t+6yMmWynp6PFrADs3Whmy8IslnYGl83ujhlpRIBvCn1EuVHjV7yLsIiJ8a0X2Kg0DQ=="; + }; + }; "ssh-config-1.1.3" = { name = "ssh-config"; packageName = "ssh-config"; @@ -28437,6 +30328,15 @@ let sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; }; }; + "stack-0.1.0" = { + name = "stack"; + packageName = "stack"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stack/-/stack-0.1.0.tgz"; + sha1 = "e923598a9be51e617682cb21cf1b2818a449ada2"; + }; + }; "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; @@ -28464,6 +30364,15 @@ let sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; }; }; + "statistics-3.3.0" = { + name = "statistics"; + packageName = "statistics"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statistics/-/statistics-3.3.0.tgz"; + sha1 = "ec7b4750ff03ab24a64dd9b357a78316bead78aa"; + }; + }; "statsd-parser-0.0.4" = { name = "statsd-parser"; packageName = "statsd-parser"; @@ -28896,6 +30805,15 @@ let sha1 = "5bcfad39f4649bb2d031292e19bcf0b510d4b242"; }; }; + "string.prototype.trim-1.1.2" = { + name = "string.prototype.trim"; + packageName = "string.prototype.trim"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz"; + sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; + }; + }; "string2compact-1.3.0" = { name = "string2compact"; packageName = "string2compact"; @@ -28932,6 +30850,15 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; + "stringify-entities-1.3.2" = { + name = "stringify-entities"; + packageName = "stringify-entities"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz"; + sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A=="; + }; + }; "stringstream-0.0.6" = { name = "stringstream"; packageName = "stringstream"; @@ -29189,7 +31116,7 @@ let packageName = "superagent"; version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; + url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; }; }; @@ -29198,7 +31125,7 @@ let packageName = "superagent"; version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz"; + url = "http://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz"; sha1 = "1c0ddc3af30e80eb84ebc05cb2122da8fe940b55"; }; }; @@ -29500,6 +31427,15 @@ let sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; }; }; + "tape-4.9.1" = { + name = "tape"; + packageName = "tape"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tape/-/tape-4.9.1.tgz"; + sha512 = "6fKIXknLpoe/Jp4rzHKFPpJUHDHDqn8jus99IfPnHIjyz78HYlefTGD3b5EkbQzuLfaEvmfPK3IolLgq2xT3kw=="; + }; + }; "tar-0.1.17" = { name = "tar"; packageName = "tar"; @@ -30085,6 +32021,15 @@ let sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6"; }; }; + "to-vfile-1.0.0" = { + name = "to-vfile"; + packageName = "to-vfile"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-vfile/-/to-vfile-1.0.0.tgz"; + sha1 = "88defecd43adb2ef598625f0e3d59f7f342941ba"; + }; + }; "toidentifier-1.0.0" = { name = "toidentifier"; packageName = "toidentifier"; @@ -30135,17 +32080,17 @@ let packageName = "torrent-discovery"; version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz"; + url = "http://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz"; sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.0.2" = { + "torrent-discovery-9.1.1" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.0.2"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.0.2.tgz"; - sha512 = "UpkOyi/QUXRAwts8vSsFu/jRQ1mwGkaqv2OxLTJGr4DJKCiXpLHZ1+A4rxabcOWinM9RiqmS5mAjDuFfPHiJvw=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.1.1.tgz"; + sha512 = "3mHf+bxVCVLrlkPJdAoMbPMY1hpTZVeWw5hNc2pPFm+HCc2DS0HgVFTBTSWtB8vQPWA1hSEZpqJ+3QfdXxDE1g=="; }; }; "torrent-piece-1.1.2" = { @@ -30328,6 +32273,15 @@ let sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; }; }; + "trim-lines-1.1.1" = { + name = "trim-lines"; + packageName = "trim-lines"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-lines/-/trim-lines-1.1.1.tgz"; + sha512 = "X+eloHbgJGxczUk1WSjIvn7aC9oN3jVE3rQfRVKcgpavi3jxtCn0VVKtjOBj64Yop96UYn/ujJRpTbCdAF1vyg=="; + }; + }; "trim-newlines-1.0.0" = { name = "trim-newlines"; packageName = "trim-newlines"; @@ -30373,6 +32327,15 @@ let sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; }; }; + "trim-trailing-lines-1.1.1" = { + name = "trim-trailing-lines"; + packageName = "trim-trailing-lines"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; + sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg=="; + }; + }; "truncate-2.0.1" = { name = "truncate"; packageName = "truncate"; @@ -30490,6 +32453,15 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "tweetnacl-auth-0.3.1" = { + name = "tweetnacl-auth"; + packageName = "tweetnacl-auth"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl-auth/-/tweetnacl-auth-0.3.1.tgz"; + sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; + }; + }; "twig-1.12.0" = { name = "twig"; packageName = "twig"; @@ -30576,7 +32548,7 @@ let packageName = "typescript"; version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; + url = "http://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; sha512 = "p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw=="; }; }; @@ -30657,7 +32629,7 @@ let packageName = "uglify-js"; version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; sha1 = "b542c2c76f78efb34b200b20177634330ff702b6"; }; }; @@ -30666,7 +32638,7 @@ let packageName = "uglify-js"; version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; }; }; @@ -30675,7 +32647,7 @@ let packageName = "uglify-js"; version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; }; }; @@ -30697,6 +32669,15 @@ let sha512 = "WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A=="; }; }; + "uglify-js-3.4.9" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz"; + sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; + }; + }; "uglify-to-browserify-1.0.2" = { name = "uglify-to-browserify"; packageName = "uglify-to-browserify"; @@ -30778,6 +32759,15 @@ let sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }; }; + "uint48be-1.0.2" = { + name = "uint48be"; + packageName = "uint48be"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uint48be/-/uint48be-1.0.2.tgz"; + sha512 = "jNn1eEi81BLiZfJkjbiAKPDMj7iFrturKazqpBu0aJYLr6evgkn+9rgkX/gUwPBj5j2Ri5oUelsqC/S1zmpWBA=="; + }; + }; "uint64be-2.0.2" = { name = "uint64be"; packageName = "uint64be"; @@ -30949,6 +32939,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "unherit-1.1.1" = { + name = "unherit"; + packageName = "unherit"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz"; + sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g=="; + }; + }; "unicode-5.2.0-0.7.5" = { name = "unicode-5.2.0"; packageName = "unicode-5.2.0"; @@ -30967,6 +32966,15 @@ let sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; }; }; + "unified-2.1.4" = { + name = "unified"; + packageName = "unified"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-2.1.4.tgz"; + sha1 = "14bc6cd40d98ffff75b405506bad873ecbbac3ba"; + }; + }; "union-value-1.0.0" = { name = "union-value"; packageName = "union-value"; @@ -31030,6 +33038,33 @@ let sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; }; }; + "unist-util-is-2.1.2" = { + name = "unist-util-is"; + packageName = "unist-util-is"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz"; + sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw=="; + }; + }; + "unist-util-visit-1.4.0" = { + name = "unist-util-visit"; + packageName = "unist-util-visit"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz"; + sha512 = "FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw=="; + }; + }; + "unist-util-visit-parents-2.0.1" = { + name = "unist-util-visit-parents"; + packageName = "unist-util-visit-parents"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz"; + sha512 = "6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA=="; + }; + }; "universalify-0.1.2" = { name = "universalify"; packageName = "universalify"; @@ -31381,13 +33416,13 @@ let sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; }; }; - "ut_metadata-3.2.2" = { + "ut_metadata-3.3.0" = { name = "ut_metadata"; packageName = "ut_metadata"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.2.tgz"; - sha512 = "PltK6kZ85DMscFl1gwyvOyja6UGROdyLI1ufWCTLsYnLfBaMyhtOEcbtgEgOwYEz8QuchR49qgHXTdJ2H05VHA=="; + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.3.0.tgz"; + sha512 = "IK+ke9yL6a4oPLz/3oSW9TW7m9Wr4RG+5kW5aS2YulzEU1QDGAtago/NnOlno91fo3fSO7mnsqzn3NXNXdv8nA=="; }; }; "ut_pex-1.2.1" = { @@ -31678,13 +33713,13 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "validator-10.7.0" = { + "validator-10.7.1" = { name = "validator"; packageName = "validator"; - version = "10.7.0"; + version = "10.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.7.0.tgz"; - sha512 = "7Z4kif6HeMLroCQZvh8lwCtmPOqBTkTkt5ibXtJR8sOkzWdjW+YIJOZUpPFlfq59zYvnpSPVd4UX5QYnSCLWgA=="; + url = "https://registry.npmjs.org/validator/-/validator-10.7.1.tgz"; + sha512 = "tbB5JrTczfeHKLw3PnFRzGFlF1xUAwSgXEDb66EuX1ffCirspYpDEZo3Vc9j38gPdL4JKrDc5UPFfgYiw1IWRQ=="; }; }; "validator-5.2.0" = { @@ -31692,7 +33727,7 @@ let packageName = "validator"; version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz"; + url = "http://registry.npmjs.org/validator/-/validator-5.2.0.tgz"; sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689"; }; }; @@ -31701,7 +33736,7 @@ let packageName = "validator"; version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz"; + url = "http://registry.npmjs.org/validator/-/validator-9.4.1.tgz"; sha512 = "YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA=="; }; }; @@ -31840,6 +33875,51 @@ let sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; }; }; + "vfile-1.4.0" = { + name = "vfile"; + packageName = "vfile"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz"; + sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7"; + }; + }; + "vfile-find-down-1.0.0" = { + name = "vfile-find-down"; + packageName = "vfile-find-down"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-find-down/-/vfile-find-down-1.0.0.tgz"; + sha1 = "84a4d66d03513f6140a84e0776ef0848d4f0ad95"; + }; + }; + "vfile-find-up-1.0.0" = { + name = "vfile-find-up"; + packageName = "vfile-find-up"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-1.0.0.tgz"; + sha1 = "5604da6fe453b34350637984eb5fe4909e280390"; + }; + }; + "vfile-reporter-1.5.0" = { + name = "vfile-reporter"; + packageName = "vfile-reporter"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-1.5.0.tgz"; + sha1 = "21a7009bfe55e24df8ff432aa5bf6f6efa74e418"; + }; + }; + "vfile-sort-1.0.0" = { + name = "vfile-sort"; + packageName = "vfile-sort"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-1.0.0.tgz"; + sha1 = "17ee491ba43e8951bb22913fcff32a7dc4d234d4"; + }; + }; "vhost-3.0.2" = { name = "vhost"; packageName = "vhost"; @@ -31939,13 +34019,13 @@ let sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; }; }; - "vlc-command-1.1.1" = { + "vlc-command-1.1.2" = { name = "vlc-command"; packageName = "vlc-command"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.1.tgz"; - sha1 = "349b85def831f980cd6eec560b1990fd989eaf92"; + url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.2.tgz"; + sha512 = "KZ15RTHz96OEiQDA8oNFn1edYDWyKJIWI4gF74Am9woZo5XmVYryk5RYXSwOMvsaAgL5ejICEGCl0suQyDBu+Q=="; }; }; "vm-browserify-0.0.4" = { @@ -32191,13 +34271,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-sources-1.1.0" = { + "webpack-sources-1.2.0" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz"; - sha512 = "aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.2.0.tgz"; + sha512 = "9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw=="; }; }; "websocket-driver-0.7.0" = { @@ -32227,13 +34307,13 @@ let sha512 = "lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw=="; }; }; - "webtorrent-0.102.2" = { + "webtorrent-0.102.4" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.102.2"; + version = "0.102.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.102.2.tgz"; - sha512 = "9+thCKf9zfs9OTMkNqSp3whqKlYd4f/VkBCsx+HkD5dh9O5oWf2lxfAMq1P411WiSY0PqBS77jxjQilYeYYskw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.102.4.tgz"; + sha512 = "Oa7NatbPlESqf5ETwgVUOXAbUjiZr7XNFbHhd88BRm+4vN9u3JgeIbF9Gnuxb5s26cHxPYpGJRVTtBsc6Z6w9Q=="; }; }; "whatwg-fetch-2.0.4" = { @@ -32335,6 +34415,15 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; + "which-pm-runs-1.0.0" = { + name = "which-pm-runs"; + packageName = "which-pm-runs"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; + sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; + }; + }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -32506,6 +34595,15 @@ let sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe"; }; }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; "wordwrap-0.0.2" = { name = "wordwrap"; packageName = "wordwrap"; @@ -32547,7 +34645,7 @@ let packageName = "wrap-ansi"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + url = "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; }; }; @@ -32758,13 +34856,13 @@ let sha512 = "4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ=="; }; }; - "xml-1.0.0" = { + "xml-1.0.1" = { name = "xml"; packageName = "xml"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz"; - sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; + url = "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz"; + sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"; }; }; "xml-name-validator-2.0.1" = { @@ -33353,13 +35451,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "zero-fill-2.2.3" = { - name = "zero-fill"; - packageName = "zero-fill"; - version = "2.2.3"; + "zerr-1.0.4" = { + name = "zerr"; + packageName = "zerr"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/zero-fill/-/zero-fill-2.2.3.tgz"; - sha1 = "a3def06ba5e39ae644850bb4ca2ad4112b4855e9"; + url = "https://registry.npmjs.org/zerr/-/zerr-1.0.4.tgz"; + sha1 = "62814dd799eff8361f2a228f41f705c5e19de4c9"; }; }; "zip-dir-1.0.2" = { @@ -33654,7 +35752,7 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ - sources."@types/node-8.10.28" + sources."@types/node-8.10.29" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -33854,7 +35952,7 @@ in sources."from-0.1.7" sources."fs.realpath-1.0.0" sources."galaxy-0.1.12" - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -34259,7 +36357,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.2.0" + sources."buffer-5.2.1" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" @@ -34546,7 +36644,7 @@ in sources."long-2.4.0" sources."loud-rejection-1.6.0" sources."lru-2.0.1" - sources."magnet-uri-5.2.3" + sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" (sources."mdns-js-1.0.1" // { dependencies = [ @@ -34925,7 +37023,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.34" + sources."big-integer-1.6.35" sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.2" @@ -34952,7 +37050,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-transform-tools-1.7.0" sources."browserify-zlib-0.1.4" - sources."buffer-5.2.0" + sources."buffer-5.2.1" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" @@ -35083,7 +37181,7 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."function-bind-1.1.1" - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-assigned-identifiers-1.2.0" (sources."getpass-0.1.7" // { @@ -35439,7 +37537,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.0" - sources."@types/node-10.9.2" + sources."@types/node-10.9.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -35787,7 +37885,7 @@ in sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.1" sources."ci-info-1.4.0" @@ -36522,7 +38620,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.303.0" + sources."aws-sdk-2.307.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -36624,10 +38722,10 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.18.12"; + version = "0.18.13-beta"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.12.tgz"; - sha512 = "5n1uNviCRxXIx5ciaFuzJd3fshcyicbYvTwyGh/L5t05bfBeq/3FZ5a3mLTz+zRZhp18dul2Oz8WoZmcn8PHcg=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.13-beta.tgz"; + sha512 = "bD2euTGjq4GFHqG2AWOrXXYidqYgz/NU3RVZB3d0qvDwZ8GItlv2ReCtU4D2RuqY40+sCTUT4Tiq2gpV13GThg=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -36696,7 +38794,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.1.2" sources."fstream-1.0.11" - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -37083,40 +39181,31 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz"; - sha512 = "UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz"; + sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw=="; }; dependencies = [ + sources."@babel/code-frame-7.0.0" + sources."@babel/highlight-7.0.0" sources."acorn-5.7.2" sources."acorn-jsx-4.1.1" sources."ajv-6.5.3" sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - ]; - }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-2.4.1" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."supports-color-5.5.0" - ]; - }) - sources."chardet-0.4.2" + sources."chalk-2.4.1" + sources."chardet-0.7.0" sources."circular-json-0.3.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" @@ -37138,7 +39227,7 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."external-editor-2.2.0" + sources."external-editor-3.0.3" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -37151,14 +39240,13 @@ in sources."globals-11.7.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" - sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."inquirer-5.2.0" + sources."inquirer-6.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" sources."is-path-in-cwd-1.0.1" @@ -37166,7 +39254,7 @@ in sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" sources."isexe-2.0.0" - sources."js-tokens-3.0.2" + sources."js-tokens-4.0.0" sources."js-yaml-3.12.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -37201,7 +39289,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-5.5.11" + sources."rxjs-6.3.1" sources."safer-buffer-2.1.2" sources."semver-5.5.1" sources."shebang-command-1.2.0" @@ -37210,18 +39298,14 @@ in sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - (sources."strip-ansi-4.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - ]; - }) + sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" - sources."symbol-observable-1.0.1" + sources."supports-color-5.5.0" sources."table-4.0.3" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" + sources."tslib-1.9.3" sources."type-check-0.3.2" sources."uri-js-4.2.2" sources."which-1.3.1" @@ -37247,34 +39331,25 @@ in sha512 = "NjFiFcKPEjDlleLlngMyVcD6oLu6L8BctLJ3saPZfC4yLD+AJteII5E8meGqTislKxiVMMWHWXed61siXz3mCA=="; }; dependencies = [ + sources."@babel/code-frame-7.0.0" + sources."@babel/highlight-7.0.0" sources."acorn-5.7.2" sources."acorn-jsx-4.1.1" sources."ajv-6.5.3" sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-2.4.1" // { - dependencies = [ - sources."ansi-styles-3.2.1" - ]; - }) - sources."chardet-0.4.2" + sources."chalk-2.4.1" + sources."chardet-0.7.0" sources."circular-json-0.3.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" @@ -37287,7 +39362,7 @@ in sources."del-2.2.2" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - sources."eslint-5.4.0" + sources."eslint-5.5.0" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -37297,7 +39372,7 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."external-editor-2.2.0" + sources."external-editor-3.0.3" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -37310,14 +39385,13 @@ in sources."globals-11.7.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" - sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."inquirer-5.2.0" + sources."inquirer-6.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" sources."is-path-in-cwd-1.0.1" @@ -37325,7 +39399,7 @@ in sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" sources."isexe-2.0.0" - sources."js-tokens-3.0.2" + sources."js-tokens-4.0.0" sources."js-yaml-3.12.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -37363,7 +39437,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-5.5.11" + sources."rxjs-6.3.1" sources."safer-buffer-2.1.2" sources."semver-5.5.1" sources."shebang-command-1.2.0" @@ -37372,18 +39446,14 @@ in sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - (sources."strip-ansi-4.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - ]; - }) + sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."symbol-observable-1.0.1" sources."table-4.0.3" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" + sources."tslib-1.9.3" sources."type-check-0.3.2" sources."uri-js-4.2.2" sources."which-1.3.1" @@ -37403,10 +39473,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "3.1.7"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-3.1.7.tgz"; - sha1 = "2d3c725c696f179c9dde3acb655c621ee9429b1e"; + url = "https://registry.npmjs.org/emojione/-/emojione-4.0.0.tgz"; + sha512 = "ATFSRHrK838NoTUE96j9rpmS1R4a/qpK1maQURGdFtarpWloEttjjIBBWbSFqsUxC0Vot6P2WXmSlotvZoegxw=="; }; buildInputs = globalBuildInputs; meta = { @@ -37817,6 +39887,181 @@ in production = true; bypassCache = true; }; + git-ssb = nodeEnv.buildNodePackage { + name = "git-ssb"; + packageName = "git-ssb"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/git-ssb/-/git-ssb-2.3.6.tgz"; + sha512 = "xH6KEeJaUJDB8FAov4OdYxb4GuMOTcKdJ+xW5SUGLEuXfBLgyS0zUeeYVIUS8qvM3gf7w+W35WRwwK4d0InqxQ=="; + }; + dependencies = [ + sources."asyncmemo-1.0.0" + sources."chloride-2.2.10" + sources."chloride-test-1.2.2" + sources."deep-equal-1.0.1" + sources."deep-extend-0.4.2" + sources."diff-3.5.0" + sources."ed2curve-0.1.4" + sources."emoji-named-characters-1.0.2" + sources."explain-error-1.0.4" + sources."generate-function-2.3.1" + sources."generate-object-property-1.2.0" + sources."git-packidx-parser-1.0.0" + sources."git-remote-ssb-2.0.4" + sources."git-ssb-web-2.8.0" + sources."hashlru-2.2.1" + sources."highlight.js-9.12.0" + sources."increment-buffer-1.0.1" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ip-1.1.5" + sources."is-electron-2.1.0" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.19.0" + sources."is-property-1.0.2" + sources."is-valid-domain-0.0.5" + sources."json-buffer-2.0.11" + sources."jsonpointer-4.0.1" + sources."kvgraph-0.1.0" + sources."kvset-1.0.0" + sources."libsodium-0.7.3" + sources."libsodium-wrappers-0.7.3" + sources."looper-4.0.0" + sources."lrucache-1.0.3" + sources."mime-db-1.36.0" + sources."mime-types-2.1.20" + sources."minimist-1.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."moment-2.22.2" + sources."multicb-1.2.2" + sources."multiserver-1.13.3" + sources."muxrpc-6.4.1" + sources."nan-2.11.0" + sources."node-gyp-build-3.4.0" + sources."node-polyglot-1.0.0" + sources."non-private-ip-1.4.4" + sources."options-0.0.6" + sources."os-homedir-1.0.2" + sources."packet-stream-2.0.4" + sources."packet-stream-codec-1.1.2" + sources."pako-1.0.6" + sources."private-box-0.2.1" + sources."progress-1.1.8" + sources."pull-block-filter-1.0.0" + sources."pull-box-stream-1.0.13" + sources."pull-buffered-0.3.4" + sources."pull-cache-0.0.0" + sources."pull-cat-1.1.11" + sources."pull-core-1.1.0" + sources."pull-git-pack-1.0.2" + (sources."pull-git-pack-concat-0.2.1" // { + dependencies = [ + sources."looper-3.0.0" + ]; + }) + sources."pull-git-packidx-parser-1.0.0" + sources."pull-git-remote-helper-2.0.0" + sources."pull-git-repo-1.2.1" + (sources."pull-goodbye-0.0.2" // { + dependencies = [ + sources."pull-stream-3.5.0" + ]; + }) + sources."pull-handshake-1.1.4" + sources."pull-hash-1.0.0" + sources."pull-hyperscript-0.2.2" + (sources."pull-identify-filetype-1.1.0" // { + dependencies = [ + sources."pull-stream-2.28.4" + ]; + }) + sources."pull-kvdiff-0.0.0" + sources."pull-looper-1.0.0" + sources."pull-many-1.0.8" + sources."pull-paginate-1.0.0" + sources."pull-pair-1.1.0" + sources."pull-paramap-1.2.2" + sources."pull-pushable-2.2.0" + sources."pull-reader-1.3.1" + sources."pull-skip-footer-0.1.0" + sources."pull-stream-3.6.9" + (sources."pull-through-1.0.18" // { + dependencies = [ + sources."looper-3.0.0" + ]; + }) + sources."pull-ws-3.3.1" + (sources."rc-1.2.8" // { + dependencies = [ + sources."deep-extend-0.6.0" + ]; + }) + sources."relative-url-1.0.2" + sources."remove-markdown-0.1.0" + sources."safe-buffer-5.1.2" + sources."secret-handshake-1.1.13" + sources."semver-5.5.1" + sources."separator-escape-0.0.0" + sources."sha.js-2.4.5" + sources."smart-buffer-4.0.1" + sources."socks-2.2.1" + sources."sodium-browserify-1.2.4" + (sources."sodium-browserify-tweetnacl-0.2.3" // { + dependencies = [ + sources."sha.js-2.4.11" + ]; + }) + sources."sodium-chloride-1.1.0" + sources."sodium-native-2.2.1" + sources."split-buffer-1.0.0" + sources."ssb-avatar-0.2.0" + sources."ssb-client-4.6.0" + sources."ssb-config-2.2.0" + sources."ssb-git-0.5.0" + sources."ssb-git-repo-2.8.3" + sources."ssb-issues-1.0.0" + sources."ssb-keys-7.0.16" + sources."ssb-marked-0.6.0" + (sources."ssb-mentions-0.1.2" // { + dependencies = [ + sources."ssb-marked-0.5.4" + ]; + }) + (sources."ssb-msg-schemas-6.3.0" // { + dependencies = [ + sources."pull-stream-2.27.0" + ]; + }) + sources."ssb-msgs-5.2.0" + sources."ssb-pull-requests-1.0.0" + sources."ssb-ref-2.11.2" + (sources."stream-to-pull-stream-1.7.2" // { + dependencies = [ + sources."looper-3.0.0" + ]; + }) + sources."strip-json-comments-2.0.1" + sources."through-2.2.7" + sources."tweetnacl-0.14.5" + sources."tweetnacl-auth-0.3.1" + sources."ultron-1.0.2" + sources."ws-1.1.5" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "git hosting on secure-scuttlebutt (ssb)"; + homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256; + license = "Fair"; + }; + production = true; + bypassCache = true; + }; git-standup = nodeEnv.buildNodePackage { name = "git-standup"; packageName = "git-standup"; @@ -37885,7 +40130,7 @@ in sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" (sources."body-parser-1.18.2" // { dependencies = [ sources."iconv-lite-0.4.19" @@ -37900,7 +40145,7 @@ in sources."call-me-maybe-1.0.1" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.1" sources."change-case-3.0.2" @@ -38203,7 +40448,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."ono-4.0.6" + sources."ono-4.0.7" sources."open-0.0.5" sources."opn-5.3.0" sources."ora-1.4.0" @@ -38285,7 +40530,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" sources."safe-buffer-5.1.1" sources."safer-buffer-2.1.2" sources."scuid-1.1.0" @@ -38357,7 +40602,7 @@ in sources."utils-merge-1.0.1" sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.4" - sources."validator-10.7.0" + sources."validator-10.7.1" sources."vary-1.1.2" sources."verror-1.10.0" sources."wcwidth-1.0.1" @@ -39173,28 +41418,46 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.9.13"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz"; - sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88"; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.0.tgz"; + sha512 = "g/bNE3G7D8N1pgfGeL8FTgv4lhA04cWiCTofi8F20f4s+tkcIAL/j2FsD8iVlRCzVpNDYbXCmYtGmQzQe0FKGw=="; }; dependencies = [ - sources."async-1.4.2" + sources."ajv-5.5.2" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-2.6.1" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" - (sources."cli-0.6.6" // { + sources."buffer-from-1.1.1" + sources."caseless-0.12.0" + sources."cli-1.0.1" + sources."clone-2.1.2" + sources."co-4.6.0" + sources."colors-1.3.2" + sources."combined-stream-1.0.6" + sources."commander-2.17.1" + sources."concat-map-0.0.1" + (sources."concat-stream-1.6.2" // { dependencies = [ - sources."glob-3.2.11" - sources."minimatch-0.3.0" + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) - sources."colors-1.0.3" - sources."commander-2.6.0" - sources."concat-map-0.0.1" sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" - sources."csslint-0.10.0" + sources."csslint-1.0.5" + sources."cycle-1.0.3" + sources."dashdash-1.14.1" sources."date-now-0.1.4" + sources."debug-2.6.9" + sources."delayed-stream-1.0.0" (sources."dom-serializer-0.1.0" // { dependencies = [ sources."domelementtype-1.1.3" @@ -39204,42 +41467,114 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.3.0" sources."domutils-1.5.1" + sources."ecc-jsbn-0.1.2" sources."entities-1.0.0" + sources."es6-promise-4.2.4" sources."exit-0.1.2" - sources."glob-5.0.15" + sources."extend-3.0.2" + sources."extract-zip-1.6.7" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-1.0.0" + sources."fs.realpath-1.0.0" + sources."getpass-0.1.7" + sources."glob-7.1.3" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.1.0" + sources."hasha-2.2.0" sources."htmlparser2-3.8.3" + sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-dotfile-1.0.3" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" sources."isarray-0.0.1" - (sources."jshint-2.8.0" // { + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + (sources."jshint-2.9.6" // { dependencies = [ - sources."minimatch-2.0.10" + sources."strip-json-comments-1.0.4" ]; }) - sources."lodash-3.7.0" - sources."lru-cache-2.7.3" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."kew-0.7.0" + sources."klaw-1.3.1" + sources."lodash-4.17.10" + sources."mime-db-1.36.0" + sources."mime-types-2.1.20" sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."parse-glob-3.0.4" - sources."parserlib-0.2.5" + sources."parserlib-1.1.1" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."phantom-4.0.12" + sources."phantomjs-prebuilt-2.1.16" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."process-nextick-args-2.0.0" + sources."progress-1.1.8" + sources."psl-1.1.29" + sources."punycode-1.4.1" + sources."qs-6.5.2" sources."readable-stream-1.1.14" + sources."request-2.88.0" + sources."request-progress-2.0.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."shelljs-0.3.0" - sources."sigmund-1.0.1" + sources."split-1.0.1" + sources."sshpk-1.14.2" + sources."stack-trace-0.0.10" sources."string_decoder-0.10.31" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" + sources."throttleit-1.0.0" + sources."through-2.3.8" + sources."tough-cookie-2.4.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."unicode-5.2.0-0.7.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + sources."which-1.3.1" + (sources."winston-2.4.4" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + ]; + }) sources."wrappy-1.0.2" - sources."xml-1.0.0" + sources."xml-1.0.1" + sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; meta = { - description = "A Static Code Analysis Tool for HTML"; - homepage = "https://github.com/yaniswang/HTMLHint#readme"; + description = "The Static Code Analysis Tool for your HTML"; + homepage = "https://github.com/thedaviddias/HTMLHint#readme"; license = "MIT"; }; production = true; @@ -39263,7 +41598,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.4.8" + sources."uglify-js-3.4.9" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -39298,7 +41633,7 @@ in sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" sources."@types/ncp-2.0.1" - sources."@types/node-6.0.116" + sources."@types/node-6.0.117" sources."@types/rimraf-2.0.2" sources."@types/rx-4.1.1" sources."@types/rx-core-4.0.3" @@ -39332,9 +41667,9 @@ in sources."brace-expansion-1.1.11" sources."bytes-3.0.0" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-2.4.1" - sources."chardet-0.5.0" + sources."chardet-0.7.0" sources."chownr-1.0.1" sources."ci-info-1.4.0" sources."cli-boxes-1.0.0" @@ -39373,7 +41708,7 @@ in sources."esutils-2.0.2" sources."execa-0.7.0" sources."extend-3.0.2" - sources."external-editor-3.0.1" + sources."external-editor-3.0.3" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" @@ -39504,7 +41839,7 @@ in sources."rimraf-2.6.2" sources."rsvp-3.6.2" sources."run-async-2.3.0" - sources."rxjs-6.2.2" + sources."rxjs-6.3.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -39812,7 +42147,7 @@ in sources."deep-equal-1.0.1" sources."error-7.0.2" sources."escape-string-regexp-1.0.5" - sources."fast-json-patch-2.0.6" + sources."fast-json-patch-2.0.7" sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" sources."glob-7.1.3" @@ -39841,7 +42176,7 @@ in sources."opentracing-0.14.3" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.1" sources."string-template-0.2.1" @@ -39901,7 +42236,7 @@ in }; dependencies = [ sources."babylon-7.0.0-beta.19" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."catharsis-0.8.9" sources."escape-string-regexp-1.0.5" sources."graceful-fs-4.1.11" @@ -40199,10 +42534,10 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.9.tgz"; - sha512 = "7N8yDNktol+fIQBQmCoaHwAxvga102kgil/awf8TrGHIhQh2o788inzS6QygfY0B++Z7v5NCAAmCddU+qJf6hA=="; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.10.tgz"; + sha512 = "hTBuXx9RKpyhNhCEh7AUm0Emngxf9f1caw4BzH9CQSPlTqxSJG/X5W0di8AHSeePu+ZqSYjlXLU6u2+Q/6wFmw=="; }; dependencies = [ sources."argparse-1.0.10" @@ -40229,7 +42564,7 @@ in sources."mime-types-2.1.20" sources."ms-2.0.0" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.7" + sources."path-loader-1.0.8" sources."process-nextick-args-2.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -40281,7 +42616,7 @@ in sources."boxen-1.3.0" sources."bytes-3.0.0" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.1" sources."ci-info-1.4.0" @@ -40417,7 +42752,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.0" sources."ms-2.0.0" - sources."nanoid-1.2.1" + sources."nanoid-1.2.2" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -40577,7 +42912,7 @@ in sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" sources."blob-0.0.4" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -41471,20 +43806,20 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.1.4"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.1.4.tgz"; - sha512 = "DetcjFPZmClvHbTOUX3ynBEfzWPLIRhwnoCMw57iNV1lWyW3ERLj6B2Iz6XtWOwW6E+fBrmK5tYV9t0OXuSF6A=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.2.1.tgz"; + sha512 = "nHa/TgRLOHlBm+NfeW62ffVO7hY7wJxnu6IJmZA3lrSmRlqrXZk2BPvnq0FSaCinVYjW0w0XeSNZdRKR//HAwQ=="; }; dependencies = [ - sources."@lerna/add-3.1.4" + sources."@lerna/add-3.2.0" sources."@lerna/batch-packages-3.1.2" - sources."@lerna/bootstrap-3.1.4" - sources."@lerna/changed-3.1.3" + sources."@lerna/bootstrap-3.2.0" + sources."@lerna/changed-3.2.0" sources."@lerna/check-working-tree-3.1.0" sources."@lerna/child-process-3.0.0" sources."@lerna/clean-3.1.3" - sources."@lerna/cli-3.1.4" + sources."@lerna/cli-3.2.0" sources."@lerna/collect-updates-3.1.0" sources."@lerna/command-3.1.3" sources."@lerna/conventional-commits-3.0.2" @@ -41507,23 +43842,23 @@ in sources."@lerna/npm-conf-3.0.0" sources."@lerna/npm-dist-tag-3.0.0" sources."@lerna/npm-install-3.0.0" - sources."@lerna/npm-publish-3.0.6" + sources."@lerna/npm-publish-3.2.0" sources."@lerna/npm-run-script-3.0.0" sources."@lerna/output-3.0.0" sources."@lerna/package-3.0.0" sources."@lerna/package-graph-3.1.2" sources."@lerna/project-3.0.0" sources."@lerna/prompt-3.0.0" - sources."@lerna/publish-3.1.3" + sources."@lerna/publish-3.2.1" sources."@lerna/resolve-symlink-3.0.0" sources."@lerna/rimraf-dir-3.0.0" sources."@lerna/run-3.1.3" - sources."@lerna/run-lifecycle-3.0.0" + sources."@lerna/run-lifecycle-3.2.0" sources."@lerna/run-parallel-batches-3.0.0" sources."@lerna/symlink-binary-3.1.4" sources."@lerna/symlink-dependencies-3.1.4" sources."@lerna/validation-error-3.0.0" - sources."@lerna/version-3.1.3" + sources."@lerna/version-3.2.0" sources."@lerna/write-log-file-3.0.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.1" @@ -41571,7 +43906,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -41613,9 +43948,10 @@ in }) sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - (sources."cliui-2.1.0" // { + (sources."cliui-4.1.0" // { dependencies = [ - sources."wordwrap-0.0.2" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) sources."clone-1.0.4" @@ -41665,9 +44001,10 @@ in sources."dateformat-3.0.3" sources."debug-2.6.9" sources."debuglog-1.0.1" - sources."decamelize-1.2.0" + sources."decamelize-2.0.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) @@ -41739,7 +44076,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-up-2.1.0" + sources."find-up-3.0.0" sources."flush-write-stream-1.0.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -41763,6 +44100,7 @@ in dependencies = [ sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" sources."indent-string-2.1.0" sources."map-obj-1.0.1" sources."meow-3.7.0" @@ -41883,7 +44221,7 @@ in sources."lazy-cache-1.0.4" sources."lcid-1.0.0" sources."load-json-file-4.0.0" - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.10" sources."lodash._reinterpolate-3.0.0" sources."lodash.sortby-4.7.0" @@ -41900,7 +44238,12 @@ in sources."mem-1.1.0" (sources."meow-4.0.1" // { dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" sources."minimist-1.2.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" sources."read-pkg-up-3.0.0" ]; }) @@ -41989,12 +44332,13 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" sources."p-map-1.2.0" sources."p-map-series-1.0.0" + sources."p-pipe-1.2.0" sources."p-reduce-1.0.0" - sources."p-try-1.0.0" + sources."p-try-2.0.0" sources."p-waterfall-1.0.0" sources."pacote-9.1.0" sources."parallel-transform-1.1.0" @@ -42010,7 +44354,15 @@ in sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pkg-dir-2.0.0" + (sources."pkg-dir-2.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + ]; + }) sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.0" sources."promise-inflight-1.0.1" @@ -42071,7 +44423,7 @@ in sources."rimraf-2.6.2" sources."run-async-2.3.0" sources."run-queue-1.0.3" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -42197,6 +44549,9 @@ in (sources."uglify-js-2.8.29" // { dependencies = [ sources."camelcase-1.2.1" + sources."cliui-2.1.0" + sources."decamelize-1.2.0" + sources."wordwrap-0.0.2" sources."yargs-3.10.0" ]; }) @@ -42251,19 +44606,7 @@ in sources."xtend-4.0.1" sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-12.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."cliui-4.1.0" - sources."decamelize-2.0.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.0.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."yargs-12.0.1" sources."yargs-parser-10.1.0" ]; buildInputs = globalBuildInputs; @@ -43317,7 +45660,7 @@ in sources."longest-1.0.1" sources."lru-cache-2.7.3" sources."lru-queue-0.1.0" - sources."make-error-1.3.4" + sources."make-error-1.3.5" sources."make-error-cause-1.2.2" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" @@ -43529,7 +45872,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typescript-2.7.2" - (sources."uglify-js-3.4.8" // { + (sources."uglify-js-3.4.9" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -43674,7 +46017,7 @@ in sources."mime-types-2.1.20" sources."ms-2.0.0" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.7" + sources."path-loader-1.0.8" sources."process-nextick-args-2.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -44029,7 +46372,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.34" + sources."big-integer-1.6.35" sources."block-stream-0.0.9" sources."body-parser-1.18.2" sources."boom-2.10.1" @@ -44389,10 +46732,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.18.3"; + version = "1.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz"; - sha512 = "XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.4.tgz"; + sha512 = "hyK6vl65IPnky/ee+D3IWvVGgJa/m3No2/Xc/3wanS6Ce1MWjCzH6NnhPJ/vZM+6JFym16jtHx51lmCMB9HDtg=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -44424,7 +46767,7 @@ in }) sources."cache-base-1.0.1" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-2.4.1" sources."chokidar-2.0.4" sources."ci-info-1.4.0" @@ -45279,10 +47622,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.4.0.tgz"; - sha512 = "k0VteQaxRuI1mREBxCtLUksesD2ZmX5gxjXNEjTmTrxQ3SHW22InkCKyX4NzoeGAYtgmDg5MuE7rcXYod7xgug=="; + url = "https://registry.npmjs.org/npm/-/npm-6.4.1.tgz"; + sha512 = "mXJL1NTVU136PtuopXCUQaNWuHlXCTp4McwlSW8S9/Aj8OEPAlSBgo8og7kJ01MjCDrkmqFQTvN5tTEhBMhXQg=="; }; buildInputs = globalBuildInputs; meta = { @@ -45470,7 +47813,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" (sources."boxen-1.3.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -45479,7 +47822,7 @@ in ]; }) sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."ci-info-1.4.0" sources."cint-8.2.1" @@ -45822,7 +48165,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" (sources."body-parser-1.18.3" // { dependencies = [ sources."content-type-1.0.4" @@ -46154,7 +48497,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" - sources."big-integer-1.6.34" + sources."big-integer-1.6.35" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -46272,7 +48615,7 @@ in sources."lodash-3.10.1" sources."loud-rejection-1.6.0" sources."lru-2.0.1" - sources."magnet-uri-5.2.3" + sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" sources."meow-3.7.0" sources."mime-2.3.1" @@ -46354,7 +48697,7 @@ in sources."run-parallel-1.1.9" sources."run-series-1.1.8" sources."rusha-0.8.13" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.1" @@ -46476,7 +48819,7 @@ in }) sources."boom-0.3.8" sources."brace-expansion-1.1.11" - sources."buffer-5.2.0" + sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -46883,7 +49226,7 @@ in sources."form-data-1.0.1" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -46979,10 +49322,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.13.6"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz"; - sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.15.0.tgz"; + sha512 = "bMS1ShnuwRtg1SRrauo9gYFXn4CxO+tyYNRe40DsY4cDpycbLs3Lr54ulQrFZtE4Yn6m3keu3sft7f36eg0gbw=="; }; buildInputs = globalBuildInputs; meta = { @@ -48047,6 +50390,583 @@ in production = true; bypassCache = true; }; + scuttlebot = nodeEnv.buildNodePackage { + name = "scuttlebot"; + packageName = "scuttlebot"; + version = "11.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-11.4.2.tgz"; + sha512 = "JbOKdMFCyoALwpiK5FM8qikpFvEqCdRycbFGiOdhhQT0VrTWCO1PXDFuDAHnCBTDYvjjO88M9njq2BOXVypvAg=="; + }; + dependencies = [ + sources."abstract-leveldown-4.0.3" + (sources."aligned-block-file-1.1.3" // { + dependencies = [ + sources."obv-0.0.0" + ]; + }) + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-1.3.2" + sources."append-batch-0.0.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.2.1" + sources."arrify-1.0.1" + sources."async-each-1.0.1" + sources."async-single-1.0.5" + sources."async-write-2.1.0" + sources."atomic-file-0.0.1" + sources."attach-ware-1.1.1" + sources."bail-1.0.3" + sources."balanced-match-1.0.0" + sources."base64-url-2.2.0" + sources."bash-color-0.0.4" + sources."binary-extensions-1.11.0" + sources."binary-search-1.3.4" + sources."bindings-1.3.0" + sources."bl-1.2.2" + sources."blake2s-1.0.1" + sources."brace-expansion-1.1.11" + sources."braces-1.8.5" + sources."broadcast-stream-0.2.2" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.1" + sources."bytewise-1.1.0" + sources."bytewise-core-1.2.3" + sources."camelcase-2.1.1" + sources."ccount-1.0.3" + sources."chalk-1.1.3" + sources."character-entities-1.2.2" + sources."character-entities-html4-1.1.2" + sources."character-entities-legacy-1.1.2" + sources."character-reference-invalid-1.1.2" + sources."charwise-3.0.1" + sources."chloride-2.2.10" + sources."chloride-test-1.2.2" + sources."chokidar-1.7.0" + sources."chownr-1.0.1" + sources."cli-cursor-1.0.2" + sources."co-3.1.0" + sources."code-point-at-1.1.0" + sources."collapse-white-space-1.0.4" + sources."commander-2.17.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-control-strings-1.1.0" + sources."cont-1.0.3" + sources."continuable-1.2.0" + (sources."continuable-hash-0.1.4" // { + dependencies = [ + sources."continuable-1.1.8" + ]; + }) + (sources."continuable-list-0.1.6" // { + dependencies = [ + sources."continuable-1.1.8" + ]; + }) + sources."continuable-para-1.2.0" + sources."continuable-series-1.2.0" + sources."core-util-is-1.0.2" + sources."cross-spawn-5.1.0" + sources."debug-2.6.9" + sources."decompress-response-3.3.0" + sources."deep-equal-1.0.1" + sources."deep-extend-0.6.0" + sources."deferred-leveldown-3.0.0" + sources."define-properties-1.1.3" + sources."defined-1.0.0" + sources."delegates-1.0.0" + sources."detab-1.0.2" + sources."detect-libc-1.0.3" + sources."ed2curve-0.1.4" + sources."elegant-spinner-1.0.1" + sources."emoji-named-characters-1.0.2" + sources."emoji-server-1.0.0" + (sources."encoding-down-4.0.1" // { + dependencies = [ + sources."level-codec-8.0.0" + ]; + }) + sources."end-of-stream-1.4.1" + sources."epidemic-broadcast-trees-6.3.4" + sources."errno-0.1.7" + sources."es-abstract-1.12.0" + sources."es-to-primitive-1.1.1" + sources."escape-string-regexp-1.0.5" + sources."exit-hook-1.1.1" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."expand-template-1.1.1" + sources."explain-error-1.0.4" + sources."extend-3.0.2" + sources."extend.js-0.0.2" + sources."extglob-0.3.2" + sources."fast-future-1.0.2" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.4" + sources."flumecodec-0.0.1" + sources."flumedb-0.4.9" + (sources."flumelog-offset-3.3.1" // { + dependencies = [ + sources."looper-4.0.0" + ]; + }) + (sources."flumeview-hashtable-1.0.4" // { + dependencies = [ + sources."atomic-file-1.1.5" + ]; + }) + (sources."flumeview-level-3.0.5" // { + dependencies = [ + sources."obv-0.0.0" + ]; + }) + (sources."flumeview-query-6.3.0" // { + dependencies = [ + sources."map-filter-reduce-3.1.0" + ]; + }) + (sources."flumeview-reduce-1.3.13" // { + dependencies = [ + sources."atomic-file-1.1.5" + sources."flumecodec-0.0.0" + sources."obv-0.0.0" + ]; + }) + sources."for-each-0.3.3" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."fs-constants-1.0.0" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.4" + sources."function-bind-1.1.1" + sources."gauge-2.7.4" + sources."github-from-package-0.0.0" + sources."glob-6.0.4" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."globby-4.1.0" + sources."graceful-fs-4.1.11" + sources."graphreduce-3.0.4" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-network-0.0.1" + sources."has-unicode-2.0.1" + sources."hashlru-2.2.1" + sources."he-0.5.0" + sources."hoox-0.0.1" + sources."increment-buffer-1.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."int53-0.2.4" + sources."ip-0.3.3" + sources."irregular-plurals-1.4.0" + sources."is-alphabetical-1.0.2" + sources."is-alphanumerical-1.0.2" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" + sources."is-decimal-1.0.2" + sources."is-dotfile-1.0.3" + sources."is-electron-2.1.0" + 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-hexadecimal-1.0.2" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.1" + sources."is-valid-domain-0.0.5" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-2.1.0" + sources."json-buffer-2.0.11" + sources."kind-of-3.2.2" + sources."level-3.0.2" + sources."level-codec-6.2.0" + sources."level-errors-1.1.2" + sources."level-iterator-stream-2.0.3" + sources."level-packager-2.1.1" + sources."level-post-1.0.7" + (sources."level-sublevel-6.6.5" // { + dependencies = [ + (sources."abstract-leveldown-0.12.4" // { + dependencies = [ + sources."xtend-3.0.0" + ]; + }) + sources."bl-0.8.2" + sources."deferred-leveldown-0.2.0" + sources."isarray-0.0.1" + (sources."levelup-0.19.1" // { + dependencies = [ + sources."xtend-3.0.0" + ]; + }) + sources."ltgt-2.1.3" + sources."prr-0.0.0" + sources."readable-stream-1.0.34" + sources."semver-5.1.1" + sources."string_decoder-0.10.31" + ]; + }) + (sources."leveldown-3.0.2" // { + dependencies = [ + sources."nan-2.10.0" + ]; + }) + sources."levelup-2.0.2" + sources."libsodium-0.7.3" + sources."libsodium-wrappers-0.7.3" + sources."log-symbols-1.0.2" + sources."log-update-1.0.2" + sources."longest-streak-1.0.0" + sources."looper-3.0.0" + sources."lossy-store-1.2.3" + sources."lru-cache-4.1.3" + sources."ltgt-2.2.1" + sources."map-filter-reduce-2.2.1" + sources."map-merge-1.1.0" + sources."markdown-table-0.4.0" + sources."math-random-1.0.1" + sources."mdmanifest-1.0.8" + sources."micromatch-2.3.11" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."monotonic-timestamp-0.0.9" + sources."ms-2.0.0" + (sources."multiblob-1.13.0" // { + dependencies = [ + sources."deep-extend-0.2.11" + sources."minimist-0.0.10" + sources."pull-file-0.5.0" + sources."rc-0.5.5" + sources."rimraf-2.2.8" + sources."strip-json-comments-0.1.3" + ]; + }) + sources."multiblob-http-0.4.2" + sources."multicb-1.2.2" + sources."multiserver-1.13.3" + sources."muxrpc-6.4.1" + (sources."muxrpc-validation-2.0.1" // { + dependencies = [ + sources."pull-stream-2.28.4" + ]; + }) + (sources."muxrpcli-1.1.0" // { + dependencies = [ + sources."pull-stream-2.28.4" + ]; + }) + (sources."mv-2.1.1" // { + dependencies = [ + sources."rimraf-2.4.5" + ]; + }) + sources."nan-2.11.0" + sources."ncp-2.0.0" + sources."node-abi-2.4.3" + sources."node-gyp-build-3.4.0" + (sources."non-private-ip-1.4.4" // { + dependencies = [ + sources."ip-1.1.5" + ]; + }) + sources."noop-logger-0.1.1" + sources."normalize-path-2.1.1" + sources."normalize-uri-1.1.1" + sources."npm-prefix-1.2.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."object-inspect-1.6.0" + sources."object-keys-1.0.12" + sources."object.omit-2.0.1" + sources."observ-0.2.0" + sources."observ-debounce-1.1.1" + sources."obv-0.0.1" + sources."on-change-network-0.0.2" + sources."on-wakeup-1.0.1" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."opencollective-postinstall-2.0.0" + sources."options-0.0.6" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."packet-stream-2.0.4" + sources."packet-stream-codec-1.1.2" + sources."parse-entities-1.1.2" + sources."parse-glob-3.0.4" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."plur-2.1.2" + sources."prebuild-install-4.0.0" + sources."preserve-0.2.0" + sources."private-box-0.2.1" + sources."process-nextick-args-2.0.0" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."pull-abortable-4.1.1" + sources."pull-box-stream-1.0.13" + sources."pull-cat-1.1.11" + sources."pull-cont-0.0.0" + sources."pull-core-1.1.0" + (sources."pull-cursor-3.0.0" // { + dependencies = [ + sources."looper-4.0.0" + ]; + }) + sources."pull-defer-0.2.3" + sources."pull-file-1.1.0" + sources."pull-flatmap-0.0.1" + (sources."pull-fs-1.1.6" // { + dependencies = [ + sources."pull-file-0.5.0" + ]; + }) + sources."pull-glob-1.0.7" + (sources."pull-goodbye-0.0.2" // { + dependencies = [ + sources."pull-stream-3.5.0" + ]; + }) + sources."pull-handshake-1.1.4" + sources."pull-hash-1.0.0" + (sources."pull-inactivity-2.1.2" // { + dependencies = [ + sources."pull-abortable-4.0.0" + ]; + }) + sources."pull-level-2.0.4" + sources."pull-live-1.0.1" + (sources."pull-looper-1.0.0" // { + dependencies = [ + sources."looper-4.0.0" + ]; + }) + sources."pull-many-1.0.8" + sources."pull-next-1.0.1" + sources."pull-notify-0.1.1" + sources."pull-pair-1.1.0" + (sources."pull-paramap-1.2.2" // { + dependencies = [ + sources."looper-4.0.0" + ]; + }) + sources."pull-ping-2.0.2" + sources."pull-pushable-2.2.0" + sources."pull-rate-1.0.2" + sources."pull-reader-1.3.1" + sources."pull-sink-through-0.0.0" + sources."pull-stream-3.6.9" + sources."pull-stream-to-stream-1.3.4" + sources."pull-stringify-1.2.2" + sources."pull-through-1.0.18" + sources."pull-traverse-1.0.3" + sources."pull-utf8-decoder-1.0.2" + (sources."pull-window-2.1.4" // { + dependencies = [ + sources."looper-2.0.0" + ]; + }) + (sources."pull-write-1.1.4" // { + dependencies = [ + sources."looper-4.0.0" + ]; + }) + sources."pull-write-file-0.2.4" + sources."pull-ws-3.3.1" + sources."pump-2.0.1" + sources."push-stream-10.0.3" + sources."push-stream-to-pull-stream-1.0.3" + (sources."randomatic-3.1.0" // { + dependencies = [ + sources."is-number-4.0.0" + sources."kind-of-6.0.2" + ]; + }) + sources."rc-1.2.8" + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."regex-cache-0.4.4" + sources."relative-url-1.0.2" + sources."remark-3.2.3" + sources."remark-html-2.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-1.7.1" + sources."restore-cursor-1.0.1" + sources."resumer-0.0.0" + (sources."rimraf-2.6.2" // { + dependencies = [ + sources."glob-7.1.3" + ]; + }) + sources."safe-buffer-5.1.2" + sources."secret-handshake-1.1.13" + (sources."secret-stack-4.1.0" // { + dependencies = [ + sources."ip-1.1.5" + ]; + }) + (sources."secure-scuttlebutt-18.2.0" // { + dependencies = [ + sources."deep-equal-0.2.2" + ]; + }) + sources."semver-5.5.1" + sources."separator-escape-0.0.0" + sources."set-blocking-2.0.0" + sources."set-immediate-shim-1.0.1" + sources."sha.js-2.4.5" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shellsubstitute-1.2.0" + sources."signal-exit-3.0.2" + sources."simple-concat-1.0.0" + sources."simple-get-2.8.1" + sources."smart-buffer-4.0.1" + (sources."socks-2.2.1" // { + dependencies = [ + sources."ip-1.1.5" + ]; + }) + sources."sodium-browserify-1.2.4" + (sources."sodium-browserify-tweetnacl-0.2.3" // { + dependencies = [ + sources."sha.js-2.4.11" + ]; + }) + sources."sodium-chloride-1.1.0" + sources."sodium-native-2.2.1" + sources."split-buffer-1.0.0" + sources."ssb-blobs-1.1.5" + sources."ssb-client-4.6.0" + (sources."ssb-config-2.2.0" // { + dependencies = [ + sources."deep-extend-0.4.2" + ]; + }) + sources."ssb-ebt-5.2.2" + (sources."ssb-friends-2.4.0" // { + dependencies = [ + sources."pull-cont-0.1.1" + ]; + }) + sources."ssb-keys-7.0.16" + sources."ssb-links-3.0.3" + sources."ssb-msgs-5.2.0" + (sources."ssb-query-2.2.1" // { + dependencies = [ + sources."flumeview-query-git://github.com/mmckegg/flumeview-query#map" + sources."map-filter-reduce-3.1.0" + ]; + }) + (sources."ssb-ref-2.11.2" // { + dependencies = [ + sources."ip-1.1.5" + ]; + }) + sources."ssb-validate-3.0.10" + sources."ssb-ws-2.1.1" + sources."stack-0.1.0" + sources."statistics-3.3.0" + sources."stream-to-pull-stream-1.7.2" + sources."string-width-1.0.2" + sources."string.prototype.trim-1.1.2" + sources."string_decoder-1.1.1" + sources."stringify-entities-1.3.2" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + (sources."tape-4.9.1" // { + dependencies = [ + sources."glob-7.1.3" + ]; + }) + (sources."tar-fs-1.16.3" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."tar-stream-1.6.1" + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."to-buffer-1.1.1" + sources."to-vfile-1.0.0" + sources."trim-0.0.1" + sources."trim-lines-1.1.1" + sources."trim-trailing-lines-1.1.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."tweetnacl-auth-0.3.1" + sources."typedarray-0.0.6" + sources."typewise-1.0.3" + sources."typewise-core-1.2.0" + sources."typewiselite-1.0.0" + sources."uint48be-1.0.2" + sources."ultron-1.0.2" + sources."unherit-1.1.1" + sources."unified-2.1.4" + sources."unist-util-is-2.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-parents-2.0.1" + sources."untildify-2.1.0" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."vfile-1.4.0" + sources."vfile-find-down-1.0.0" + sources."vfile-find-up-1.0.0" + sources."vfile-reporter-1.5.0" + sources."vfile-sort-1.0.0" + sources."ware-1.3.0" + sources."which-1.3.1" + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.3" + sources."word-wrap-1.2.3" + sources."wrap-fn-0.1.5" + sources."wrappy-1.0.2" + sources."ws-1.1.5" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + sources."zerr-1.0.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "network protocol layer for secure-scuttlebutt"; + homepage = https://github.com/ssbc/scuttlebot; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; @@ -49148,7 +52068,7 @@ in sources."bytes-1.0.0" sources."cache-base-1.0.1" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."center-align-0.1.3" sources."chalk-1.1.3" sources."charenc-0.0.2" @@ -49444,7 +52364,7 @@ in sources."nan-2.11.0" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" - (sources."nodemon-1.18.3" // { + (sources."nodemon-1.18.4" // { dependencies = [ sources."debug-3.1.0" sources."supports-color-5.5.0" @@ -49482,7 +52402,7 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - (sources."path-loader-1.0.7" // { + (sources."path-loader-1.0.8" // { dependencies = [ sources."debug-3.1.0" sources."qs-6.5.2" @@ -49701,7 +52621,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."valid-url-1.0.9" - sources."validator-10.7.0" + sources."validator-10.7.1" sources."which-1.3.1" sources."widest-line-2.0.0" sources."window-size-0.1.0" @@ -49776,10 +52696,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.95.0"; + version = "0.96.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.95.0.tgz"; - sha512 = "vy6jMYs7CDwn47CejYHNi+++OdQue7xGIBhbLfekQ/G6MDxKRm0QB0/xWScz46/JvQAvF6pJAS5Q907l0i5iQA=="; + url = "https://registry.npmjs.org/three/-/three-0.96.0.tgz"; + sha512 = "tS+A5kelQgBblElc/E1G5zR3m6wNjbqmrf6OAjijuNJM7yoYQjOktPoa+Lglx73OTiTOJ3+Ff+pgWdOFt7cOhQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -49897,7 +52817,7 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.4.8" + sources."uglify-js-3.4.9" sources."universalify-0.1.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -50105,10 +53025,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz"; - sha512 = "zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz"; + sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; buildInputs = globalBuildInputs; meta = { @@ -50139,7 +53059,7 @@ in sources."array-uniq-1.0.3" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" (sources."boxen-1.3.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -50150,7 +53070,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."ci-info-1.4.0" sources."cli-boxes-1.0.0" @@ -50229,7 +53149,7 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" sources."make-dir-1.3.0" - sources."make-error-1.3.4" + sources."make-error-1.3.5" sources."make-error-cause-1.2.2" sources."mime-db-1.36.0" sources."mime-types-2.1.20" @@ -50339,10 +53259,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.8"; + version = "3.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.8.tgz"; - sha512 = "WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz"; + sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; }; dependencies = [ sources."commander-2.17.1" @@ -50395,7 +53315,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.4" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."blueimp-md5-2.10.0" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" @@ -50463,7 +53383,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."editions-2.0.1" + sources."editions-2.0.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" (sources."engine.io-3.2.0" // { @@ -50532,7 +53452,7 @@ in sources."gauge-2.7.4" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" - sources."getmac-1.4.5" + sources."getmac-1.4.6" sources."getpass-0.1.7" sources."glob-7.1.3" sources."graceful-fs-4.1.11" @@ -50845,7 +53765,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."brace-expansion-1.1.11" sources."buffer-3.6.0" sources."buffer-alloc-1.2.0" @@ -50854,12 +53774,12 @@ in sources."buffer-fill-1.0.0" sources."builtins-1.0.3" sources."camelcase-1.2.1" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" sources."center-align-0.1.3" sources."chalk-2.4.1" - sources."chardet-0.5.0" + sources."chardet-0.7.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-width-2.2.0" @@ -50910,7 +53830,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."extend-shallow-2.0.1" - sources."external-editor-3.0.1" + sources."external-editor-3.0.3" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -51041,7 +53961,7 @@ in sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.2.2" + sources."rxjs-6.3.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -51149,7 +54069,7 @@ in sources."@types/graphql-0.12.6" sources."@types/long-4.0.0" sources."@types/mime-2.0.0" - sources."@types/node-10.9.2" + sources."@types/node-10.9.4" sources."@types/range-parser-1.2.2" sources."@types/serve-static-1.13.2" sources."@types/ws-5.1.2" @@ -51170,11 +54090,11 @@ in sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" sources."apollo-cache-1.1.16" - sources."apollo-cache-control-0.2.2" + sources."apollo-cache-control-0.2.3" sources."apollo-cache-inmemory-1.2.9" sources."apollo-client-2.4.1" - sources."apollo-datasource-0.1.2" - sources."apollo-engine-reporting-0.0.2" + sources."apollo-datasource-0.1.3" + sources."apollo-engine-reporting-0.0.3" sources."apollo-engine-reporting-protobuf-0.0.1" sources."apollo-link-1.2.2" sources."apollo-link-context-1.0.8" @@ -51185,11 +54105,11 @@ in sources."apollo-link-state-0.4.1" sources."apollo-link-ws-1.0.8" sources."apollo-server-caching-0.1.2" - sources."apollo-server-core-2.0.4" - sources."apollo-server-env-2.0.2" + sources."apollo-server-core-2.0.5" + sources."apollo-server-env-2.0.3" sources."apollo-server-errors-2.0.2" - sources."apollo-server-express-2.0.4" - sources."apollo-tracing-0.2.2" + sources."apollo-server-express-2.0.5" + sources."apollo-tracing-0.2.3" sources."apollo-upload-client-8.1.0" sources."apollo-utilities-1.0.20" sources."argparse-1.0.10" @@ -51256,11 +54176,11 @@ in sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.1" - sources."chardet-0.5.0" + sources."chardet-0.7.0" sources."chokidar-2.0.4" sources."ci-info-1.4.0" (sources."class-utils-0.3.6" // { @@ -51410,7 +54330,11 @@ in sources."express-history-api-fallback-2.2.1" sources."extend-3.0.2" sources."extend-shallow-2.0.1" - sources."external-editor-3.0.1" + (sources."external-editor-3.0.3" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -51472,7 +54396,7 @@ in sources."graceful-readlink-1.0.1" sources."graphql-0.13.2" sources."graphql-anywhere-4.1.18" - sources."graphql-extensions-0.1.2" + sources."graphql-extensions-0.1.3" sources."graphql-subscriptions-0.5.8" sources."graphql-tag-2.9.2" sources."graphql-tools-3.1.1" @@ -51608,7 +54532,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.11.0" - sources."nanoid-1.2.1" + sources."nanoid-1.2.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -51620,7 +54544,7 @@ in sources."node-fetch-2.2.0" sources."node-ipc-9.1.1" sources."node-notifier-5.2.1" - sources."nodemon-1.18.3" + sources."nodemon-1.18.4" sources."nopt-1.0.10" sources."normalize-path-2.1.1" sources."npm-conf-1.1.3" @@ -51731,7 +54655,7 @@ in sources."retry-0.10.1" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.2.2" + sources."rxjs-6.3.1" sources."safe-buffer-5.1.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -52000,7 +54924,7 @@ in sources."form-data-1.0.1" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -52167,7 +55091,7 @@ in sources."base64-js-1.3.0" sources."big.js-3.2.0" sources."binary-extensions-1.11.0" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -52550,7 +55474,7 @@ in sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" - (sources."webpack-sources-1.1.0" // { + (sources."webpack-sources-1.2.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -52587,7 +55511,7 @@ in sources."bencode-2.0.0" sources."binary-search-1.3.4" sources."bitfield-2.0.0" - (sources."bittorrent-dht-8.4.0" // { + (sources."bittorrent-dht-9.0.0" // { dependencies = [ sources."debug-3.1.0" ]; @@ -52596,6 +55520,7 @@ in (sources."bittorrent-protocol-3.0.1" // { dependencies = [ sources."debug-3.1.0" + sources."readable-stream-2.3.6" ]; }) (sources."bittorrent-tracker-9.10.1" // { @@ -52605,7 +55530,11 @@ in ]; }) sources."blob-to-buffer-1.2.8" - sources."block-stream2-1.1.0" + (sources."block-stream2-1.1.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" @@ -52625,15 +55554,23 @@ in sources."mime-1.6.0" ]; }) - sources."chunk-store-stream-3.0.1" + (sources."chunk-store-stream-3.0.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."clivas-0.2.0" sources."closest-to-2.0.0" sources."colour-0.7.1" sources."compact2string-1.4.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" + (sources."concat-stream-1.6.2" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."core-util-is-1.0.2" - sources."create-torrent-3.32.1" + sources."create-torrent-3.33.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."defined-1.0.0" @@ -52644,7 +55581,7 @@ in }) sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" - (sources."ecstatic-3.2.1" // { + (sources."ecstatic-3.3.0" // { dependencies = [ sources."mime-1.6.0" ]; @@ -52652,7 +55589,11 @@ in sources."elementtree-0.1.7" sources."end-of-stream-1.4.1" sources."executable-4.1.1" - sources."filestream-4.1.3" + (sources."filestream-4.1.3" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."flatten-1.0.2" (sources."fs-chunk-store-1.7.0" // { dependencies = [ @@ -52675,8 +55616,12 @@ in sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."junk-2.1.0" - sources."k-bucket-4.0.1" - sources."k-rpc-5.0.0" + sources."k-bucket-5.0.0" + (sources."k-rpc-5.0.0" // { + dependencies = [ + sources."k-bucket-4.0.1" + ]; + }) sources."k-rpc-socket-1.8.0" sources."last-one-wins-1.0.4" (sources."load-ip-set-2.1.0" // { @@ -52686,10 +55631,14 @@ in }) sources."long-2.4.0" sources."lru-3.1.0" - sources."magnet-uri-5.2.3" + sources."magnet-uri-5.2.4" sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" - sources."mediasource-2.2.2" + (sources."mediasource-2.2.2" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."memory-chunk-store-1.3.0" sources."mime-2.3.1" sources."mimic-response-1.0.1" @@ -52702,14 +55651,22 @@ in }) sources."moment-2.22.2" sources."mp4-box-encoding-1.3.0" - sources."mp4-stream-2.0.3" + (sources."mp4-stream-2.0.3" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."ms-2.0.0" (sources."multicast-dns-6.2.3" // { dependencies = [ sources."thunky-1.0.2" ]; }) - sources."multistream-2.1.1" + (sources."multistream-2.1.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."netmask-1.0.6" sources."network-address-1.1.2" sources."next-event-1.0.0" @@ -52744,8 +55701,12 @@ in sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - sources."range-slice-stream-1.2.0" - sources."readable-stream-2.3.6" + (sources."range-slice-stream-1.2.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) + sources."readable-stream-3.0.2" sources."record-cache-1.1.0" (sources."render-media-3.1.3" // { dependencies = [ @@ -52765,12 +55726,14 @@ in (sources."simple-peer-9.1.2" // { dependencies = [ sources."debug-3.1.0" + sources."readable-stream-2.3.6" ]; }) sources."simple-sha1-2.1.1" (sources."simple-websocket-7.2.0" // { dependencies = [ sources."debug-3.1.0" + sources."readable-stream-2.3.6" ]; }) sources."speedometer-1.1.0" @@ -52784,7 +55747,7 @@ in sources."through-2.3.8" sources."thunky-0.1.0" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.0.2" // { + (sources."torrent-discovery-9.1.1" // { dependencies = [ sources."debug-3.1.0" ]; @@ -52798,7 +55761,7 @@ in sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.2.4" sources."url-join-2.0.5" - (sources."ut_metadata-3.2.2" // { + (sources."ut_metadata-3.3.0" // { dependencies = [ sources."debug-3.1.0" ]; @@ -52807,11 +55770,10 @@ in sources."utf-8-validate-5.0.1" sources."util-deprecate-1.0.2" sources."videostream-2.5.1" - sources."vlc-command-1.1.1" - (sources."webtorrent-0.102.2" // { + sources."vlc-command-1.1.2" + (sources."webtorrent-0.102.4" // { dependencies = [ sources."debug-3.1.0" - sources."readable-stream-3.0.2" sources."simple-get-3.0.3" ]; }) @@ -52822,7 +55784,6 @@ in sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" sources."xtend-4.0.1" - sources."zero-fill-2.2.3" ]; buildInputs = globalBuildInputs; meta = { @@ -52836,27 +55797,35 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.8.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.8.0.tgz"; - sha512 = "3JuPYU3yrefysm3pvGwRP5k9plRMPUeLo5KLp2TSnE9g4t7x6SeIWZEWWG3jwVeFsPQuIj3sAuVHEDO5ai9mCw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.9.1.tgz"; + sha512 = "sK5ebAiUNJFG+KfFjjvWks9ihecy0TdVCrrnSW/tZ15QFO6u4LCIQKCuBr7FyGMjC+IOGJFB7pS1ZbyPNJ72GQ=="; }; dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.9.2" + sources."@types/node-10.9.4" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.2" - sources."acorn-jsx-4.1.1" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.2.6" // { + (sources."addons-linter-1.3.1" // { dependencies = [ sources."source-map-0.6.1" sources."source-map-support-0.5.6" - sources."yargs-12.0.1" + (sources."yargs-12.0.1" // { + dependencies = [ + sources."os-locale-2.1.0" + ]; + }) ]; }) sources."adm-zip-0.4.11" @@ -52945,7 +55914,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."buffer-5.2.0" + sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -52959,7 +55928,7 @@ in sources."caller-path-0.1.0" sources."callsites-0.2.0" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-2.4.0" // { dependencies = [ @@ -53021,7 +55990,7 @@ in sources."crc-3.8.0" sources."crc32-stream-2.0.0" sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" + sources."cross-spawn-5.1.0" sources."crx-parser-0.1.2" sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" @@ -53050,15 +56019,12 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."detect-indent-4.0.0" - (sources."dispensary-0.21.0" // { + (sources."dispensary-0.22.0" // { dependencies = [ - sources."ansi-styles-3.2.1" sources."async-2.6.1" - sources."chalk-2.4.1" - sources."pino-4.17.6" + sources."os-locale-2.1.0" sources."source-map-0.6.1" sources."source-map-support-0.5.9" - sources."supports-color-5.5.0" sources."yargs-12.0.1" ]; }) @@ -53106,6 +56072,7 @@ in (sources."eslint-5.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."cross-spawn-6.0.5" sources."debug-3.1.0" sources."globals-11.7.0" sources."strip-ansi-4.0.0" @@ -53113,8 +56080,6 @@ in }) (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { dependencies = [ - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" @@ -53144,7 +56109,11 @@ in }) sources."eslint-scope-4.0.0" sources."eslint-visitor-keys-1.0.0" - sources."espree-4.0.0" + (sources."espree-4.0.0" // { + dependencies = [ + sources."acorn-jsx-4.1.1" + ]; + }) sources."esprima-3.1.3" sources."esquery-1.0.1" sources."esrecurse-4.2.1" @@ -53152,11 +56121,7 @@ in sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - (sources."execa-0.7.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - ]; - }) + sources."execa-0.7.0" sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -53192,11 +56157,11 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-parse-1.0.3" - sources."fast-json-patch-2.0.6" + sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-1.1.14" - sources."fast-safe-stringify-1.2.3" + sources."fast-safe-stringify-2.0.6" sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" @@ -53207,7 +56172,7 @@ in ]; }) sources."find-up-3.0.0" - (sources."firefox-profile-1.1.0" // { + (sources."firefox-profile-1.2.0" // { dependencies = [ sources."async-2.5.0" sources."fs-extra-4.0.3" @@ -53242,7 +56207,7 @@ in sources."which-1.2.4" ]; }) - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" @@ -53270,7 +56235,7 @@ in sources."graphlib-2.1.5" sources."growly-1.3.0" sources."har-schema-2.0.0" - (sources."har-validator-5.0.3" // { + (sources."har-validator-5.1.0" // { dependencies = [ sources."ajv-5.5.2" sources."fast-deep-equal-1.1.0" @@ -53539,7 +56504,7 @@ in sources."npm-run-path-2.0.2" sources."nth-check-1.0.1" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -53561,11 +56526,20 @@ in sources."opn-5.3.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" - sources."os-locale-2.1.0" + (sources."os-locale-3.0.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."execa-0.10.0" + sources."invert-kv-2.0.0" + sources."lcid-2.0.0" + sources."mem-3.0.1" + ]; + }) sources."os-name-2.0.1" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" sources."p-limit-2.0.0" sources."p-locate-3.0.0" sources."p-try-2.0.0" @@ -53593,12 +56567,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pino-5.0.0-rc.4" // { - dependencies = [ - sources."fast-safe-stringify-2.0.6" - sources."quick-format-unescaped-3.0.0" - ]; - }) + sources."pino-5.0.4" sources."pino-std-serializers-2.2.1" sources."pluralize-7.0.0" sources."po2json-0.4.5" @@ -53626,10 +56595,11 @@ in }) sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" + sources."psl-1.1.29" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."quick-format-unescaped-1.1.2" + sources."quick-format-unescaped-3.0.0" (sources."raw-body-2.3.3" // { dependencies = [ sources."iconv-lite-0.4.23" @@ -53667,7 +56637,7 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."repeating-2.0.1" - sources."request-2.87.0" + sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-uncached-1.0.3" @@ -53680,7 +56650,7 @@ in sources."run-async-2.3.0" sources."rx-lite-3.1.2" sources."rx-lite-aggregates-4.0.8" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" @@ -53710,11 +56680,19 @@ in sources."shellwords-0.1.1" (sources."sign-addon-0.3.1" // { dependencies = [ + sources."ajv-5.5.2" sources."babel-polyfill-6.16.0" sources."es6-error-4.0.0" + sources."fast-deep-equal-1.1.0" + sources."har-validator-5.0.3" + sources."json-schema-traverse-0.3.1" sources."mz-2.5.0" + sources."oauth-sign-0.8.2" + sources."punycode-1.4.1" sources."regenerator-runtime-0.9.6" + sources."request-2.87.0" sources."source-map-support-0.4.6" + sources."tough-cookie-2.3.4" ]; }) sources."signal-exit-3.0.2" @@ -53824,7 +56802,7 @@ in }) sources."socks-1.1.10" sources."socks-proxy-agent-3.0.1" - sources."sonic-boom-0.5.0" + sources."sonic-boom-0.6.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" (sources."source-map-support-0.5.3" // { @@ -53840,7 +56818,6 @@ in sources."spdx-license-ids-3.0.0" sources."split-0.3.3" sources."split-string-3.1.0" - sources."split2-2.2.0" sources."sprintf-js-1.0.3" sources."sshpk-1.14.2" (sources."static-extend-0.1.2" // { @@ -53896,7 +56873,6 @@ in sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."through-2.3.8" - sources."through2-2.0.3" sources."thunkify-2.1.2" sources."timed-out-4.0.1" sources."tmp-0.0.33" @@ -53907,7 +56883,7 @@ in sources."to-regex-range-2.1.1" sources."toml-2.3.3" sources."tosource-1.0.0" - (sources."tough-cookie-2.3.4" // { + (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" ]; @@ -54118,10 +57094,10 @@ in sources."call-me-maybe-1.0.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.1" - sources."chardet-0.5.0" + sources."chardet-0.7.0" sources."ci-info-1.4.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -54227,7 +57203,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.0.1" + sources."external-editor-3.0.3" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -54309,7 +57285,7 @@ in sources."chardet-0.4.2" sources."external-editor-2.2.0" sources."inquirer-5.2.0" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" ]; }) sources."into-stream-3.1.0" @@ -54547,7 +57523,7 @@ in sources."root-check-1.0.0" sources."run-async-2.3.0" sources."rx-4.1.0" - sources."rxjs-6.2.2" + sources."rxjs-6.3.1" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" From bfb14fbe72037a5abf947649fd6a53ffdeb39e54 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 25 Aug 2018 19:40:26 +0200 Subject: [PATCH 023/600] thonny: init at 3.0.0b3 --- pkgs/applications/editors/thonny/default.nix | 43 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/editors/thonny/default.nix diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix new file mode 100644 index 000000000000..a4ea354ebf69 --- /dev/null +++ b/pkgs/applications/editors/thonny/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromBitbucket, python3 }: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "thonny"; + version = "3.0.0b3"; + + src = fetchFromBitbucket { + owner = "plas"; + repo = pname; + rev = "a511d4539c532b6dddf6d7f1586d30e1ac35bd86"; + sha256 = "1s3pp97r6p3j81idglnml4faxryk7saszxmv3gys1agdfj75qczr"; + }; + + propagatedBuildInputs = with python3.pkgs; [ jedi pyserial tkinter docutils pylint ]; + + preInstall = '' + export HOME=$(mktemp -d) + ''; + + preFixup = '' + wrapProgram "$out/bin/thonny" \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3.pkgs.jedi}) + ''; + + # Tests need a DISPLAY + doCheck = false; + + meta = with stdenv.lib; { + description = "Python IDE for beginners"; + longDescription = '' + Thonny is a Python IDE for beginners. It supports different ways + of stepping through the code, step-by-step expression + evaluation, detailed visualization of the call stack and a mode + for explaining the concepts of references and heap. + ''; + homepage = https://www.thonny.org/; + license = licenses.mit; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cce255e3728a..08e8ffabb7ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18736,6 +18736,8 @@ with pkgs; nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; + thonny = callPackage ../applications/editors/thonny { }; + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; libpng = libpng_apng; From 5e9aafb316c47ff96bd500c6310e7facb4afa3af Mon Sep 17 00:00:00 2001 From: Alexander Kahl Date: Tue, 4 Sep 2018 09:35:58 +0200 Subject: [PATCH 024/600] semodule-utils: init at 2.7 --- .../linux/semodule-utils/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/os-specific/linux/semodule-utils/default.nix diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix new file mode 100644 index 000000000000..10ba1a3c7d07 --- /dev/null +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, libsepol }: + +stdenv.mkDerivation rec { + name = "semodule-utils-${version}"; + version = "2.7"; + + inherit (libsepol) se_release se_url; + + src = fetchurl { + url = "${se_url}/${se_release}/${name}.tar.gz"; + sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch"; + }; + + buildInputs = [ libsepol ]; + + makeFlags = [ + "PREFIX=$(out)" + "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + ]; + + meta = with stdenv.lib; { + description = "SELinux policy core utilities (packaging additions)"; + license = licenses.gpl2; + inherit (libsepol.meta) homepage platforms; + maintainers = [ maintainers.e-user ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4ad53040523..4c21d085c77c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14510,6 +14510,8 @@ with pkgs; policycoreutils = callPackage ../os-specific/linux/policycoreutils { }; + semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; + powerdns = callPackage ../servers/dns/powerdns { }; dnsdist = callPackage ../servers/dns/dnsdist { }; From 9f3707d83aad3726e451ee11a18b7af52d3aeceb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Sep 2018 10:32:05 +0100 Subject: [PATCH 025/600] cargo-download: add Security build input on darwin --- .../package-management/cargo-download/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/cargo-download/default.nix b/pkgs/tools/package-management/cargo-download/default.nix index 3459f1db553c..398e007c3702 100644 --- a/pkgs/tools/package-management/cargo-download/default.nix +++ b/pkgs/tools/package-management/cargo-download/default.nix @@ -1,5 +1,11 @@ -{ lib, buildPlatform, buildRustCrate, fetchgit }: +{ stdenv, lib, fetchgit, darwin, buildPlatform +, buildRustCrate, defaultCrateOverrides }: ((import ./Cargo.nix { inherit lib buildPlatform buildRustCrate fetchgit; }).cargo_download {}).override { - + crateOverrides = defaultCrateOverrides // { + cargo-download = attrs: { + buildInputs = lib.optional stdenv.isDarwin + darwin.apple_sdk.frameworks.Security; + }; + }; } From 93a594715881e626a61488042a5796d253914f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 4 Sep 2018 11:37:54 +0200 Subject: [PATCH 026/600] mxnet: 1.1.0 -> 1.2.1 (#46026) Update and fix the build: - Perl is a build-time requirement. - Fix hardcoded /bin/bash invocation. --- .../science/math/mxnet/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index ce9c214b3f0c..a3043bcf6952 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchgit, cmake -, opencv, gtest, openblas, liblapack +{ stdenv, lib, fetchurl, bash, cmake +, opencv, gtest, openblas, liblapack, perl , cudaSupport ? false, cudatoolkit, nvidia_x11 , cudnnSupport ? false, cudnn }: @@ -8,16 +8,17 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { name = "mxnet-${version}"; - version = "1.1.0"; + version = "1.2.1"; - # Submodules needed - src = fetchgit { - url = "https://github.com/apache/incubator-mxnet"; - rev = "refs/tags/${version}"; - sha256 = "1qgns0c70a1gfyil96h17ms736nwdkp9kv496gvs9pkzqzvr6cpz"; + # Fetching from git does not work at the time (1.2.1) due to an + # incorrect hash in one of the submodules. The provided tarballs + # contain all necessary sources. + src = fetchurl { + url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; + sha256 = "053zbdgs4j8l79ipdz461zc7wyfbfcflmi5bw7lj2q08zm1glnb2"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ opencv gtest openblas liblapack ] ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] @@ -30,6 +31,11 @@ stdenv.mkDerivation rec { ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; + postPatch = '' + substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + installPhase = '' install -Dm755 libmxnet.so $out/lib/libmxnet.so cp -r ../include $out From 205f3e941a6fff6b8bb12fc20dfdd76ba3d64455 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 4 Sep 2018 09:24:38 +0000 Subject: [PATCH 027/600] swift-im: fix build with Qt 5.11 and split QtWebKit --- .../networking/instant-messengers/swift-im/default.nix | 4 +++- .../instant-messengers/swift-im/qt-5.11.patch | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index e3b3d7191892..8316c560b069 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; }; - patches = [ ./scons.patch ]; + patches = [ ./qt-5.11.patch ./scons.patch ]; nativeBuildInputs = [ pkgconfig qttools scons ]; @@ -28,6 +28,8 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" "-I${miniupnpc}/include/miniupnpc" + "-I${qtwebkit.dev}/include/QtWebKit" + "-I${qtwebkit.dev}/include/QtWebKitWidgets" ]; buildPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch new file mode 100644 index 000000000000..911e7570427f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch @@ -0,0 +1,10 @@ +--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h ++++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h +@@ -8,6 +8,7 @@ + + #include + ++#include + #include + + #include From 17b6efaf3d27c369df5d6dd66370d5251102fa94 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 4 Sep 2018 11:24:03 +0200 Subject: [PATCH 028/600] go_1_11: Only allow one of GOARM=5, 6 or 7 --- pkgs/development/compilers/go/1.11.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 55cc654b0aa9..237f74e319f7 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { else if stdenv.targetPlatform.isAarch32 then "arm" else if stdenv.targetPlatform.isAarch64 then "arm64" else throw "Unsupported system"; - GOARM = stdenv.targetPlatform.parsed.cpu.version or ""; + GOARM = toString (stdenv.lib.intersectLists [(stdenv.targetPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; From 61df695f65fe3102536f152c36cca45753f303d6 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Sep 2018 19:27:19 +0900 Subject: [PATCH 029/600] khal: add zsh completion --- pkgs/applications/misc/khal/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index ede85aeada5a..f9c929c21bfb 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -46,6 +46,10 @@ in with python.pkgs; buildPythonApplication rec { nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ]; checkInputs = [ pytest ]; + postInstall = '' + install -D misc/__khal $out/share/zsh/site-functions/__khal + ''; + checkPhase = '' py.test ''; From 4295e225f568a61836bcb89e92aa27cbdcd4f19f Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 4 Sep 2018 13:30:07 +0200 Subject: [PATCH 030/600] libvmi: fix libxenctrl dynamic loading (#45865) libvmi uses dlopen() to only require libxenctrl if the Xen hypervisor is used, which failed because libxenctrl could not be found. Add xen libraries to libvmi's RUNPATH using patchelf. --- pkgs/development/libraries/libvmi/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 28cfe56d59b8..44b2a81b2d3c 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -15,6 +15,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libvmi-${version}"; version = "0.12.0"; + libVersion = "0.0.12"; src = fetchFromGitHub { owner = "libvmi"; @@ -28,6 +29,13 @@ stdenv.mkDerivation rec { configureFlags = optional (!xenSupport) "--disable-xen"; + # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here + postFixup = optionalString xenSupport '' + libvmi="$out/lib/libvmi.so.${libVersion}" + oldrpath=$(patchelf --print-rpath "$libvmi") + patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi" + ''; + meta = with stdenv.lib; { homepage = "http://libvmi.com/"; description = "A C library for virtual machine introspection"; From e65617d8238d647fcd63938a8fbad9a7ed9de7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 4 Sep 2018 08:44:21 -0300 Subject: [PATCH 031/600] deepin-shortcut-viewer: init at 1.3.5 --- .../deepin/deepin-shortcut-viewer/default.nix | 37 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 38 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix new file mode 100644 index 000000000000..1bb112b76f6e --- /dev/null +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, + qt5integration +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-shortcut-viewer"; + version = "1.3.5"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "13vz8kjdqkrhgpvdgrvwn62vwzbyqp88hjm5m4rcqg3bh56709ma"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + ]; + + buildInputs = [ + dtkcore + dtkwidget + qt5integration + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Pop-up shortcut viewer for Deepin applications"; + homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 15e108a651aa..d8fc63e4f912 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -8,6 +8,7 @@ let deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; deepin-icon-theme = callPackage ./deepin-icon-theme { }; deepin-menu = callPackage ./deepin-menu { }; + deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-terminal = callPackage ./deepin-terminal { inherit (pkgs.gnome3) libgee vte; wnck = pkgs.libwnck3; From b99077f5b13860f1fed05c69fa71d7e0a0379cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 4 Sep 2018 08:45:16 -0300 Subject: [PATCH 032/600] deepin-terminal: add dependency on deepin-shortcut-viewer; enable parallel building --- .../deepin/deepin-terminal/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 2ce7885807ac..26146b8ab477 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, - json-glib, gobjectIntrospection, deepin-menu }: + json-glib, gobjectIntrospection, deepin-menu, deepin-shortcut-viewer +}: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; @@ -27,12 +28,27 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig vala cmake ninja gettext - # For setup hook - gobjectIntrospection + pkgconfig + vala + cmake + ninja + gettext + gobjectIntrospection # For setup hook ]; - buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib deepin-menu ]; + buildInputs = [ + gtk3 + vte + libgee + wnck + librsvg + libsecret + json-glib + deepin-menu + deepin-shortcut-viewer + ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "The default terminal emulation for Deepin"; From 12723b105cc6b2a07ab0ad70dd8f1cf60dfd8f86 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 4 Sep 2018 21:13:35 +0900 Subject: [PATCH 033/600] firefox-bin: 61.0.2 -> 62.0 --- .../browsers/firefox-bin/release_sources.nix | 796 +++++++++--------- 1 file changed, 403 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 13808fca99fe..594cf175e9eb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,995 @@ { - version = "61.0.2"; + version = "62.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ach/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ach/firefox-62.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "572696944414358a50dcf8e647f22f4d3172bf5ac846cd29bcb4baeb0ac5a351f361632ee87dacc1214633848f9970f93cbb25a6e9cfbd9ee796e30e06f34715"; + sha512 = "68a0802cccd72ffd36bc9188fb96b819b6357b889630173294f92af4dcf719389d678232b986ff6aeb258d2cd149d670d70c2bc90309dc61fb359b1d3011cc6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/af/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/af/firefox-62.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "dc4b22a8df99c3519f3a8001d0bdbcfdf4fc5d4dd13d18bd15892fb29e928126d46e2ccb9b512dca0c5395852a3c918a5aacd2b9a7b7f2cdb982052e915d5413"; + sha512 = "afdb463bc4bb5f0f3ba95a0af9430d5407a707b7cdd181c44ba0d343230d75e16a3078bc1f412dce8248991b8e752480be885355e394c1e4a4465c7c1929075e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/an/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/an/firefox-62.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "2d57784a18278bac69c08e81fafbdc3530d17a112d3f1e7d407e2590935c87058641498c74300950d3f151bf5fd67065133d91c83e1e500c72b60ebc91a4572d"; + sha512 = "c54b5365a97c44559aeac1c50a5d22250eabb94180987e3745bc875e7f2d7a843fd1282946cf5f27e53f4e0e6958a00376e6f761333e9bd5fd9ae7f6c081e1a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ar/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ar/firefox-62.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "e397f8d276c115105afcbab6fb71afd7bcc93778e79ec86a4274e10a6a039ad3107cbaabc9dd4bd197ce6be7add3cc0af954f029c179a6972ad2ba15ff2e3eb9"; + sha512 = "08d5c5aefa22408c15a44646ef1b82ec3100a8bd69beb68a1d34029d2b0b554e110092ea5ee905bd866393cf506cd658591bba2e6f670943b21187015d99a836"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/as/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/as/firefox-62.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "9869e76e004c1e77d976f01f9a4cafe29c253ad3c85b1119d67a65c784b5f65dd7a4927ccd535ee80fd63a6a47127e614478effbd0455a227e200ca31c846acb"; + sha512 = "c403ca739506adc934e3453bff0e282ed514580895dcab70d41ac92499feabaa0d811a821b4441b988a3c12320735794d891620e06c8f081f13882f3bb6a56e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ast/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ast/firefox-62.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "5b298cce253df9c8a072fdc93df894fdb4218c720ded3260f282c711270086104eca08e2d5afe1be4960beb274017eb4e0ae7313ceb5d6e596d0591f026f78fc"; + sha512 = "8d0e1c648c9eb8ddf8987360be83238eb6daf578f090687071ad5a63ff76028ebb4a988115a8ff9f7c40dc3522f06b4f79626f2ec8371040c76501457b93bcc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/az/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/az/firefox-62.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "cd8df2a19e10d5445ac0970814ad245e25f6ea695ec9590344c1a4e261b6fd7d15534028f6a8abf1943fb97f0e127ed55774e2cc2bf7cf85be525503bbb69f1e"; + sha512 = "2cc58aa3833572ae3a97e0d2b70caf19f5429d360da8d3587399a3ef71b48bd1565b0a6eb560c032c45984930e74ad072ca6806686a18cbd7a0ee24805524a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/be/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/be/firefox-62.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "94947ee7b7477b467016cd21daa8134bf28ab289ea29c0905e04291b7560da895124be2ab7403d2b9874291b7e33f5a92d36f9c0ed9d58ccc3306ecd7723305c"; + sha512 = "fa196010cf483c3f8a4bf63934cb54f543fd00bf8cee45d76aac29675a2b95757f687f8584e7f9122fa1e82b007aa13ef06f0c8fed7dcdea059223f3607db0ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bg/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bg/firefox-62.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "9b0bce62c85282c79708245fa792207dccd7bf939ebc23ddb2e6bb7bc3f6fdbfdeecf69d1ba599b2ec8d10fe2d79bab5dd229cf9fa7b79e076797267df39c54b"; + sha512 = "e0f107ab8248ee3e1bdb30ed081e415f03dba9068599f9596706dc4fb907be7737a9f2378e347aeedd667f2526a5b5753c4f35b004da6db6dfc9ca1593e9c91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-BD/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bn-BD/firefox-62.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "4de95899462eafed03464fd054b7ee12cf53d004fbcb58ad18bd462e57f5c50c31d3b50f689a7d54f973228a2877e6c77c47740280daf7d6db4f7ba5988b9484"; + sha512 = "794d93fa5bc61186b3cc1d7866a13d155420d6f829e9b20377c8bd8ed66418b92eac08e843170893a23249fefd7fb4c5a93df89fc9249b8de00ad803b9aad0ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bn-IN/firefox-62.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "2ecbf2ae7d1296dcfd6e2268dbc27060ce07bb4b3d9d62f6bf27fc8874f114dfcca73672adb4d411d2c1eca7ffac22f7832bc5cdad12a492c3bc4406e3a6746a"; + sha512 = "1ba17cf852e267f1adf9192d0081e03b7d96f4a23cb83ff1a67f31d7340b234037a6def0c821fb4a872fd011999b14b464a3041d308cf5135382c2164f9832c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/br/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/br/firefox-62.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "a92abcb1aaec11ae3b0eee75b5b5610157f8ca64627a20018925431ac09cc4295d14357e63ea0fa2b66bb415039c659f53292b8133558d591a16cbb5772f875f"; + sha512 = "7ff933244cabb95fbdad1a64ae900f6fd694dacf1d76621865b4a2066624c31f0686c4dff53add7523749d6f5befe6ec7bbf0160e426e1a02457f8d3d5e15016"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bs/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bs/firefox-62.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "15dda8914e02198a9b6efdf0ba9dd4f37e41ec7c6674b8b32189ccc368ab6ee671e401cd668c5ed57157634220c176be543c277342e708baf7b0110cbbb4fe64"; + sha512 = "dfd9a7b8f2f355f274dca7941349512339aeaa9da4412681a4e933cf0e1e9396d57d60887fca59c341e70496dd7073647794fbb4c8bcd1abd7b5062ee6809b53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ca/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ca/firefox-62.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "230591cd45dd9d3644313b96ea304d33e9c87d6968c37b73ac3c701132bf13a3869672317b135f31d8082f39298c978c07d614f5055555ba9079afc6e17a489e"; + sha512 = "3785649ca22ab7882f751d0c2223589b7c8b5fa04bb0786ba5f64be405ba89a665244e7f4882d77a85569c46da9f6bc1d3fc95f0ff77e57f02cb8a7dc22f5b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cak/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cak/firefox-62.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "c622e622cc199b8a9946276afdf03f006403bd302d2c62a5076403e6764dfdcd121c1e15fc56d45bdb1751131326babdc9be96e6425fcab9e55d6c689e5959ca"; + sha512 = "e367d02bf8c743f7a5c42b6ca19521813ba31f6a6525f4fbd4ecf418c9927a083d218ded1ae8b11084d4cc5707f97312b327a40735d638e1d3ea07056dce7070"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cs/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cs/firefox-62.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "8e4d452a75befcb6c2a6e7ed0b4b1aaa8f18d4d61302ddf6b8143e024352a060621c375742748db5981efecb8075268f56811702586189a116698a669408dee2"; + sha512 = "cfa21baf935d6e325b6ea13d19796ae7adb51bfa6923f7f13e5138628f8064154bbfc5a4a0131a147383b2bf723e1abc46a79b698b2682602faa9a8f80b5e6cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cy/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cy/firefox-62.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "349f73f43be8dad527549ff158b267c62be7c0d828c2adcfc635e419ac9840076549a7a51396b306bc042d1d7697c8d6caea3bf0b4e3f42e7c0efbd5b8d92e1e"; + sha512 = "0a9ad3a8ba02b863194fe4ba347be568fdb92bd72352251220f673349b77ebdb2b2c6e828e98c1c757fe3d4484783528e5f0129ae994a2f0226a17040a2f8c7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/da/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/da/firefox-62.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "187bec61e1218fa6c2fe79b3e80066a617ee3c26f83aa16b61a21e3fc76a64c2c821120f9206240642dd10175b6976c352b13a5b2e5514126a3840524fdd1de6"; + sha512 = "21ce01d959f36084dacdcd52cd26440a67e724c79361ed1897371fe4b33a853c72fc4feec6fee446ef47c1ce29c4a88392266bfca08189f1d99127ca637b8be1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/de/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/de/firefox-62.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "8aaa8aeecf1a2dff922b785ed3a4cbf248454cf010ea9c188a4ac70f0550813944a8e9265c2edb13bdbdfbe20ec5a0dda3168d2dcd529d082bafcfaef6271913"; + sha512 = "cae69bd2193db9888ed3a415ed7147dc3002c05029a6cf3e7a010259919dfb0f209055b20e259459f008b99317a215cf6962ab173fac0f1e57c86341571d0eae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/dsb/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/dsb/firefox-62.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c821eae950e48de43580c9dd4af7fc609927e3fd27ea876fca909bb3319574663120688e442ba83acf1d273e1fd22a87d0cd934e68151edd9a8561015e58a47c"; + sha512 = "4583f05b675973a2818b06baf771474b7bff9ec741c2e606cce13f6e4b153f92fadfb0c15d91c4a25d492a38fc3c48180cb6c7ea5e433aa774a9fffe26f4e593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/el/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/el/firefox-62.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "afa286bd1ac48a6007b6e5072bce0a26482a0eefdb00aee824de8c4dd06688d16731252933cb71b9f3bf6d30f951c6df68c2ede85733edc81facbb628118c72c"; + sha512 = "4419885f9b6510edbf2797a047a08c97008731ce4fad19cda1fde4ab70b8912c9aa96df533f9b138d843303e549baa30ff9338bd9531b3044bdcc521cff14678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-GB/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-CA/firefox-62.0.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha512 = "86cf4dda9c21faea5d5031f423c7badb1876b225ad618fa8c1dd49803d65aec1032bedfded3278dc19d84c1f88688cd4ba31a27ad6f706ad55e9b407e3151f9a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-GB/firefox-62.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "c2ca0c9a72503ac5817ed9ff3736b812005037c51534ef9a159b7914b974a356f3f1bc89d0669d05bde8dde124f2fcc3ff3a91cb412ec0329c2e6def875219fc"; + sha512 = "278d00ec48c2d88d3aa5bedbc9443e82f367a2c9f8261f624eef42fcbfb83d74a3f35d6ad450ef3974ca8a19f7e654c93c40c1941264a2372fafdbb803c08f40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-US/firefox-62.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "9f32b33727e5877bfdeb186420a02f185896a2a5803565a811203d86e84d51ede06f27d63a88a482028c36b65ed92ac4c17196aa2069370d6cae09b74bf482a5"; + sha512 = "f4dfc51d6c8f9ccac869691ea4efb0f5fd8257d661698dba4eb7cc9fb7d28314e00a09ec595d424186cc928c8a6f9f93af0efcb3651eaa4fa40f81cfda73770d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-ZA/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-ZA/firefox-62.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "e41b7ea34f193bbcd892030b5feb2f117bb5f3f9dfbe69560ea64b7936bcdc47a55e878c645786999a2e52c4333c033320eb1ed9aace3481a9f37d87c9ae9ccb"; + sha512 = "f6036fe984da3057e76d324c76a2cfb17903d73f3e6bc7884338bb0ef0f9f68ef69e94ee93331f81e17a8eacc40827263c74e5aeb9a70420c7cf0670a205c61c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eo/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/eo/firefox-62.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e0850feb028cf0644340d2842b054e49608cdc1afbb9487ee744f6fe1ce0662874f0f96de2da52de2e0abbe39d7ea430efc70392d555e7cbff7a46f9029ba9fd"; + sha512 = "011a742e57cdc2134115ea294782716bdc49ac4d2d7b06bfed048f75d18a5780cb93a16cd0ec6b8017e6b8299a5b260015adfcb3f093883703ed9403768555f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-AR/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-AR/firefox-62.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "72bde05493e4c140f6022e24cccf0ca580ed3c423840d2631cb28ce8a20be92837f78cfaa3b09a324bbc0fcb064ced351fc66a0edf2c56d972f629aed6662dcb"; + sha512 = "f86be240d21d47eda8bb04ff6b502ccee3c94afd6763239c5a79e094532facb8e8beefdf024c089d35ecffbd687febde5a4f10f362fd3c4d71bdabdc3ef1ce04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-CL/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-CL/firefox-62.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "4bb298e184263edff9100e1e7f58cbbd405dbc73a265a5dc1d78e8cd25e538d34ef0994b6b5e79082fc12f1c0b2035c944e17eccaa7e1bd92eee8d27d8f50400"; + sha512 = "e6be4bff771e5c64d35fdce320fcd80283c964e16fa938824adfa6dff9c69c721ee9184a1f37de86ac42f730ebc7b4c8355d151306e761bc96308868d6d349a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-ES/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-ES/firefox-62.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "13d7f54f7899eda53add9dc4a1bc27fd30e0caaa9c5a95d716c1ef8382c2317733cc7a71aba9aa4f2a024717eeb09be7fdd55dbf6183d1679e61e3b57964e61e"; + sha512 = "32473438f9d39f53249faef39e467546db58b3dce905cc1f4c0250b5fcf5ff2eb671baef0ab179b27ea47bd85bc5684f9bd4846c785f2454076035711642a7d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-MX/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-MX/firefox-62.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "66c24cd9a80da6137a94bf9cf2bad4ad3ef0141bc10c8d92435f9d89e11712afc08018d7e1b4f17fe03e4ac62b2f6ed1cec638dc7d0726bf27453e1741a1ba06"; + sha512 = "e81563bd3cc51241b129f084d4d9f5e8b7f34c1f5517f041bbf6992b50e0ad4fdf33fb36f0d1cc22d2bf9eb0bcbd0515a1b21b5cbb8d084cadd0f5d9d80c7b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/et/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/et/firefox-62.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "a7a686b1e16b616a3aff8901148a2818cbbe2459851660a23610ddfb4b8109aac159fe80986744bdc4124a10ab160d2703b2e8f65def0c86977bfa3fcb3ab020"; + sha512 = "5827c7dac8e12610e731e92128ed66f8f107c19de99937a730e7439b26dc404cf518145467cb702fb395d9cb3a0f4ad45c92484ffb053d88dc7ac858781f4ed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eu/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/eu/firefox-62.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "0760621f5d053fb802a46151f6283fb7a0b7de5c22ba0a55ae0f3056b0d43cf16c6da79af8a2217a665825a840b9c83134128f455dfe6e83f473290e425ad396"; + sha512 = "c59ad7413f47ac19e9cd3a267150066099f561a455913714a18afd1b0e284202364f009cbe0361f5941b96d57b43c3d7d778235c9b9123133f864e75479556da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fa/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fa/firefox-62.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "29e8466e754900b63704206b5b650ea60aea841aebfa58187013a495a95dd32d939308253b0f856ef5e04d3ddf320c289e74cb03830a16374e9fe2c03214a1b4"; + sha512 = "fc3a1caac599a418ab0ce2208fa921dd40912e80ff075bf7d90ef64379057e83332483c1a7a44dece95a38be523d0ea2f92a57b45c300f032b174dde4812e5f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ff/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ff/firefox-62.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "240232a8dd4556c5c4df872b60b3352176490b7afd4388c26322008c7dca489f48f679c21d148016965ea81d850eaffe9fb7887b97cbbbac955f9cc29f28b4f6"; + sha512 = "629c2b79571980bfdbf9bece6760d1553cc002f91f26fe46d58d4fa5040f437b6a8b9b6ff41cdcb3d615c479c66a17d87d878fca65025070a31073165098ed26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fi/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fi/firefox-62.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "63c7d4ede5e02c9d4b2e59234b57d4f539c0cd3666a053b127cc18d080900bcf488f8d3d7f2dfb98399a1cec5ec6780d86d93ad9dd2ce7612e84604481562a64"; + sha512 = "4393019f9dec44bc62985d84f95585de0a26736a923f873b92d87f7d46d11f8f3e8af53812696ed4d312fad51c3bdd34026cd7ef933fd047f771441245b30213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fr/firefox-62.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3a4263e78c62faaab850c743660e633269dd9e625f03f94459b34ede41989cbaf498755fb8c2f507e4f4b88b633c29a3eae837ffce0572ee03afdf67c53d4ed1"; + sha512 = "9d9afd43288fe6719b8d4f76c4542a26dd4b36376abcc8a0d8111c701bf397345451ccec5bc5ed1f2c2927549c62a429d4d97470d850d0c83ef8362c40531f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fy-NL/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fy-NL/firefox-62.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "e8c7760f3f64b4c525bd0521cb66ed11bdd9142deee986fd6a5f6a322685633aa3539f819e3ec886884906998d37dd6401b77e4790a246cd098c47cd49f929d3"; + sha512 = "12050decaa38a27ead08d67130d43ba36666728d3920cf40ad2dc0eb18de6a204e81dfff72cc0a33022b0d96097ec83fb36c88b463707f04669e5c907b8cac15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ga-IE/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ga-IE/firefox-62.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8f59620f30767cd58babc163b803b2c8b174562e5a6a686c5a586d24db0da4c4ecf180c13673a6a434faee02c2b7ef746c1f10e45055d42327044a945925e514"; + sha512 = "fb028d4b55cb5758eddb89a506b68d322c758d2e8ce01151a30678dd01c4ce625c9a051650a2e115705dbe02967f0db5894a4476d6460ff08313d4767dad9b7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gd/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gd/firefox-62.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ba496ad0daec76e2c6e4f3c2dbb8219d1f3234893acb09602e51b7bfab4ef84d9f49104a021b206ff528bb323e2255c97e92a6949b3949098e5863f48e9fefa7"; + sha512 = "a1173104e4be1fdb6cf3a0c8c997075d40e5eb950dc2482107b5795adb2590575c1c79f50daca87227de6426f4ad9d756233f95a0ddd3aa6e949ab773d319db2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gl/firefox-62.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "3ef33eda5d7a88fb6f67f91983ab2db11404f58686ecbe30dcbc27dd1358660b4c88ab8e678184cdd3fd4102f93120e0d0a4d75435812b047ec2bcb74cb52a83"; + sha512 = "b6b46ec64e4386c9196d1f5362674667e46b5006b756cdc164e6c1c42ebff417c57cacceee949d2e9a5f55c76b82471ed9cfa01cbddd8ab74d6669c6870864d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gn/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gn/firefox-62.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "5e86c34b627b66872a7f07e30ee6285e61d041e69b0e2355eec142b23ceac8ea5ef7e257adfd1ae877b442f7171381cb013fddd7593d1b6e42f3a22e2267a5df"; + sha512 = "3c35f52d34d57dfbfe43d8df6be4f04bc10c79b3b9e08949525a503952ebecb90e59d99565c44adf25addff6f713088bce3034513eea3108a37c02b0921e2f01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gu-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gu-IN/firefox-62.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "72e43c4dbc3db08473d96d0686fa2df56f82ebdbee064a152ebb2a49cb4fa7a9a80135fa9b7106ffdb64d3342b38400de5351a3b225360d5a730f0f4991418f3"; + sha512 = "0bdaed369d5318c59b929193686960ea2ed2173027c2cdb0384936d724585a9f8db058cd00d5a9d4b5ff8182a59c65066a9daf70e1e0b0d6013b3753e6f36adf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/he/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/he/firefox-62.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "d3b5a43aff6e76264eec6d211a5a9dd0b7fb89e41bbb265f31091ce3261f4a160e1ddaf59432bc3771bc5afacf1a3e12e42e0d08107727b0e8b5941ff29174c6"; + sha512 = "07074488f2b83055b66300b357e8fd4cd94dea52c359227cf33908a0abdfcf1bb969dbc8d00454c42e5b83f35651aadfd8492507deb5a229d3e70b329753a86d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hi-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hi-IN/firefox-62.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7b568bad470b3fa069b44bc0d69fbae51408ab44751a99fc36a7c220548d0200ec57d8362dbe1dca7370e587d5aadb45b5c9dc91e6d267f2421fe5a2260d29fa"; + sha512 = "8e6b126bbd13b6ca9ecdf088a049e28328942c5153937198b851ddfdf1705211a03c6dbe71e95b3afd8f7d3889705d2c6a1bb0b135e34ba389830cff519dfbf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hr/firefox-62.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c69df1a2226a967dbc0cbd3813ced6ae36b696389187489ec62b78b3180800175d3c33b07bc84c45112947348e160cbcd6db2e68d5e4b6f07e0a2f6adfc8fd2a"; + sha512 = "d1c36d8cff63d070a827d24d3e95a823a1e302cd42a48ec50edd34ca3f76678f65897f060ff5365a677525e938baca6df512f27b0fa039eac6b78fcfd347b440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hsb/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hsb/firefox-62.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "080ad8f1bf263f96294e3e6178dd64d30a7fda50d229081b14e54bfaa183c6efeb0ba3aa66cd23c8541a622382e415a12e3e063cb3aace5619d3c8c212ea3078"; + sha512 = "384393359093655a50c6052cf25ba413fcc02000685fc6e97f15e3668cd93421dfd3fe95d266bd4ae5e687105ce7a4c364aef92faec9a5c01f6f5336c134fa21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hu/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hu/firefox-62.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "44f07968bb89c3c0e2d365f9cfd45d89b138a269cdff48542124a34f9d9ba9df5103e4613934c504f90b494fe20bbc6f71a12c210799e689e8f69405ea22e4a1"; + sha512 = "05c76472230f7ca011fd5f936568b50cfb646ce7efdde65d1640f0d4ccb31196873a8e5aa32ca6bc796e80400d52ea4c191e334270c04ed92354b6744ff4cb50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hy-AM/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hy-AM/firefox-62.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "8d3ee8a030ad60ae2de062b21437e8d512ff3feaf614b91da71ff6af9d3994be79aab1753e3d46a94237d7e0a49eb670781c2567f96662b6057ee7172a0363c7"; + sha512 = "cd3f20095f0c31e20fb383089141f1aa22ba8f8e7734370fd377ba900cb71ba1f2e76e196bf30cf3e3a8139bd667575d139b03969ca3ceb3f2e1c231e70431bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ia/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ia/firefox-62.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "448e543b5f7075e2e1b984c808dded1ee67dcefb600058635c87d0c226eb02aa8dd7f59c624ebec60c9c0b334f98607eba88e111f2b03a1aa579b74b1398511e"; + sha512 = "834d2f397c3eefa2da5b184dcb4537ff28d26ade5ba985f916c4921473774d79a63cc97f3c72e49e19f37b4285a6efbc0bfd8ca78159b4a9e643027fbc4fc830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/id/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/id/firefox-62.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a1f8eceb53485ac41a685f98b1e9dcf57ac094c0911ed8f9a862d4b3a5fa8072c16fa6a4cef3e06d15b07b3866397fcf9ead7b4b43143e0f5dccf93acb2f7676"; + sha512 = "25b18c83fa9899f54a6fea9c617582c06b6ace769deb95e2ee6d1f3f4d32ce1654041605072096fb434c483b2f47913a35b4cdf392989db108f48ac9376d62ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/is/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/is/firefox-62.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "43d6ff785394bdfb6c376588531a9fe043b18fe44ae83f481b11d71a2422b5d5022356cf960d92f55fb3d0ee103e6534bc0299a3d84e9ca7e6b3a5544e11ad45"; + sha512 = "596a5ae84a71ee3a5f1ba4896b794cd103d2bce08a505faa38ea6df9cdc5380d7b97b2c4b3c80cb525007bc2f08dfa2bccc2634a135e653c79b913c1624f56ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/it/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/it/firefox-62.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "460385b5854565f4ca33431c573ac355baddd7a35a2fbf631b3748b02102a749e56fb1128ec3e9f6b721b1123578060641bc3b783ece271a1708656626b10a13"; + sha512 = "46bb6c5d0e575acdd510b72375677fefc3feba3c7ca2d1ad4a84f82ebfb3e7d14a9b419964850f6b640adad0970b105b3ae45bdee4a8a47200c5ac7f290c204e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ja/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ja/firefox-62.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "682430030d87391692170bc81d759d806f4667b66b4e3df84e836e65678f274720038d0556f5338d8eb18e281b64249e758b5265b3ce30e6f272ca9d84ac1496"; + sha512 = "031a4aebd4d676f724c95812dab0fa4ca289fe4144417ffb28c6c4579580666bfa690737f544a3b09f5e07c7661200c334c4a336ea45700b6e8fbf5bbe5cd81c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ka/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ka/firefox-62.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "e8c9e6a61867efdb9d021aaa8f059e3ac9896444448b08b7d90f70fb2847d46d1950a24e6fa2db0b947cf3ec628bba1c230ee7d8d53a959928122018a9e5c7da"; + sha512 = "14979e42ecff3c9005fd229a5516d36a72958ef810766a64963c2a6028c31e0717ca9079abe6103ece951c5ade140adbd35227dcb73c6101a145f1bc9e241721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kab/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kab/firefox-62.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "17636e7157d6cf3ab73b7e36eeb7ad5bcc35e756fe6d369b98305c58b88208b5b11f673f52425363425d18c2a7fe79274a6e5babeb926adc9cea22afe3e55e5a"; + sha512 = "16189c288a8807afc94b1d781a3afad833a52c16ad8a805787b7ba5603ed6988bffe34d9c9a98ea3db0eda25341ff24430ab68b59a1cf9724bd16246a52c1847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kk/firefox-62.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "4eeb48f250c617ea8eefd99fb44159170311becc229f77ca014e801594260ea23ce46ae11e0526ad620dd830b857b73de8a3a90c18764ab2a8f71cebfecfa143"; + sha512 = "c4a35a83e41df1149c1ab38d8f243753865a50d6d896b89499bee42db45c8237b9b8d6599fb3c932717977c5e460ce7adc6c93d561fa69a4704e1931fc11d21f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/km/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/km/firefox-62.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "57a0bb58ced30d8743c30d288250328568758674e55127d51e99485f5c85e8b0b300aeeec4d34526f53d1d538189b75925eb907e3b5fb2d455e0546e179dfe04"; + sha512 = "dadea116c3bce18f18f2bfb3652ee1d26b3cd11442b8e941565772d202d2a8a2e7d6277a1737f39c63947b2972ed8a84680b4c7dc351563c5ff11abeebd6205f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kn/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kn/firefox-62.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "c40e9f5906cf3968bc92932f45d4d0b712322e6efd9a5d1f3b48a7b94a162c6390142081a8a4fd2f0fb8737869723432eeb5a4b44c3161aa38a4d506bff8a3d8"; + sha512 = "dd6109e92bdc9a7b3c8e08d9e104691a1ee449f9f915b5a4090ca471089ea000da34dda44883f10f72f4a5ca21078263663444a413ab1f1e7599f85f01f3700a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ko/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ko/firefox-62.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3f6104ed9b2fb9f1b0e3f49b06aaaf513ecf7e31b417af90c11403bca7a3ad51a87b448fa0a2ae6a01462b57dfd21f90376421ca8cd9ea62b0e3a1c7462aa9db"; + sha512 = "1dc4383f48dc1aedb80c373398a5539649397f1660664181c97ecfaa17eac2c503a976ae15b1e7607a83ed90e3b4f6c3b15d1bd60e13e22b8f071d91d373fab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lij/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lij/firefox-62.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "46c8eb64b30455ed97618d67215510b22acb6cf5946ba492c5938d879e656d983accfcd7ff2e93cebe7ea5a52e9fca348ebb9ba02e70ffb4196a9d9edf5abc51"; + sha512 = "a26d5e50807efe3d4e3e01d10b0131ecbde0ef141f13310db4b01adcbac63d003db073ee24620745ab551ecba92965a5055e553b31fcfbd2df9af0a8913c7823"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lt/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lt/firefox-62.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "54470adc31bdab9745f72598d402fc961d6b407b6f8fabc8e0c6b785a5a5f3e9922e06a922688c6bd1ba43be81ed37bbab216fe2182bdd0b32befabc55fa1a48"; + sha512 = "dd99282b5eea3a1e4518644acdd9bebdcb1532cde148f8c60fc83177fd39757e98e7fe3cc54c681305c699a085788a14cd44e93e5f10e11a6812afae10b2db8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lv/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lv/firefox-62.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "376ded474c9c8a898bab54b66a4a9e9cb598dee114d9a156b9e7fb925250511e610d2e17a5decf4c2db44f227065cb2840265d6955364a1405060ff022b04d07"; + sha512 = "4be6a61d0ccf424ced36aad978f6419d00afb3db93751c1cd9f6d1ec0c2db8530e77099efbdd8883b333fc2dcb315143088423c359debdc7da5808853aa99268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mai/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mai/firefox-62.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "21643b1b723a42d81bb4476b16282d2550100278a221b5538d5666c8fd7f3e96f242393c4b175cf6431e82458e199fa80a51ef0f5bd6a9b691d0150bf1d4c8c6"; + sha512 = "71aa1872d28a5f741df79e4f1490b110fd9bc13e9f6c4f2aea8d5028b434d02f0bff859613dcac258e0af7e8840b5a5b37fe80eb6d94d4712e83b96d971a46bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mk/firefox-62.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "452571329b805586a1218dd5fcd5b48f7f20fc914ba006441ec3642ef8653537b764a98b7916c0e440888d60d41b290826114c3a37083ec098fcd6c86a6adc15"; + sha512 = "5b9e7e8f865675c0488fb9f7e965dc37b35ff53f0ab84c3cc0d37f9baab0084bf5981e4a1dc65557a02f83de7a92302c5cc72c7c25c20baa484fc6abc552c279"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ml/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ml/firefox-62.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "8d2c850525f9ffab96c4d02908440a9a5f4b6fffc49e5505d5eb33d35d3690fd7a81ef73aac810d0c52e0deca5b69dff9eb3f0eaf508b7c866442943f7cf9547"; + sha512 = "d3ea17e668e021f9f002d775df1117c51e7b5bd92780b014bbdd869f93e50400e290a35e4f056c4ce8a235fc2851b630d24ddb3b8e6ccce7c21b65a94fe9816b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mr/firefox-62.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "1eedeaa3a2b6362c460e468b28bf7efc9bb5c960c766ec9f0e423834aaa67248c5bea0fe9b4fc0a8e62b0a40d8dfd1e7ff31adfebf6d1d6405daa02879977015"; + sha512 = "9022898d857eae94054ed357cc5d06bae72ea38fe2f1efb6d09baa6b18d55cb8a75a5c0f2b312458366e2146b36d12407373e8862278ef348e588a893c068a17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ms/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ms/firefox-62.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "fe2d5ae09b8921d366616eaee49c240ff529050e1b3f97c915d91c23dd67b22d78a75e14e2f192963f0fcb05eb812da2c5f68313599111d85c1abc0ac9dbb676"; + sha512 = "c81f40e528ec7f141de902432f1f367023a39889794a46de8b271e9c4bebcfbb4b6124dc8e0b86c560214c493d650389829a04c3f4a4d121b3243ae66092a100"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/my/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/my/firefox-62.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "631a6059d38a64c24e1f7d2b9a27aa2e405fe413471ac1e1d7ab337f614df9a1470a091de35904c39664d679c06eaddcd239c4a392c1e2ee548ce0be7fd5e416"; + sha512 = "ba942bcab35045de32a2d7914bf7f953dd1f683ff0d142246035df830d4528b47f195b8a6b96c95b62e2d03e89215c938072ae23b19af41bbbbc40bed3d0212e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nb-NO/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nb-NO/firefox-62.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "90d0c3c696ada86b47e9a6ce8aa9a8d0939eedf5746ccef79ae170a935e6b97906b187d7839af158a6008a9022cc50467febaf0617f3a3b1e8e21fd648805d13"; + sha512 = "dc86c87a0e51105bd89ee579711aea9e61904f17afae27236ad12bf754831dd592f9ef938ab35d037b2da884aa301044eb71462a6c4ad26af97e9911e6356bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ne-NP/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ne-NP/firefox-62.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b5e13e214cbea0d541aa8c29d53afa4ae952970a64bb5695be62ce19c829df901dba4c66cfd03d5d3a31f69041c9c700553b2689dcc4ac4ef254d155700bf5fc"; + sha512 = "9bb1e18c015696ee9b17853a942537bf462101e687107771d34c4f62d3cb3f7d9debbbba9efdcf7acafd8a9f8c4f8c197b2df15c80b9c5a562ca1ee765867b3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nl/firefox-62.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "44470b1cc4e95a05b4198ac3458125651de9bf9548dcfbcab5850c519fea01a3e8c6161e4a66271af68d7f1a1b37456d2ae1e51ca890307e6185a531c8cbfe74"; + sha512 = "2fa2082a1a9cd71f0ae7019507055e6109292bdacc9ad4c860aa5ca9ea6896c37609a083981df309d2c53811674261147053ee6247908ec1ce7a2e030d320443"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nn-NO/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nn-NO/firefox-62.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5e49d30ed8fb64e367ea3f5b472baf0caff6c4b880d811cba5db969d21f8e5dd0d8ae4c01a151fd495eab1eef817b35b6a6e14441a860059b8f20453dbe86116"; + sha512 = "4665302f9850b93c4cf178c3e2397e299716ccf92e4fbec9762892b17960f275c1167396de4073b899d4bdbd73bf06f87f10c36be7eda22934faaaa78925e8dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/oc/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/oc/firefox-62.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "bd75cdbb1bcbe24347f35b748ec5d62da6bb20fb0f58f17a348f8bbe19e92ec3d08da3148d41f56e0b42a8e49e1c1b70b40770c737e626239b5b538bac6d42e0"; + sha512 = "d0b9a462b7157a1452a54e2fd3d9d0c38ab478eb6c6391350c8c7c9c581e425262f42d33fdd0ac9e50eb8cf77f0d8b71372cf15b079254c2294f5bb613337bd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/or/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/or/firefox-62.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "e88f706c60e93b205484411bde177fd9b1ea921372669b5665ecebd795d7abcef5d2caee16a8605bf7f3f23e8d0ebf8036c156097318e7f8d3a22517e1fdf017"; + sha512 = "555135a96975771bc9bef17601f1e2a2e308e07ba3681164512f2939da1892ac592a8f69264a365dfad36a473306d6d33712fc6868bc809ad5d5a3ef16eaf5e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pa-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pa-IN/firefox-62.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "81af24b8ab70e373339ed4fd7116e1c4f2bc7a2ee14b46e2af29860add01ab492ec692ee2653de81856d04a465860e4cfda0af4928a237bc0c8469c4899136d5"; + sha512 = "a1d01ebf734b6357ecdddb3601b9062216c040966d633e282d61a28ecb830b5edb5152dff4c46a3cc273034fdc7110cc56858cbf31c6e90ada6efeb4130c510a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pl/firefox-62.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f7b6b21ab27b58ab1bdaaac012dc035e7cb1226f46da43fa3de37c7e4fac73f5303dac02332510eae7a8bcec0172769b620acfbaab8b383a64404bb294d6df66"; + sha512 = "701b496e7d20e8eff7484db6bf5e15f1bac769fc97f69de028a0dcbfe0f681d0a9031242b30367833f8cf1f8fbb1acd6d469a225152bf5b220a38b369c740381"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-BR/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pt-BR/firefox-62.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "c17c0e7990b4192f10f7269a5c5c6c74cd6e6353b8649a0417c537197c5f853085948e9d0c50f08afbb16e242f3d8e9eaa1e9657bfb6c40075e5f4e640771d2f"; + sha512 = "c4b3be3a9483ed76f7b8334998d75b293db031329852ec59ce8ae13e1184a541f2f35b5d1bce413ecf525d482277d27d7470444e477f297e361751d07cf64920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-PT/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pt-PT/firefox-62.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "2a5db6053556c75d399bbad5ffbfe51505f6b25bcd73008d85f7dba66d89fdf56ee0ba2cfce6e2617b463cb8db087a1700507051322fdd2ea8f732be5bfadb9c"; + sha512 = "389ffbbd4dfeb1c7149a02cdbcb70479be32ac8e91683570093f99e38b4c541f145ec27fc3cbe54f70ec3ebc21e5c0ded3b18124307976befd8f2ae1839c5dc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/rm/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/rm/firefox-62.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "94e95e037ea9f924363aa5b80298f67ecc678bb2e22d552c2207af1cdfdcd9ef5b85fa4a6b42ed08167a4b482859658ef6a946adb7462c2e2519c4685428bb90"; + sha512 = "cf9b89f1828bec694147528a0db8a8ec4530fb60e8a1957b77c8202e95459217c95bea2f104ec303922074c3528321f775fd955080b5e012b8941bb7f6575bdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ro/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ro/firefox-62.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "dc901a8b6ea913f976c915807bc4ab5fd4a756c98a78498ef52fa8577cb9e3a047e2a38240bf675d72644d975ac70d720f693db056e764218151431de572a37b"; + sha512 = "44e3ac3e35af41616c1dfab41edb172b4dd92bc622aa53b8626375d782235ce3e9540e72e14b1d25dc19f4e44db5717fede7429b1fb245b644c20f2e13c0d7e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ru/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ru/firefox-62.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "dcaddf1072b19f714e9f50eb1d5e8e15bce98bf96bbbc13e7a4a82581e76339818766e389279fb33d212afa6cea947185de130a3eb72c0f6079e159ff2f18e9d"; + sha512 = "7b38581a552ae9df2222ef9bd8f2c272cd98458d4a11c55a8f942870411d08c72da0c1dc5c4354b8e2e17d0a97794e4f2d59446a394e3c95376f5e7ee296d57b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/si/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/si/firefox-62.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5544833432d6b41efdff96fcc8d2d322f5c158764320ae6345e9183b2d48817afd796685bb87998e5e6fd227b1753f503bedda5f6fdfa9dcad2083cc9b7df9fd"; + sha512 = "dbb7cc9c9efd5c1305cb7c770db67ace1b10c2afa55d2dc9b8de896629e4e69e79bdc5d06cf3d7900635d03420c32e0dcb1b0b8ead25ab8fb3cd12a154eaf0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sk/firefox-62.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d4702ea94482a276ecafaeb7e991ab850a432158009c95489b2b87a82402c92a84c33ce43b27ebf58367e20d63bc444e656f32cb957ad0ad03b1d9f793157052"; + sha512 = "04f9b7c1977aff8144ad53a2bb7bc5aaaa11054cb8bd00b1747ab7ec34e3664d1fb3adf65b49b5d5acbbde2e1ab45ee642033e3ab57e99d5973ec853a1a6194c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sl/firefox-62.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6103a4d340e45af988d17b93c4e8951a656ace095c9e13f5b0d6bcfd55d51e27f9f26614223d40dc19733aee34606a80a221838be86a1f91417a1c6f00a7771f"; + sha512 = "3202a009f73fab2326611c65ee97a8249f5ccf047365874db92da588c5cb8693ad1a7b7852511bbab10a9146d0beb7cefdc79d3269c3b7404205d616a7394dfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/son/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/son/firefox-62.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "ea04aee1c01d4d545ab4a370e4be4bd23b9f1a698bc660877a754f42995334446bbc08412bc9f8ec92a2a69a6fb8bd0caee40f622813d9ac18b43773c3111029"; + sha512 = "a4f718670b73af088e87910197a78dace22d9e04bf268e4653709eebfa499ffa4a97b4048e4ac80c6a847afa598b0e19bdff07c6a7d6e164dfbf3d09f1070593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sq/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sq/firefox-62.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6789f071e366dfb3300cf5057d690c89daafe969a8b8b4e5a3ddee6683caa1426e62901d2288da61b8e8c59ac19d9764521b82f2d0d4fbe375d4e4eecd5751fb"; + sha512 = "8b67dfcd41328b677bb33a640c1045b3643368b8c0004cb55027d36ac2f3fb9cc99c272d132c355567ab0505a50d34fab80f6fdb8598cef09ea9806e19d6107e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sr/firefox-62.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "2d079c315d0c66d2e1530cf2d30a357d62f9bb6517abe7313911bcfb5c42ac95c47b3f12f654ea61d2fdb74d44ed0b090443f6ec66ec22cbd51c674084a8c4e1"; + sha512 = "51834193c037ca0e23f2c73800a351debd8327908f7c6b378a89424ea86b01a272bed893df59b1102760303592604812794c7ac70effcd50c20fbd676f4b5640"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sv-SE/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sv-SE/firefox-62.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c78e06de0834a84bf0cdd22a46e80901db3dec7d5d9e0dcb6ad850a040e8df6d3ba2c6e68f8a3da118dd9306c7af7f352d9b56e839cf74afd3730b2d8ddbd38b"; + sha512 = "8763a55b6a3f7ffb75afe854aaa54bd7bd5a5ee8dbd741f4348fd29ce015603f81cd98bed3547c628dafe98dfa800a97b64e281606223fbb400c03a0af332018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ta/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ta/firefox-62.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "d996633ce2cfc9d5766840d5198900a341c8158f4bc00c32ef168ac57a1c1d89dc10e9ebfcb2a504273d1722ed319acb9d9aca8d30257a7a6a01361ae7acbc4a"; + sha512 = "82d687d98f2e75b637e76416ed1b749d1af18c7ac140eab32f8fdf99238fec76f3f926caaf212fb42f054d51d8c807536da8cb0ac5354ad123a3030fdf46690d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/te/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/te/firefox-62.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "81b745184db9c550a135efd9b085e074a0dbbce24d81a16a39fb51166233d84da6c61b556e39b2ec68365ded627b31065d367c224721bf9e99338456aec07698"; + sha512 = "2a690bbaf6f8ba90f98c2761d6ac6030fe17d384478a3bf7c07875bc6e3e6285f154e3e21db4b639602f205cc03360fb36bcfe26473ec48cb1749a65b781875d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/th/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/th/firefox-62.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "a6ba250aa390005ce6830f14a4f7518062b3a98444da87e36f515fe29d3408b7efe9947a9d865a220b9f60ce57dadc12099c5742012981ca9c4d3fcc0ff4c877"; + sha512 = "ebc344d1439fc4fdb71d772b047466e5bc19a04a83de09e64e9c820d19bc057f3deeff5d0ec9bd9cb11ed2079f4bff459f3727b0ba92fb7426e2e186bd0cb4f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/tr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/tr/firefox-62.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "55eef864538b70b8d6e7fc2e6af2c73853a48860dfdb1ac5e4471675ebd2d9f089793c1c6cee713654caaa253b059e9e01acb12aa0f6f4efedd09632d10315d6"; + sha512 = "9096da5a647463a3643e3e5f21dc51ee9be87d857004285de7dab164255103bca4ceb9d8474fce587ae497397c753803b8157c40d05dd8d3310d59e97965ca0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/uk/firefox-62.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2bf67d7523c9b07acbef099dee48902d19a5b542ffe9eb65283524ce2cbcf853b1e3e862fa2a7640160cf5dec8ad884a237f4bddf215304a458a4d9575af8137"; + sha512 = "f9f609eb7f3050e95bff33de4b88d8e17949c4c167d3bbd7a9901cb0d19926a37f72e40a6bdde1f6c7610a3ffc67d7fbcfaf298659e519aca16592714c70bb4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ur/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ur/firefox-62.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4127578edad2690915aae81fac45cbc90694b68d593562f4c55a1545cd1b8cdcf3eda18fbfb2dc9fb3e0dd3119fad09db68d65e6fdc09d96aa65440750fcf380"; + sha512 = "35a755f1c1d93d9d8e4bd813c83a332a1cee74989d993921f987e023da90a851863f83b56a41c58878f5aed07b4e08e0ca9d3f4d4ccc8610544516bf903855c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uz/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/uz/firefox-62.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7b0257e2bf2edf26afaf6bff2a06f9fc81bbf5397c8823a65ee63e54cd32bd2329ddd858a5e1374df64bd188d3d3392434d83e05d0fcb4a71d0a73bb6da224dc"; + sha512 = "d957def873388aa5f5051ed3ab5cf51196f8b5fc83e2fc4b56476f63357ff26ef38e6f3d469cf4f117b094c3e31a0f561b1f5c0a90c85e827436ecfe0d61e98d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/vi/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/vi/firefox-62.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "071e162e6919168fa4858aa98d68a2c6ff8ceeb10e5968a2dff55040613ecd7e7290f3acc929f8f2faf3fa4b97cdfbe4fd8b464f7df0c3d1d530af5a9ca8fd71"; + sha512 = "e7f10deacc80f55928f3f6ea4dff80142e790cf9dc814c38f173cd03ea59de45438fda5cce1073b0c9e1b528870c7d979d16254b038bd351834def51944193f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/xh/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/xh/firefox-62.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "7e12d3e453216ce6ef2dd56980a130c52e273b23543a3df0b5fb11c69d1366533eb4875814e5084682c54f86d2cb8a304b95b08a66c8595c8dada69d4e97af71"; + sha512 = "0e64c9a9c1ebada345f02d6dd40d2ab1ae157ee238b8716b011aeddfb18775c1594ae0f7706c4ddda97ca01c44304391570f526524f4f19d3eb5580a1839c19a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-CN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/zh-CN/firefox-62.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1b98d214d15d0163aa91316fc6f507bda61169701a8accac3aa79dc8b6d7260d58813d87ce25d7083f6fc2d2a16519464267feaa3981e2e556298d3cc3f1abf0"; + sha512 = "cf1381aeb00f19fa6f8665ffbda8a9c6c19939a29e16fb49a2cf9097dbb2674eaf4e32b658dfb126645540582c52ad86e87a9679c1dabe03757d57032e0d3d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-TW/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/zh-TW/firefox-62.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f466df89dcc7a4b72ef7b41800961828012fe913b2eecdf68f442b492109467ee69a95738db2afc1ff39fac0b6376598e8ae5b050aeddd6fe3d40d0dc8d424b6"; + sha512 = "9d28b0b773227d7efc611e300250d518b303b9e03396092420e8195872c6e8c78aed6f9985e491bb01f75c541299bb7f0cf78abdf25d3a8587b085e3f6489e0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ach/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ach/firefox-62.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "6aafc9db497700c6c91087e2477b707a162447199f26c87a4921b278d81828e868214501e8b89deb387c097d5768faa18eab83076ed84aa59799b24f62a3663a"; + sha512 = "6de54e5cde101eff5c1edd43b7f3286f10cd631398f646608e0d6f22c9dc6d8dc2a3346c8d5fa9caf6ab1a82af8708ba3ee17fcf605d0404e2beb5d10b623ca9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/af/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/af/firefox-62.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "5cfe6413a70265360661dce8555941703feaf9045604313361553769b4738e3febf21a79c8be66e24272fef72b41dbf0c3a2e8e76e5b992789250d4b04fda45e"; + sha512 = "29c5898b88cda4a1f365b8792789c854b954b4d6533ed7a556f7d0e3dde3f7705adf5a6c3bf14444268648ad3b3002eef49dac200d5eb89cbda5ee33e1cb4d4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/an/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/an/firefox-62.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "cdd9509e49d563ed3d26f58fe957375357fcee36fca7526a20dbd09e9f4f2867c81508cb637cb8d35572bd730b13ed34fceb0af4aefcff631e632bb78a6713f3"; + sha512 = "484a8277cca9e437d8372f750403c71c5e4923b28b776b5809f58debb8d0d3ceb5d523df05691f326d06efba5970e27bb06abffcefc500748b04e99ee41664bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ar/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ar/firefox-62.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "906d0020510eb911d7b2709c55cca0e4a69638c685bda7e7b406fb41f385b97ed95ee97515693d72f722a619d13583d227264d0819ef973f01e67427a269225f"; + sha512 = "7e3deb89acab69012c5f1aa99219ec0ff0cb380ae5f1dd71eea078bee4434855c612c808a574bcf46512d2eb77b3e8f9c26ea524ece97b02699b2434d8cacf45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/as/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/as/firefox-62.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "2fce0d7c990c7e2039a601ec5b5feafa7da368e24f363489c1cdae831bf36a11e2bf967ec4f74512f6ca06095ee3a59982b0a5ea3bd003bba9c3f4c763b9771e"; + sha512 = "0836d6d22d13096db35f5ee3da13cd4a8504a55de73ce24897a8e4903eca5b7d56f244321d2b6b623a357b1741d419957f67ee65e71d1c71606db24bbbd95631"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ast/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ast/firefox-62.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "872e0b0962b7d6f86663c0cdf5fed6f4927f4a24bfe1848debb605e7c19bc574d98bdcfb74a2e5a4362c27ed1b9372881fc1418c742e4cfa75d15d838cad6f87"; + sha512 = "247817ddfd24b97b991ac916311e01871a831197c92025d3a2ea97937fe993869c7a12e118b32baa3aaca49ae469dfaa8e892150731b6dfdca1c4e0929c2ba08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/az/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/az/firefox-62.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "dd92dcd6f0c32d5487525cd88832fb567ef0e8fda5cf7f401399992243146bc2690881839d5752ebafb4e7e099c6594c71ef99d5509d94753256507216a2532a"; + sha512 = "4f0977cc5ce9e01c311d256d239a3e89dcc1db5b78b4c08f08999d7c52731fd58fce08c9f77a80fde1176a0a5289b5c59f06eb790cedd3625d96928dbdec46da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/be/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/be/firefox-62.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1eda2b0945a4d8e70c0e61b187abce6873b9a8a578c089cb66b2728bfc71b90aab71b57599417ce775b4d5fa1c0fd908fa4b9b3183a3aa570da95d4fd726ba84"; + sha512 = "294adf3029076f9dceb32a54330d63b10ba9219d9f688e3c7246e04fdff2ff10bdc24b577f48b18935c35b8d9acb2437a7d6cc3533fd6441b9027ca67e7cacc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bg/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bg/firefox-62.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "597dc8972c670f67f34ac23ffb57506b896efc9436d36270dbcdab484dcacab174aba53671f5462ffc7b54b9718c0280a66734e789edeb7710cd7c2b9fd602a8"; + sha512 = "41b78104367cd25e67a38b71d3db6054995caa28fd0c4dfa0ebb494d2293c92c20a347fd763f88b65d31a514987c607102206390b2dc41335d00aabd9d5d589d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-BD/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bn-BD/firefox-62.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "79989196e4647c035d4af9f24dc9edfceebf9d90afb1efe894e0a54e940ffcf32e3746b9e07b486bd89a11ef8f35cfaf2e61992071352a561a535bb058c0396b"; + sha512 = "79241d9dc44b5ad35ed76f7b33bc8be8bf7f5da09855df9e34354994554aff2ddd2dfe8a2a3410916887568fc92a70927b8cae4747f20d0dacb067206eec3d7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bn-IN/firefox-62.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "25b3d138308e0667d62e41a8384619fea548dfe441cec761c82e238c1f0467300d6abc89d265f22f1d9699ffa2165bbb7dceab76169a78acaa4bb1c46396182e"; + sha512 = "5194de3d21783d335a11c824cd46b0e01ea512f900a7e3fb45ed2567501acd27d5f5bf8dd68f146ff550f6ae4c70089d539f56823cf7280f02b67d5111715760"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/br/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/br/firefox-62.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "8f18a08ed64cf071462b2eb65e0965f4b3825857e867da2898f959fbe84ea55cf19fbed289a4c4e739e5c4fc5392f1f496feb6b4f383e86a753f5041dfa333ee"; + sha512 = "59dfe19ea10c4698067a8ca70143b160ed5a73c38e0f6ed3a14d9a60209378acfaa1f8b09647a1a96d519e6fd6a34cb7e2a8bc3cc276653842c2bb3a6ee3cbe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bs/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bs/firefox-62.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "2cd2a33ff71b4a471d694912f8c102b53327f1bdf005316e16d32ef17a510784cfeac972f9a854304b07d6c9d19459b19bf3f7e47caae2e58a635fa555115039"; + sha512 = "7e6069ecc137c1b0b479159fc8eb323a8c417c81edd8c7d54498c47cea4f1a2fd4a1cc52bed17b899ca72df8b0fbaf88e1794b17f86086d249011ccb592ce5d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ca/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ca/firefox-62.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "78649a90b8e890adb271fc57328669afb49f70e9f323a2849a2071b83125f3f1f40e13beb353336a9c5aebd930979889c719075b49ce4099715951164d979926"; + sha512 = "932ce6517bd55ddbd927eb28935bc99ff5576ee924d239dc490fa79b3d90dd77f579a7b16c0b4fe4ddf8fedb4e825664aee7fe246145ebbe19c8f8841d098464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cak/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cak/firefox-62.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "8e66b6ed5b20efda281350535f2b08892763c2dcb62ba4fc764b598606a36b4a6f3d5960919a8f2967f736add11132252449efc4bef827653534b45566ff69ce"; + sha512 = "38c4ed4be2e79145056bfbc5a476e3a03c4f1f6aed1ccb834a7ddb2576f99fc52305b93939145ee1e7ae9144b656e857bfcc6b084ea4b501c3a574e10d7438a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cs/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cs/firefox-62.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5e81414b8411fda775b35704de90d006be40cffbb51b495171b9f69896b9d486e4438bcc2bd2f3775ab5f998b7b41599f44f92ee150ddbbb2a84f64058657938"; + sha512 = "1d569ba50f84ada02f0962e0418ee7f26e79fe19cc09f50dee4350a59262ddc87440dabbf10129d73172e512eff5904062f60561f4bd2d4eda395bc67af90dd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cy/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cy/firefox-62.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8f4c5db5c760e16ef258bf2da401e51c2cf3d75808d83eb4b7adfaea4c2b69bfca0cd92c9cf69d7e4de188a2c43574d37c49b3c641dd9c8edb7bb6aefd2e4755"; + sha512 = "9294f39bf32de7eb2a1bc2480cf7f7e51dcdd124d3281f9e45c4729b6926002f8ac99c30403ea53a5c6857077633ec08e0c35f5160ea8e08a7f5f881e8a90748"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/da/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/da/firefox-62.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4aceadbf8cd2ced63f15aed369d98f4234faef18560e767aab1026c876fd3d6a069cbba49139eea60a78e0e42c063451918ce4090e850fc5528a93f527067335"; + sha512 = "77bde4fc9cacdec311b513045f3f026c44d7c199cfe0520cde20ed711c1cdb40d6b64483944f4da47b8fb280764899ff5931a8e5639bd0a8a4e03425835d8f2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/de/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/de/firefox-62.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "327c8b22f3ff3c11061b5ee58d1ea2311743e53d804bcff6e66615eeae3aada694c8adbba58f3521b6bcd8f54513bcff1d50ac952ffe5f1ff3f22b52264bdb68"; + sha512 = "b2bf1a5fc4536c3c0822d84c7f0138f04f6bf4597804eff101502d3d782f2b22fc54dff966c2f32821471622cb1602050de1c51aaf9f64c63314f8ba002ea201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/dsb/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/dsb/firefox-62.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "5a964d9c25326d2a97730723be2a999bcd8a1bc91b2d0d7ebb4aee9bd773fe93cdfdd94c70cb2f9c0ef10f84474c28726c21c23e19a1fb9b55e6db5c2a74b6b9"; + sha512 = "812842664c8b0088f33acc42ae1581a33cb2527d3aaea0ed102fdc27a088c06008b96a3a052f95a900694d869591311dd986bea2e828a02238aaff854a77aaf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/el/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/el/firefox-62.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "ed1eceba7d5bae11af3a916902a55c66ed97ca6da9f1a6421e4be76c65b25111e2ca7c979c55f920d5fa30146016980fde273c643a5ff4996ed32b82f0b9087e"; + sha512 = "f1116c938bed2333309d32c13ef69f806418c14fb8a2fc10f63c932d8d8ae169aa76a8e3835eb6bb2d61cde7c8d8dfec56240b8280695f1c2273899bb7c8aa4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-GB/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-CA/firefox-62.0.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha512 = "ba07c206a4b4ee0bf27ff82e8ea14e3ddff262fec11e088a114253ef4a4a81951cd5c85cf6eb9f6e1ba06f97be0bf5787f5e26c65b7f2aadfedf27f968146efe"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-GB/firefox-62.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "019be53a2e1bafbc4ea77730545c40be314d7e4a370e5cadaffd735a2dcb3dbca14e4d23b88dd2e34aa4518a57aae1b37ca561e8e62d7acd3417227f0d18d344"; + sha512 = "558c10ec35144d696e1458a4b70de954ed3c8d3f05d5d1ae492374ee3b90752a93d55e6e41de30a64a3ee3b9e68bab88aa479066b849971d78121961ce2aaab9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-US/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-US/firefox-62.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ee88e6d55855a9e2fccf2a362f26177393447dd1210eb8f78992a7760bd0e8245267c4143eb5309a7ac5826b345b8c9637bcc504bb7214d1f7897db70e9c7697"; + sha512 = "51d606c5d9fdc2d6b611b1fea06c54ee4a6ac7666b4dce0a26dbaec99d110a2e304f88108d307b011f27312f8b935fcbf473f87b52056a465b667f8ecff9a48f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-ZA/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-ZA/firefox-62.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "877cb9d50e95a8b0789660d871f263497279ea229b11218bc9398facb23d78200db4ad19e0030ca44cf36ae3913f8a119abddc3278e85a4c89d298c59a3443fb"; + sha512 = "b88ea68f4eabf086ff2f3fa6752cc42bd19391029d4c0565342bf24d90817717e5f07f774e164df234eeb735e426491adf35784dd9096475635365912e57ba62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eo/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/eo/firefox-62.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "5c78af15b977019cf7402e88b823ab2488b08ba9e8dd27a55caac7570392e78afd8aa972f0f95f21dfb1239936ba23272ed5b84cf24578cda5e7bb1048ce7d67"; + sha512 = "b97c269786efad57ff954d27ec69a4983e18a7ee4e0ffdc6925268830104103a99a31247359eba915be0710455f0626379b801d5fbcf501f30e3cc0b9736eb32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-AR/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-AR/firefox-62.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "8328fef71e94c07c37491a331ac362d142d44e93404c0a3ea883426c8f11ebf6f5bf6584237b7fa75439c7312bd1f33a2ddcfcb8882c3cf3c526abfae48a620e"; + sha512 = "a5fd087a8852f39e1208b388a2507981af3d989a8b86b1b0e2e83adcc9f6a494116050ff811e8b2225fd113ef1e689bace73a617c0e569df627df7e9c655a14e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-CL/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-CL/firefox-62.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ef4e96123acde3a3ed75d8d93868894f859349613b556d44056009d55a3794e78824928eb04afe8746e291fb3d443b7a1b6f63376ebeb65102f7e03067480b86"; + sha512 = "bdf7aeb5fbb80711d7b8dd7ac30e544847e00f015f7bb8835315f5ee3023458bf781a368f0dcf11c57737fb1d0f077352c0eab28d32e801861bba36bce5e52cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-ES/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-ES/firefox-62.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "934e92d37b920ccb715a411509905c150501eb14d11aefd084f2639afb8ee1a4ce3e869d682ec9f9db4b70a795875f09ca3d7d997f0e621ef99cffeeb1675f04"; + sha512 = "47bf0dbb55435016312a6f6650033f28710471e7aaf14e0dc83488f1ff87e559de552fd95d5a58864420032392f84de06d8a1916efb8128423826c7e4577ab44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-MX/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-MX/firefox-62.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "57e7bacb006bd079554670fc216ab2c1912a252b7966b32cc25a7d6735f7b0928ae0911b666c2810c63031d57513a4ff800cf92906a95868aa32608eb927e2f6"; + sha512 = "79e42f01744b05df6c1c7928743914ac28f3dd696a6918a08000a531b050fda95ca621ce0484c216f2eadf728db867707c1ec45188c70bb91ee611eaff7ac565"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/et/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/et/firefox-62.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b357f29c0f77e7ed4ac764f7feab6588cf322a1807210052359402e5d1092d3d8cf515e04beac86d32a6ddac43b4be8b92d88a1437f6899b4007d2c9faeb7fc2"; + sha512 = "8489f6dcc733debebe1acbaa86cd093e5dcbdb4c8d60480414ec1e27710bf57590fef3a29fb208e9eeaa5d8858e5807d7cf0be5130d57bfe308b7653de431db4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eu/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/eu/firefox-62.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "61b4a7b767e62b1a1b4eee4cb024e869969b5623de658ca2a3762c271a6519fb4869c9398e7a3cbb987f01799961021fff6f8634b78dc62770ca1f345e56d061"; + sha512 = "92f49ebaf7777962eb2d1b13043a10e82cebcad1a0f43a3527d7e7a5a31e720b812febda86051125e64d5f0355225dcb6cb496df5ace1ed10c2c6a4cfbe16cf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fa/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fa/firefox-62.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4eec6e7231fa548c0a24b8904b55311058dfc89b2ffb87142859b994aa0a31a07c48107495cfa66bb4a65094328f6bbd7f33e0ca33632457f620ecd90678552d"; + sha512 = "1bf258264b77fc9cece834363a12c34be719121afd55378e23fb2af9cf20da2a7ef4ffdb2d39c34c9970ea5d259a47c894b6f9d703ecf75834a2239844d783e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ff/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ff/firefox-62.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "0a17ac2aa0a855c97b613741d7933dffc4569da9fef9f753a4e404847e683cf10a4444ff4cee5b5d1f86ef069525d0f2635433e8249ef029bfa2c247ed605386"; + sha512 = "0b60ade68d6f4b9f1fda4a3ce36fe54e69583efa5ecb41443f0f92d394257449c2d5ca7124d1e194fc7394ba0daeb67f828de4aaf13f78c89aff8dc273213ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fi/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fi/firefox-62.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "32526703d86dcd74739f419518974ba7f43083a8b3f971d0dd7446caf787c5ed4be82710e3bd53f2d1e9e5dcb67f46735bb55f60ec7d9c49c62cfc2857866fc2"; + sha512 = "f5cd4ed69914705a01765cce884e3f3fd66cea53e85d33da378087ac7ccbc9afcb1b2ebaa78bb4ffbdca2fc34b2ce4aebad6d55fdff44b8740a815265026d2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fr/firefox-62.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b7e00691c8a1a5f0c1a6312a79eb40ae17e455e156f66da2f4e43beaad5ec35d770b783aba83c500db1fa885b1038095effe69f936e17d69bd320f41b71d4b2f"; + sha512 = "3dc1eda7eba9e0112b246a370a296c6f5e11f318e514d08fc800d198afa5fc692f13ba66fa7b2ec891929c53572ade6caed21f967b880262cb36718fd76e18c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fy-NL/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fy-NL/firefox-62.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d8d70ed1d04686cabc9862c5cad06dffa6fa8b975a2a61f0154a6c1c6b182a173abe4563b727de30f414a4d04311744917a82158665883697d26589b29a25263"; + sha512 = "576b0645bb3c2367138e3f385282f77c72040b0a4c75ac5f39163a7f1e23a34e7702305857ae2250c96adcebd587c1cb83b1e7d129667307089b38842bc4e175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ga-IE/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ga-IE/firefox-62.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "352620fb58ed1fc024e8633e70ce3a705fa518cb8f600b3bbcf1c50c440812ab8f04608bb5a3582f96dfb2a19b0d52debe6c4947dff2f06f426710d8f927977c"; + sha512 = "416cad5b5859bf1565f7e68fd3a53ca8b180609a488e2201f70d42eda3186fb1e22c647016c67fd3068d67b50af678bc6dcd96194001511844afff43e31611bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gd/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gd/firefox-62.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "90923e5ecaa85d21d7d6de57c79a3f35b329faa14a74e8b210cc2024f1d48f3aa5c4930c63e8e1688778bdbe998f06c72b5bdce8287ffd7ae05fe62845ba2bfd"; + sha512 = "167ac1a9411d1cc3ab052d3b206de6a119e8b56854b7e9588ed68815e7c9b9e1722210951a8b731e944aeb8b2890095cdfa7d73b03b473a5ac99a90095de6917"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gl/firefox-62.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "339f8ebd6d714945e50be0d18be3af010e2f00924a84df2fe5641b06842278550bc76b01474ad2b2a0feda734f6f2ac9254c008c3a6f942714c684504bdd47b9"; + sha512 = "efefb9e9d53be16fda773e8f40073c357c4b46cedecedcfd311e890a45810b7fbfb368ea3e93b07efd0f9111b9fa7a67808298c0ce98be2c8bc7eff354f7efb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gn/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gn/firefox-62.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "35de07bd227904bf0372555d81ead164d993410d963e0e733f536ec445112652c04d3bce8f910d0b3daa3d9ef2ff956d24ed680916a5e86c3e9a6f9366d0dda9"; + sha512 = "044c8e610d639ac8830b00ba2e4e2ff8e1bf827c3f91101edd45a6d478b5b8b99c1100c9fb2273a6fd378826f0bcbaf8817cdf1e3303bdb1b9b0e0c01cf095ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gu-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gu-IN/firefox-62.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "20b1b40d84264f0e98ab91a4e5943da078b7c37816b24443f8936933d779453d640b26ae04eca1b24b3a68134a29e7853bbd544c4cd725b934660574c6381284"; + sha512 = "433bc4b580bb3d164ad78a21ef8894e053b4c6d972d5e4aa46a9b8ac27cdf38e395164eb46e24815cc645d8048c237371a3abbd1bb639e69b65efbeff00a30b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/he/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/he/firefox-62.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f8652f2cdc19827a7f2a92e6ec251c5f0bd8448d3dfaa3bd930a4ba116dbdcdd7f2a9c083c5fa93ba2a24395147782146c5443221c6183622248e54d0687f287"; + sha512 = "d6acd3b06216d4b0f0856cb6576c36381dd9f48bfbd3543e410eb0e0e5aa11977cf3d68b38b0be7b6700831c1561e2a8dc75eb5193637bbd2484673d83bd3a1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hi-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hi-IN/firefox-62.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7051302d9315dc30fc8f6ebebaa587b49d17823aae7a542133d2f82a1d5a18e3062ff02880f347518e5f88a0de913568d9f6b4ab72bf7dd20cff5812cea65ebe"; + sha512 = "49856be15be3ab0ca687f8d6616c481d61bc0380133b043d394cdcd21d1f7cd8816b2bca5538f2e601a32ffa8c51745e89f537f62bfa853da42759db70186ee1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hr/firefox-62.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "acc1297166057cdac0015758d6556bc870481d96951e7a14704792e39010938a6c0bafab2cb28e9a23bf24695813e8dc1a80512c1c5fc75bfb8a0d29f7091c93"; + sha512 = "0040ba7333a13820e4c0a85fb24c30131d4b477da3da9e4e04296088d1c0e938fd495777aedbe3bec22533a6c4766be902adbd8b470a81380fe4dd23f831d0f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hsb/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hsb/firefox-62.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "2ec761ce5eaa14cf5fa114524f70b93998d76971de7b8d001e656cd6331c32252ef3ae78f54906f5dd416896b2cf8b6f5afcb5e3a02d017d9c8a33835655718e"; + sha512 = "715d14b52fb82f255300dbc828ab05fd578f61325cdf4d4cf86f1a47e22fc1856b57bb459941a4bfa8d325b7168fb0e39c075122b56de3455933fa89927f025f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hu/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hu/firefox-62.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "160d7307aeb834f9ac15ad77c0cced4cf7abb855264e10d8a62eea1b1ef85aa3b0a00fa9221052bf4a3df010e54fa198d7033d8450d59212ff36c936d99a1469"; + sha512 = "deac0b43865960d665f13a2f0a77cd9413ba9b3172fd2660695464b5f72944f4013f6d9a47801e528db63c3e05496aa7df890624a39ddc6651ff5e8d0d02883e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hy-AM/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hy-AM/firefox-62.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "09950c9536fa0bdbad207b84ccc83088b23a7f2f960d094ea0615de566ac1bd9cf55acbe01c0f574114dd9246bc74e582e67706ec0c34a2c9ed6dea3d30bae17"; + sha512 = "22e134785777ea4e4fd72cdc7f17765d5bf8e943be33a0991baada71fb254f60f9ce9b68b4ba5640dc807a6db0e4ac3c81784a7a33e5096cda1833b22336f9de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ia/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ia/firefox-62.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e6c1b00971dce7387e183a8328234ba65722c69c7d48e328223eb7e490af3706298d43c11844505ba2ea5aaf21a1fcf7b3cc8ec8946862fe7aed8128e6c6d5cb"; + sha512 = "91112a783ed4402cec7ce357e68806609b202bd1553c649271ccf4cb90a724ec612951b3acfe0eb64646957870726cb40f66b4a233cc0b73fdeed51083d6894a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/id/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/id/firefox-62.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "85506ef07ecdd1d466fbb261d46bca8cc4ac8b3a707f27db9083dfe1996e5214cc0e78080f33c2b3198e27e044c6a6d13717d69b43c3ad98a1c43f50b12bb69b"; + sha512 = "8b87e2f13550334a96bde04fb7d61ac963548e35de2717b8738fd14fafb015944403a1bf175e2c13ceb7d4f482f5a6d56b57b44cf015b6dabfac3fed77d86f81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/is/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/is/firefox-62.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "973b863ef94121836f472f5450f8a1a2d3329306f289b8ba09ff811b336196a157cfc966fdffecd54e78f4f48508ca1f8284f0c2d3804579ef82be4e1adda48d"; + sha512 = "8ea8972b5dc06bd12844fbafff92f6f493f604ebe03139043435fb5f761098cee81c0ccd42b67bcf3c7d1b370f3382858c08d4c14eb24a75fb851e78c51c296c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/it/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/it/firefox-62.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "fbb8e899b2aac3f4c64ccde0fffa11f8609ca3b7ea8bc05e062d207b46234b2414746822e0fad8d24fe8ae43e3bd8ebf2fc5d26a02365012a95a4070de002274"; + sha512 = "b50a422dcd94d6ea69ab22426d6f79b3997313bf4e0e17f2af31d8b64ee85d603cde1768a730b279a10ff87639ba2af26185bdb81ea4bcb7b61947b1836ab700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ja/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ja/firefox-62.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "c6585b28baaeffcdedeb1167aae4d20874755e970f53aafb351a31acd3933e6b805cde1e22ce0c2ade58984ad940a5d8b6857116f11ea6070bfa88c8232bbae8"; + sha512 = "f52d31f997b291e2a0c9cedaafbcb5bc3ffd2148b52700eb5c140846f2809613c9061f339728b1810bc5f899fd208a3eedad06ace984dad41fac0a057c101ec1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ka/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ka/firefox-62.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "136f49750c33d72e7aee3fd5733730f1b78d6656fd45b2aa2299d8e9d01adf13f9debe1d08d8fb9149107e96ce5f5fefce81b5d9a2d9a1e1896cb8df3c588829"; + sha512 = "e155d5c70de47d6f96f3f0e34ee317e90ac1aaeee4be68ed265d4bec46d52e6d67d7a140f3fb135dd086d9d6cfb5e8f80063a85f07e8b2197b23233a122efbb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kab/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kab/firefox-62.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2a0fd4952c493a4c22e76135efbf155962fb51444328726f29660cb97586ba76c1903d28c7baed9bb4815e57747b5a009649e179971b3c7aafd19fb96be23c75"; + sha512 = "153ed4ce1692e6691222779860a066b27dc9a5e747d79f4e1bd3273541d849d4b093062b3ff8d702786542fe99caefcde13f63cada7d0f67f461531aa32603a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kk/firefox-62.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0cad124b5e3d995124057fe0d818121be4f7f186c7cd4ada4d13b89ca5d505a8830525ffcda9a27a0f5f2241fb65b44b8433d95221220740ab8643f374c938ad"; + sha512 = "dd88ca465251b9489e766c268755a66babdcaa5962d40ddb4ebdc3f100a31f34b9b962bcf5fb5a0e46b2871e7ebb8d4169982a3a7174bbdaf5e6716274321ae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/km/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/km/firefox-62.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "06a58d8d54bf641e3ddc7fdb3417f8a5a2aaa16e8c11f961321c939e803249edb7dd3e08027a4b20ea840298b4a12da20c2771364d2b9caaba496d1eba863e15"; + sha512 = "ccb473d36522f34c889ae3d211a1cd4ebf4e60da341c51c34cf05d9d8d75615b91eb4b00e327409c6fe406aaeaa07f8eec53c364bec50ae87c48c37ac1602e69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kn/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kn/firefox-62.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "92a9d9e4fc65472200f408238ade4ed23321d4e25b0c7eff9096f23f76e480cea0031159b53e509cc6d3d6b2c0c0c8396742c81f2fc3e9825c1d5e45a35a12f3"; + sha512 = "e1c718690141b6e89f4df017d5804efe07a1dfa838f1c23ca14b90438458278bfe90e178abb5ad6c52d43a993b6a65664c0e801a9f58ac57f9300a9bb6f9679a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ko/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ko/firefox-62.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "dd9d7674f6261a94cb00fb823a02cec12758476c1ca1cf6a973eae78dbc1c94ebfcc14155c035966781398e1d3262e000da4291e90ec434756c8c3ba0de7b7b4"; + sha512 = "e916fddce4044fd924f7aded0b0c082f82bb50fe0f7587d7aed4782d545be8b0dad67ed4d2c41bc75360f6ed7c236bd7c40cb3503b472792f1b27c8f0742f597"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lij/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lij/firefox-62.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "1d01c34ab89ff1122147685b0551aa650f5b751deec35a5e7d64d6ba46272e929d7f1c49601fb2b1f5514b840ba6554af892c79c1a3f71af392216271d206cd5"; + sha512 = "ab86bf8a92b05bc5defee073afa19ab00be704ce49a2d26f032edcbb60d9e5ef4e7a6196d31bec8d6e090c586a88d6e9b69f576ed5e587ca09dcfb60a0661b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lt/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lt/firefox-62.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "93d3dfaca37a668eb7c43bdc74ba521bee0344fff43ff9cefad5e4746b7c3ccdba445f97577338606951a15fc5e629bcd4b8cb979842fbe550d3e7e88169b3a4"; + sha512 = "d716f7fc2c4015f97962d07ba7ffd6903675a6c36416765f2e81da43f9e4aba759b3ff31bd82bb7cf64c7d8b99f9d7454716f4ce6daa022f9fa31f4a49d9efee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lv/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lv/firefox-62.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "0037d16778bccde9146965d7553513a21a443960cabca4a65b6f58ca2ea9f243b3405d3993e8ed078c1a2b7bd636deb86ed829f8f699400fd755f35cf048c463"; + sha512 = "453e0bbf9eb2e9678ed029ecb797b701b4b39e030f9555bcca7eb6d56676bb44366e2d1ccc613b12a09f95d99ed08f9d3f34cfc9dd16cf38c9ab8e162dbae3e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mai/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mai/firefox-62.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "d8025e4c4ab5b7e9b2d8dd8afbc221e1765eddf878943c4daece0e27b7443e7e17de3e400d99a5ef5b62a5ba9e3f2a4c27112551c8c0ea1f81136d6d74b7e91e"; + sha512 = "75e863c56d68cf2304f0c6c2f1861ce025d934d033341c23d3b95a70e73bfe66334c3beb77d9fd597f7b4091baf70729419ce452131009ccf03d2d33d16621c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mk/firefox-62.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6ed44201501bd8336615b29078de4e52374712f857e2816732277cc37b6f8b305af0861894f3f70fa62fe2de6476d689bc5b79bd245b4dd750dcbab0b448c69e"; + sha512 = "bb87f94a4de4984544477837cde4186a55309eec70b85f0cffaf0cfe747b7c761d9a6553adfa1ab1fba72d732be855e2bb46e4c7f22a0f25529207b42b6da396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ml/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ml/firefox-62.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "5b7272acc37c4dffc2421824b86c5f0192b7a92535f193a0b567fff8e79129f41bdb336bfc1c742ea0f106739eca47339d9f550b785951364233e612b035f94b"; + sha512 = "5754b4a0a3c6c67191f4ef3dda7bc208766ed8171de772d4250033039b2b39dddc3bee800a28fffe41c68cfca82a5c9c6005625fc6bb5bf232b256d7bd58de71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mr/firefox-62.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "fff73ffc6f080aa064df90a2f19c85364a09c831a095bf3722a5bc0760e04e305be8683804883968a492589a652d705f1cfbbed617de2f00348a723babf60a86"; + sha512 = "04e40c1d060b848cf957af34079f6d1cdd12589b0f31932f15b5ebf837e37d84d332fe3ee4a54c501ac47050233f891ec6617802d03472ae9d7e45baca809adc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ms/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ms/firefox-62.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "a7574ce597a12b92aec0e88ca72d544cca1ec1a5def40b034a8cb25a24a3672c42e2fbe7ebcf0b5293f55fa12216856503af5514c3ab2b3cea551a8a43900b04"; + sha512 = "1b84fd0960c4952ff42bc50595683da47545fec9ab10d7b3fee3e3541b2a47aee084526766fb2bbf17dad413f4dd2dc458cb0c3e8153b7ef897a9573292abe2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/my/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/my/firefox-62.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "0bb892e7ab8126f2f946b1d3c9b8b00119dde0a165832ed211265be4f698087ab83970b1c1d47171913db7e01f43036e90b4aea135accb91c33beea1031d545c"; + sha512 = "95fd60b8c2e9b0add3163c67a5b46e794f0105621293017838fdce48cf90a0b0bd62bcefec2693fa16b0616260b39587bf3c619b506d56b072f0c715398307ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nb-NO/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nb-NO/firefox-62.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "184130d826eda76da820974a4f729de6eb569bbc7f36ffe2d4599b7c142d75c5537546511770db38abaf28b9d3866937fc6d51c7fbcffb074432da3d98310b06"; + sha512 = "05c83c17e5470f009ab369d0c8a1c64cb8ecc008161fe1ced3ca85e9065f36f7ee4e220f8ed7a0320305ac31b35a035b5c8f7525b3b04c6b96e95e4044418f33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ne-NP/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ne-NP/firefox-62.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "2428dc2175f0da8e4fa66ac11810467306a59b181c34165e4a54dfe5f3bebc182f0fbcb117f15707e72baf97f4d75131a3ec97d03d0fc1109229caf83519dd51"; + sha512 = "2ad4756b8800554c54aa1f47effe512de332a61fcd7571e27ae83bd5e0100cd8b60fd5d8381764f9bc2b1d925ec4b53fc3c6c6a88840cb12f57e9acba892dc5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nl/firefox-62.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "96bd92c9979e02a13db550f7f3a795585baa1017691371c5e5bc99825d730d535c63ddbf805ebf8a0e6406ae80ec644d0f715d04f913935f845ad89467c01832"; + sha512 = "a3ba32bb48a6bc386d49e4ec703f51cda3bf917673e23965d7f5e7977dc8ae0696b375535aa04d1a416b6b5655cb3302cb9738a238d9cc8a6bcb78dda52afae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nn-NO/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nn-NO/firefox-62.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "26f35cd02873ba061cd0f38cca18947e2c05589d3b399c55fb4d0f356c26d399848467a20fc542c7f51c67c912ab7c8fe5fae25c97d942260276faba40d24c89"; + sha512 = "35bac6119415eaca5c8d9fd2d57e0a550abcd7d069454202a02ce6418f9e47ae59563224763008f23d49604cde09ad251dc8785d2205d4e9623c138a97b69533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/oc/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/oc/firefox-62.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "711b260ac771280d795d6e3746df07bed4b9357b7261e83e8b17934ab027d77bfa1781d3d9d1923724f49f16136468c1fef40d1809d6a020d5b49b7767030f85"; + sha512 = "40d3e74b204da461cdd79163cc838e538a5dbb8c4e693a59d801202363cfba4bf48e01bcc87d247dce6b1fdad0a24f2bdd15272399e407b26293156698f7bf7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/or/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/or/firefox-62.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "dcd1d7068c75428533d268b50d3d1e7324dba2709abe4049c9cfea4fd4413b09c3c7dd9f944f5f54f57454d8d2aa8471b8ba5871e73cbeae6fa357c8c68e90fc"; + sha512 = "2220ecdcb26b459ebb0fb3380bb8b9430c1a09aa899418b18a765a4ba76c8d35480f59b71edaf6047e0eae04146ec6dd6bf25ccb619f559a260ff6f2828a0db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pa-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pa-IN/firefox-62.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f34c32479a92cce9fc6564899b5477fdbdbdc868b17904f8d7ae338c2924fb7cb8335b038378a805a2119ff5ad13e349c7b80efe7a29add706bbaf1466d623a6"; + sha512 = "91425dba14c27a3bbb744cf5added1545c071f466c6cfb77d7b2ff0b0b5ab289ffcb56821023e50d12deb4ff29cc5ae490c028420384da84811c661d277017f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pl/firefox-62.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "d62822aa991cd30cb6c5e47dc211bd4018de427b243543bd83bd166601e40e3bed35dfc073660573dc500ae19ead2dca858041a3b80bd616def3c2b3f72aee11"; + sha512 = "a5581c2e2d7de1187967af10802c4a6577a5bbf9a0ab56448b0695ca3fdee845117fa364ea53149b81a5aeb3ddab22c58ff65863fc981445bd34858766fb438c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-BR/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pt-BR/firefox-62.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "5a2ea1494423a5ce1afc60c2d1a4e53ef084a02050ca61a688ecf18ff9d99e43d6bd334683937c12965767e7e5b0bd1a32708f1f2c2a241db1f68271633ace66"; + sha512 = "70a9cc592980afbaa3efa37b57e190f6bd6c76fe975ee16b3a3b2e3498c65e792a83870f569836fe79fabc289c201b7f6764d4d512f9d561058eb496d1bc1cf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-PT/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pt-PT/firefox-62.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "83cff834812ad238b103fcee8b801e46ae542eba3475709e04848f18df0bee68075b2834ee871bfa5eb58ad1ec7fb34239d661a27d0dcba17e6c39de8428cef6"; + sha512 = "8e1d94b4b3e01e684387b4e3c9439ee1df9712cef607f370d63ff0072876c2ad9e22a978fcaba14c03802c8fd5b559c6dc412fdadaa6a01425bb491852c4ce02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/rm/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/rm/firefox-62.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c4190e7e2007805b2c7507dd26b0695bc5d3c007eabd6a592c283a99cf0495ce1dfcd6dbb1e753a990f64466f24618d3b84df617f99fb266ceadf32fcd990af8"; + sha512 = "77500b96558c055ea90750d99aeb096d789a920fac4fd368b95a032cfa565ea0ee1259503ef0d198c4802bbeeb847a3ca22f06ae79b6e554c54d336a99f61687"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ro/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ro/firefox-62.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "292112e0af6bad96b97bb0a1d58d0b7c9d4cb476cf531b1caaffcfd54c2f0ecd72a4311f98b614d7f834ffe2779261f77eb43d4d7ab724378dc6b7ad83bb1840"; + sha512 = "e3cfec0059f0372d2b3764a4c3809b7a8c9ee6e795bb1d8eccf663feb1d054be58c15569b8dcad55b5ad37a1332d950f5286ad88ca5db55441c1cb3dd879bb8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ru/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ru/firefox-62.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "3d6fa0994fba5ff988e281ac4feff8655a5353ebf0d99df5ac7412cff2d19d478a912851d27f2af5bd78fdbc68030878682bb7ffa912180d2c4aa9bafcd77cd5"; + sha512 = "91077e66da0403828807fe1a3ee274ac162898efafd651b3c243c315c9f0f1cfb88925e738b9bf25fa7fc0c7b747f2a9f2a5a1c77b87cb83d3aa620475239822"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/si/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/si/firefox-62.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e6d3c4049f267e68216e9824743b123539e5445a5d53297eb8af33af95a418e492a655a456970d02049f8969c81c0ab8c5be1471a5ab8e01b4744995b799158a"; + sha512 = "f770321771e965776b55d7681783e3782b7ce4df3c3d7cce581a3de1db0f8fc8c3ded3d606fc7f7f61e62b33986e8e05ff64e49427a8cb85b68b7b6fe43f6c3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sk/firefox-62.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "66fc1f3f4fb7dec1c261db144243dc0647b4dbc4257de93c5fb017ae616d31d6825fdfafc30d3fc299a278d5fd51731f24e6033cb3807c69ccd1512527029063"; + sha512 = "150792fbeebcd0969fdbef0827b617f83383bcaaf3eed9dac0790aa0ffb893d4498dae29eb480fda05a2feaca0428cf600bfb3398dfbcc921e92cf2ca01c7a1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sl/firefox-62.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e089b96b77a60c2c8e96f107cd26f37e681f8a8c702cf32ee3592344900c81daba274516c32ac856609917a30f8d60d853fd649fe575c3a2915072e45908126b"; + sha512 = "d423c10683ba690a8d8eec50e4e966b7233d565e2c35b5fdd70aa917908daab5d01f847c32f7e24c604aa19ab941ca70c6e6613b39271d01f1370dbd974800fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/son/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/son/firefox-62.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "00eecadab36816ae5e977dd50f335222e1fd8253b98daa1f14920e48678afb22b0e619ae4a86e6a45c8d2973f83f614f16a1f860e6ed1ed488851032075d6c72"; + sha512 = "7f1d638cbd729b51d959b0b1ee0e4ec5473f5478bf315c890fd9df20e3065861a5c8447399e973cac78bd078d2a1f0e1bad829f6b462ec6ffc55e7748760677a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sq/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sq/firefox-62.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ebd8ed00c12288a3ae4f6a113bbac8595ea9c0fbc35575115fd019c6158857ad083588100d4cae440822780bf25789501d0dd800bbe2baef5f037fb43aeabb74"; + sha512 = "823b4b5043e3fd8fcf0bcb345d00dbfa38e6e03fdf172a30c272f51eee7f9057ec99423c7117ab8d21e9037bcc1e19a7082401a0b25514e2258542aef4c4af80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sr/firefox-62.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "bfce8265755adbc3c30d56a1e4bbbbb14385ddd3d2434b6404b04e3fa3120d58b32cb9e598aeb1540f23d2757c23fe903fd5c9d5167db305a88077e98d9a39b2"; + sha512 = "a08ef0de87e4f01c11b20301e45e98d3bf10bbd4d2699de56f66470d7f4298aec3744f44888ba46ec1293fb713487f6df20bb9f5682a57827993f0ddd28cdde3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sv-SE/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sv-SE/firefox-62.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "518b28e8f88a763aa09c5aed12eb0f2b582f84770401f3e11e5083fe69d176ce1483a81c2345a7fae2473551bf41db6a35f341495eb59c559a99398b93a7195a"; + sha512 = "e3e65e32e5e11547e220bb34d0009257f3c4f18aec0fe961f310ef4b76311d8d885a01d6bc4420c2b97687b886c3d00c09d43af0c6c7eaca8e6a804d78d4bfe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ta/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ta/firefox-62.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a4d5960e0b60cf03c0ecf7f0d2b697dbb68dbfb4e0f3c77548c020d574f60c0fe7cc032a81215f34108a11651800deb1b1533efad3e238fd32780f22bd5524fc"; + sha512 = "47753ccbe4471ab3d3de3ea11992cd332251868ae3a7772e860531d013c657f5ff559d34592fedf7b52ecf3a54476dc2e0fc68119170afb9c482fccd04a36776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/te/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/te/firefox-62.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8bf1510077ce86f50c668cb8d931d6d0899d1b7559736312c86acfdc3149da75f8c8f750393e02023a9b063c27c03adcc6bd5c29c950fc0a6055392a2e0eb2d4"; + sha512 = "90327dd95f3a597692cf5ea54258c31ed813261f102a7f668f5bc5062499a6bfe64d2d241dc33ffdc5cd152802e7d462c7ffdbe4498825ad88be48d21031919b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/th/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/th/firefox-62.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "af32b002380fee3b147b2cc44831c3d2ee29d784b8c935fe1be464b302992aebba73a39929ca23b35b9b6a8475e909a73622f70810e0a4a21bc7db74a8b4da46"; + sha512 = "652a7bf7f2a7c6fa27edbd5e78cfecd2df661e1a7a01cc532b1caaed53bd40025aaee2126dd1116e77ef9e050777e78e96537ed2decfe493caa1d03c7bbb0646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/tr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/tr/firefox-62.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4216a4e126a41f26b344804e4222535aee43c9f52fafbb6e1d019cc743fe18c0cdeed7fc04dd06fb921efc0431256ed2f09ed21fafff8a1132d097082b849388"; + sha512 = "f98d45b831f51a0caa47fcaaaf1ed37f267035e1f1ab95ae0cfbafa06f03b89f99b7a7accb9812644f862b819c2bb294f5a3454ece80f775359ac77734a99d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/uk/firefox-62.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "dfe75bb618097d0a96066dd65ba0da7e9d3ce91c14075023c48aedfb88c6d30b83c8ab503666c7581783baf347beac58e81d49e7f9b671bedcdb6827f0843b35"; + sha512 = "6c67554c87c7941fec8193bfcdd9d5d0af906d13ab237e0ddd97733816d2df27fee5e11eb450e85f9143f71049219e8ef9c6cd4d327faf3e335247130cdd26f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ur/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ur/firefox-62.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "0a1a8cae5f364b5e0e2570ef6e06870efd136322082e2fb7690b381f05195eee48787ac679916cd7508f9f51458c038798c9e73f982992dd5b0de8d596e83ca4"; + sha512 = "0c90e5575d057d9f32c18a102d2db7848f8821d71edb3cb9ae4f2565a1cc2851da7fb1bd493e81dca003a50a9f26454af8cf0ef7f947ea42aa22baf20abc06d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uz/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/uz/firefox-62.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "153e781c6e4a530fad7631168afaaed74b0c8323317b1b4104cfffd8ee9250ae9af0ed9a0a0f157fc6745dfef7889402426c3d5e13d0c1b234fdaf952c9cb3aa"; + sha512 = "fc35bb30011063bda8c256b6c405bffae55ae7d67ce5809367aaadaddb1094acfe0186f2cd84b2dceb55a76358ee46e29ec013058e035123a7797b5ac49b6e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/vi/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/vi/firefox-62.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "1cc2e611316137b1d569d3c2617d41bddc48a8618a8937eab643ebdf94727139743b8bc6e1d18a7487e9d30f867ae1b7f77bfd528e0b535d122a4e8f9fcd311c"; + sha512 = "0c6a94f811ba509dc468b31f9448eba7f1004e6652a418db8ef84d03d79ff850237bd7555b8f73d515f8a0c546df371a18bc51ccd3dad069bc481f58f9a4c989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/xh/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xh/firefox-62.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b0c4a093950fe90ad2249a5259843e7b3b4bdf2179b0c7ee61e1f965a4104636a53d7db0b91aaff3047cc7252855970f12e1b3bc4aa9e4f85d301652cb53c6c0"; + sha512 = "b113f1f4a81a7cac63a8604a8152bf651ebee3ad48eaabef84d09d3576b37b529f56c04fc9fd1b3326364aeaefad77cc123a97b662c85665c7f239384f5c6d7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-CN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/zh-CN/firefox-62.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "b3d1ea1e74ce5c7779bd1c7299197d0143688cc6bd9c4ae0b391e3849fec40c3142a9b7db19d3805616fa885deb16a6fdbe2fd23ddf0eac0fb0094498917d356"; + sha512 = "7c3da83ebdfbcaf8a67ac8cf953d648dd3eb54d1c9f6e74680b00ef94e01a0384a53d27c4a78312e25e284209f3e4c53661958347e3250eb820a20873e66c3fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-TW/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/zh-TW/firefox-62.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "cda9d835f282746cb711054f1ed2f137e0f7e89c27429af12f470ed8984ea0c9a4f28e5cd403aa2f37fe0c06271c7651f794009ec11ddc64a96c4c661ca9ecb6"; + sha512 = "659ea2bbd51d99a0c3573043a55ee580839e5f0323c57bb7b086ebc41a19f493baadecf67b64443b5abcf5db69e7e82e0c965a40b151d141557cda04b3ce6d52"; } ]; } From 26cbfe1035547ddb885f66e52aa0ecc33239ae1f Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 4 Sep 2018 21:16:46 +0900 Subject: [PATCH 034/600] firefox: 61.0.2 -> 62.0 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 984d80167c39..3559135a01dd 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -20,10 +20,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "61.0.2"; + version = "62.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3zzcxqjpsn2m5z4l66rxrq7yf58aii370jj8pcl50smcd55sfsyknnc20agbppsw4k4pnwycfn57im33swwkjzg0hk0h2ng4rvi42x2"; + sha512 = "0byxslbgr37sm1ra3wywl5c2a39qbkjwc227yp4j2l930m5j86m5g7rmv8zm944vv5vnyzmwhym972si229fm2lwq74p4xam5rfv948"; }; patches = nixpkgsPatches ++ [ From 90ab6c8400c5c68e32113441e8dc4166dae50e98 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 4 Sep 2018 01:13:46 +0200 Subject: [PATCH 035/600] monero: 0.12.0.0 -> 0.12.3.0 --- pkgs/applications/altcoins/monero/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index cbba1ecba145..a4a884707a98 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchgit , cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline @@ -11,25 +11,16 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.12.0.0"; + version = "0.12.3.0"; - src = fetchFromGitHub { - owner = "monero-project"; - repo = "monero"; + src = fetchgit { + url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk"; + sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i"; }; nativeBuildInputs = [ cmake pkgconfig git ]; - patches = [ - # fix daemon crash, remove with 0.12.1.0 update - (fetchpatch { - url = "https://github.com/monero-project/monero/commit/08343ab.diff"; - sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83"; - }) - ]; - buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline @@ -39,7 +30,7 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" - ]; + ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; hardeningDisable = [ "fortify" ]; From fd95d306095b664977285078a2169874c4766b1b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 4 Sep 2018 12:11:19 +0200 Subject: [PATCH 036/600] monero-gui: 0.12.0.0 -> 0.12.3.0 --- .../altcoins/monero-gui/default.nix | 7 ++- .../altcoins/monero-gui/move-log-file.patch | 55 ++++++++----------- .../monero-gui/move-translations-dir.patch | 15 +++-- 3 files changed, 33 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 2aff86ae1d38..49b8db51bcc8 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.12.0.0"; + version = "0.12.3.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl"; + sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i"; }; nativeBuildInputs = [ qmake pkgconfig ]; @@ -70,7 +70,8 @@ stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications # install translations - cp -r release/bin/translations $out/share/ + mkdir -p $out/share/translations + cp translations/*.qm $out/share/translations/ # install icons for n in 16 24 32 48 64 96 128 256; do diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 08840c6a65e8..74f817d81350 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -1,38 +1,27 @@ diff --git a/main.cpp b/main.cpp -index c03b160..a8ea263 100644 +index 79223c0..e80b317 100644 --- a/main.cpp +++ b/main.cpp -@@ -80,14 +80,16 @@ int main(int argc, char *argv[]) - // qDebug() << "High DPI auto scaling - enabled"; - //#endif - -- // Log settings -- Monero::Wallet::init(argv[0], "monero-wallet-gui"); --// qInstallMessageHandler(messageHandler); -- - MainApp app(argc, argv); - - qDebug() << "app startd"; - -+ // Log settings -+ QString logfile = -+ QStandardPaths::writableLocation(QStandardPaths::CacheLocation) -+ + "/monero-wallet-gui.log"; -+ Monero::Wallet::init(argv[0], logfile.toUtf8().constData()); -+ - app.setApplicationName("monero-core"); - app.setOrganizationDomain("getmonero.org"); - app.setOrganizationName("monero-project"); -diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp -index 74649ce..fe1efc6 100644 ---- a/src/libwalletqt/Wallet.cpp -+++ b/src/libwalletqt/Wallet.cpp -@@ -729,7 +729,7 @@ QString Wallet::getWalletLogPath() const - #ifdef Q_OS_MACOS - return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs/" + filename; - #else -- return QCoreApplication::applicationDirPath() + "/" + filename; -+ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + filename; +@@ -115,6 +115,9 @@ int main(int argc, char *argv[]) + QCommandLineOption logPathOption(QStringList() << "l" << "log-file", + QCoreApplication::translate("main", "Log to specified file"), + QCoreApplication::translate("main", "file")); ++ logPathOption.setDefaultValue( ++ QStandardPaths::writableLocation(QStandardPaths::CacheLocation) ++ + "/monero-wallet-gui.log"); + parser.addOption(logPathOption); + parser.addHelpOption(); + parser.process(app); +diff --git a/Logger.cpp b/Logger.cpp +index 660bafc..dae24d4 100644 +--- a/Logger.cpp ++++ b/Logger.cpp +@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log"; + #elif defined(Q_OS_MAC) + static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs"; + #else // linux + bsd +- static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0); ++ static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0); #endif - } + diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch index 29bb56301547..ff17ce5da1c0 100644 --- a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch +++ b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch @@ -1,14 +1,13 @@ diff --git a/TranslationManager.cpp b/TranslationManager.cpp -index fa39d35..5a410f7 100644 +index e7fc52a..83534cc 100644 --- a/TranslationManager.cpp +++ b/TranslationManager.cpp -@@ -29,7 +29,7 @@ bool TranslationManager::setLanguage(const QString &language) - #ifdef Q_OS_MACX - QString dir = qApp->applicationDirPath() + "/../Resources/translations"; - #else +@@ -25,7 +25,7 @@ bool TranslationManager::setLanguage(const QString &language) + return true; + } + - QString dir = qApp->applicationDirPath() + "/translations"; + QString dir = qApp->applicationDirPath() + "/../share/translations"; - #endif - QString filename = "monero-core_" + language; - + + qDebug("%s: loading translation file '%s' from '%s'", From 3bc898035d7e4402ca9257b8e348545868433520 Mon Sep 17 00:00:00 2001 From: Sebastien Maret Date: Tue, 4 Sep 2018 15:55:46 +0200 Subject: [PATCH 037/600] gildas: fix makefile rule --- .../science/astronomy/gildas/default.nix | 2 +- .../astronomy/gildas/gag-font-bin-rule.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index ee19077065e0..8b01ef0c7713 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; - patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ]; + patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ]; configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out diff --git a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch new file mode 100644 index 000000000000..61ddc37c7fd4 --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch @@ -0,0 +1,13 @@ +diff -ruN gildas-src-aug18a/kernel/etc/Makefile gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile +--- gildas-src-aug18a/kernel/etc/Makefile 2016-09-09 09:39:37.000000000 +0200 ++++ gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile 2018-09-04 12:03:11.000000000 +0200 +@@ -29,7 +29,8 @@ + + SEDEXE=sed -e 's?source tree?executable tree?g' + +-$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey ++$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey \ ++ $(gagintdir)/etc/gag.dico.gbl $(gagintdir)/etc/gag.dico.lcl + ifeq ($(GAG_ENV_KIND)-$(GAG_TARGET_KIND),cygwin-mingw) + $(bindir)/hershey `cygpath -w $(datadir)`/gag-font.bin + else From d376ceb6ff676edebc6410d7cfc10e30875f50f9 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Tue, 4 Sep 2018 10:44:38 -0400 Subject: [PATCH 038/600] all-cabal-hashes: update snapshot to Hackage at 2018-09-04T11:59:40Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index fce8f44bd3ff..a2d04640d591 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/d5c89ad106556f7890c89c50a2b4d3fbdcea7616.tar.gz"; - sha256 = "0j8r88wwf0qvqxcnwmcs6xcn4vi0189c9f5chfl80941ggxfbpxk"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/22cb611adaf63739fc7e3956d83d450154ec766b.tar.gz"; + sha256 = "0wxggabwz8qs2hmnr3k3iwy9rmvicx4a1n22l7f6krk1hym5bkpl"; } From c19136b1cda1ae95430ae27fceb2223064d7cfae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 4 Sep 2018 18:06:47 +0200 Subject: [PATCH 039/600] ghostscript: 9.22 -> 9.24 (security) The $doc stuff needed changes, probably because of ghostscript newly reacting to some configure flags that stdenv passes. - share/ghostscript/9.22/doc was an ugly location for documentation, and I didn't like their new share/ghostscript/9.24 either, so that got changed to share/doc/ghostscript/9.24 - their process no longer installs examples, apparently, but I don't expect that would be any problem for us --- pkgs/misc/ghostscript/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 5839b076c0de..42e5e5c379c8 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -9,8 +9,9 @@ assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; let version = "9.${ver_min}"; - ver_min = "22"; - sha256 = "1fyi4yvdj39bjgs10klr31cda1fbx1ar7a7b7yz7v68gykk65y61"; + ver_min = "24"; + # ghostscript*.tar.xz in https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9xx/SHA512SUMS + sha512 = "dcbeeb5d3dd5ccaf949dc4be68363c50b1d35e647be4790a50b1bbf5f259f1d9181f705be27bfca708c4d270f945ff4b24e3db10b57800c1ee0ea7a40931c547"; fonts = stdenv.mkDerivation { name = "ghostscript-fonts"; @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${name}.tar.xz"; - inherit sha256; + inherit sha512; }; outputs = [ "out" "man" "doc" ]; @@ -89,8 +90,8 @@ stdenv.mkDerivation rec { cp -r Resource "$out/share/ghostscript/${version}" - mkdir -p "$doc/share/ghostscript/${version}" - mv "$out/share/ghostscript/${version}"/{doc,examples} "$doc/share/ghostscript/${version}/" + mkdir -p "$doc/share/doc/ghostscript" + mv "$doc/share/doc/${version}" "$doc/share/doc/ghostscript/" ln -s "${fonts}" "$out/share/ghostscript/fonts" '' + stdenv.lib.optionalString stdenv.isDarwin '' From 7cdb44e7936e9bd45a719085c8edaf138bc681db Mon Sep 17 00:00:00 2001 From: geistesk Date: Tue, 4 Sep 2018 18:44:01 +0200 Subject: [PATCH 040/600] mpv: resorted support options alphabetically --- pkgs/applications/video/mpv/default.nix | 134 ++++++++++++------------ 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index c384455d6722..bb96ed372e48 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -3,42 +3,42 @@ , freefont_ttf, freetype, libass, libpthreadstubs , lua, luasocket, libuchardet, libiconv ? null, darwin -, x11Support ? stdenv.isLinux, - libGLU_combined ? null, - libX11 ? null, - libXext ? null, - libXxf86vm ? null, - libXrandr ? null - , waylandSupport ? false , wayland ? null , wayland-protocols ? null , libxkbcommon ? null -, rubberbandSupport ? true, rubberband ? null -, xineramaSupport ? true, libXinerama ? null -, xvSupport ? true, libXv ? null -, sdl2Support ? true, SDL2 ? null +, x11Support ? stdenv.isLinux + , libGLU_combined ? null + , libX11 ? null + , libXext ? null + , libXxf86vm ? null + , libXrandr ? null + , alsaSupport ? true, alsaLib ? null -, screenSaverSupport ? true, libXScrnSaver ? null -, cmsSupport ? true, lcms2 ? null -, vdpauSupport ? true, libvdpau ? null -, dvdreadSupport ? true, libdvdread ? null -, dvdnavSupport ? true, libdvdnav ? null , bluraySupport ? true, libbluray ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? 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 +, cmsSupport ? true, lcms2 ? null , drmSupport ? true, libdrm ? null -, openalSupport ? false, openalSoft ? null -, vapoursynthSupport ? false, vapoursynth ? null +, dvdnavSupport ? true, libdvdnav ? null +, dvdreadSupport ? true, libdvdread ? null +, libpngSupport ? true, libpng ? null +, pulseSupport ? true, libpulseaudio ? null +, rubberbandSupport ? true, rubberband ? null +, screenSaverSupport ? true, libXScrnSaver ? null +, sdl2Support ? true, SDL2 ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vaapiSupport ? true, libva ? null +, vdpauSupport ? true, libvdpau ? null +, xineramaSupport ? true, libXinerama ? null +, xvSupport ? true, libXv ? null +, youtubeSupport ? true, youtube-dl ? null , archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null +, openalSupport ? false, openalSoft ? null +, vapoursynthSupport ? false, vapoursynth ? null }: with stdenv.lib; @@ -46,32 +46,32 @@ with stdenv.lib; let available = x: x != null; in -assert x11Support -> all available [libGLU_combined libX11 libXext libXxf86vm libXrandr]; -assert waylandSupport -> all available [wayland wayland-protocols libxkbcommon]; -assert rubberbandSupport -> available rubberband; -assert xineramaSupport -> x11Support && available libXinerama; -assert xvSupport -> x11Support && available libXv; -assert sdl2Support -> available SDL2; assert alsaSupport -> available alsaLib; -assert screenSaverSupport -> available libXScrnSaver; -assert cmsSupport -> available lcms2; -assert vdpauSupport -> available libvdpau; -assert dvdreadSupport -> available libdvdread; -assert dvdnavSupport -> available libdvdnav; +assert archiveSupport -> available libarchive; assert bluraySupport -> available libbluray; -assert speexSupport -> available speex; -assert theoraSupport -> available libtheora; -assert openalSupport -> available openalSoft; -assert pulseSupport -> available libpulseaudio; assert bs2bSupport -> available libbs2b; assert cacaSupport -> available libcaca; -assert libpngSupport -> available libpng; -assert youtubeSupport -> available youtube-dl; -assert vapoursynthSupport -> available vapoursynth; -assert jackaudioSupport -> available libjack2; -assert archiveSupport -> available libarchive; -assert vaapiSupport -> available libva; +assert cmsSupport -> available lcms2; assert drmSupport -> available libdrm; +assert dvdnavSupport -> available libdvdnav; +assert dvdreadSupport -> available libdvdread; +assert jackaudioSupport -> available libjack2; +assert libpngSupport -> available libpng; +assert openalSupport -> available openalSoft; +assert pulseSupport -> available libpulseaudio; +assert rubberbandSupport -> available rubberband; +assert screenSaverSupport -> available libXScrnSaver; +assert sdl2Support -> available SDL2; +assert speexSupport -> available speex; +assert theoraSupport -> available libtheora; +assert vaapiSupport -> available libva; +assert vapoursynthSupport -> available vapoursynth; +assert vdpauSupport -> available libvdpau; +assert waylandSupport -> all available [ wayland wayland-protocols libxkbcommon ]; +assert x11Support -> all available [ libGLU_combined libX11 libXext libXxf86vm libXrandr ]; +assert xineramaSupport -> x11Support && available libXinerama; +assert xvSupport -> x11Support && available libXv; +assert youtubeSupport -> available youtube-dl; let # Purity: Waf is normally downloaded by bootstrap.py, but @@ -115,13 +115,13 @@ in stdenv.mkDerivation rec { "--disable-static-build" "--disable-build-date" # Purity "--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported - (enableFeature archiveSupport "libarchive") - (enableFeature dvdreadSupport "dvdread") - (enableFeature dvdnavSupport "dvdnav") - (enableFeature openalSupport "openal") - (enableFeature vaapiSupport "vaapi") - (enableFeature waylandSupport "wayland") - (enableFeature stdenv.isLinux "dvbin") + (enableFeature archiveSupport "libarchive") + (enableFeature dvdnavSupport "dvdnav") + (enableFeature dvdreadSupport "dvdread") + (enableFeature openalSupport "openal") + (enableFeature vaapiSupport "vaapi") + (enableFeature waylandSupport "wayland") + (enableFeature stdenv.isLinux "dvbin") ]; configurePhase = '' @@ -137,32 +137,32 @@ in stdenv.mkDerivation rec { ffmpeg_4 freetype libass libpthreadstubs lua luasocket libuchardet ] ++ optional alsaSupport alsaLib - ++ optional xvSupport libXv - ++ optional theoraSupport libtheora - ++ optional xineramaSupport libXinerama - ++ optional dvdreadSupport libdvdread + ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray + ++ optional bs2bSupport libbs2b + ++ optional cacaSupport libcaca + ++ optional cmsSupport lcms2 + ++ optional drmSupport libdrm + ++ optional dvdreadSupport libdvdread ++ optional jackaudioSupport libjack2 + ++ optional libpngSupport libpng + ++ optional openalSupport openalSoft ++ optional pulseSupport libpulseaudio ++ optional rubberbandSupport rubberband ++ optional screenSaverSupport libXScrnSaver - ++ optional cmsSupport lcms2 - ++ optional vdpauSupport libvdpau - ++ optional speexSupport speex - ++ optional bs2bSupport libbs2b - ++ optional openalSupport openalSoft - ++ optional libpngSupport libpng - ++ optional youtubeSupport youtube-dl ++ optional sdl2Support SDL2 - ++ optional cacaSupport libcaca + ++ optional speexSupport speex + ++ optional theoraSupport libtheora ++ optional vaapiSupport libva - ++ optional drmSupport libdrm ++ optional vapoursynthSupport vapoursynth - ++ optional archiveSupport libarchive + ++ optional vdpauSupport libvdpau + ++ optional xineramaSupport libXinerama + ++ optional xvSupport libXv + ++ optional youtubeSupport youtube-dl ++ optional stdenv.isDarwin libiconv ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] - ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] + ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Cocoa CoreAudio ]); From 14837a8277e4b751d8a8154b656321e40a5e34d4 Mon Sep 17 00:00:00 2001 From: geistesk Date: Tue, 4 Sep 2018 18:46:31 +0200 Subject: [PATCH 041/600] mpv: add cddaSupport-flag to play Audio CDs Introduced `cddaSupport` for `mpv` which defaults to false. By enabling it, `mpv` will be compiled with cdda support (`libcdio{,-paranoia}`) to play audio CDs. --- pkgs/applications/video/mpv/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index bb96ed372e48..9d843a3bfefb 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -15,6 +15,10 @@ , libXxf86vm ? null , libXrandr ? null +, cddaSupport ? false + , libcdio ? null + , libcdio-paranoia ? null + , alsaSupport ? true, alsaLib ? null , bluraySupport ? true, libbluray ? null , bs2bSupport ? true, libbs2b ? null @@ -51,6 +55,7 @@ assert archiveSupport -> available libarchive; assert bluraySupport -> available libbluray; assert bs2bSupport -> available libbs2b; assert cacaSupport -> available libcaca; +assert cddaSupport -> all available [libcdio libcdio-paranoia]; assert cmsSupport -> available lcms2; assert drmSupport -> available libdrm; assert dvdnavSupport -> available libdvdnav; @@ -116,6 +121,7 @@ in stdenv.mkDerivation rec { "--disable-build-date" # Purity "--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported (enableFeature archiveSupport "libarchive") + (enableFeature cddaSupport "cdda") (enableFeature dvdnavSupport "dvdnav") (enableFeature dvdreadSupport "dvdread") (enableFeature openalSupport "openal") @@ -160,6 +166,7 @@ in stdenv.mkDerivation rec { ++ optional xvSupport libXv ++ optional youtubeSupport youtube-dl ++ optional stdenv.isDarwin libiconv + ++ optionals cddaSupport [ libcdio libcdio-paranoia ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] From a3f6a4b9b6c7fe800af23b2744000c7d5b3a5d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 4 Sep 2018 18:50:15 +0200 Subject: [PATCH 042/600] ghostscript: fix nitpicks after the update - unused lcms2 input - reference $out -> $doc --- pkgs/misc/ghostscript/default.nix | 14 ++++++++------ pkgs/misc/ghostscript/doc-no-ref.diff | 7 +++++++ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 pkgs/misc/ghostscript/doc-no-ref.diff diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 42e5e5c379c8..54ad32622756 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf -, libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec +, libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libiconv, ijs , x11Support ? false, xlibsWrapper ? null , cupsSupport ? false, cups ? null @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { inherit sha512; }; + patches = [ + ./urw-font-files.patch + ./doc-no-ref.diff + ]; + outputs = [ "out" "man" "doc" ]; enableParallelBuilding = true; @@ -50,16 +55,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ zlib expat openssl - libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec + libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec libiconv ijs ] ++ lib.optional x11Support xlibsWrapper ++ lib.optional cupsSupport cups ; - - patches = [ - ./urw-font-files.patch - ]; + # No lcms2; upstream "is in process of forking it" and thus won't use one from a library. preConfigure = '' # requires in-tree (heavily patched) openjpeg diff --git a/pkgs/misc/ghostscript/doc-no-ref.diff b/pkgs/misc/ghostscript/doc-no-ref.diff new file mode 100644 index 000000000000..7380ba2f9953 --- /dev/null +++ b/pkgs/misc/ghostscript/doc-no-ref.diff @@ -0,0 +1,7 @@ +Kill the reference from libgc.so to the documentation directory. +It's bad for closure, and probably not really good for anything. +--- a/base/gs.mak ++++ b/base/gs.mak +@@ -538,1 +538,1 @@ +- $(EXP)$(ECHOGS_XE) -a $(gconfigd_h) -x 23 define -s -u GS_DOCDIR -x 2022 $(GS_DOCDIR) -x 22 ++ $(EXP)$(ECHOGS_XE) -a $(gconfigd_h) -x 23 define -s -u GS_DOCDIR -x 2022 /no-path-to-docs -x 22 From 72cf7f513d1aedf1248933938c66ded4fc2d720d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 3 Sep 2018 15:07:20 -0500 Subject: [PATCH 043/600] libreoffice-{fresh,still}: upgrade and clean * libreoffice-still: -> 6.0.6.2 * (newer than our current 'fresh!') * libreoffice-fresh: -> 6.1.0.3 * 6.1.1(.1) is currently pre-release, FWIW * Use normal gcc, not gcc5 * dropping 'glibc' from buildInputs fixed this (?) * remove many fixes/touchups/workarounds/hacks * hopefully everything still works for everyone * disable online update since that seems unlikely to work anyway * fix autogen/configure invocations * disable libnumbertext in 6.1.x since not packaged * drop 'touch solenv/inc/target.mk' as unclear what it was for and doesn't seem to be currently needed * cleanup link gen a bit[1] * split checks to check phase [1] primary motivation was to stop creating links like: 'libreoffice-6.0.5.2/src/-libxslt-1.1.32.tar.gz' -> '/nix/store/503v5hmhm430bld0h078gacmkniwdllr-libxslt-1.1.32.tar.gz' 'libreoffice-6.0.5.2/src/libxslt-1.1.32.tar.gz' -> '/nix/store/503v5hmhm430bld0h078gacmkniwdllr-libxslt-1.1.32.tar.gz' This is mostly accomplished by simply using the 'md5name' field which the python script kindly generates for us (including the use of non-md5 if md5 is not set or empty). --- .../libreoffice/default-primary-src.nix | 8 +- .../office/libreoffice/default.nix | 159 +++--- .../libreoffice/libreoffice-srcs-still.nix | 452 ++++++++++-------- .../office/libreoffice/libreoffice-srcs.nix | 173 ++++--- .../office/libreoffice/still-primary-src.nix | 8 +- .../applications/office/libreoffice/still.nix | 172 +++---- pkgs/top-level/all-packages.nix | 7 +- 7 files changed, 531 insertions(+), 448 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 87fe343613e5..446efe78d256 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -2,9 +2,9 @@ rec { major = "6"; - minor = "0"; - patch = "5"; - tweak = "2"; + minor = "1"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "16h60j7h9z48vfhhj22m64myksnrrgrnh0qc6i4bxgshmm8kkzdn"; + sha256 = "54eccd268f75d62fa6ab78d25685719c109257e1c0f4d628eae92ec09632ebd8"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 22c044d199a3..2de1ed92dea8 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,7 +6,7 @@ , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux , librsvg, gnome_vfs, libGLU_combined, 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, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf @@ -34,22 +34,28 @@ let }; srcs = { - third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { - 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)); + third_party = + map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) + ((import ./libreoffice-srcs.nix) ++ [ + (rec { + name = "unowinreg.dll"; + url = "https://dev-www.libreoffice.org/extern/${md5name}"; + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; + md5 = "185d60944ea767075d27247c3162b3bc"; + md5name = "${md5}-${name}"; + }) + ]); translations = fetchSrc { name = "translations"; - sha256 = "1p8gb9jxv4n8ggksbfsqzdw5amxg575grxifsabhgjllpisjzrlr"; + sha256 = "140i0q6nyi2l6nv2b3n7s7mggm2rb1ws3h9awa9y6m2iads54qm7"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1dkzm766zi4msk6w35bvfk5b5bx1xyqg2wx58wklr5375kjv6ba9"; + sha256 = "0ayssl5ivhyzxi3gz3h4yhp8hq7ihig6n6iijbks5f1sm7dwridv"; }; }; @@ -58,26 +64,18 @@ in stdenv.mkDerivation rec { inherit (primary-src) src; - # Openoffice will open libcups dynamically, so we link it directly - # to make its dlopen work. - # It also seems not to mention libdl explicitly in some places. - NIX_LDFLAGS = "-lcups -ldl"; - # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - # 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; + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; patches = [ ./xdg-open-brief.patch ]; postUnpack = '' mkdir -v $sourceRoot/src - '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' + (lib.flip lib.concatMapStrings srcs.third_party (f: '' + ln -sfv ${f} $sourceRoot/src/${f.md5name} + ln -sfv ${f} $sourceRoot/src/${f.name} + '')) + '' ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} @@ -85,14 +83,20 @@ in stdenv.mkDerivation rec { postPatch = '' sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx + + # configure checks for header 'gpgme++/gpgmepp_version.h', + # and if it is found (no matter where) uses a hardcoded path + # in what presumably is an effort to make it possible to write + # '#include ' instead of '#include '. + # + # Fix this path to point to where the headers can actually be found instead. + substituteInPlace configure.ac --replace \ + 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ + 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' ''; QT4DIR = qt4; - # Fix boost 1.59 compat - # Try removing in the next version - CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; - preConfigure = '' configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" @@ -101,69 +105,72 @@ in stdenv.mkDerivation rec { chmod a+x ./bin/unpack-sources patchShebangs . - # It is used only as an indicator of the proper current directory - touch solenv/inc/target.mk - - # 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" + + NOCONFIGURE=1 ./autogen.sh ''; - # fetch_Download_item tries to interpret the name as a variable name - # Let it do so… - postConfigure = '' - sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile - sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile + postConfigure = + # fetch_Download_item tries to interpret the name as a variable name, let it do so... + '' + sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile + sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile + '' + # Test fixups + # May need to be revisited/pruned, left alone for now. + + '' + # unit test sd_tiledrendering seems to be fragile + # 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 + 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 — 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 + # rendering-dependent tests + sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + 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 + 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 + '' + # This to avoid using /lib:/usr/lib at linking + + '' + sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk - # unit test sd_tiledrendering seems to be fragile - # 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 - 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 — 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 - # rendering-dependent tests - sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx - sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx - 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 - 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 - ''; + find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; + ''; makeFlags = "SHELL=${bash}/bin/bash"; enableParallelBuilding = true; buildPhase = '' - # This to avoid using /lib:/usr/lib at linking - sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk - - find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; - - make + make build-nocheck ''; + doCheck = true; + # It installs only things to $out/lib/libreoffice postInstall = '' mkdir -p $out/bin $out/share/desktop @@ -195,11 +202,11 @@ in stdenv.mkDerivation rec { "--with-vendor=NixOS" "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" "--disable-report-builder" + "--disable-online-update" "--enable-python=system" "--enable-dbus" "--enable-release-build" (lib.enableFeature kdeIntegration "kde4") - "--with-package-format=installed" "--enable-epm" "--with-jdk-home=${jdk.home}" "--with-ant-home=${ant}/lib/ant" @@ -213,9 +220,13 @@ in stdenv.mkDerivation rec { "--with-system-openldap" "--with-system-coinmp" + "--with-alloc=system" + # Without these, configure does not finish "--without-junit" + "--disable-libnumbertext" # system-libnumbertext" + # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though "--disable-odk" @@ -260,7 +271,7 @@ 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 libtool + mdds bluez5 libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme gettext diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index 36500166dccf..94e2564d1133 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -1,10 +1,10 @@ [ { - 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 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199-libabw-0.1.1.tar.bz2"; + md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; @@ -28,11 +28,11 @@ 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 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0-boost_1_63_0.tar.bz2"; + md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2"; } { name = "breakpad.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 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20-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 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d-libcdr-0.1.3.tar.bz2"; + md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -90,13 +90,6 @@ md5 = ""; md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-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"; - } { name = "cppunit-1.14.0.tar.gz"; url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; @@ -112,18 +105,18 @@ 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.60.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz"; + sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5"; md5 = ""; - md5name = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae-curl-7.52.1.tar.gz"; + md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.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 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850-libe-book-0.1.2.tar.bz2"; + md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { name = "libepoxy-1.3.1.tar.bz2"; @@ -140,18 +133,25 @@ 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 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78-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 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f-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"; @@ -161,11 +161,11 @@ 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 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3-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"; @@ -252,18 +238,74 @@ 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 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877-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 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88-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,11 +315,11 @@ 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 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33-gpgme-1.8.0.tar.bz2"; + md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { name = "graphite2-minimal-1.3.10.tgz"; @@ -287,11 +329,11 @@ md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.4.8.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.4.8.tar.bz2"; - sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131"; + name = "harfbuzz-1.7.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2"; + sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029"; md5 = ""; - md5name = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131-harfbuzz-1.4.8.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 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c-libjpeg-turbo-1.5.1.tar.gz"; + md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - 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"; + name = "language-subtag-registry-2018-03-30.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2"; + sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854"; md5 = ""; - md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; + md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -448,25 +497,18 @@ 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 = "libexttextcat-3.4.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; + sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; + md5 = ""; + md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { - name = "libgltf-0.1.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz"; - sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da"; + name = "libgpg-error-1.27.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; + sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; 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"; + md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; @@ -483,25 +525,25 @@ 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 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc-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.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz"; + sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"; + md5 = ""; + md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.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,11 +560,11 @@ 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 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d-mdds-1.2.2.tar.bz2"; + md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2"; } { name = "mDNSResponder-576.30.4.tar.gz"; @@ -532,18 +574,18 @@ 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 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a-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 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a-libmwaw-0.3.11.tar.xz"; + md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -560,18 +602,18 @@ 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 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4-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"; @@ -595,32 +637,25 @@ 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 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4-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 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400-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.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz"; + sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9"; 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 = ""; - md5name = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908-liborcus-0.12.1.tar.gz"; + md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -630,18 +665,18 @@ 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 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33-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 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883-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 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2-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.66.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz"; + sha256 = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7"; md5 = ""; - md5name = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173-poppler-0.56.0.tar.xz"; + md5name = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7-poppler-0.66.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -672,11 +707,18 @@ md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; } { - name = "Python-3.5.4.tgz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz"; - sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44"; + name = "Python-3.5.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.5.tar.xz"; + sha256 = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009"; md5 = ""; - md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz"; + md5name = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009-Python-3.5.5.tar.xz"; + } + { + 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"; @@ -721,11 +763,11 @@ 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 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6-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 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e-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 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d-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 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59-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 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0-libwps-0.4.6.tar.xz"; + md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz"; } { name = "xsltml_2.1.2.zip"; @@ -784,10 +826,10 @@ 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 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b-libzmf-0.0.1.tar.bz2"; + md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } ] diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 66d1baed2dae..57495404eb97 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_65_1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2"; - sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; + name = "boost_1_66_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; + sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; md5 = ""; - md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2"; + md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; } { name = "breakpad.zip"; @@ -133,18 +133,18 @@ md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { - name = "libepubgen-0.1.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2"; - sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633"; + name = "libepubgen-0.1.1.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; + sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad"; md5 = ""; - md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2"; + md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz"; - sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac"; + name = "libetonyek-0.1.8.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz"; + sha256 = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d"; md5 = ""; - md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz"; + md5name = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d-libetonyek-0.1.8.tar.xz"; } { name = "expat-2.2.5.tar.bz2"; @@ -266,11 +266,11 @@ 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"; + name = "Amiri-0.111.zip"; + url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip"; + sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166"; md5 = ""; - md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip"; + md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip"; } { name = "ttf-kacst_2.01+mry.tar.gz"; @@ -280,11 +280,11 @@ 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"; + name = "ReemKufi-0.7.zip"; + url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; + sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f"; md5 = ""; - md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz"; + md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip"; } { name = "Scheherazade-2.100.zip"; @@ -329,11 +329,11 @@ md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.7.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2"; - sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029"; + name = "harfbuzz-1.7.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.4.tar.bz2"; + sha256 = "b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b"; md5 = ""; - md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2"; + md5name = "b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b-harfbuzz-1.7.4.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -357,18 +357,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-60_2-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz"; - sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418"; + name = "icu4c-61_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-61_1-src.tgz"; + sha256 = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"; md5 = ""; - md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz"; + md5name = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef-icu4c-61_1-src.tgz"; } { - name = "icu4c-60_2-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip"; - sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9"; + name = "icu4c-61_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-61_1-data.zip"; + sha256 = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a"; md5 = ""; - md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip"; + md5name = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a-icu4c-61_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -455,11 +455,11 @@ md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - name = "language-subtag-registry-2018-03-30.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2"; - sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854"; + name = "language-subtag-registry-2018-04-23.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2"; + sha256 = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878"; md5 = ""; - md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2"; + md5name = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878-language-subtag-registry-2018-04-23.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -476,11 +476,11 @@ 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"; + name = "libassuan-2.5.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; + sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; md5 = ""; - md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2"; + md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { name = "libatomic_ops-7_2d.zip"; @@ -517,6 +517,13 @@ md5 = ""; md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } + { + name = "libnumbertext-1.0.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz"; + sha256 = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b"; + md5 = ""; + md5name = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b-libnumbertext-1.0.4.tar.xz"; + } { name = "ltm-1.0.zip"; url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; @@ -552,6 +559,13 @@ md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } + { + name = "lxml-4.1.1.tgz"; + url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; + sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; + md5 = ""; + md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; + } { name = "mariadb_client-2.0.0-src.tar.gz"; url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; @@ -574,18 +588,18 @@ md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; } { - name = "libmspub-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz"; - sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97"; + name = "libmspub-0.1.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; + sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"; md5 = ""; - md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz"; + md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.13.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz"; - sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea"; + name = "libmwaw-0.3.14.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; + sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; md5 = ""; - md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz"; + md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -644,18 +658,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2m.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz"; - sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f"; + name = "openssl-1.0.2o.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2o.tar.gz"; + sha256 = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d"; md5 = ""; - md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz"; + md5name = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d-openssl-1.0.2o.tar.gz"; } { - name = "liborcus-0.13.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz"; - sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9"; + name = "liborcus-0.13.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz"; + sha256 = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b"; md5 = ""; - md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz"; + md5name = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b-liborcus-0.13.4.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -672,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3235.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2"; - sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f"; + name = "pdfium-3426.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3426.tar.bz2"; + sha256 = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957"; md5 = ""; - md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2"; + md5name = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957-pdfium-3426.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -693,11 +707,11 @@ md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; } { - name = "poppler-0.59.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz"; - sha256 = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641"; + name = "poppler-0.66.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz"; + sha256 = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7"; md5 = ""; - md5name = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641-poppler-0.59.0.tar.xz"; + md5name = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7-poppler-0.66.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -707,11 +721,11 @@ md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; } { - name = "Python-3.5.4.tgz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz"; - sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44"; + name = "Python-3.5.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.5.tar.xz"; + sha256 = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009"; md5 = ""; - md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz"; + md5name = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009-Python-3.5.5.tar.xz"; } { name = "libqxp-0.0.1.tar.xz"; @@ -763,11 +777,11 @@ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz"; - sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982"; + name = "libstaroffice-0.0.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"; + sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4"; md5 = ""; - md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz"; + md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz"; } { name = "swingExSrc.zip"; @@ -776,6 +790,13 @@ md5 = "35c94d2df8893241173de1d16b6034c0"; md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; } + { + name = "twaindsm_2.4.1.orig.tar.gz"; + url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; + sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6"; + md5 = ""; + md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; + } { name = "ucpp-1.3.2.tar.gz"; url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; @@ -805,11 +826,11 @@ md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz"; } { - name = "libwps-0.4.8.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz"; - sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e"; + name = "libwps-0.4.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz"; + sha256 = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922"; md5 = ""; - md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz"; + md5name = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922-libwps-0.4.9.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 22216af3723c..6719b953ad16 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -1,9 +1,9 @@ { fetchurl }: rec { - major = "5"; - minor = "4"; - patch = "7"; + major = "6"; + minor = "0"; + patch = "6"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0s9s4nhp2whwxis54jbxrf1dwpnpl95b9781d1pdj4xk5z9v90fv"; + sha256 = "f1666430abf616a3813e4c886b51f157366f592102ae0e874abc17f3d58c6a8e"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 1808eec8c2b1..aff0817a865e 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip +{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext , IOCompress, zlib, libjpeg, expat, 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, carlito -, openssl, gperf, cppunit, GConf, ORBit2, poppler +, icu, boost, jdk, ant, cups, xorg, libcmis +, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux , librsvg, gnome_vfs, libGLU_combined, 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, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, bluez5, libtool +, fontsConf, pkgconfig, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook @@ -34,22 +34,28 @@ let }; srcs = { - third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { - 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)); + third_party = + map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) + ((import ./libreoffice-srcs-still.nix) ++ [ + (rec { + name = "unowinreg.dll"; + url = "https://dev-www.libreoffice.org/extern/${md5name}"; + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; + md5 = "185d60944ea767075d27247c3162b3bc"; + md5name = "${md5}-${name}"; + }) + ]); translations = fetchSrc { name = "translations"; - sha256 = "05ixmqbs3pkdpyqcwadz9i3wg797vimsm75rmfby7z71wc3frcyk"; + sha256 = "0hi7m5y9gxwqn5i2nsyqyz1vdiz2bxn26sd3i0958ghhwv3zqmdb"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0ifyh4m8mwpkb16g6883ivk2s2qybr4s4s7pdjzp4cpx1nalzibl"; + sha256 = "0pp8xs3mqna6fh1jd4h1xjyr4v0fsrik10rri5if5n3z1vfg0jby"; }; }; @@ -58,26 +64,18 @@ in stdenv.mkDerivation rec { inherit (primary-src) src; - # Openoffice will open libcups dynamically, so we link it directly - # to make its dlopen work. - # It also seems not to mention libdl explicitly in some places. - NIX_LDFLAGS = "-lcups -ldl"; - # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - # 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; + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; patches = [ ./xdg-open-brief.patch ]; postUnpack = '' mkdir -v $sourceRoot/src - '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' + (lib.flip lib.concatMapStrings srcs.third_party (f: '' + ln -sfv ${f} $sourceRoot/src/${f.md5name} + ln -sfv ${f} $sourceRoot/src/${f.name} + '')) + '' ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} @@ -85,14 +83,20 @@ in stdenv.mkDerivation rec { postPatch = '' sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx + + # configure checks for header 'gpgme++/gpgmepp_version.h', + # and if it is found (no matter where) uses a hardcoded path + # in what presumably is an effort to make it possible to write + # '#include ' instead of '#include '. + # + # Fix this path to point to where the headers can actually be found instead. + substituteInPlace configure.ac --replace \ + 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ + 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' ''; QT4DIR = qt4; - # Fix boost 1.59 compat - # Try removing in the next version - CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; - preConfigure = '' configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" @@ -101,68 +105,72 @@ in stdenv.mkDerivation rec { chmod a+x ./bin/unpack-sources patchShebangs . - # It is used only as an indicator of the proper current directory - touch solenv/inc/target.mk - - # 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" + + NOCONFIGURE=1 ./autogen.sh ''; - # fetch_Download_item tries to interpret the name as a variable name - # Let it do so… - postConfigure = '' - sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile - sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile + postConfigure = + # fetch_Download_item tries to interpret the name as a variable name, let it do so... + '' + sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile + sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile + '' + # Test fixups + # May need to be revisited/pruned, left alone for now. + + '' + # unit test sd_tiledrendering seems to be fragile + # 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 + 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 — 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 + # rendering-dependent tests + sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + 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 + 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 + '' + # This to avoid using /lib:/usr/lib at linking + + '' + sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk - # unit test sd_tiledrendering seems to be fragile - # 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 - # 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@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 — 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 - # rendering-dependent tests - sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx - sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx - 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 - ''; + find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; + ''; makeFlags = "SHELL=${bash}/bin/bash"; 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 - - find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; - - make + make build-nocheck ''; + doCheck = true; + # It installs only things to $out/lib/libreoffice postInstall = '' mkdir -p $out/bin $out/share/desktop @@ -194,11 +202,11 @@ in stdenv.mkDerivation rec { "--with-vendor=NixOS" "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" "--disable-report-builder" + "--disable-online-update" "--enable-python=system" "--enable-dbus" "--enable-release-build" (lib.enableFeature kdeIntegration "kde4") - "--with-package-format=installed" "--enable-epm" "--with-jdk-home=${jdk.home}" "--with-ant-home=${ant}/lib/ant" @@ -212,6 +220,8 @@ in stdenv.mkDerivation rec { "--with-system-openldap" "--with-system-coinmp" + "--with-alloc=system" + # Without these, configure does not finish "--without-junit" @@ -234,8 +244,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" "--without-system-xmlsec" @@ -257,10 +269,10 @@ 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 libtool - libxshmfence libatomic_ops graphite2 harfbuzz gpgme + mdds bluez5 libcmis libwps libabw libzmf libtool + libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme + libodfgen CoinMP librdf_rasqal defaultIconTheme gettext ] ++ lib.optional kdeIntegration kdelibs4; nativeBuildInputs = [ wrapGAppsHook gdb ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8ff605bbd09..45e46a581b14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17280,15 +17280,12 @@ with pkgs; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; - # checking whether g++ supports C++14 or C++11... configure: error: no - # Still relevant: 2018-04-13 - stdenv = overrideCC stdenv gcc5; }; - libreoffice-unwrapped =callPackage ../applications/office/libreoffice + libreoffice-unwrapped = callPackage ../applications/office/libreoffice (libreoffice-args // { }); - libreoffice-still-unwrapped =callPackage ../applications/office/libreoffice/still.nix + libreoffice-still-unwrapped = callPackage ../applications/office/libreoffice/still.nix (libreoffice-args // { poppler = poppler_0_61; }); From 1ee3c294bfdb32bdbe9a8f4c7ac3e462d6c344ce Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 18 Aug 2018 17:59:02 +0000 Subject: [PATCH 044/600] all-packages.nix: rename emacs functions Gen -> For This was introduced when it was unclear which suffix was better, but now it's clear that the "For" convention won. --- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ae7137d3a6a4..c05f01ec839e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -81,6 +81,8 @@ mapAliases ({ dwarf_fortress = dwarf-fortress; # added 2016-01-23 emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25 emacsMelpa = emacs25PackagesNg; # for backward compatibility + emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 + emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8ff605bbd09..946b97121770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16022,7 +16022,7 @@ with pkgs; ImageCaptureCore GSS ImageIO; }; - emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { + emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { inherit emacs; autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; @@ -16165,10 +16165,10 @@ with pkgs; cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; - emacs26Packages = emacsPackagesGen emacs26 pkgs.emacs26Packages; + emacs25Packages = emacsPackagesFor emacs25 pkgs.emacs25Packages; + emacs26Packages = emacsPackagesFor emacs26 pkgs.emacs26Packages; - emacsPackagesNgGen = emacs: import ./emacs-packages.nix { + emacsPackagesNgFor = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch; inherit emacs texinfo makeWrapper runCommand writeText; @@ -16190,9 +16190,9 @@ with pkgs; }; }; - emacs25PackagesNg = emacsPackagesNgGen emacs25; + emacs25PackagesNg = emacsPackagesNgFor emacs25; emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; - emacs26PackagesNg = emacsPackagesNgGen emacs26; + emacs26PackagesNg = emacsPackagesNgFor emacs26; emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; From 033ed93da2c739842283068325f5c31bc5dacd40 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 18 Aug 2018 18:15:14 +0000 Subject: [PATCH 045/600] all-packages.nix: cleanup a bit --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 946b97121770..383c4838942e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8496,7 +8496,7 @@ with pkgs; gn = callPackage ../development/tools/build-managers/gn { }; nixbang = callPackage ../development/tools/misc/nixbang { - pythonPackages = python3Packages; + pythonPackages = python3Packages; }; nexus = callPackage ../development/tools/repository-managers/nexus { }; @@ -12827,8 +12827,8 @@ with pkgs; rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; + apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; @@ -12852,8 +12852,8 @@ with pkgs; subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; }; - apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages; apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; + apacheHttpdPackages = apacheHttpdPackages_2_4; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; From 590ce7d1ae5512360da09257c4bf8936fc6b6827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 4 Sep 2018 20:27:25 +0200 Subject: [PATCH 046/600] mxnet: fix library dependencies. - mxnet now builds the open source MKL DNN library. However, this was not included with the build. - mxnet builds its own OpenMP library, even when OpenMP is provided by the system. This leads to problems, so remove the included OpenMP implementation: https://github.com/apache/incubator-mxnet/pull/12160 --- pkgs/applications/science/math/mxnet/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index a3043bcf6952..990d3f1a5d59 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -34,11 +34,14 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \ --replace "/bin/bash" "${bash}/bin/bash" + + # Build against the system version of OpenMP. + # https://github.com/apache/incubator-mxnet/pull/12160 + rm -rf 3rdparty/openmp ''; - installPhase = '' - install -Dm755 libmxnet.so $out/lib/libmxnet.so - cp -r ../include $out + postInstall = '' + rm "$out"/lib/*.a ''; enableParallelBuilding = true; From 19ac91770736ffb012a8003085be640417464d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 4 Sep 2018 20:30:31 +0200 Subject: [PATCH 047/600] python[23]Packages.graphviz: 0.5.2 -> 0.9 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0bc38b0f8dfe..5c039f1f9ee8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7937,11 +7937,11 @@ in { graphviz = buildPythonPackage rec { name = "graphviz-${version}"; - version = "0.5.2"; + version = "0.9"; src = pkgs.fetchurl { url = "mirror://pypi/g/graphviz/${name}.zip"; - sha256 = "0jh31nlm0qbxwylhdkwnb69pcjlc5z03fcfbs0gvgzp3hfrngsk0"; + sha256 = "14r9brj4r31b3qy1nnn34v3l4h0n39bqxg9sn2fz4p3pp5mglnl6"; }; propagatedBuildInputs = [ pkgs.graphviz ]; From e57e92bfa2515b1b7ff5ad2db2e7d503e7ae24fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 4 Sep 2018 20:35:05 +0200 Subject: [PATCH 048/600] python[23]Packages.mxnet: fix build Relax graphviz, numpy, requests dependency version bounds. --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c039f1f9ee8..63028eeaa838 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1788,6 +1788,13 @@ in { doCheck = !isPy3k; + postPatch = '' + substituteInPlace python/setup.py \ + --replace "graphviz<0.9.0" "graphviz<0.10.0" \ + --replace "numpy<=1.15.0" "numpy<1.16.0" \ + --replace "requests<2.19.0" "requests<2.20.0" + ''; + preConfigure = '' cd python ''; From 16e776fde7130e9722e400a1606ba79526359898 Mon Sep 17 00:00:00 2001 From: symphorien Date: Tue, 4 Sep 2018 19:16:01 +0000 Subject: [PATCH 049/600] sound-juicer: fix build (#46051) --- pkgs/applications/audio/sound-juicer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index e38f38dad78c..f402721e180d 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -22,6 +22,8 @@ in stdenv.mkDerivation rec{ gst_all_1.gst-libav ]; + NIX_CFLAGS_COMPILE="-Wno-error=format-nonliteral"; + passthru = { updateScript = gnome3.updateScript { packageName = pname; From 88ae8f7d55efa457c95187011eb410d097108445 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Tue, 4 Sep 2018 21:19:31 +0200 Subject: [PATCH 050/600] dconf module: add dconf to services.dbus.packages Some programs like eog seem to need dconf accessible on dbus. Without this change I get (eog:1738): dconf-WARNING **: 21:20:52.770: failed to commit changes to dconf: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name ca.desrt.dconf was not provided by any .service files --- nixos/modules/programs/dconf.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index b7d8a345e65c..9c9765b06b6f 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -32,6 +32,8 @@ in environment.etc = optionals (cfg.profiles != {}) (mapAttrsToList mkDconfProfile cfg.profiles); + services.dbus.packages = [ pkgs.gnome3.dconf ]; + environment.variables.GIO_EXTRA_MODULES = optional cfg.enable "${pkgs.gnome3.dconf.lib}/lib/gio/modules"; # https://github.com/NixOS/nixpkgs/pull/31891 From e37c21ce950e8975887f2beb5e648a3ad521a1a6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Sep 2018 14:55:05 -0500 Subject: [PATCH 051/600] musl: 1.1.19 -> 1.1.20 --- pkgs/os-specific/linux/musl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 9628ec516763..a24900ce337a 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.19"; + version = "1.1.20"; src = fetchurl { url = "https://www.musl-libc.org/releases/musl-${version}.tar.gz"; - sha256 = "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv"; + sha256 = "0q8dsjxl41dccscv9a0r78bs7jap57mn4mni5pwbbip6s1qqggj4"; }; enableParallelBuilding = true; From 080a6385ff0fa6b3152d31a9a028f30b3a68baf8 Mon Sep 17 00:00:00 2001 From: Lenz Weber Date: Tue, 4 Sep 2018 20:44:06 +0200 Subject: [PATCH 052/600] zfs-unstable: 64e9696 -> c197a77 --- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c689faad492f..e6807f1214cc 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -180,10 +180,10 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-08-13"; + version = "2018-09-02"; - rev = "64e96969a88c21aebb2f8d982a8c345e55a2ae6c"; - sha256 = "164fvsf9zqvq3vafnvjxafjl8gihmfqfsjwsmky16i90a6hs96gf"; + rev = "c197a77c3cf36531e4cf79e524e1ccf7ec00cc4c"; + sha256 = "0rk835nnl4w5km8qxcr1wdpr9xasssnrmsxhjlqjy0ry3qcb2197"; isUnstable = true; extraPatches = [ From 98ef33ec74c4792f14175d27241352e270d1b5d7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 4 Sep 2018 16:19:43 -0400 Subject: [PATCH 053/600] oh-my-zsh: 2018-07-29 -> 2018-09-03 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 6f9e338dabaa..22aa478d743c 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2018-07-29"; + version = "2018-09-03"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "5fa7824ea59ec12a976f348a83399e66699456ea"; - sha256 = "1ry46jxk7k4ndh4gic9v7c19gsqmcag8bng92pp7vw0fj0b0ij6k"; + rev = "69e637c35578305e19dbfc520e65c514180db6ef"; + sha256 = "067qwvdlghjb2kcv4fydnnbwss2kb4fgn1qib88ygz82fpvb0cwf"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 62086c6be6560e1f34a19cb909c74a33fbc3b6c3 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 4 Sep 2018 22:39:01 +0200 Subject: [PATCH 054/600] nixos/tests/novacomd: prevent non-deterministic failure A sporadic failure occured on Hydra because a request was sent to the daemon after the systemd unit was started, but before the daemon was actually listening. Fix by checking for open port first. --- nixos/tests/novacomd.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix index 2b56aee0a2e7..4eb60c0feb5c 100644 --- a/nixos/tests/novacomd.nix +++ b/nixos/tests/novacomd.nix @@ -9,12 +9,16 @@ import ./make-test.nix ({ pkgs, ...} : { }; testScript = '' - startAll; + $machine->waitForUnit("multi-user.target"); + # multi-user.target wants novacomd.service, but let's make sure $machine->waitForUnit("novacomd.service"); # Check status and try connecting with novacom $machine->succeed("systemctl status novacomd.service >&2"); + # to prevent non-deterministic failure, + # make sure the daemon is really listening + $machine->waitForOpenPort(6968); $machine->succeed("novacom -l"); # Stop the daemon, double-check novacom fails if daemon isn't working @@ -23,6 +27,8 @@ import ./make-test.nix ({ pkgs, ...} : { # And back again for good measure $machine->startJob("novacomd"); + # make sure the daemon is really listening + $machine->waitForOpenPort(6968); $machine->succeed("novacom -l"); ''; }) From 59f5a65e72fc3e1708069a6d5a21127d985c8489 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Sep 2018 16:32:43 -0500 Subject: [PATCH 055/600] zsh: 5.5.1 -> 5.6 (#46052) Security, see: https://github.com/zsh-users/zsh/blob/zsh-5.6/NEWS#L7 --- pkgs/shells/zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 3259dbbd9bc6..100657312da0 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre }: let - version = "5.5.1"; + version = "5.6"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "0bm9n7lycdzvw5hmgi4a920pqbb5yxvmyhfxx8jbign2hzgf7g01"; + sha256 = "1kz57w4l0jank67a2hiz6y5idbff5avwg52zdxx3qnflkjvkn2kx"; }; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "10705qnnr3p416bwfjaip9r7yw187vczzjrk60yg79dfwy4slk3p"; + sha256 = "1vik7s3q5hvazvgw4jm4b90qlk6zcry0s314xw1liarspkd721g3"; }; buildInputs = [ ncurses pcre ]; From 33fa23f6b389ed3c439bc938887c5dbcd2a53336 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 4 Sep 2018 21:38:07 +0000 Subject: [PATCH 056/600] dbus-sharp-2_0: fix build (#46060) --- pkgs/development/libraries/dbus-sharp/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index 40c633dda523..855dd9f3832e 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: +{stdenv, fetchFromGitHub, pkgconfig, mono48, autoreconfHook }: stdenv.mkDerivation rec { name = "dbus-sharp-${version}"; @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ mono ]; + + # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged + # See: https://github.com/NixOS/nixpkgs/pull/46060 + buildInputs = [ mono48 ]; dontStrip = true; From f50aa1cd4ed4a6f505b4ab3c7c54063ee3cefe84 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 4 Sep 2018 23:39:15 +0200 Subject: [PATCH 057/600] pythonPackages.glances: 3.0 -> 3.0.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0bc38b0f8dfe..f74f9ace2fdf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5916,14 +5916,14 @@ in { glances = buildPythonPackage rec { name = "glances-${version}"; - version = "3.0"; + version = "3.0.1"; disabled = isPyPy; src = pkgs.fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "19pymw104l05af710ph69znqiz9av3if7436kigjlwd65gxnghkc"; + sha256 = "18pyp6ij3bzybqj771v48n7yn3a1spk6ncg1kgp6hfpjhpqiw87x"; }; # Requires access to /sys/class/power_supply From 6b74b16579b64a3c064c1e173dda84fcfa6d8127 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 4 Sep 2018 23:44:05 +0200 Subject: [PATCH 058/600] kitty: 0.11.3 -> 0.12.0 (#46067) --- pkgs/applications/misc/kitty/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index c34167b4ddb8..70b580cd0f8a 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -2,12 +2,12 @@ fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, - which + which, dbus }: with python3Packages; buildPythonApplication rec { - version = "0.11.3"; + version = "0.12.0"; name = "kitty-${version}"; format = "other"; @@ -15,13 +15,13 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1fql8ayxvip8hgq9gy0dhqfvngv13gh5bf71vnc3agd80kzq1n73"; + sha256 = "1n2pi9pc903inls1fvz257q7wpif76rj394qkgq7pixpisijdyjm"; }; buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext - wayland-protocols wayland + wayland-protocols wayland dbus ]; nativeBuildInputs = [ pkgconfig which sphinx ]; From b7d408713c7a29ee6bb9ab594e225984f1a114b1 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 4 Sep 2018 23:45:30 +0200 Subject: [PATCH 059/600] puredata: 0.48-0 -> 0.48-2 (#46065) --- pkgs/applications/audio/puredata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 6aca7e9ce226..354b7c4b6c7b 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "puredata-${version}"; - version = "0.48-0"; + version = "0.48-2"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "0wy9kl2v00fl27x4mfzhbca415hpaisp6ls8a6mkl01qbw20krny"; + sha256 = "0p86hncgzkrl437v2wch2fg9iyn6mnrgbn811sh9pwmrjj2f06v8"; }; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; From a36b861f804e0645fea97f39cc3a09985813938e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Sep 2018 16:47:21 -0500 Subject: [PATCH 060/600] liblangtag: bump to CLDR 33.1 unicode data (#46050) http://cldr.unicode.org/index/downloads/cldr-33-1 --- pkgs/development/libraries/liblangtag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 6d9085e1741b..8ebfa53b7d13 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { core_zip = fetchurl { # please update if an update is available - url = "http://www.unicode.org/Public/cldr/33/core.zip"; - sha256 = "1faq1p5dmxpkczz6cjfsry7piksgym19cq2kf4jj2v885h490d7s"; + url = "http://www.unicode.org/Public/cldr/33.1/core.zip"; + sha256 = "0f195aald02ng3ch2q1wf59b5lwp2bi1cd8ia7572pbyy2w8w8cp"; }; language_subtag_registry = fetchurl { From 24ce88615e32f1bea04c74c748a0fd14f59b0726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Sep 2018 22:51:01 +0100 Subject: [PATCH 061/600] radare2: 2.8.0 -> 2.9.0 --- pkgs/development/tools/analysis/radare2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 85559269f279..76df2d4fd642 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -86,12 +86,12 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "19251"; - gittap = "2.8.0"; - gittip = "a76b965410aba07b4ef8b96d90b25b271c2003dd"; - rev = "2.8.0"; - version = "2.8.0"; - sha256 = "1d9rkzc3vychy2h1bnywwx4why83rr18r0lvvl1cqx87ad5awcjk"; + version_commit = "19349"; + gittap = "2.9.0"; + gittip = "d5e9539ec8068ca2ab4759dc3b0697781ded4cc8"; + rev = "2.9.0"; + version = "2.9.0"; + sha256 = "0zz6337p9095picfvjrcnqaxdi2a2b68h9my523ilnw8ynwfhdzw"; cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; }; From 7931d455a469a3f5ac533f13f4f713ea8cb9c1cf Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 4 Sep 2018 22:03:51 +0000 Subject: [PATCH 062/600] stdenv: linux: cleanup a bit --- pkgs/stdenv/linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index de58178a34ba..b29a96314d2c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -343,8 +343,8 @@ in # Mainly avoid reference to bootstrap tools allowedRequisites = with prevStage; with lib; # Simple executable tools - concatMap (p: [ (getBin p) (getLib p) ]) - [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils + concatMap (p: [ (getBin p) (getLib p) ]) [ + gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl ] # Library dependencies From 409270826112d035934a6b7a0969aa47dac0bf35 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 4 Sep 2018 21:13:00 +0000 Subject: [PATCH 063/600] treewide: cleanup some references to bash --- pkgs/build-support/cc-wrapper/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index a981ffea7081..301bc2694c4f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation { preferLocalBuild = true; inherit cc libc_bin libc_dev libc_lib bintools coreutils_bin; - shell = getBin shell + stdenv.lib.optionalString (stdenv ? shellPath) stdenv.shellPath; + shell = getBin shell + shell.shellPath or ""; gnugrep_bin = if nativeTools then "" else gnugrep; inherit targetPrefix infixSalt; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 383c4838942e..e67d038c1ca1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6222,7 +6222,7 @@ with pkgs; ### SHELLS - runtimeShell = "${runtimeShellPackage}/bin/bash"; + runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; runtimeShellPackage = bash; bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); From 63b7bc847cfdfe6c5d43eac69802c2b1cb7c0912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Sep 2018 23:08:39 +0100 Subject: [PATCH 064/600] radare2-cutter: add mic92 as maintainer --- pkgs/development/tools/analysis/radare2/cutter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index 4269661a4ff3..95b456fd2b79 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { description = "A Qt and C++ GUI for radare2 reverse engineering framework"; homepage = src.meta.homepage; license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ mic92 dtzWill ]; }; } From a56fd17938917fcdb461c67c24b3bec8f7d7c033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Sep 2018 22:51:35 +0100 Subject: [PATCH 065/600] radare2-cutter: 1.7 -> 1.7.1 --- pkgs/development/tools/analysis/radare2/cutter.nix | 4 ++-- pkgs/development/tools/analysis/radare2/default.nix | 12 ++++++------ pkgs/development/tools/analysis/radare2/update.py | 13 ++++++++++++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index 95b456fd2b79..659d6a94f5eb 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -8,7 +8,7 @@ , python3 }: let - version = "1.7"; + version = "1.7.1"; in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0z9wzxd5hw0ivakrg3xiv4zx1rjj032hlmizq0pxj22xjrj1gg9n"; + sha256 = "0dfi6f016jnh3swppvks5qkvmk0j2hvggh9sd1f40kg9pg5p08hy"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 76df2d4fd642..f10b820a73ea 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -96,12 +96,12 @@ in { cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; }; r2-for-cutter = generic { - version_commit = "19251"; - gittap = "2.8.0-118-gb0547831f"; - gittip = "b0547831f127b7357e3c93bc43933482a4d6213b"; - rev = "b0547831f127b7357e3c93bc43933482a4d6213b"; - version = "2018-08-07"; - sha256 = "1ix42kipd1aayb494ajbxawzc1cwikm9fxk343d1kchxx4a30a1m"; + version_commit = "19349"; + gittap = "2.8.0-189-gf82b28982"; + gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; + rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; + version = "2018-08-14"; + sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1"; cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; }; diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index fae6a52a3920..45920fd1e4bf 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -13,6 +13,8 @@ from datetime import datetime from pathlib import Path from typing import Dict +SCRIPT_DIR = Path(__file__).parent.resolve() + def sh(*args: str) -> str: out = subprocess.check_output(list(args)) @@ -34,8 +36,17 @@ def get_radare2_rev() -> str: return release["tag_name"] +def get_cutter_version() -> str: + version_expr = """ +(with import {}; (builtins.parseDrvName (qt5.callPackage ./cutter.nix {}).name).version) +""" + with SCRIPT_DIR: + return sh("nix", "eval", "--raw", version_expr.strip()) + + def get_r2_cutter_rev() -> str: - url = "https://api.github.com/repos/radareorg/cutter/contents/" + version = get_cutter_version() + url = f"https://api.github.com/repos/radareorg/cutter/contents?ref=v{version}" with urllib.request.urlopen(url) as response: data = json.load(response) # type: ignore for entry in data: From d814c98ec86d632e706ca71263e09be60eb23eb5 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 5 Sep 2018 01:02:06 +0200 Subject: [PATCH 066/600] python.pkgs.pytest-fixture-config: disable tests (#46021) Tests seem to fail on all recent versions even outside of our build system. The upstream CI tests seem to somehow succeed but I wasn't able to reproduce that locally. For not it is probably best to disable them. --- .../python-modules/pytest-fixture-config/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index df700526d1b4..67ceebef3057 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools-git, pytest, six }: +, setuptools-git, pytest }: buildPythonPackage rec { pname = "pytest-fixture-config"; @@ -14,11 +14,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ six ]; - - checkPhase = '' - py.test - ''; + doCheck = false; meta = with stdenv.lib; { description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set."; From de825a4eaacdfe092e7023159f351cbe6c9a988d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 5 Sep 2018 00:22:31 +0100 Subject: [PATCH 067/600] dino: 2018-07-08 -> 2018-09-05 --- .../networking/instant-messengers/dino/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 3682097e302f..777057b327b0 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2018-07-08"; + name = "dino-unstable-2018-09-05"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "df8b5fcb722c4a33ed18cbbaafecb206f127b849"; - sha256 = "1r7h9pxix0sylnwab7a8lir9h5yssk98128x2bzva77id9id33vi"; + rev = "79e0aee5fdb90830fad748fdfae717cb5fbf91f9"; + sha256 = "1sfh729fg6c5ds3rcma13paqnvv58jln34s93j74jnca19wgn7k5"; fetchSubmodules = true; }; From 107de747c7044736738916ff1442dd7f275955d2 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 4 Sep 2018 13:29:40 -0700 Subject: [PATCH 068/600] linux_4_18: HID: core: fix grouping by application This patch fixes #45165 commit f07b3c1da92d ("HID: generic: create one input report per application type") was effectively the same as MULTI_INPUT: hidinput->report was never set, so hidinput_match_application() always returned null. Fix that by testing against the real application. Note that this breaks some old eGalax touchscreens that expect MULTI_INPUT instead of HID_QUIRK_INPUT_PER_APP. Enable this quirk for backward compatibility on all non-Win8 touchscreens. link: https://bugzilla.kernel.org/show_bug.cgi?id=200847 link: https://bugzilla.kernel.org/show_bug.cgi?id=200849 link: https://bugs.archlinux.org/task/59699 link: https://github.com/NixOS/nixpkgs/issues/45165 Cc: stable@vger.kernel.org # v4.18+ Signed-off-by: Benjamin Tissoires --- pkgs/top-level/all-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8ff605bbd09..2425dcf5b280 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14016,6 +14016,18 @@ with pkgs; # when adding a new linux version # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + + # https://github.com/NixOS/nixpkgs/issues/45165 + # TODO: remove this patch once it is merged upstream and released. + (rec { + name = "hid-core-fix-grouping-by-application"; + patch = fetchpatch { + name = name + ".patch"; + # https://patchwork.kernel.org/patch/10587369/ + url = https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/patch/?id=0d6c3011409135ea84e2a231b013a22017ff999a; + sha256 = "0bdrv0aqjh0rdjlaaaqpdgrnd9452fa4ggaa1nq2kmik3q00cq4m"; + }; + }) ]; }; From 4f8a248b236d239b4b5de3b80e96d8ccfa36cbe1 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 4 Sep 2018 17:10:27 -0700 Subject: [PATCH 069/600] kernel: increase build timeout to two hours --- pkgs/os-specific/linux/kernel/manual-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 2cc83e62d11e..97921f07e82c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -247,6 +247,7 @@ let maintainers.thoughtpolice ]; platforms = platforms.linux; + timeout = 7200; # 2 hours } // extraMeta; }; in From d23c357f1c0248c7f38260d696082ace77758df4 Mon Sep 17 00:00:00 2001 From: Urban Skudnik Date: Mon, 3 Sep 2018 17:21:43 +0200 Subject: [PATCH 070/600] hcloud: Add autocomplete support for bash and zsh Currently one would need to manually run the command to generate completion and insert it into `.bashrc`/`.zshrc` to get the autocompletion to work. This patch will automatically generate both docs and save them to correct position so it should continue to work even if user changes the shell at a later stage. --- pkgs/development/tools/hcloud/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 877080508d40..b3fa6f852f76 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -14,6 +14,19 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; + postInstall = '' + mkdir -p \ + $bin/etc/bash_completion.d \ + $bin/share/zsh/vendor-completions + + # Add bash completions + $bin/bin/hcloud completion bash > "$bin/etc/bash_completion.d/hcloud" + + # Add zsh completions + echo "#compdef hcloud" > "$bin/share/zsh/vendor-completions/_hcloud" + $bin/bin/hcloud completion zsh >> "$bin/share/zsh/vendor-completions/_hcloud" + ''; + meta = { description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; homepage = https://github.com/hetznercloud/cli; From e9fe3a334bf0b4509358b9c5d9cc5d9fcd0b6d9c Mon Sep 17 00:00:00 2001 From: Urban Skudnik Date: Wed, 5 Sep 2018 03:36:56 +0200 Subject: [PATCH 071/600] restic: Fix autocomplete for zsh zsh requires for files to be prepended with underscore to be recognized as widgets, see [1] for more details. [1] https://github.com/NixOS/nixpkgs/pull/46001#issuecomment-418567160 --- pkgs/tools/backup/restic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index feb7b4802630..453e31f5d13a 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { cp restic $bin/bin/ $bin/bin/restic generate \ --bash-completion $bin/etc/bash_completion.d/restic.sh \ - --zsh-completion $bin/share/zsh/vendor-completions/restic.sh \ + --zsh-completion $bin/share/zsh/vendor-completions/_restic \ --man $bin/share/man/man1 ''; From 83a0d5d0139c0650b74e83cb2160907ddcf7a7d5 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Tue, 4 Sep 2018 22:03:56 -0400 Subject: [PATCH 072/600] solarus: 1.4.5 -> 1.5.3 --- pkgs/games/solarus/default.nix | 18 ++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index 6f7876e48723..23abadf66ae5 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchFromGitHub, cmake, luajit, +{ stdenv, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs, - openal, libmodplug, libvorbis}: + openal, libmodplug, libvorbis, + qtbase, qttools }: stdenv.mkDerivation rec { name = "solarus-${version}"; - version = "1.4.5"; + version = "1.5.3"; - src = fetchFromGitHub { - owner = "christopho"; + src = fetchFromGitLab { + owner = "solarus-games"; repo = "solarus"; - rev = "d9fdb9fdb4e1b9fc384730a9279d134ae9f2c70e"; - sha256 = "0xjx789d6crm322wmkqyq9r288vddsha59yavhy78c4r01gs1p5v"; + rev = "v1.5.3"; + sha256 = "035hkdw3a1ryasj5wfa1xla1xmpnc3hjp4s20sl9ywip41675vaz"; }; buildInputs = [ cmake luajit SDL2 SDL2_image SDL2_ttf physfs - openal libmodplug libvorbis ]; + openal libmodplug libvorbis + qtbase qttools ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 436c44609ec9..23d24aa04732 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20157,7 +20157,7 @@ with pkgs; lua = lua5_1; }; - solarus = callPackage ../games/solarus { }; + solarus = libsForQt5.callPackage ../games/solarus { }; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; From 455f8151fdeaba4e5fbbd9e17640f25ed70e0f50 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Tue, 4 Sep 2018 22:04:33 -0400 Subject: [PATCH 073/600] solarus-quest-editor: 1.4.5 -> 1.5.3 --- .../tools/solarus-quest-editor/default.nix | 27 ++++++++++----- ...beab62594f73e57190c49848c848487214cf.patch | 33 +++++++++++++++++++ 2 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index 3df6d3de3e16..5a340d309495 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, luajit, +{ stdenv, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs, openal, libmodplug, libvorbis, solarus, - qtbase, qttools }: + qtbase, qttools, fetchpatch }: stdenv.mkDerivation rec { name = "solarus-quest-editor-${version}"; - version = "1.4.5"; + version = "1.5.3"; - src = fetchFromGitHub { - owner = "christopho"; + src = fetchFromGitLab { + owner = "solarus-games"; repo = "solarus-quest-editor"; - rev = "61f0fa7a5048994fcd9c9f3a3d1255d0be2967df"; - sha256 = "1fpq55nvs5k2rxgzgf39c069rmm73vmv4gr5lvmqzgsz07rkh07f"; + rev = "v1.5.3"; + sha256 = "1b9mg04yy4pnrl745hbc82rz79k0f8ci3wv7gvsm3a998q8m98si"; }; buildInputs = [ cmake luajit SDL2 @@ -19,7 +19,18 @@ stdenv.mkDerivation rec { openal libmodplug libvorbis solarus qtbase qttools ]; - patches = [ ./patches/fix-install.patch ]; + patches = [ + ./patches/fix-install.patch + + # Next two patches should be fine to remove for next release. + # This commit fixes issues AND adds features *sighs* + ./patches/partial-f285beab62594f73e57190c49848c848487214cf.patch + + (fetchpatch { + url = https://gitlab.com/solarus-games/solarus-quest-editor/commit/8f308463030c18cd4f7c8a6052028fff3b7ca35a.patch; + sha256 = "1jq48ghhznrp47q9lq2rhh48a1z4aylyy4qaniaqyfyq3vihrchr"; + }) + ]; meta = with stdenv.lib; { description = "The editor for the Zelda-like ARPG game engine, Solarus"; diff --git a/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch b/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch new file mode 100644 index 000000000000..73e817fcfbe8 --- /dev/null +++ b/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch @@ -0,0 +1,33 @@ +From f285beab62594f73e57190c49848c848487214cf Mon Sep 17 00:00:00 2001 +From: stdgregwar +Date: Sun, 1 Jul 2018 00:00:41 +0200 +Subject: [PATCH] Shader previewer base + + +diff --git a/include/widgets/tileset_view.h b/include/widgets/tileset_view.h +index 615f432..799a4c6 100644 +--- a/include/widgets/tileset_view.h ++++ b/include/widgets/tileset_view.h +@@ -23,6 +23,7 @@ + #include "pattern_separation.h" + #include + #include ++#include + + class QAction; + +diff --git a/src/widgets/text_editor.cpp b/src/widgets/text_editor.cpp +index 4f2ff68..90080a9 100644 +--- a/src/widgets/text_editor.cpp ++++ b/src/widgets/text_editor.cpp +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + +-- +2.18.0 + From 7e0dd4c261591dabbfa4a6ea345b8c26b74783c2 Mon Sep 17 00:00:00 2001 From: Kenny Shen Date: Wed, 5 Sep 2018 05:52:55 +0000 Subject: [PATCH 074/600] prettyping: init 1.0.1 (#46008) --- pkgs/tools/networking/prettyping/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/prettyping/default.nix diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/tools/networking/prettyping/default.nix new file mode 100644 index 000000000000..36700195a1bd --- /dev/null +++ b/pkgs/tools/networking/prettyping/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "${program}-${version}"; + program = "prettyping"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "denilsonsa"; + repo = program; + rev = "v${version}"; + sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf"; + }; + + installPhase = '' + install -Dt $out/bin prettyping + ''; + + meta = with lib; { + homepage = https://github.com/denilsonsa/prettyping; + description = "A wrapper around the standard ping tool with the objective of making the output prettier, more colorful, more compact, and easier to read"; + license = with licenses; [ mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ qoelet ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34f8d73f5828..9fab60de0bf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4738,6 +4738,8 @@ with pkgs; pptpd = callPackage ../tools/networking/pptpd {}; + prettyping = callPackage ../tools/networking/prettyping { }; + prey-bash-client = callPackage ../tools/security/prey { }; profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; From c722db75ba35d7bc86d5e83c457ab34e88698041 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Aug 2018 16:51:54 +0000 Subject: [PATCH 075/600] ocamlPackages.{tyxml,lwt}: always enable camlp4 support --- pkgs/development/ocaml-modules/lwt/default.nix | 2 +- pkgs/development/ocaml-modules/tyxml/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 345ca037fec9..739e6e1e43a8 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder , ocaml, findlib, cppo , ocaml-migrate-parsetree, ppx_tools_versioned, result -, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07" +, withP4 ? true , camlp4 ? null }: diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index b34c9279c307..a38040e6e1fe 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re -, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07" +, withP4 ? true , camlp4 ? null }: From 7ec9a333df36daa7829142d93965ab134ded438d Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 5 Sep 2018 02:23:29 -0400 Subject: [PATCH 076/600] qtchan: Fixes build from Qt upgrade. (#46082) Uses an upstream fix. --- pkgs/applications/networking/browsers/qtchan/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix index f6bc05371f30..df956addf5cc 100644 --- a/pkgs/applications/networking/browsers/qtchan/default.nix +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt, makeWrapper }: +{ stdenv, fetchFromGitHub, fetchpatch, qt, makeWrapper }: stdenv.mkDerivation rec { name = "qtchan-${version}"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a"; }; + patches = [ + (fetchpatch { + url = https://github.com/siavash119/qtchan/commit/718abeee5cf4aca8c99b35b26f43909362a29ee6.patch; + sha256 = "11b72l5njvfsyapd479hp4yfvwwb1mhq3f077hwgg0waz5l7n00z"; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ qt.qmake makeWrapper ]; buildInputs = [ qt.qtbase ]; From a394d08f1188fc612c5760218af4395653cfd662 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 5 Sep 2018 02:39:29 -0400 Subject: [PATCH 077/600] qmapshack: 1.11.1 -> 1.12.0 (#46084) --- pkgs/applications/misc/qmapshack/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index 3b9e76aee4b8..a2c8c75dc245 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }: +{ stdenv, fetchurl, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }: stdenv.mkDerivation rec { name = "qmapshack-${version}"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; - sha256 = "0yqilfldmfw8m18jbkffv4ar1px6kjs0zlgb216bnhahcr1y8r9y"; + sha256 = "0d5p60kq9pa2hfql4nr8p42n88lr42jrsryrsllvaj45b8b6kvih"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtscript qtwebkit gdal proj routino quazip ]; + buildInputs = [ qtscript qtwebengine gdal proj routino quazip ]; cmakeFlags = [ "-DROUTINO_XML_PATH=${routino}/share/routino" From c59d9d371ecca2b7cc5798aecb75252a9c396f8a Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 5 Sep 2018 03:28:50 -0400 Subject: [PATCH 078/600] qtkeychain: Fixes Qt4 build. (#46085) --- .../0001-Fixes-build-with-Qt4.patch | 25 +++++++++++++++++++ .../libraries/qtkeychain/default.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch diff --git a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch new file mode 100644 index 000000000000..4cd7214e61e2 --- /dev/null +++ b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch @@ -0,0 +1,25 @@ +From f72e5b67ee1137a0ccd57db5d077a197b01b3cdc Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel +Date: Tue, 4 Sep 2018 23:19:29 -0400 +Subject: [PATCH] Fixes build with Qt4. + +--- + keychain_unix.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/keychain_unix.cpp b/keychain_unix.cpp +index 30b26c3..b27ebef 100644 +--- a/keychain_unix.cpp ++++ b/keychain_unix.cpp +@@ -91,7 +91,7 @@ static bool isKwallet5Available() + // a wallet can be opened. + + iface.setTimeout(500); +- QDBusMessage reply = iface.call(QStringLiteral("networkWallet")); ++ QDBusMessage reply = iface.call("networkWallet"); + return reply.type() == QDBusMessage::ReplyMessage; + } + +-- +2.16.4 + diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 220c6241096d..2b3c88d58860 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 }; + patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ]; + cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ] ++ stdenv.lib.optional stdenv.isDarwin [ # correctly detect the compiler From ffb094f939fd1065908d01f31718f94669761f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 5 Sep 2018 08:17:34 +0200 Subject: [PATCH 079/600] thinc: relax dependency version requirements --- pkgs/development/python-modules/thinc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 88e6c8d16742..321b1fb11816 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -35,7 +35,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "msgpack-python==" "msgpack-python>=" \ - --replace "msgpack-numpy==" "msgpack-numpy>=" + --replace "msgpack-numpy==" "msgpack-numpy>=" \ + --replace "plac>=0.9,<1.0" "plac>=0.9" \ + --replace "hypothesis>=2,<3" "hypothesis>=2" ''; propagatedBuildInputs = [ From e3cae4a2e596d63f5b3876e4e740a5ae2cb3521d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 5 Sep 2018 10:36:03 +0200 Subject: [PATCH 080/600] gnumeric: 1.12.39 -> 1.12.43 (#46088) goffice: 0.10.39 -> 0.10.43 --- pkgs/applications/office/gnumeric/default.nix | 4 ++-- pkgs/development/libraries/goffice/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e196b1bd0d77..c155d696d39f 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -9,11 +9,11 @@ let isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; }; isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; }; in stdenv.mkDerivation rec { - name = "gnumeric-1.12.39"; + name = "gnumeric-1.12.43"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f"; + sha256 = "87c9abd6260cf29401fa1e0fcce374e8c7bcd1986608e4049f6037c9d32b5fd5"; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 6155b8b18bd0..4795f45812b2 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg }: stdenv.mkDerivation rec { - name = "goffice-0.10.39"; + name = "goffice-0.10.43"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "73f23fbf05f3fa98343208b751db04b31a7ff743c2d828e1a0a130c566f1bc4f"; + sha256 = "550fceefa74622b8fe57dd0b030003e31db50edf7f87068ff5e146365108b64e"; }; nativeBuildInputs = [ pkgconfig intltool ]; From da8475736ee9f68e3ccfb845fe7955e877731a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 5 Sep 2018 08:38:52 +0200 Subject: [PATCH 081/600] spacy: relax dependency versions --- pkgs/development/python-modules/spacy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index dc0509e226c0..0667565c0de8 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -37,7 +37,8 @@ buildPythonPackage rec { --replace "ftfy==" "ftfy>=" \ --replace "msgpack-python==" "msgpack-python>=" \ --replace "msgpack-numpy==" "msgpack-numpy>=" \ - --replace "pathlib" "pathlib; python_version<\"3.4\"" + --replace "thinc>=6.10.3,<6.11.0" "thinc>=6.10.3" \ + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" ''; propagatedBuildInputs = [ From cf0342a2610d948214427b750276428771aa1578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 5 Sep 2018 10:42:48 +0200 Subject: [PATCH 082/600] gnome3.tracker: 2.1.3 -> 2.1.4 (#46086) Fix build with format-security flag --- pkgs/desktops/gnome-3/core/tracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 06c41937d12e..891d4a70a5f7 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -5,7 +5,7 @@ let pname = "tracker"; - version = "2.1.3"; + version = "2.1.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00gimpn2ydv3yka25cmw3i0n402d2nhx7992byvq4yvhr77rni22"; + sha256 = "0xf58zld6pnfa8k7k70rv8ya8g7zqgahz6q4sapwxs6k97d2fgsx"; }; nativeBuildInputs = [ From a885e886b6d5942dcc9b92e8fb530a70fe4d8926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 5 Sep 2018 11:09:55 +0200 Subject: [PATCH 083/600] nullidentdmod: Init at 1.3 (#46040) --- pkgs/servers/identd/nullidentdmod/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/identd/nullidentdmod/default.nix diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix new file mode 100644 index 000000000000..fdad63d67af4 --- /dev/null +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { + name = "nullidentdmod-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "Acidhub"; + repo = "nullidentdmod"; + rev = "v${version}"; + sha256 = "1ahwm5pyidc6m07rh5ls2lc25kafrj233nnbcybprgl7bqdq1b0k"; + }; + + installPhase = '' + mkdir -p $out/bin + + install -Dm755 nullidentdmod $out/bin + ''; + + meta = with stdenv.lib; { + description = "Simple identd that just replies with a random string or customized userid"; + license = licenses.gpl2; + homepage = http://acidhub.click/NullidentdMod; + maintainers = with maintainers; [ das_j ]; + platforms = platforms.linux; # Must be run by systemd + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24c1234cbc6b..f563f0dfe243 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13287,6 +13287,8 @@ with pkgs; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; + nullidentdmod = callPackage ../servers/identd/nullidentdmod {}; + riemann = callPackage ../servers/monitoring/riemann { }; riemann-dash = callPackage ../servers/monitoring/riemann-dash { }; From b76cf0b54c6d6108466a7ca67e4a952e6017bca7 Mon Sep 17 00:00:00 2001 From: Sebastien Maret Date: Wed, 5 Sep 2018 12:17:05 +0200 Subject: [PATCH 084/600] gildas: ignore clang warnings for unused command line arguments See #46044 --- pkgs/applications/science/astronomy/gildas/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 8b01ef0c7713..d74eee4190df 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} From 4cd94bb5b89821dcd7478420e3e8fa48d591a5e7 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Wed, 5 Sep 2018 14:33:51 +0300 Subject: [PATCH 085/600] wireguard: 0.0.20180809 -> 0.0.20180904 --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 96e2a094ac0a..f93596b8e8fb 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180809"; + version = "0.0.20180904"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "07sbaignf8l4lndfxypgacaf2qmgyfkv1j5z7kn0cw5mgfsphmkx"; + sha256 = "0slf6lchzhb2san1hsqnny1sdmxq8rzqwz355f33zsgaj6qh1gmk"; }; sourceRoot = "source/src/tools"; From f685edba08787e1d3021324871110a5f5495f221 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Sep 2018 08:21:33 -0400 Subject: [PATCH 086/600] linux: 4.4.153 -> 4.4.154 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 7c5f345e3400..0872856c1190 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.153"; + version = "4.4.154"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00jlajwbq7w5cxzzaa5mib5qvihqab3ysfq401b71ji2bi8ma8qg"; + sha256 = "1j00y6hgj4c82y3j0gaqj68kf46fwxz1y5wx6ry5sgxnr3xp12z0"; }; } // (args.argsOverride or {})) From 92010b7a88f9cf5fe76dbb6134153826d091a1dd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Sep 2018 08:21:43 -0400 Subject: [PATCH 087/600] linux: 4.9.124 -> 4.9.125 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index ed0075b7876b..068cf25f0053 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.124"; + version = "4.9.125"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04a3iqy6divkd9bamn60d0v8jkls2jbip7qn0m82dlcdikab19jw"; + sha256 = "1jqi25ld83l57lzcbhrzdnmsj4isz686ivdj0wfsrgxyc7pxwr57"; }; } // (args.argsOverride or {})) From de9a2fd061478e6fd5bc49ccf72432523d2c55ff Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Sep 2018 08:21:51 -0400 Subject: [PATCH 088/600] linux: 4.14.67 -> 4.14.68 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 000764eca9b3..eee2b132ae29 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.67"; + version = "4.14.68"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1fkha288nv5vk2l13dj0xj09c2pxvipysdaaga7sfcvjq9nhajrz"; + sha256 = "1446sbyysrv6hws35nnippa1mz4g31w7sc433svg4fq3jwavy7br"; }; } // (args.argsOverride or {})) From 25cad43f85ae4b956bf4839d2b6c4b2a7ee06092 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Sep 2018 08:22:02 -0400 Subject: [PATCH 089/600] linux: 4.18.5 -> 4.18.6 --- pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index e76beadc27bf..22bbd73f9859 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.5"; + version = "4.18.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ga7ys6s5d9dk1ly9722sbik1y6kbc3w6nw9pw86zpzdh0v0l2gv"; + sha256 = "1518q822fs28sfdqwsibj3bpibzj5r2dqfr0skv7l8cid3yrgnq5"; }; } // (args.argsOverride or {})) From d89b1f0fbf4abacef99c5fe7d1280241d070a925 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 5 Sep 2018 15:53:38 +0200 Subject: [PATCH 090/600] spotify: 1.0.88.353.g15c26ea1-14 -> 1.0.83.316.ge96b6e67-5 The recent update is broken. Playing a song causes spotify to segfault. This is probably https://community.spotify.com/t5/Desktop-Linux/Segfault-with-the-new-update/td-p/4554830#, which was recognized by upstream and will hopefully be fixed soon. --- pkgs/applications/audio/spotify/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 1639ab34b6cf..81cda4edaedb 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,14 +5,14 @@ let # TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update) # "rev" decides what is actually being downloaded - version = "1.0.88.353.g15c26ea1-14"; + version = "1.0.83.316.ge96b6e67-5"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' - # More exapmles of api usage: + # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "19"; + rev = "17"; deps = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "3a068cbe3c1fca84ae67e28830216f993aa459947517956897c3b3f63063005c9db646960e85185b149747ffc302060c208a7f9968ea69d50a3496067089f3db"; + sha512 = "19bbr4142shsl4qrikf48vq7kyrd4k4jbsada13qxicxps46a9bx51vjm2hkijqv739c1gdkgzwx7llyk95z26lhrz53shm2n5ij8xi"; }; buildInputs = [ squashfsTools makeWrapper ]; From 348a153781bf5a65df5e9f3d65d5db0dddbe8256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 5 Sep 2018 16:22:52 +0200 Subject: [PATCH 091/600] pythonPackages.thinc: fix darwin build (#46092) thinc uses Accelerate on macOS as a blas library. Add the necessary dependencies to allow building on unsandboxed Darwin machines. --- pkgs/development/python-modules/thinc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 321b1fb11816..6217a4200574 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -6,6 +6,7 @@ , pytest , cython , cymem +, darwin , msgpack-numpy , msgpack-python , preshed @@ -40,6 +41,10 @@ buildPythonPackage rec { --replace "hypothesis>=2,<3" "hypothesis>=2" ''; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Accelerate CoreFoundation CoreGraphics CoreVideo + ]); + propagatedBuildInputs = [ cython cymem From 7cafc36d28a60d3be28a96d09607f39f5f348f08 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 5 Sep 2018 15:33:57 +0100 Subject: [PATCH 092/600] cargo-edit: 0.2.0 -> 0.3.0 --- .../package-management/cargo-edit/Cargo.nix | 3148 +++++++++++++++++ .../cargo-edit/cargo-edit.nix | 1905 ---------- .../package-management/cargo-edit/default.nix | 9 +- 3 files changed, 3153 insertions(+), 1909 deletions(-) create mode 100644 pkgs/tools/package-management/cargo-edit/Cargo.nix delete mode 100644 pkgs/tools/package-management/cargo-edit/cargo-edit.nix diff --git a/pkgs/tools/package-management/cargo-edit/Cargo.nix b/pkgs/tools/package-management/cargo-edit/Cargo.nix new file mode 100644 index 000000000000..fa6cfaab387f --- /dev/null +++ b/pkgs/tools/package-management/cargo-edit/Cargo.nix @@ -0,0 +1,3148 @@ +# Generated by carnix 0.7.2: carnix nix +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); +in +rec { + cargo_edit = f: cargo_edit_0_3_0 { features = cargo_edit_0_3_0_features { cargo_edit_0_3_0 = f; }; }; + __all = [ (cargo_edit {}) ]; + adler32_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "adler32"; + version = "1.0.3"; + authors = [ "Remi Rampin " ]; + sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb"; + inherit dependencies buildDependencies features; + }; + aho_corasick_0_6_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.6"; + authors = [ "Andrew Gallant " ]; + sha256 = "0ap5lv1q6ylmzq70bjgg66dsa6p9926gwv2q4z0chfjnii8hczq8"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; path = "src/main.rs"; } ]; + inherit dependencies buildDependencies features; + }; + ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.11.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; + sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; + inherit dependencies buildDependencies features; + }; + arrayvec_0_4_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "arrayvec"; + version = "0.4.7"; + authors = [ "bluss" ]; + sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4"; + inherit dependencies buildDependencies features; + }; + ascii_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ascii"; + version = "0.7.1"; + authors = [ "Thomas Bahn " "Torbjørn Birch Moltu " "Simon Sapin " ]; + sha256 = "0fy9rh316vcc4v0k8d1p2gi3a3wpiwj5bm2mw0yqzs8xvz6yd1ax"; + inherit dependencies buildDependencies features; + }; + assert_cli_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "assert_cli"; + version = "0.6.3"; + authors = [ "Pascal Hertleif " "Ed Page " ]; + sha256 = "1yx4phpiqvs83gin33hnqcl30dsp3imzvfbahmp4qqpmpp5hzgcv"; + crateBin = [ { name = "assert_fixture"; } ]; + inherit dependencies buildDependencies features; + }; + atty_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.11"; + authors = [ "softprops " ]; + sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20"; + inherit dependencies buildDependencies features; + }; + backtrace_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.9"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "137pjkcn89b7fqk78w65ggj92pynmf1hkr1sjz53aga4b50lkmwm"; + inherit dependencies buildDependencies features; + }; + backtrace_sys_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.23"; + authors = [ "Alex Crichton " ]; + sha256 = "0sx7h7bl5j5dj4hlk7bcf8fwbhrxrvq2hfpy70vw2140gnlrl9dw"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + base64_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "base64"; + version = "0.9.2"; + authors = [ "Alice Maz " "Marshall Pierce " ]; + sha256 = "0g4xxl8jhwjhvr69qlxdmbzd521xcn5j67lhkr20nh7ajvl6k0l1"; + inherit dependencies buildDependencies features; + }; + bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.9.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; + inherit dependencies buildDependencies features; + }; + bitflags_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw"; + inherit dependencies buildDependencies features; + }; + build_const_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "build_const"; + version = "0.2.1"; + authors = [ "Garrett Berg " ]; + sha256 = "15249xzi3qlm72p4glxgavwyq70fx2sp4df6ii0sdlrixrrp77pl"; + inherit dependencies buildDependencies features; + }; + byteorder_1_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.2.4"; + authors = [ "Andrew Gallant " ]; + sha256 = "095xbm5bi23fkbfb97kg81x02dymfmd2kp5nl93rvw6dar2kpwyw"; + inherit dependencies buildDependencies features; + }; + bytes_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bytes"; + version = "0.4.9"; + authors = [ "Carl Lerche " ]; + sha256 = "1jiqc94j85la9vs165vqpf6s1sah8n3ivnhsfapcjrvbhjawi6i6"; + inherit dependencies buildDependencies features; + }; + cargo_edit_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cargo-edit"; + version = "0.3.0"; + authors = [ "Without Boats " "Pascal Hertleif " "Sebastian Garrido " "Jonas Platte " "Benjamin Gill " "Andronik Ordian " ]; + sha256 = "1zyf52x82slh27s6bzc6pmmbgp7cfr1xpmsp7i3zy0nd1p4gd13f"; + crateBin = [ { name = "cargo-add"; path = "src/bin/add/main.rs"; } { name = "cargo-rm"; path = "src/bin/rm/main.rs"; } { name = "cargo-upgrade"; path = "src/bin/upgrade/main.rs"; } ]; + inherit dependencies buildDependencies features; + }; + cargo_metadata_0_5_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cargo_metadata"; + version = "0.5.8"; + authors = [ "Oliver Schneider " ]; + sha256 = "0vkkvpxmspkx80iq6vlrh8972g1b9f8qb92qy75daz43x16qnbd2"; + inherit dependencies buildDependencies features; + }; + cc_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.18"; + authors = [ "Alex Crichton " ]; + sha256 = "0wcnpa54qvm5921wwrrkn8cwxd5y0p5f4gb1qgyh5imii7rdhpjx"; + inherit dependencies buildDependencies features; + }; + cfg_if_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.4"; + authors = [ "Alex Crichton " ]; + sha256 = "0n5baxk53dvqjymzwynq55wb805b24390qx1n16zi8fjzq90j7k4"; + inherit dependencies buildDependencies features; + }; + chrono_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "chrono"; + version = "0.4.5"; + authors = [ "Kang Seonghoon " "Brandon W Maister " ]; + sha256 = "0v3gpbkaxjsskil0si321bak9p0k1sfz43cx9p50kvx0s5p3x0yr"; + inherit dependencies buildDependencies features; + }; + colored_1_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "colored"; + version = "1.6.1"; + authors = [ "Thomas Wickham " ]; + sha256 = "0n3ja64sdiafp751nyq97c8rvrn8xqw036461i7q4n47yiqxn8rw"; + inherit dependencies buildDependencies features; + }; + combine_3_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "combine"; + version = "3.3.6"; + authors = [ "Markus Westerlind " ]; + sha256 = "1wzxpn0ipz1n7d9ygcc8rh9a59lk4mh2jq5asxa7cgqgdzbhicys"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "core-foundation"; + version = "0.2.3"; + authors = [ "The Servo Project Developers" ]; + sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm"; + inherit dependencies buildDependencies features; + }; + core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "core-foundation-sys"; + version = "0.2.3"; + authors = [ "The Servo Project Developers" ]; + sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + crc_1_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crc"; + version = "1.8.1"; + authors = [ "Rui Hu " ]; + sha256 = "00m9jjqrddp3bqyanvyxv0hf6s56bx1wy51vcdcxg4n2jdhg109s"; + inherit dependencies buildDependencies features; + }; + crossbeam_deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crossbeam-deque"; + version = "0.3.1"; + authors = [ "The Crossbeam Project Developers" ]; + sha256 = "1km0mavyp9ddwb7k7kcdmyryi3bwxf0nmr6jqcpyjzvzmxjlkqap"; + inherit dependencies buildDependencies features; + }; + crossbeam_epoch_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crossbeam-epoch"; + version = "0.4.3"; + authors = [ "The Crossbeam Project Developers" ]; + sha256 = "18xfgi7h9aq4lqqrqzy366xg885z1hlkbhvycl2i3zhkhkvadhv3"; + inherit dependencies buildDependencies features; + }; + crossbeam_utils_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crossbeam-utils"; + version = "0.3.2"; + authors = [ "The Crossbeam Project Developers" ]; + sha256 = "1byx31nkxl48la58571h40ssk94faky26jwz15w40v2gba3v4fql"; + inherit dependencies buildDependencies features; + }; + difference_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "difference"; + version = "2.0.0"; + authors = [ "Johann Hofmann " ]; + sha256 = "1rk24wxxkhhw8drhda229dfy2nb64vvcz0ras6lq7va6wswlrc49"; + crateBin = [ { name = "difference"; } ]; + inherit dependencies buildDependencies features; + }; + docopt_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "docopt"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "009xdzqzyrx0yq390vbjbr6m9s8pyazq5r6gf7bchygy9r4p40hr"; + crateBin = [ { name = "docopt-wordlist"; path = "src/wordlist.rs"; } ]; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.3"; + authors = [ "David Tolnay " ]; + sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8"; + inherit dependencies buildDependencies features; + }; + either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "either"; + version = "1.5.0"; + authors = [ "bluss" ]; + sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; + inherit dependencies buildDependencies features; + }; + encoding_rs_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "encoding_rs"; + version = "0.7.2"; + authors = [ "Henri Sivonen " ]; + sha256 = "1c23bi3q4qmi2ci8g7p5j4b4i5abyggvyg6hkl7w4p4r527c9g3q"; + inherit dependencies buildDependencies features; + }; + env_proxy_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "env_proxy"; + version = "0.2.0"; + authors = [ "Ivan Nejgebauer " ]; + sha256 = "178vn5agzxbq6a7pgpkvaf74ilsqk8d010r4qbbf88l9cs2g8qz2"; + inherit dependencies buildDependencies features; + }; + environment_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "environment"; + version = "0.1.1"; + authors = [ "Freyskeyd " ]; + sha256 = "1dx1xi9851lvigfic05j9r2d5rf71v9b4bg2mh7jj6z6qccfq8nb"; + inherit dependencies buildDependencies features; + }; + error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.11.0"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; + inherit dependencies buildDependencies features; + }; + failure_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "failure"; + version = "0.1.1"; + authors = [ "Without Boats " ]; + sha256 = "0gf9cmkm9kc163sszgjksqp5pcgj689lnf2104nn4h4is18nhigk"; + inherit dependencies buildDependencies features; + }; + failure_derive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "failure_derive"; + version = "0.1.1"; + authors = [ "Without Boats " ]; + sha256 = "1w895q4pbyx3rwnhgjwfcayk9ghbi166wc1c3553qh8zkbz52k8i"; + procMacro = true; + inherit dependencies buildDependencies features; + }; + foreign_types_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "foreign-types"; + version = "0.3.2"; + authors = [ "Steven Fackler " ]; + sha256 = "105n8sp2djb1s5lzrw04p7ss3dchr5qa3canmynx396nh3vwm2p8"; + inherit dependencies buildDependencies features; + }; + foreign_types_shared_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "foreign-types-shared"; + version = "0.1.1"; + authors = [ "Steven Fackler " ]; + sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.3"; + authors = [ "Raph Levien " ]; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.3"; + authors = [ "Raph Levien " ]; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; + inherit dependencies buildDependencies features; + }; + futures_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "futures"; + version = "0.1.23"; + authors = [ "Alex Crichton " ]; + sha256 = "075s7sv1iqzf2r3lvb4hk81k5c9xzfcyb8q92h2s35fnypxyqd21"; + inherit dependencies buildDependencies features; + }; + futures_cpupool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "futures-cpupool"; + version = "0.1.8"; + authors = [ "Alex Crichton " ]; + sha256 = "0ficd31n5ljiixy6x0vjglhq4fp0v1p4qzxm3v6ymsrb3z080l5c"; + inherit dependencies buildDependencies features; + }; + httparse_1_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "httparse"; + version = "1.3.2"; + authors = [ "Sean McArthur " ]; + sha256 = "1mm10m2hv1inxzzvm85s6fdmwl9a3q9vik0nzh5qrx2hx5x8fcwl"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + hyper_0_11_27_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hyper"; + version = "0.11.27"; + authors = [ "Sean McArthur " ]; + sha256 = "0q5as4lhvh31bzk4qm7j84snrmxyxyaqk040rfk72b42dn98mryi"; + inherit dependencies buildDependencies features; + }; + hyper_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hyper-tls"; + version = "0.1.4"; + authors = [ "Sean McArthur " ]; + sha256 = "1242mxvkgkm936fcsfcmmwwb5blclf0xld4d6gqzbvhlfc9yhnl8"; + inherit dependencies buildDependencies features; + }; + idna_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "idna"; + version = "0.1.5"; + authors = [ "The rust-url developers" ]; + sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy"; + inherit dependencies buildDependencies features; + }; + iovec_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "iovec"; + version = "0.1.2"; + authors = [ "Carl Lerche " ]; + sha256 = "0vjymmb7wj4v4kza5jjn48fcdb85j3k37y7msjl3ifz0p9yiyp2r"; + inherit dependencies buildDependencies features; + }; + itoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "193a744yd74rmk13hl8xvd9p2hqhdkyf8xkvi1mxm5s10bby0h8v"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "language-tags"; + version = "0.2.2"; + authors = [ "Pyfisch " ]; + sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.11"; + authors = [ "Marvin Löbel " ]; + sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; + inherit dependencies buildDependencies features; + }; + lazy_static_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "1.0.2"; + authors = [ "Marvin Löbel " ]; + sha256 = "0ix4dmy6zb4v3m75l4alg84fk06y145z52z9pyysc9labw2x5r3r"; + inherit dependencies buildDependencies features; + }; + lazycell_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazycell"; + version = "0.6.0"; + authors = [ "Alex Crichton " "Nikita Pekin " ]; + sha256 = "1ax148clinbvp6alxcih8s5i2bg3mc5mi69n3hvzvzbwlm6k532r"; + inherit dependencies buildDependencies features; + }; + libc_0_2_42_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.42"; + authors = [ "The Rust Project Developers" ]; + sha256 = "064v49hz1zpl081w8c4vwikrkhaxp06y4i9l7x7wx6bjpwp19pjx"; + inherit dependencies buildDependencies features; + }; + libflate_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libflate"; + version = "0.1.16"; + authors = [ "Takeru Ohta " ]; + sha256 = "0l15g61h10bznxsjirwq9c43w17mjpqx6wz0357agskardkdh14n"; + inherit dependencies buildDependencies features; + }; + linked_hash_map_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "linked-hash-map"; + version = "0.5.1"; + authors = [ "Stepan Koltsov " "Andrew Paseltiner " ]; + sha256 = "1f29c7j53z7w5v0g115yii9dmmbsahr93ak375g48vi75v3p4030"; + inherit dependencies buildDependencies features; + }; + log_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.9"; + authors = [ "The Rust Project Developers" ]; + sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2"; + inherit dependencies buildDependencies features; + }; + log_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.4.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1gdmwrbm7s18zcdz4lcdhz975m4gwhi854c7j1rvj1gsr8aca250"; + inherit dependencies buildDependencies features; + }; + matches_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "matches"; + version = "0.1.7"; + authors = [ "Simon Sapin " ]; + sha256 = "0zx9gi5flyzkh9nx52fyc3k2zz08b9ww1c4yndlfrw72kr8m7yfy"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "2.0.1"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; + inherit dependencies buildDependencies features; + }; + memoffset_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memoffset"; + version = "0.2.1"; + authors = [ "Gilad Naaman " ]; + sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf"; + inherit dependencies buildDependencies features; + }; + mime_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "mime"; + version = "0.3.8"; + authors = [ "Sean McArthur " ]; + sha256 = "1577adg9zvkd1qdb2nqqg1ryap33p5r4qsw01n9pw162xpisqjm3"; + inherit dependencies buildDependencies features; + }; + mime_guess_2_0_0_alpha_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "mime_guess"; + version = "2.0.0-alpha.6"; + authors = [ "Austin Bonander " ]; + sha256 = "1k2mdq43gi2qr63b7m5zs624rfi40ysk33cay49jlhq97jwnk9db"; + inherit dependencies buildDependencies features; + }; + mio_0_6_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "mio"; + version = "0.6.15"; + authors = [ "Carl Lerche " ]; + sha256 = "0a93wxsmkh8x38wxivhn6qdj08pj9f0j3y46p4wv3xclbq8i4aaa"; + inherit dependencies buildDependencies features; + }; + miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miow"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0"; + inherit dependencies buildDependencies features; + }; + native_tls_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "native-tls"; + version = "0.1.5"; + authors = [ "Steven Fackler " ]; + sha256 = "11f75qmbny5pnn6zp0vlvadrvc9ph9qsxiyn4n6q02xyd93pxxlf"; + inherit dependencies buildDependencies features; + }; + net2_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "net2"; + version = "0.2.33"; + authors = [ "Alex Crichton " ]; + sha256 = "1qnmajafgybj5wyxz9iffa8x5wgbwd2znfklmhqj7vl6lw1m65mq"; + inherit dependencies buildDependencies features; + }; + nodrop_0_1_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nodrop"; + version = "0.1.12"; + authors = [ "bluss" ]; + sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d"; + inherit dependencies buildDependencies features; + }; + num_integer_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.39"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1f42ls46cghs13qfzgbd7syib2zc6m7hlmv1qlar6c9mdxapvvbg"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + num_traits_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.2.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0ql203ca6lzppksy4fsfnpz3kq96vwlwvyn3ahvnd9g6k9f5ncj0"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.8.0"; + authors = [ "Sean McArthur " ]; + sha256 = "1y6qnd9r8ga6y8mvlabdrr73nc8cshjjlzbvnanzyj9b8zzkfwk2"; + inherit dependencies buildDependencies features; + }; + openssl_0_9_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl"; + version = "0.9.24"; + authors = [ "Steven Fackler " ]; + sha256 = "0wzm3c11g3ndaqyzq36mcdcm1q4a8pmsyi33ibybhjz28g2z0f79"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + openssl_sys_0_9_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl-sys"; + version = "0.9.33"; + authors = [ "Alex Crichton " "Steven Fackler " ]; + sha256 = "1q5f7ykkxgniwjrqifx1ssrqjzcf8fi4fzh770xrbyp8n6v14qr6"; + build = "build/main.rs"; + inherit dependencies buildDependencies features; + }; + pad_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pad"; + version = "0.1.5"; + authors = [ "Ben S " ]; + sha256 = "081qzwl58r1rn5b7m5pvy2xyfk4amm59f3i1gf95417s71gd4j53"; + inherit dependencies buildDependencies features; + }; + percent_encoding_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "percent-encoding"; + version = "1.0.1"; + authors = [ "The rust-url developers" ]; + sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.22"; + authors = [ "Steven Fackler " ]; + sha256 = "0b58l863rhmqyqsfj2d89nmdzc21g9yvvvq1m4c3a615zpcykb3i"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_codegen_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.22"; + authors = [ "Steven Fackler " ]; + sha256 = "0k8yx4gr9m6cfrvh21s6bhnh1azz13j4xih88bvm06r6blfl89fs"; + inherit dependencies buildDependencies features; + }; + phf_generator_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.22"; + authors = [ "Steven Fackler " ]; + sha256 = "093gla320qb6rbk8z7wqqxl79zrh874sa7sxir31q2p7mrw4b70k"; + inherit dependencies buildDependencies features; + }; + phf_shared_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.22"; + authors = [ "Steven Fackler " ]; + sha256 = "0ij9flicfi0ab5vpzdwbizpdyxhk891qxa8nxsqlv4sg4abqang6"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.12"; + authors = [ "Alex Crichton " ]; + sha256 = "0k343rlyv9qmplxwxn8clzkyx1zbplhnvm0psjl6s111fjqmgsgh"; + inherit dependencies buildDependencies features; + }; + pretty_assertions_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pretty_assertions"; + version = "0.5.1"; + authors = [ "Colin Kiegel " "Florent Fayolle " ]; + sha256 = "0vlfprmgch79bvnp02mr8ham8wld0yrx29nbx6sv1srf5djzplj1"; + inherit dependencies buildDependencies features; + }; + proc_macro2_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "proc-macro2"; + version = "0.4.9"; + authors = [ "Alex Crichton " ]; + sha256 = "1qmfx3z2xvsgwsqqkhri339i4spk5wkxf5y4j8sg47ggig2y00rh"; + inherit dependencies buildDependencies features; + }; + quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quote"; + version = "0.3.15"; + authors = [ "David Tolnay " ]; + sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + inherit dependencies buildDependencies features; + }; + quote_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quote"; + version = "0.6.4"; + authors = [ "David Tolnay " ]; + sha256 = "1x3sxi9vpn4sayj4lbi0wh483b4iphwfsfkkk2gj3z89sqw3wkwg"; + inherit dependencies buildDependencies features; + }; + rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.4.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; + inherit dependencies buildDependencies features; + }; + redox_syscall_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.40"; + authors = [ "Jeremy Soller " ]; + sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611"; + libName = "syscall"; + inherit dependencies buildDependencies features; + }; + redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + regex_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "1.0.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0ksq2bc2g0xhrkpzzfr8l2vidw6c04mwgynwjbwcx7shfrwgw0lx"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.6.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "109426mj7nhwr6szdzbcvn1a8g5zy52f9maqxjd9agm8wg87ylyw"; + inherit dependencies buildDependencies features; + }; + relay_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "relay"; + version = "0.1.1"; + authors = [ "Sean McArthur " ]; + sha256 = "16csfaslbmj25iaxs88p8wcfh2zfpkh9isg9adid0nxjxvknh07r"; + inherit dependencies buildDependencies features; + }; + remove_dir_all_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "remove_dir_all"; + version = "0.5.1"; + authors = [ "Aaronepower " ]; + sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7"; + inherit dependencies buildDependencies features; + }; + reqwest_0_8_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "reqwest"; + version = "0.8.7"; + authors = [ "Sean McArthur " ]; + sha256 = "1wfc77jir16xcjcdjn988f8bpaldd0la1gf1piphfxydp8i7gr56"; + inherit dependencies buildDependencies features; + }; + rustc_demangle_0_1_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.9"; + authors = [ "Alex Crichton " ]; + sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax"; + inherit dependencies buildDependencies features; + }; + safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "safemem"; + version = "0.2.0"; + authors = [ "Austin Bonander " ]; + sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm"; + inherit dependencies buildDependencies features; + }; + schannel_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "schannel"; + version = "0.1.13"; + authors = [ "Steven Fackler " "Steffen Butzer " ]; + sha256 = "033zavvq2k6z5akk38vzaglzbxzljaixgmhj9am27nr21dgaj6b3"; + inherit dependencies buildDependencies features; + }; + scoped_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped-tls"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "0nblksgki698cqsclsnd6f1pq4yy34350dn2slaah9dlmx9z5xla"; + inherit dependencies buildDependencies features; + }; + scopeguard_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scopeguard"; + version = "0.3.3"; + authors = [ "bluss" ]; + sha256 = "0i1l013csrqzfz6c68pr5pi01hg5v5yahq8fsdmaxy6p8ygsjf3r"; + inherit dependencies buildDependencies features; + }; + security_framework_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "security-framework"; + version = "0.1.16"; + authors = [ "Steven Fackler " ]; + sha256 = "1kxczsaj8gz4922jl5af2gkxh71rasb6khaf3dp7ldlnw9qf2sbm"; + inherit dependencies buildDependencies features; + }; + security_framework_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "security-framework-sys"; + version = "0.1.16"; + authors = [ "Steven Fackler " ]; + sha256 = "0ai2pivdr5fyc7czbkpcrwap0imyy0r8ndarrl3n5kiv0jha1js3"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + semver_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.9.0"; + authors = [ "Steve Klabnik " "The Rust Project Developers" ]; + sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63"; + inherit dependencies buildDependencies features; + }; + semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver-parser"; + version = "0.7.0"; + authors = [ "Steve Klabnik " ]; + sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; + inherit dependencies buildDependencies features; + }; + serde_1_0_70_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "1.0.70"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1z1gyjf5rrs1k3j1civfzqjqs790651bwf8m31bw2pagclhnazs4"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + serde_derive_1_0_75_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.75"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "15v35aj079qg4dqhs8wjyinqifxgbkw8zf4sk44h43q3xha6znqy"; + procMacro = true; + inherit dependencies buildDependencies features; + }; + serde_json_1_0_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.24"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1wvvc3y0202my2p00ah8ygl1794nspar9pf39fz1525jd6m6k8a1"; + inherit dependencies buildDependencies features; + }; + serde_urlencoded_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_urlencoded"; + version = "0.5.2"; + authors = [ "Anthony Ramine " ]; + sha256 = "0m5pigng0665qrk4ii1z84pb4lchbsswhgb863yglljskmm056m0"; + inherit dependencies buildDependencies features; + }; + siphasher_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.3"; + authors = [ "Frank Denis " ]; + sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw"; + inherit dependencies buildDependencies features; + }; + slab_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "slab"; + version = "0.4.0"; + authors = [ "Carl Lerche " ]; + sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0"; + inherit dependencies buildDependencies features; + }; + strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.7.0"; + authors = [ "Danny Guo " ]; + sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; + inherit dependencies buildDependencies features; + }; + syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "syn"; + version = "0.11.11"; + authors = [ "David Tolnay " ]; + sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + inherit dependencies buildDependencies features; + }; + syn_0_14_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "syn"; + version = "0.14.5"; + authors = [ "David Tolnay " ]; + sha256 = "0b3xx5aa1shaz2i8mrvc7pmrj5lq2n6gmxyv2h1d7637gdky9smg"; + inherit dependencies buildDependencies features; + }; + synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "synom"; + version = "0.11.3"; + authors = [ "David Tolnay " ]; + sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + inherit dependencies buildDependencies features; + }; + synstructure_0_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "synstructure"; + version = "0.6.1"; + authors = [ "Michael Layzell " ]; + sha256 = "1xnyw58va9zcqi4vvpnmpllacdj2a0mvy0cbd698izmr4qs92xlk"; + inherit dependencies buildDependencies features; + }; + tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.7"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; + inherit dependencies buildDependencies features; + }; + termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termcolor"; + version = "0.3.6"; + authors = [ "Andrew Gallant " ]; + sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z"; + inherit dependencies buildDependencies features; + }; + termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + inherit dependencies buildDependencies features; + }; + thread_local_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.6"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "02rksdwjmz2pw9bmgbb4c0bgkbq5z6nvg510sq1s6y2j1gam0c7i"; + inherit dependencies buildDependencies features; + }; + time_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "time"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m"; + inherit dependencies buildDependencies features; + }; + tokio_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio"; + version = "0.1.7"; + authors = [ "Carl Lerche " ]; + sha256 = "0d5fj90wk05m5vbd924irg1pl1d4fn86jjw5napzanh6vbwsnr66"; + inherit dependencies buildDependencies features; + }; + tokio_codec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-codec"; + version = "0.1.0"; + authors = [ "Carl Lerche " "Bryan Burgers " ]; + sha256 = "0347ygccbj05yn9krjk4ifcy5xbv41xk7yyi9cl2cnxrc285xnm7"; + inherit dependencies buildDependencies features; + }; + tokio_core_0_1_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-core"; + version = "0.1.17"; + authors = [ "Carl Lerche " ]; + sha256 = "1j6c5q3aakvb1hjx4r95xwl5ms8rp19k4qsr6v6ngwbvr6f9z6rs"; + inherit dependencies buildDependencies features; + }; + tokio_executor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-executor"; + version = "0.1.2"; + authors = [ "Carl Lerche " ]; + sha256 = "1y4mwqjw438x6jskigz1knvfbpbinxfv6h43s60w6wdb80xmyg48"; + inherit dependencies buildDependencies features; + }; + tokio_fs_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-fs"; + version = "0.1.2"; + authors = [ "Carl Lerche " ]; + sha256 = "18rxwslv2hdmij6alpqfcm8aywcd28vw12s826ajgvkskh8jsdh2"; + inherit dependencies buildDependencies features; + }; + tokio_io_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-io"; + version = "0.1.7"; + authors = [ "Carl Lerche " ]; + sha256 = "08r46b5lp7929agwal1iaabdhfv309wyvd6cld1g39x5ml8x7hp2"; + inherit dependencies buildDependencies features; + }; + tokio_reactor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-reactor"; + version = "0.1.2"; + authors = [ "Carl Lerche " ]; + sha256 = "11yx7fvyv1c5h097lspfrim1r67axl8y8m22y5mgny8nhly56s4m"; + inherit dependencies buildDependencies features; + }; + tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-service"; + version = "0.1.0"; + authors = [ "Carl Lerche " ]; + sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih"; + inherit dependencies buildDependencies features; + }; + tokio_tcp_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-tcp"; + version = "0.1.0"; + authors = [ "Carl Lerche " ]; + sha256 = "19cyajkqvvbn3qqnak0qzivdq6amfjymbc30k7bbqhx4y1pcgqvh"; + inherit dependencies buildDependencies features; + }; + tokio_threadpool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-threadpool"; + version = "0.1.5"; + authors = [ "Carl Lerche " ]; + sha256 = "04nzjdjlir33s0z5nh3vh2h4v3vb1rwzv45jdjridrk92rqpb2vc"; + inherit dependencies buildDependencies features; + }; + tokio_timer_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-timer"; + version = "0.2.4"; + authors = [ "Carl Lerche " ]; + sha256 = "0imv1k4g583hh61qkh6mpx06ik9accyl4582vq0z61rr484050gi"; + inherit dependencies buildDependencies features; + }; + tokio_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-tls"; + version = "0.1.4"; + authors = [ "Carl Lerche " "Alex Crichton " ]; + sha256 = "07rwv3q6jbg65ln1ahzb4g648l8lcn4hvc0ax3r12bnsi1py7agp"; + inherit dependencies buildDependencies features; + }; + tokio_udp_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-udp"; + version = "0.1.1"; + authors = [ "Carl Lerche " ]; + sha256 = "1zsq3bny959dq7cnhdjrlaglrdcm63zn82jpkjs6nrrcfhb9l6z9"; + inherit dependencies buildDependencies features; + }; + toml_edit_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml_edit"; + version = "0.1.3"; + authors = [ "Andronik Ordian " ]; + sha256 = "0g5v5d141phzjk2crrgb0xcm65ysw76a01y75y597cmrg9ic6bjm"; + inherit dependencies buildDependencies features; + }; + try_lock_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "try-lock"; + version = "0.1.0"; + authors = [ "Sean McArthur " ]; + sha256 = "0kfrqrb2xkjig54s3qfy80dpldknr19p3rmp0n82yk5929j879k3"; + inherit dependencies buildDependencies features; + }; + ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; + inherit dependencies buildDependencies features; + }; + unicase_1_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicase"; + version = "1.4.2"; + authors = [ "Sean McArthur " ]; + sha256 = "0rbnhw2mnhcwrij3vczp0sl8zdfmvf2dlh8hly81kj7132kfj0mf"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + unicase_2_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicase"; + version = "2.1.0"; + authors = [ "Sean McArthur " ]; + sha256 = "1zzn16hh8fdx5pnbbnl32q8m2mh4vpd1jm9pdcv969ik83dw4byp"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-bidi"; + version = "0.3.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; + libName = "unicode_bidi"; + inherit dependencies buildDependencies features; + }; + unicode_normalization_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.7"; + authors = [ "kwantam " ]; + sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.5"; + authors = [ "kwantam " ]; + sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; + inherit dependencies buildDependencies features; + }; + unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.0.4"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + inherit dependencies buildDependencies features; + }; + unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.1.0"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; + inherit dependencies buildDependencies features; + }; + unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + authors = [ "Jonathan Reem " ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + inherit dependencies buildDependencies features; + }; + url_1_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "url"; + version = "1.7.1"; + authors = [ "The rust-url developers" ]; + sha256 = "1l36pbvlwdnh3zqz4wp5n6jg332wkis9pi2g3vy12xr8k4nfyk8i"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; + inherit dependencies buildDependencies features; + }; + uuid_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "uuid"; + version = "0.6.5"; + authors = [ "Ashley Mannix" "Christopher Armstrong" "Dylan DPC" "Hunar Roop Kahlon" ]; + sha256 = "1jy15m4yxxwma0jsy070garhbgfprky23i77rawjkk75vqhnnhlf"; + inherit dependencies buildDependencies features; + }; + vcpkg_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.4"; + authors = [ "Jim McGrath " ]; + sha256 = "0xgk5axv1qhj4rfn2rca7768wnvzihccnajkgc6im8ndsx371nml"; + inherit dependencies buildDependencies features; + }; + version_check_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "version_check"; + version = "0.1.4"; + authors = [ "Sergio Benitez " ]; + sha256 = "1ghi6bw2qsj53x2vyprs883dbrq8cjzmshlamjsxvmwd2zp13bck"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + want_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "want"; + version = "0.0.4"; + authors = [ "Sean McArthur " ]; + sha256 = "1l1qy4pvg5q71nrzfjldw9xzqhhgicj4slly1bal89hr2aaibpy0"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.3.5"; + authors = [ "Peter Atashian " ]; + sha256 = "0cfdsxa5yf832r5i2z7dhdvnryyvhfp3nb32gpcaq502zgjdm3w6"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian " ]; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wincolor"; + version = "0.1.6"; + authors = [ "Andrew Gallant " ]; + sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47"; + inherit dependencies buildDependencies features; + }; + ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ws2_32-sys"; + version = "0.2.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc"; + libName = "ws2_32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + adler32_1_0_3 = { features?(adler32_1_0_3_features {}) }: adler32_1_0_3_ {}; + adler32_1_0_3_features = f: updateFeatures f (rec { + adler32_1_0_3.default = (f.adler32_1_0_3.default or true); + }) []; + aho_corasick_0_6_6 = { features?(aho_corasick_0_6_6_features {}) }: aho_corasick_0_6_6_ { + dependencies = mapFeatures features ([ memchr_2_0_1 ]); + }; + aho_corasick_0_6_6_features = f: updateFeatures f (rec { + aho_corasick_0_6_6.default = (f.aho_corasick_0_6_6.default or true); + memchr_2_0_1.default = true; + }) [ memchr_2_0_1_features ]; + ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + }; + ansi_term_0_11_0_features = f: updateFeatures f (rec { + ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); + winapi_0_3_5.consoleapi = true; + winapi_0_3_5.default = true; + winapi_0_3_5.errhandlingapi = true; + winapi_0_3_5.processenv = true; + }) [ winapi_0_3_5_features ]; + arrayvec_0_4_7 = { features?(arrayvec_0_4_7_features {}) }: arrayvec_0_4_7_ { + dependencies = mapFeatures features ([ nodrop_0_1_12 ]); + features = mkFeatures (features.arrayvec_0_4_7 or {}); + }; + arrayvec_0_4_7_features = f: updateFeatures f (rec { + arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or true); + arrayvec_0_4_7.serde = + (f.arrayvec_0_4_7.serde or false) || + (f.arrayvec_0_4_7.serde-1 or false) || + (arrayvec_0_4_7.serde-1 or false); + arrayvec_0_4_7.std = + (f.arrayvec_0_4_7.std or false) || + (f.arrayvec_0_4_7.default or false) || + (arrayvec_0_4_7.default or false); + nodrop_0_1_12.default = (f.nodrop_0_1_12.default or false); + }) [ nodrop_0_1_12_features ]; + ascii_0_7_1 = { features?(ascii_0_7_1_features {}) }: ascii_0_7_1_ { + features = mkFeatures (features.ascii_0_7_1 or {}); + }; + ascii_0_7_1_features = f: updateFeatures f (rec { + ascii_0_7_1.default = (f.ascii_0_7_1.default or true); + }) []; + assert_cli_0_6_3 = { features?(assert_cli_0_6_3_features {}) }: assert_cli_0_6_3_ { + dependencies = mapFeatures features ([ colored_1_6_1 difference_2_0_0 environment_0_1_1 failure_0_1_1 failure_derive_0_1_1 serde_json_1_0_24 ]); + }; + assert_cli_0_6_3_features = f: updateFeatures f (rec { + assert_cli_0_6_3.default = (f.assert_cli_0_6_3.default or true); + colored_1_6_1.default = true; + difference_2_0_0.default = true; + environment_0_1_1.default = true; + failure_0_1_1.default = true; + failure_derive_0_1_1.default = true; + serde_json_1_0_24.default = true; + }) [ colored_1_6_1_features difference_2_0_0_features environment_0_1_1_features failure_0_1_1_features failure_derive_0_1_1_features serde_json_1_0_24_features ]; + atty_0_2_11 = { features?(atty_0_2_11_features {}) }: atty_0_2_11_ { + dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + }; + atty_0_2_11_features = f: updateFeatures f (rec { + atty_0_2_11.default = (f.atty_0_2_11.default or true); + libc_0_2_42.default = (f.libc_0_2_42.default or false); + termion_1_5_1.default = true; + winapi_0_3_5.consoleapi = true; + winapi_0_3_5.default = true; + winapi_0_3_5.minwinbase = true; + winapi_0_3_5.minwindef = true; + winapi_0_3_5.processenv = true; + winapi_0_3_5.winbase = true; + }) [ termion_1_5_1_features libc_0_2_42_features winapi_0_3_5_features ]; + backtrace_0_3_9 = { features?(backtrace_0_3_9_features {}) }: backtrace_0_3_9_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 rustc_demangle_0_1_9 ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] + ++ (if features.backtrace_0_3_9.backtrace-sys or false then [ backtrace_sys_0_1_23 ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ ] + ++ (if features.backtrace_0_3_9.winapi or false then [ winapi_0_3_5 ] else [])) else []); + features = mkFeatures (features.backtrace_0_3_9 or {}); + }; + backtrace_0_3_9_features = f: updateFeatures f (rec { + backtrace_0_3_9.addr2line = + (f.backtrace_0_3_9.addr2line or false) || + (f.backtrace_0_3_9.gimli-symbolize or false) || + (backtrace_0_3_9.gimli-symbolize or false); + backtrace_0_3_9.backtrace-sys = + (f.backtrace_0_3_9.backtrace-sys or false) || + (f.backtrace_0_3_9.libbacktrace or false) || + (backtrace_0_3_9.libbacktrace or false); + backtrace_0_3_9.coresymbolication = + (f.backtrace_0_3_9.coresymbolication or false) || + (f.backtrace_0_3_9.default or false) || + (backtrace_0_3_9.default or false); + backtrace_0_3_9.dbghelp = + (f.backtrace_0_3_9.dbghelp or false) || + (f.backtrace_0_3_9.default or false) || + (backtrace_0_3_9.default or false); + backtrace_0_3_9.default = (f.backtrace_0_3_9.default or true); + backtrace_0_3_9.dladdr = + (f.backtrace_0_3_9.dladdr or false) || + (f.backtrace_0_3_9.default or false) || + (backtrace_0_3_9.default or false); + backtrace_0_3_9.findshlibs = + (f.backtrace_0_3_9.findshlibs or false) || + (f.backtrace_0_3_9.gimli-symbolize or false) || + (backtrace_0_3_9.gimli-symbolize or false); + backtrace_0_3_9.gimli = + (f.backtrace_0_3_9.gimli or false) || + (f.backtrace_0_3_9.gimli-symbolize or false) || + (backtrace_0_3_9.gimli-symbolize or false); + backtrace_0_3_9.libbacktrace = + (f.backtrace_0_3_9.libbacktrace or false) || + (f.backtrace_0_3_9.default or false) || + (backtrace_0_3_9.default or false); + backtrace_0_3_9.libunwind = + (f.backtrace_0_3_9.libunwind or false) || + (f.backtrace_0_3_9.default or false) || + (backtrace_0_3_9.default or false); + backtrace_0_3_9.memmap = + (f.backtrace_0_3_9.memmap or false) || + (f.backtrace_0_3_9.gimli-symbolize or false) || + (backtrace_0_3_9.gimli-symbolize or false); + backtrace_0_3_9.object = + (f.backtrace_0_3_9.object or false) || + (f.backtrace_0_3_9.gimli-symbolize or false) || + (backtrace_0_3_9.gimli-symbolize or false); + backtrace_0_3_9.rustc-serialize = + (f.backtrace_0_3_9.rustc-serialize or false) || + (f.backtrace_0_3_9.serialize-rustc or false) || + (backtrace_0_3_9.serialize-rustc or false); + backtrace_0_3_9.serde = + (f.backtrace_0_3_9.serde or false) || + (f.backtrace_0_3_9.serialize-serde or false) || + (backtrace_0_3_9.serialize-serde or false); + backtrace_0_3_9.serde_derive = + (f.backtrace_0_3_9.serde_derive or false) || + (f.backtrace_0_3_9.serialize-serde or false) || + (backtrace_0_3_9.serialize-serde or false); + backtrace_0_3_9.winapi = + (f.backtrace_0_3_9.winapi or false) || + (f.backtrace_0_3_9.dbghelp or false) || + (backtrace_0_3_9.dbghelp or false); + backtrace_sys_0_1_23.default = true; + cfg_if_0_1_4.default = true; + libc_0_2_42.default = true; + rustc_demangle_0_1_9.default = true; + winapi_0_3_5.dbghelp = true; + winapi_0_3_5.default = true; + winapi_0_3_5.minwindef = true; + winapi_0_3_5.processthreadsapi = true; + winapi_0_3_5.std = true; + winapi_0_3_5.winnt = true; + }) [ cfg_if_0_1_4_features rustc_demangle_0_1_9_features backtrace_sys_0_1_23_features libc_0_2_42_features winapi_0_3_5_features ]; + backtrace_sys_0_1_23 = { features?(backtrace_sys_0_1_23_features {}) }: backtrace_sys_0_1_23_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]); + buildDependencies = mapFeatures features ([ cc_1_0_18 ]); + }; + backtrace_sys_0_1_23_features = f: updateFeatures f (rec { + backtrace_sys_0_1_23.default = (f.backtrace_sys_0_1_23.default or true); + cc_1_0_18.default = true; + libc_0_2_42.default = true; + }) [ libc_0_2_42_features cc_1_0_18_features ]; + base64_0_9_2 = { features?(base64_0_9_2_features {}) }: base64_0_9_2_ { + dependencies = mapFeatures features ([ byteorder_1_2_4 safemem_0_2_0 ]); + }; + base64_0_9_2_features = f: updateFeatures f (rec { + base64_0_9_2.default = (f.base64_0_9_2.default or true); + byteorder_1_2_4.default = true; + safemem_0_2_0.default = true; + }) [ byteorder_1_2_4_features safemem_0_2_0_features ]; + bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { + features = mkFeatures (features.bitflags_0_9_1 or {}); + }; + bitflags_0_9_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); + bitflags_0_9_1.example_generated = + (f.bitflags_0_9_1.example_generated or false) || + (f.bitflags_0_9_1.default or false) || + (bitflags_0_9_1.default or false); + }) []; + bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ { + features = mkFeatures (features.bitflags_1_0_3 or {}); + }; + bitflags_1_0_3_features = f: updateFeatures f (rec { + bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true); + }) []; + build_const_0_2_1 = { features?(build_const_0_2_1_features {}) }: build_const_0_2_1_ { + features = mkFeatures (features.build_const_0_2_1 or {}); + }; + build_const_0_2_1_features = f: updateFeatures f (rec { + build_const_0_2_1.default = (f.build_const_0_2_1.default or true); + build_const_0_2_1.std = + (f.build_const_0_2_1.std or false) || + (f.build_const_0_2_1.default or false) || + (build_const_0_2_1.default or false); + }) []; + byteorder_1_2_4 = { features?(byteorder_1_2_4_features {}) }: byteorder_1_2_4_ { + features = mkFeatures (features.byteorder_1_2_4 or {}); + }; + byteorder_1_2_4_features = f: updateFeatures f (rec { + byteorder_1_2_4.default = (f.byteorder_1_2_4.default or true); + byteorder_1_2_4.std = + (f.byteorder_1_2_4.std or false) || + (f.byteorder_1_2_4.default or false) || + (byteorder_1_2_4.default or false); + }) []; + bytes_0_4_9 = { features?(bytes_0_4_9_features {}) }: bytes_0_4_9_ { + dependencies = mapFeatures features ([ byteorder_1_2_4 iovec_0_1_2 ]); + features = mkFeatures (features.bytes_0_4_9 or {}); + }; + bytes_0_4_9_features = f: updateFeatures f (rec { + byteorder_1_2_4.default = true; + byteorder_1_2_4.i128 = + (f.byteorder_1_2_4.i128 or false) || + (bytes_0_4_9.i128 or false) || + (f.bytes_0_4_9.i128 or false); + bytes_0_4_9.default = (f.bytes_0_4_9.default or true); + iovec_0_1_2.default = true; + }) [ byteorder_1_2_4_features iovec_0_1_2_features ]; + cargo_edit_0_3_0 = { features?(cargo_edit_0_3_0_features {}) }: cargo_edit_0_3_0_ { + dependencies = mapFeatures features ([ atty_0_2_11 cargo_metadata_0_5_8 docopt_1_0_0 env_proxy_0_2_0 error_chain_0_11_0 pad_0_1_5 regex_1_0_3 reqwest_0_8_7 semver_0_9_0 serde_1_0_70 serde_derive_1_0_75 serde_json_1_0_24 termcolor_0_3_6 toml_edit_0_1_3 ]); + features = mkFeatures (features.cargo_edit_0_3_0 or {}); + }; + cargo_edit_0_3_0_features = f: updateFeatures f (rec { + atty_0_2_11.default = true; + cargo_edit_0_3_0.add = + (f.cargo_edit_0_3_0.add or false) || + (f.cargo_edit_0_3_0.default or false) || + (cargo_edit_0_3_0.default or false); + cargo_edit_0_3_0.default = (f.cargo_edit_0_3_0.default or true); + cargo_edit_0_3_0.rm = + (f.cargo_edit_0_3_0.rm or false) || + (f.cargo_edit_0_3_0.default or false) || + (cargo_edit_0_3_0.default or false); + cargo_edit_0_3_0.upgrade = + (f.cargo_edit_0_3_0.upgrade or false) || + (f.cargo_edit_0_3_0.default or false) || + (cargo_edit_0_3_0.default or false); + cargo_metadata_0_5_8.default = true; + docopt_1_0_0.default = true; + env_proxy_0_2_0.default = true; + error_chain_0_11_0.default = true; + pad_0_1_5.default = true; + regex_1_0_3.default = true; + reqwest_0_8_7.default = true; + semver_0_9_0.default = true; + semver_0_9_0.serde = true; + serde_1_0_70.default = true; + serde_derive_1_0_75.default = true; + serde_json_1_0_24.default = true; + termcolor_0_3_6.default = true; + toml_edit_0_1_3.default = true; + }) [ atty_0_2_11_features cargo_metadata_0_5_8_features docopt_1_0_0_features env_proxy_0_2_0_features error_chain_0_11_0_features pad_0_1_5_features regex_1_0_3_features reqwest_0_8_7_features semver_0_9_0_features serde_1_0_70_features serde_derive_1_0_75_features serde_json_1_0_24_features termcolor_0_3_6_features toml_edit_0_1_3_features ]; + cargo_metadata_0_5_8 = { features?(cargo_metadata_0_5_8_features {}) }: cargo_metadata_0_5_8_ { + dependencies = mapFeatures features ([ error_chain_0_11_0 semver_0_9_0 serde_1_0_70 serde_derive_1_0_75 serde_json_1_0_24 ]); + features = mkFeatures (features.cargo_metadata_0_5_8 or {}); + }; + cargo_metadata_0_5_8_features = f: updateFeatures f (rec { + cargo_metadata_0_5_8.backtrace = + (f.cargo_metadata_0_5_8.backtrace or false) || + (f.cargo_metadata_0_5_8.default or false) || + (cargo_metadata_0_5_8.default or false); + cargo_metadata_0_5_8.default = (f.cargo_metadata_0_5_8.default or true); + error_chain_0_11_0.backtrace = + (f.error_chain_0_11_0.backtrace or false) || + (cargo_metadata_0_5_8.backtrace or false) || + (f.cargo_metadata_0_5_8.backtrace or false); + error_chain_0_11_0.default = (f.error_chain_0_11_0.default or false); + semver_0_9_0.default = true; + semver_0_9_0.serde = true; + serde_1_0_70.default = true; + serde_derive_1_0_75.default = true; + serde_json_1_0_24.default = true; + }) [ error_chain_0_11_0_features semver_0_9_0_features serde_1_0_70_features serde_derive_1_0_75_features serde_json_1_0_24_features ]; + cc_1_0_18 = { features?(cc_1_0_18_features {}) }: cc_1_0_18_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.cc_1_0_18 or {}); + }; + cc_1_0_18_features = f: updateFeatures f (rec { + cc_1_0_18.default = (f.cc_1_0_18.default or true); + cc_1_0_18.rayon = + (f.cc_1_0_18.rayon or false) || + (f.cc_1_0_18.parallel or false) || + (cc_1_0_18.parallel or false); + }) []; + cfg_if_0_1_4 = { features?(cfg_if_0_1_4_features {}) }: cfg_if_0_1_4_ {}; + cfg_if_0_1_4_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = (f.cfg_if_0_1_4.default or true); + }) []; + chrono_0_4_5 = { features?(chrono_0_4_5_features {}) }: chrono_0_4_5_ { + dependencies = mapFeatures features ([ num_integer_0_1_39 num_traits_0_2_5 ] + ++ (if features.chrono_0_4_5.time or false then [ time_0_1_40 ] else [])); + features = mkFeatures (features.chrono_0_4_5 or {}); + }; + chrono_0_4_5_features = f: updateFeatures f (rec { + chrono_0_4_5.clock = + (f.chrono_0_4_5.clock or false) || + (f.chrono_0_4_5.default or false) || + (chrono_0_4_5.default or false); + chrono_0_4_5.default = (f.chrono_0_4_5.default or true); + chrono_0_4_5.time = + (f.chrono_0_4_5.time or false) || + (f.chrono_0_4_5.clock or false) || + (chrono_0_4_5.clock or false); + num_integer_0_1_39.default = (f.num_integer_0_1_39.default or false); + num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false); + time_0_1_40.default = true; + }) [ num_integer_0_1_39_features num_traits_0_2_5_features time_0_1_40_features ]; + colored_1_6_1 = { features?(colored_1_6_1_features {}) }: colored_1_6_1_ { + dependencies = mapFeatures features ([ lazy_static_1_0_2 ]); + features = mkFeatures (features.colored_1_6_1 or {}); + }; + colored_1_6_1_features = f: updateFeatures f (rec { + colored_1_6_1.default = (f.colored_1_6_1.default or true); + lazy_static_1_0_2.default = true; + }) [ lazy_static_1_0_2_features ]; + combine_3_3_6 = { features?(combine_3_3_6_features {}) }: combine_3_3_6_ { + dependencies = mapFeatures features ([ ascii_0_7_1 byteorder_1_2_4 either_1_5_0 memchr_2_0_1 unreachable_1_0_0 ]); + features = mkFeatures (features.combine_3_3_6 or {}); + }; + combine_3_3_6_features = f: updateFeatures f (rec { + ascii_0_7_1.default = true; + byteorder_1_2_4.default = true; + combine_3_3_6.default = (f.combine_3_3_6.default or true); + combine_3_3_6.regex = + (f.combine_3_3_6.regex or false) || + (f.combine_3_3_6.doc or false) || + (combine_3_3_6.doc or false); + combine_3_3_6.std = + (f.combine_3_3_6.std or false) || + (f.combine_3_3_6.default or false) || + (combine_3_3_6.default or false); + either_1_5_0.default = true; + memchr_2_0_1.default = (f.memchr_2_0_1.default or false); + memchr_2_0_1.use_std = + (f.memchr_2_0_1.use_std or false) || + (combine_3_3_6.std or false) || + (f.combine_3_3_6.std or false); + unreachable_1_0_0.default = true; + }) [ ascii_0_7_1_features byteorder_1_2_4_features either_1_5_0_features memchr_2_0_1_features unreachable_1_0_0_features ]; + core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ { + dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]); + }; + core_foundation_0_2_3_features = f: updateFeatures f (rec { + core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true); + core_foundation_sys_0_2_3.default = true; + libc_0_2_42.default = true; + }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ]; + core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]); + }; + core_foundation_sys_0_2_3_features = f: updateFeatures f (rec { + core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true); + libc_0_2_42.default = true; + }) [ libc_0_2_42_features ]; + crc_1_8_1 = { features?(crc_1_8_1_features {}) }: crc_1_8_1_ { + buildDependencies = mapFeatures features ([ build_const_0_2_1 ]); + features = mkFeatures (features.crc_1_8_1 or {}); + }; + crc_1_8_1_features = f: updateFeatures f (rec { + build_const_0_2_1.default = true; + crc_1_8_1.default = (f.crc_1_8_1.default or true); + crc_1_8_1.std = + (f.crc_1_8_1.std or false) || + (f.crc_1_8_1.default or false) || + (crc_1_8_1.default or false); + }) [ build_const_0_2_1_features ]; + crossbeam_deque_0_3_1 = { features?(crossbeam_deque_0_3_1_features {}) }: crossbeam_deque_0_3_1_ { + dependencies = mapFeatures features ([ crossbeam_epoch_0_4_3 crossbeam_utils_0_3_2 ]); + }; + crossbeam_deque_0_3_1_features = f: updateFeatures f (rec { + crossbeam_deque_0_3_1.default = (f.crossbeam_deque_0_3_1.default or true); + crossbeam_epoch_0_4_3.default = true; + crossbeam_utils_0_3_2.default = true; + }) [ crossbeam_epoch_0_4_3_features crossbeam_utils_0_3_2_features ]; + crossbeam_epoch_0_4_3 = { features?(crossbeam_epoch_0_4_3_features {}) }: crossbeam_epoch_0_4_3_ { + dependencies = mapFeatures features ([ arrayvec_0_4_7 cfg_if_0_1_4 crossbeam_utils_0_3_2 memoffset_0_2_1 scopeguard_0_3_3 ] + ++ (if features.crossbeam_epoch_0_4_3.lazy_static or false then [ lazy_static_1_0_2 ] else [])); + features = mkFeatures (features.crossbeam_epoch_0_4_3 or {}); + }; + crossbeam_epoch_0_4_3_features = f: updateFeatures f (rec { + arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or false); + arrayvec_0_4_7.use_union = + (f.arrayvec_0_4_7.use_union or false) || + (crossbeam_epoch_0_4_3.nightly or false) || + (f.crossbeam_epoch_0_4_3.nightly or false); + cfg_if_0_1_4.default = true; + crossbeam_epoch_0_4_3.default = (f.crossbeam_epoch_0_4_3.default or true); + crossbeam_epoch_0_4_3.lazy_static = + (f.crossbeam_epoch_0_4_3.lazy_static or false) || + (f.crossbeam_epoch_0_4_3.use_std or false) || + (crossbeam_epoch_0_4_3.use_std or false); + crossbeam_epoch_0_4_3.use_std = + (f.crossbeam_epoch_0_4_3.use_std or false) || + (f.crossbeam_epoch_0_4_3.default or false) || + (crossbeam_epoch_0_4_3.default or false); + crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or false); + crossbeam_utils_0_3_2.use_std = + (f.crossbeam_utils_0_3_2.use_std or false) || + (crossbeam_epoch_0_4_3.use_std or false) || + (f.crossbeam_epoch_0_4_3.use_std or false); + lazy_static_1_0_2.default = true; + memoffset_0_2_1.default = true; + scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or false); + }) [ arrayvec_0_4_7_features cfg_if_0_1_4_features crossbeam_utils_0_3_2_features lazy_static_1_0_2_features memoffset_0_2_1_features scopeguard_0_3_3_features ]; + crossbeam_utils_0_3_2 = { features?(crossbeam_utils_0_3_2_features {}) }: crossbeam_utils_0_3_2_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); + features = mkFeatures (features.crossbeam_utils_0_3_2 or {}); + }; + crossbeam_utils_0_3_2_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or true); + crossbeam_utils_0_3_2.use_std = + (f.crossbeam_utils_0_3_2.use_std or false) || + (f.crossbeam_utils_0_3_2.default or false) || + (crossbeam_utils_0_3_2.default or false); + }) [ cfg_if_0_1_4_features ]; + difference_2_0_0 = { features?(difference_2_0_0_features {}) }: difference_2_0_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.difference_2_0_0 or {}); + }; + difference_2_0_0_features = f: updateFeatures f (rec { + difference_2_0_0.default = (f.difference_2_0_0.default or true); + difference_2_0_0.getopts = + (f.difference_2_0_0.getopts or false) || + (f.difference_2_0_0.bin or false) || + (difference_2_0_0.bin or false); + }) []; + docopt_1_0_0 = { features?(docopt_1_0_0_features {}) }: docopt_1_0_0_ { + dependencies = mapFeatures features ([ lazy_static_1_0_2 regex_1_0_3 serde_1_0_70 serde_derive_1_0_75 strsim_0_7_0 ]); + }; + docopt_1_0_0_features = f: updateFeatures f (rec { + docopt_1_0_0.default = (f.docopt_1_0_0.default or true); + lazy_static_1_0_2.default = true; + regex_1_0_3.default = true; + serde_1_0_70.default = true; + serde_derive_1_0_75.default = true; + strsim_0_7_0.default = true; + }) [ lazy_static_1_0_2_features regex_1_0_3_features serde_1_0_70_features serde_derive_1_0_75_features strsim_0_7_0_features ]; + dtoa_0_4_3 = { features?(dtoa_0_4_3_features {}) }: dtoa_0_4_3_ {}; + dtoa_0_4_3_features = f: updateFeatures f (rec { + dtoa_0_4_3.default = (f.dtoa_0_4_3.default or true); + }) []; + either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.either_1_5_0 or {}); + }; + either_1_5_0_features = f: updateFeatures f (rec { + either_1_5_0.default = (f.either_1_5_0.default or true); + either_1_5_0.use_std = + (f.either_1_5_0.use_std or false) || + (f.either_1_5_0.default or false) || + (either_1_5_0.default or false); + }) []; + encoding_rs_0_7_2 = { features?(encoding_rs_0_7_2_features {}) }: encoding_rs_0_7_2_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); + features = mkFeatures (features.encoding_rs_0_7_2 or {}); + }; + encoding_rs_0_7_2_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + encoding_rs_0_7_2.default = (f.encoding_rs_0_7_2.default or true); + encoding_rs_0_7_2.simd = + (f.encoding_rs_0_7_2.simd or false) || + (f.encoding_rs_0_7_2.simd-accel or false) || + (encoding_rs_0_7_2.simd-accel or false); + }) [ cfg_if_0_1_4_features ]; + env_proxy_0_2_0 = { features?(env_proxy_0_2_0_features {}) }: env_proxy_0_2_0_ { + dependencies = mapFeatures features ([ log_0_3_9 url_1_7_1 ]); + }; + env_proxy_0_2_0_features = f: updateFeatures f (rec { + env_proxy_0_2_0.default = (f.env_proxy_0_2_0.default or true); + log_0_3_9.default = true; + url_1_7_1.default = true; + }) [ log_0_3_9_features url_1_7_1_features ]; + environment_0_1_1 = { features?(environment_0_1_1_features {}) }: environment_0_1_1_ {}; + environment_0_1_1_features = f: updateFeatures f (rec { + environment_0_1_1.default = (f.environment_0_1_1.default or true); + }) []; + error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ { + dependencies = mapFeatures features ([ ] + ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_9 ] else [])); + features = mkFeatures (features.error_chain_0_11_0 or {}); + }; + error_chain_0_11_0_features = f: updateFeatures f (rec { + backtrace_0_3_9.default = true; + error_chain_0_11_0.backtrace = + (f.error_chain_0_11_0.backtrace or false) || + (f.error_chain_0_11_0.default or false) || + (error_chain_0_11_0.default or false); + error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true); + error_chain_0_11_0.example_generated = + (f.error_chain_0_11_0.example_generated or false) || + (f.error_chain_0_11_0.default or false) || + (error_chain_0_11_0.default or false); + }) [ backtrace_0_3_9_features ]; + failure_0_1_1 = { features?(failure_0_1_1_features {}) }: failure_0_1_1_ { + dependencies = mapFeatures features ([ ] + ++ (if features.failure_0_1_1.backtrace or false then [ backtrace_0_3_9 ] else []) + ++ (if features.failure_0_1_1.failure_derive or false then [ failure_derive_0_1_1 ] else [])); + features = mkFeatures (features.failure_0_1_1 or {}); + }; + failure_0_1_1_features = f: updateFeatures f (rec { + backtrace_0_3_9.default = true; + failure_0_1_1.backtrace = + (f.failure_0_1_1.backtrace or false) || + (f.failure_0_1_1.std or false) || + (failure_0_1_1.std or false); + failure_0_1_1.default = (f.failure_0_1_1.default or true); + failure_0_1_1.derive = + (f.failure_0_1_1.derive or false) || + (f.failure_0_1_1.default or false) || + (failure_0_1_1.default or false); + failure_0_1_1.failure_derive = + (f.failure_0_1_1.failure_derive or false) || + (f.failure_0_1_1.derive or false) || + (failure_0_1_1.derive or false); + failure_0_1_1.std = + (f.failure_0_1_1.std or false) || + (f.failure_0_1_1.default or false) || + (failure_0_1_1.default or false); + failure_derive_0_1_1.default = true; + }) [ backtrace_0_3_9_features failure_derive_0_1_1_features ]; + failure_derive_0_1_1 = { features?(failure_derive_0_1_1_features {}) }: failure_derive_0_1_1_ { + dependencies = mapFeatures features ([ quote_0_3_15 syn_0_11_11 synstructure_0_6_1 ]); + features = mkFeatures (features.failure_derive_0_1_1 or {}); + }; + failure_derive_0_1_1_features = f: updateFeatures f (rec { + failure_derive_0_1_1.default = (f.failure_derive_0_1_1.default or true); + failure_derive_0_1_1.std = + (f.failure_derive_0_1_1.std or false) || + (f.failure_derive_0_1_1.default or false) || + (failure_derive_0_1_1.default or false); + quote_0_3_15.default = true; + syn_0_11_11.default = true; + synstructure_0_6_1.default = true; + }) [ quote_0_3_15_features syn_0_11_11_features synstructure_0_6_1_features ]; + foreign_types_0_3_2 = { features?(foreign_types_0_3_2_features {}) }: foreign_types_0_3_2_ { + dependencies = mapFeatures features ([ foreign_types_shared_0_1_1 ]); + }; + foreign_types_0_3_2_features = f: updateFeatures f (rec { + foreign_types_0_3_2.default = (f.foreign_types_0_3_2.default or true); + foreign_types_shared_0_1_1.default = true; + }) [ foreign_types_shared_0_1_1_features ]; + foreign_types_shared_0_1_1 = { features?(foreign_types_shared_0_1_1_features {}) }: foreign_types_shared_0_1_1_ {}; + foreign_types_shared_0_1_1_features = f: updateFeatures f (rec { + foreign_types_shared_0_1_1.default = (f.foreign_types_shared_0_1_1.default or true); + }) []; + fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { + dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]); + }; + fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { + bitflags_1_0_3.default = true; + fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); + fuchsia_zircon_sys_0_3_3.default = true; + }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ]; + fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; + fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); + }) []; + futures_0_1_23 = { features?(futures_0_1_23_features {}) }: futures_0_1_23_ { + features = mkFeatures (features.futures_0_1_23 or {}); + }; + futures_0_1_23_features = f: updateFeatures f (rec { + futures_0_1_23.default = (f.futures_0_1_23.default or true); + futures_0_1_23.use_std = + (f.futures_0_1_23.use_std or false) || + (f.futures_0_1_23.default or false) || + (futures_0_1_23.default or false); + futures_0_1_23.with-deprecated = + (f.futures_0_1_23.with-deprecated or false) || + (f.futures_0_1_23.default or false) || + (futures_0_1_23.default or false); + }) []; + futures_cpupool_0_1_8 = { features?(futures_cpupool_0_1_8_features {}) }: futures_cpupool_0_1_8_ { + dependencies = mapFeatures features ([ futures_0_1_23 num_cpus_1_8_0 ]); + features = mkFeatures (features.futures_cpupool_0_1_8 or {}); + }; + futures_cpupool_0_1_8_features = f: updateFeatures f (rec { + futures_0_1_23.default = (f.futures_0_1_23.default or false); + futures_0_1_23.use_std = true; + futures_0_1_23.with-deprecated = + (f.futures_0_1_23.with-deprecated or false) || + (futures_cpupool_0_1_8.with-deprecated or false) || + (f.futures_cpupool_0_1_8.with-deprecated or false); + futures_cpupool_0_1_8.default = (f.futures_cpupool_0_1_8.default or true); + futures_cpupool_0_1_8.with-deprecated = + (f.futures_cpupool_0_1_8.with-deprecated or false) || + (f.futures_cpupool_0_1_8.default or false) || + (futures_cpupool_0_1_8.default or false); + num_cpus_1_8_0.default = true; + }) [ futures_0_1_23_features num_cpus_1_8_0_features ]; + httparse_1_3_2 = { features?(httparse_1_3_2_features {}) }: httparse_1_3_2_ { + features = mkFeatures (features.httparse_1_3_2 or {}); + }; + httparse_1_3_2_features = f: updateFeatures f (rec { + httparse_1_3_2.default = (f.httparse_1_3_2.default or true); + httparse_1_3_2.std = + (f.httparse_1_3_2.std or false) || + (f.httparse_1_3_2.default or false) || + (httparse_1_3_2.default or false); + }) []; + hyper_0_11_27 = { features?(hyper_0_11_27_features {}) }: hyper_0_11_27_ { + dependencies = mapFeatures features ([ base64_0_9_2 bytes_0_4_9 futures_0_1_23 futures_cpupool_0_1_8 httparse_1_3_2 iovec_0_1_2 language_tags_0_2_2 log_0_4_3 mime_0_3_8 net2_0_2_33 percent_encoding_1_0_1 relay_0_1_1 time_0_1_40 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 unicase_2_1_0 want_0_0_4 ]); + features = mkFeatures (features.hyper_0_11_27 or {}); + }; + hyper_0_11_27_features = f: updateFeatures f (rec { + base64_0_9_2.default = true; + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + futures_cpupool_0_1_8.default = true; + httparse_1_3_2.default = true; + hyper_0_11_27.default = (f.hyper_0_11_27.default or true); + hyper_0_11_27.http = + (f.hyper_0_11_27.http or false) || + (f.hyper_0_11_27.compat or false) || + (hyper_0_11_27.compat or false); + hyper_0_11_27.server-proto = + (f.hyper_0_11_27.server-proto or false) || + (f.hyper_0_11_27.default or false) || + (hyper_0_11_27.default or false); + hyper_0_11_27.tokio-proto = + (f.hyper_0_11_27.tokio-proto or false) || + (f.hyper_0_11_27.server-proto or false) || + (hyper_0_11_27.server-proto or false); + iovec_0_1_2.default = true; + language_tags_0_2_2.default = true; + log_0_4_3.default = true; + mime_0_3_8.default = true; + net2_0_2_33.default = true; + percent_encoding_1_0_1.default = true; + relay_0_1_1.default = true; + time_0_1_40.default = true; + tokio_core_0_1_17.default = true; + tokio_io_0_1_7.default = true; + tokio_service_0_1_0.default = true; + unicase_2_1_0.default = true; + want_0_0_4.default = true; + }) [ base64_0_9_2_features bytes_0_4_9_features futures_0_1_23_features futures_cpupool_0_1_8_features httparse_1_3_2_features iovec_0_1_2_features language_tags_0_2_2_features log_0_4_3_features mime_0_3_8_features net2_0_2_33_features percent_encoding_1_0_1_features relay_0_1_1_features time_0_1_40_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features unicase_2_1_0_features want_0_0_4_features ]; + hyper_tls_0_1_4 = { features?(hyper_tls_0_1_4_features {}) }: hyper_tls_0_1_4_ { + dependencies = mapFeatures features ([ futures_0_1_23 hyper_0_11_27 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 tokio_tls_0_1_4 ]); + }; + hyper_tls_0_1_4_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + hyper_0_11_27.default = (f.hyper_0_11_27.default or false); + hyper_tls_0_1_4.default = (f.hyper_tls_0_1_4.default or true); + native_tls_0_1_5.default = true; + tokio_core_0_1_17.default = true; + tokio_io_0_1_7.default = true; + tokio_service_0_1_0.default = true; + tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or false); + }) [ futures_0_1_23_features hyper_0_11_27_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features tokio_tls_0_1_4_features ]; + idna_0_1_5 = { features?(idna_0_1_5_features {}) }: idna_0_1_5_ { + dependencies = mapFeatures features ([ matches_0_1_7 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]); + }; + idna_0_1_5_features = f: updateFeatures f (rec { + idna_0_1_5.default = (f.idna_0_1_5.default or true); + matches_0_1_7.default = true; + unicode_bidi_0_3_4.default = true; + unicode_normalization_0_1_7.default = true; + }) [ matches_0_1_7_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ]; + iovec_0_1_2 = { features?(iovec_0_1_2_features {}) }: iovec_0_1_2_ { + dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []); + }; + iovec_0_1_2_features = f: updateFeatures f (rec { + iovec_0_1_2.default = (f.iovec_0_1_2.default or true); + libc_0_2_42.default = true; + winapi_0_2_8.default = true; + }) [ libc_0_2_42_features winapi_0_2_8_features ]; + itoa_0_4_2 = { features?(itoa_0_4_2_features {}) }: itoa_0_4_2_ { + features = mkFeatures (features.itoa_0_4_2 or {}); + }; + itoa_0_4_2_features = f: updateFeatures f (rec { + itoa_0_4_2.default = (f.itoa_0_4_2.default or true); + itoa_0_4_2.std = + (f.itoa_0_4_2.std or false) || + (f.itoa_0_4_2.default or false) || + (itoa_0_4_2.default or false); + }) []; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.language_tags_0_2_2 or {}); + }; + language_tags_0_2_2_features = f: updateFeatures f (rec { + language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true); + language_tags_0_2_2.heapsize = + (f.language_tags_0_2_2.heapsize or false) || + (f.language_tags_0_2_2.heap_size or false) || + (language_tags_0_2_2.heap_size or false); + language_tags_0_2_2.heapsize_plugin = + (f.language_tags_0_2_2.heapsize_plugin or false) || + (f.language_tags_0_2_2.heap_size or false) || + (language_tags_0_2_2.heap_size or false); + }) []; + lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_0_2_11 or {}); + }; + lazy_static_0_2_11_features = f: updateFeatures f (rec { + lazy_static_0_2_11.compiletest_rs = + (f.lazy_static_0_2_11.compiletest_rs or false) || + (f.lazy_static_0_2_11.compiletest or false) || + (lazy_static_0_2_11.compiletest or false); + lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true); + lazy_static_0_2_11.nightly = + (f.lazy_static_0_2_11.nightly or false) || + (f.lazy_static_0_2_11.spin_no_std or false) || + (lazy_static_0_2_11.spin_no_std or false); + lazy_static_0_2_11.spin = + (f.lazy_static_0_2_11.spin or false) || + (f.lazy_static_0_2_11.spin_no_std or false) || + (lazy_static_0_2_11.spin_no_std or false); + }) []; + lazy_static_1_0_2 = { features?(lazy_static_1_0_2_features {}) }: lazy_static_1_0_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_1_0_2 or {}); + }; + lazy_static_1_0_2_features = f: updateFeatures f (rec { + lazy_static_1_0_2.default = (f.lazy_static_1_0_2.default or true); + lazy_static_1_0_2.nightly = + (f.lazy_static_1_0_2.nightly or false) || + (f.lazy_static_1_0_2.spin_no_std or false) || + (lazy_static_1_0_2.spin_no_std or false); + lazy_static_1_0_2.spin = + (f.lazy_static_1_0_2.spin or false) || + (f.lazy_static_1_0_2.spin_no_std or false) || + (lazy_static_1_0_2.spin_no_std or false); + }) []; + lazycell_0_6_0 = { features?(lazycell_0_6_0_features {}) }: lazycell_0_6_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazycell_0_6_0 or {}); + }; + lazycell_0_6_0_features = f: updateFeatures f (rec { + lazycell_0_6_0.clippy = + (f.lazycell_0_6_0.clippy or false) || + (f.lazycell_0_6_0.nightly-testing or false) || + (lazycell_0_6_0.nightly-testing or false); + lazycell_0_6_0.default = (f.lazycell_0_6_0.default or true); + lazycell_0_6_0.nightly = + (f.lazycell_0_6_0.nightly or false) || + (f.lazycell_0_6_0.nightly-testing or false) || + (lazycell_0_6_0.nightly-testing or false); + }) []; + libc_0_2_42 = { features?(libc_0_2_42_features {}) }: libc_0_2_42_ { + features = mkFeatures (features.libc_0_2_42 or {}); + }; + libc_0_2_42_features = f: updateFeatures f (rec { + libc_0_2_42.default = (f.libc_0_2_42.default or true); + libc_0_2_42.use_std = + (f.libc_0_2_42.use_std or false) || + (f.libc_0_2_42.default or false) || + (libc_0_2_42.default or false); + }) []; + libflate_0_1_16 = { features?(libflate_0_1_16_features {}) }: libflate_0_1_16_ { + dependencies = mapFeatures features ([ adler32_1_0_3 byteorder_1_2_4 crc_1_8_1 ]); + }; + libflate_0_1_16_features = f: updateFeatures f (rec { + adler32_1_0_3.default = true; + byteorder_1_2_4.default = true; + crc_1_8_1.default = true; + libflate_0_1_16.default = (f.libflate_0_1_16.default or true); + }) [ adler32_1_0_3_features byteorder_1_2_4_features crc_1_8_1_features ]; + linked_hash_map_0_5_1 = { features?(linked_hash_map_0_5_1_features {}) }: linked_hash_map_0_5_1_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.linked_hash_map_0_5_1 or {}); + }; + linked_hash_map_0_5_1_features = f: updateFeatures f (rec { + linked_hash_map_0_5_1.default = (f.linked_hash_map_0_5_1.default or true); + linked_hash_map_0_5_1.heapsize = + (f.linked_hash_map_0_5_1.heapsize or false) || + (f.linked_hash_map_0_5_1.heapsize_impl or false) || + (linked_hash_map_0_5_1.heapsize_impl or false); + linked_hash_map_0_5_1.serde = + (f.linked_hash_map_0_5_1.serde or false) || + (f.linked_hash_map_0_5_1.serde_impl or false) || + (linked_hash_map_0_5_1.serde_impl or false); + linked_hash_map_0_5_1.serde_test = + (f.linked_hash_map_0_5_1.serde_test or false) || + (f.linked_hash_map_0_5_1.serde_impl or false) || + (linked_hash_map_0_5_1.serde_impl or false); + }) []; + log_0_3_9 = { features?(log_0_3_9_features {}) }: log_0_3_9_ { + dependencies = mapFeatures features ([ log_0_4_3 ]); + features = mkFeatures (features.log_0_3_9 or {}); + }; + log_0_3_9_features = f: updateFeatures f (rec { + log_0_3_9.default = (f.log_0_3_9.default or true); + log_0_3_9.use_std = + (f.log_0_3_9.use_std or false) || + (f.log_0_3_9.default or false) || + (log_0_3_9.default or false); + log_0_4_3.default = true; + log_0_4_3.max_level_debug = + (f.log_0_4_3.max_level_debug or false) || + (log_0_3_9.max_level_debug or false) || + (f.log_0_3_9.max_level_debug or false); + log_0_4_3.max_level_error = + (f.log_0_4_3.max_level_error or false) || + (log_0_3_9.max_level_error or false) || + (f.log_0_3_9.max_level_error or false); + log_0_4_3.max_level_info = + (f.log_0_4_3.max_level_info or false) || + (log_0_3_9.max_level_info or false) || + (f.log_0_3_9.max_level_info or false); + log_0_4_3.max_level_off = + (f.log_0_4_3.max_level_off or false) || + (log_0_3_9.max_level_off or false) || + (f.log_0_3_9.max_level_off or false); + log_0_4_3.max_level_trace = + (f.log_0_4_3.max_level_trace or false) || + (log_0_3_9.max_level_trace or false) || + (f.log_0_3_9.max_level_trace or false); + log_0_4_3.max_level_warn = + (f.log_0_4_3.max_level_warn or false) || + (log_0_3_9.max_level_warn or false) || + (f.log_0_3_9.max_level_warn or false); + log_0_4_3.release_max_level_debug = + (f.log_0_4_3.release_max_level_debug or false) || + (log_0_3_9.release_max_level_debug or false) || + (f.log_0_3_9.release_max_level_debug or false); + log_0_4_3.release_max_level_error = + (f.log_0_4_3.release_max_level_error or false) || + (log_0_3_9.release_max_level_error or false) || + (f.log_0_3_9.release_max_level_error or false); + log_0_4_3.release_max_level_info = + (f.log_0_4_3.release_max_level_info or false) || + (log_0_3_9.release_max_level_info or false) || + (f.log_0_3_9.release_max_level_info or false); + log_0_4_3.release_max_level_off = + (f.log_0_4_3.release_max_level_off or false) || + (log_0_3_9.release_max_level_off or false) || + (f.log_0_3_9.release_max_level_off or false); + log_0_4_3.release_max_level_trace = + (f.log_0_4_3.release_max_level_trace or false) || + (log_0_3_9.release_max_level_trace or false) || + (f.log_0_3_9.release_max_level_trace or false); + log_0_4_3.release_max_level_warn = + (f.log_0_4_3.release_max_level_warn or false) || + (log_0_3_9.release_max_level_warn or false) || + (f.log_0_3_9.release_max_level_warn or false); + log_0_4_3.std = + (f.log_0_4_3.std or false) || + (log_0_3_9.use_std or false) || + (f.log_0_3_9.use_std or false); + }) [ log_0_4_3_features ]; + log_0_4_3 = { features?(log_0_4_3_features {}) }: log_0_4_3_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); + features = mkFeatures (features.log_0_4_3 or {}); + }; + log_0_4_3_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + log_0_4_3.default = (f.log_0_4_3.default or true); + }) [ cfg_if_0_1_4_features ]; + matches_0_1_7 = { features?(matches_0_1_7_features {}) }: matches_0_1_7_ {}; + matches_0_1_7_features = f: updateFeatures f (rec { + matches_0_1_7.default = (f.matches_0_1_7.default or true); + }) []; + memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { + dependencies = mapFeatures features ([ ] + ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_42 ] else [])); + features = mkFeatures (features.memchr_2_0_1 or {}); + }; + memchr_2_0_1_features = f: updateFeatures f (rec { + libc_0_2_42.default = (f.libc_0_2_42.default or false); + libc_0_2_42.use_std = + (f.libc_0_2_42.use_std or false) || + (memchr_2_0_1.use_std or false) || + (f.memchr_2_0_1.use_std or false); + memchr_2_0_1.default = (f.memchr_2_0_1.default or true); + memchr_2_0_1.libc = + (f.memchr_2_0_1.libc or false) || + (f.memchr_2_0_1.default or false) || + (memchr_2_0_1.default or false) || + (f.memchr_2_0_1.use_std or false) || + (memchr_2_0_1.use_std or false); + memchr_2_0_1.use_std = + (f.memchr_2_0_1.use_std or false) || + (f.memchr_2_0_1.default or false) || + (memchr_2_0_1.default or false); + }) [ libc_0_2_42_features ]; + memoffset_0_2_1 = { features?(memoffset_0_2_1_features {}) }: memoffset_0_2_1_ {}; + memoffset_0_2_1_features = f: updateFeatures f (rec { + memoffset_0_2_1.default = (f.memoffset_0_2_1.default or true); + }) []; + mime_0_3_8 = { features?(mime_0_3_8_features {}) }: mime_0_3_8_ { + dependencies = mapFeatures features ([ unicase_2_1_0 ]); + }; + mime_0_3_8_features = f: updateFeatures f (rec { + mime_0_3_8.default = (f.mime_0_3_8.default or true); + unicase_2_1_0.default = true; + }) [ unicase_2_1_0_features ]; + mime_guess_2_0_0_alpha_6 = { features?(mime_guess_2_0_0_alpha_6_features {}) }: mime_guess_2_0_0_alpha_6_ { + dependencies = mapFeatures features ([ mime_0_3_8 phf_0_7_22 unicase_1_4_2 ]); + buildDependencies = mapFeatures features ([ phf_codegen_0_7_22 unicase_1_4_2 ]); + features = mkFeatures (features.mime_guess_2_0_0_alpha_6 or {}); + }; + mime_guess_2_0_0_alpha_6_features = f: updateFeatures f (rec { + mime_0_3_8.default = true; + mime_guess_2_0_0_alpha_6.default = (f.mime_guess_2_0_0_alpha_6.default or true); + phf_0_7_22.default = true; + phf_0_7_22.unicase = true; + phf_codegen_0_7_22.default = true; + unicase_1_4_2.default = true; + }) [ mime_0_3_8_features phf_0_7_22_features unicase_1_4_2_features phf_codegen_0_7_22_features unicase_1_4_2_features ]; + mio_0_6_15 = { features?(mio_0_6_15_features {}) }: mio_0_6_15_ { + dependencies = mapFeatures features ([ iovec_0_1_2 lazycell_0_6_0 log_0_4_3 net2_0_2_33 slab_0_4_0 ]) + ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 fuchsia_zircon_sys_0_3_3 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []); + features = mkFeatures (features.mio_0_6_15 or {}); + }; + mio_0_6_15_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_3.default = true; + fuchsia_zircon_sys_0_3_3.default = true; + iovec_0_1_2.default = true; + kernel32_sys_0_2_2.default = true; + lazycell_0_6_0.default = true; + libc_0_2_42.default = true; + log_0_4_3.default = true; + mio_0_6_15.default = (f.mio_0_6_15.default or true); + mio_0_6_15.with-deprecated = + (f.mio_0_6_15.with-deprecated or false) || + (f.mio_0_6_15.default or false) || + (mio_0_6_15.default or false); + miow_0_2_1.default = true; + net2_0_2_33.default = true; + slab_0_4_0.default = true; + winapi_0_2_8.default = true; + }) [ iovec_0_1_2_features lazycell_0_6_0_features log_0_4_3_features net2_0_2_33_features slab_0_4_0_features fuchsia_zircon_0_3_3_features fuchsia_zircon_sys_0_3_3_features libc_0_2_42_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ]; + miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ { + dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_33 winapi_0_2_8 ws2_32_sys_0_2_1 ]); + }; + miow_0_2_1_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + miow_0_2_1.default = (f.miow_0_2_1.default or true); + net2_0_2_33.default = (f.net2_0_2_33.default or false); + winapi_0_2_8.default = true; + ws2_32_sys_0_2_1.default = true; + }) [ kernel32_sys_0_2_2_features net2_0_2_33_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ]; + native_tls_0_1_5 = { features?(native_tls_0_1_5_features {}) }: native_tls_0_1_5_ { + dependencies = mapFeatures features ([ lazy_static_0_2_11 ]) + ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ libc_0_2_42 security_framework_0_1_16 security_framework_sys_0_1_16 tempdir_0_3_7 ]) else []) + ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then mapFeatures features ([ openssl_0_9_24 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_13 ]) else []); + }; + native_tls_0_1_5_features = f: updateFeatures f (rec { + lazy_static_0_2_11.default = true; + libc_0_2_42.default = true; + native_tls_0_1_5.default = (f.native_tls_0_1_5.default or true); + openssl_0_9_24.default = true; + schannel_0_1_13.default = true; + security_framework_0_1_16.OSX_10_8 = true; + security_framework_0_1_16.default = true; + security_framework_sys_0_1_16.default = true; + tempdir_0_3_7.default = true; + }) [ lazy_static_0_2_11_features libc_0_2_42_features security_framework_0_1_16_features security_framework_sys_0_1_16_features tempdir_0_3_7_features openssl_0_9_24_features schannel_0_1_13_features ]; + net2_0_2_33 = { features?(net2_0_2_33_features {}) }: net2_0_2_33_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ]) + ++ (if kernel == "redox" || (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + features = mkFeatures (features.net2_0_2_33 or {}); + }; + net2_0_2_33_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + libc_0_2_42.default = true; + net2_0_2_33.default = (f.net2_0_2_33.default or true); + net2_0_2_33.duration = + (f.net2_0_2_33.duration or false) || + (f.net2_0_2_33.default or false) || + (net2_0_2_33.default or false); + winapi_0_3_5.default = true; + winapi_0_3_5.handleapi = true; + winapi_0_3_5.winsock2 = true; + winapi_0_3_5.ws2def = true; + winapi_0_3_5.ws2ipdef = true; + winapi_0_3_5.ws2tcpip = true; + }) [ cfg_if_0_1_4_features libc_0_2_42_features winapi_0_3_5_features ]; + nodrop_0_1_12 = { features?(nodrop_0_1_12_features {}) }: nodrop_0_1_12_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.nodrop_0_1_12 or {}); + }; + nodrop_0_1_12_features = f: updateFeatures f (rec { + nodrop_0_1_12.default = (f.nodrop_0_1_12.default or true); + nodrop_0_1_12.nodrop-union = + (f.nodrop_0_1_12.nodrop-union or false) || + (f.nodrop_0_1_12.use_union or false) || + (nodrop_0_1_12.use_union or false); + nodrop_0_1_12.std = + (f.nodrop_0_1_12.std or false) || + (f.nodrop_0_1_12.default or false) || + (nodrop_0_1_12.default or false); + }) []; + num_integer_0_1_39 = { features?(num_integer_0_1_39_features {}) }: num_integer_0_1_39_ { + dependencies = mapFeatures features ([ num_traits_0_2_5 ]); + features = mkFeatures (features.num_integer_0_1_39 or {}); + }; + num_integer_0_1_39_features = f: updateFeatures f (rec { + num_integer_0_1_39.default = (f.num_integer_0_1_39.default or true); + num_integer_0_1_39.std = + (f.num_integer_0_1_39.std or false) || + (f.num_integer_0_1_39.default or false) || + (num_integer_0_1_39.default or false); + num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false); + num_traits_0_2_5.i128 = + (f.num_traits_0_2_5.i128 or false) || + (num_integer_0_1_39.i128 or false) || + (f.num_integer_0_1_39.i128 or false); + num_traits_0_2_5.std = + (f.num_traits_0_2_5.std or false) || + (num_integer_0_1_39.std or false) || + (f.num_integer_0_1_39.std or false); + }) [ num_traits_0_2_5_features ]; + num_traits_0_2_5 = { features?(num_traits_0_2_5_features {}) }: num_traits_0_2_5_ { + features = mkFeatures (features.num_traits_0_2_5 or {}); + }; + num_traits_0_2_5_features = f: updateFeatures f (rec { + num_traits_0_2_5.default = (f.num_traits_0_2_5.default or true); + num_traits_0_2_5.std = + (f.num_traits_0_2_5.std or false) || + (f.num_traits_0_2_5.default or false) || + (num_traits_0_2_5.default or false); + }) []; + num_cpus_1_8_0 = { features?(num_cpus_1_8_0_features {}) }: num_cpus_1_8_0_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]); + }; + num_cpus_1_8_0_features = f: updateFeatures f (rec { + libc_0_2_42.default = true; + num_cpus_1_8_0.default = (f.num_cpus_1_8_0.default or true); + }) [ libc_0_2_42_features ]; + openssl_0_9_24 = { features?(openssl_0_9_24_features {}) }: openssl_0_9_24_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_3_2 lazy_static_1_0_2 libc_0_2_42 openssl_sys_0_9_33 ]); + features = mkFeatures (features.openssl_0_9_24 or {}); + }; + openssl_0_9_24_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + foreign_types_0_3_2.default = true; + lazy_static_1_0_2.default = true; + libc_0_2_42.default = true; + openssl_0_9_24.default = (f.openssl_0_9_24.default or true); + openssl_sys_0_9_33.default = true; + }) [ bitflags_0_9_1_features foreign_types_0_3_2_features lazy_static_1_0_2_features libc_0_2_42_features openssl_sys_0_9_33_features ]; + openssl_sys_0_9_33 = { features?(openssl_sys_0_9_33_features {}) }: openssl_sys_0_9_33_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]) + ++ (if abi == "msvc" then mapFeatures features ([]) else []); + buildDependencies = mapFeatures features ([ cc_1_0_18 pkg_config_0_3_12 ]); + }; + openssl_sys_0_9_33_features = f: updateFeatures f (rec { + cc_1_0_18.default = true; + libc_0_2_42.default = true; + openssl_sys_0_9_33.default = (f.openssl_sys_0_9_33.default or true); + pkg_config_0_3_12.default = true; + }) [ libc_0_2_42_features cc_1_0_18_features pkg_config_0_3_12_features ]; + pad_0_1_5 = { features?(pad_0_1_5_features {}) }: pad_0_1_5_ { + dependencies = mapFeatures features ([ unicode_width_0_1_5 ]); + }; + pad_0_1_5_features = f: updateFeatures f (rec { + pad_0_1_5.default = (f.pad_0_1_5.default or true); + unicode_width_0_1_5.default = true; + }) [ unicode_width_0_1_5_features ]; + percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {}; + percent_encoding_1_0_1_features = f: updateFeatures f (rec { + percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true); + }) []; + phf_0_7_22 = { features?(phf_0_7_22_features {}) }: phf_0_7_22_ { + dependencies = mapFeatures features ([ phf_shared_0_7_22 ]); + features = mkFeatures (features.phf_0_7_22 or {}); + }; + phf_0_7_22_features = f: updateFeatures f (rec { + phf_0_7_22.default = (f.phf_0_7_22.default or true); + phf_shared_0_7_22.core = + (f.phf_shared_0_7_22.core or false) || + (phf_0_7_22.core or false) || + (f.phf_0_7_22.core or false); + phf_shared_0_7_22.default = true; + phf_shared_0_7_22.unicase = + (f.phf_shared_0_7_22.unicase or false) || + (phf_0_7_22.unicase or false) || + (f.phf_0_7_22.unicase or false); + }) [ phf_shared_0_7_22_features ]; + phf_codegen_0_7_22 = { features?(phf_codegen_0_7_22_features {}) }: phf_codegen_0_7_22_ { + dependencies = mapFeatures features ([ phf_generator_0_7_22 phf_shared_0_7_22 ]); + }; + phf_codegen_0_7_22_features = f: updateFeatures f (rec { + phf_codegen_0_7_22.default = (f.phf_codegen_0_7_22.default or true); + phf_generator_0_7_22.default = true; + phf_shared_0_7_22.default = true; + }) [ phf_generator_0_7_22_features phf_shared_0_7_22_features ]; + phf_generator_0_7_22 = { features?(phf_generator_0_7_22_features {}) }: phf_generator_0_7_22_ { + dependencies = mapFeatures features ([ phf_shared_0_7_22 rand_0_4_2 ]); + }; + phf_generator_0_7_22_features = f: updateFeatures f (rec { + phf_generator_0_7_22.default = (f.phf_generator_0_7_22.default or true); + phf_shared_0_7_22.default = true; + rand_0_4_2.default = true; + }) [ phf_shared_0_7_22_features rand_0_4_2_features ]; + phf_shared_0_7_22 = { features?(phf_shared_0_7_22_features {}) }: phf_shared_0_7_22_ { + dependencies = mapFeatures features ([ siphasher_0_2_3 ] + ++ (if features.phf_shared_0_7_22.unicase or false then [ unicase_1_4_2 ] else [])); + features = mkFeatures (features.phf_shared_0_7_22 or {}); + }; + phf_shared_0_7_22_features = f: updateFeatures f (rec { + phf_shared_0_7_22.default = (f.phf_shared_0_7_22.default or true); + siphasher_0_2_3.default = true; + unicase_1_4_2.default = true; + }) [ siphasher_0_2_3_features unicase_1_4_2_features ]; + pkg_config_0_3_12 = { features?(pkg_config_0_3_12_features {}) }: pkg_config_0_3_12_ {}; + pkg_config_0_3_12_features = f: updateFeatures f (rec { + pkg_config_0_3_12.default = (f.pkg_config_0_3_12.default or true); + }) []; + pretty_assertions_0_5_1 = { features?(pretty_assertions_0_5_1_features {}) }: pretty_assertions_0_5_1_ { + dependencies = mapFeatures features ([ ansi_term_0_11_0 difference_2_0_0 ]); + }; + pretty_assertions_0_5_1_features = f: updateFeatures f (rec { + ansi_term_0_11_0.default = true; + difference_2_0_0.default = true; + pretty_assertions_0_5_1.default = (f.pretty_assertions_0_5_1.default or true); + }) [ ansi_term_0_11_0_features difference_2_0_0_features ]; + proc_macro2_0_4_9 = { features?(proc_macro2_0_4_9_features {}) }: proc_macro2_0_4_9_ { + dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]); + features = mkFeatures (features.proc_macro2_0_4_9 or {}); + }; + proc_macro2_0_4_9_features = f: updateFeatures f (rec { + proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or true); + proc_macro2_0_4_9.proc-macro = + (f.proc_macro2_0_4_9.proc-macro or false) || + (f.proc_macro2_0_4_9.default or false) || + (proc_macro2_0_4_9.default or false) || + (f.proc_macro2_0_4_9.nightly or false) || + (proc_macro2_0_4_9.nightly or false); + unicode_xid_0_1_0.default = true; + }) [ unicode_xid_0_1_0_features ]; + quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {}; + quote_0_3_15_features = f: updateFeatures f (rec { + quote_0_3_15.default = (f.quote_0_3_15.default or true); + }) []; + quote_0_6_4 = { features?(quote_0_6_4_features {}) }: quote_0_6_4_ { + dependencies = mapFeatures features ([ proc_macro2_0_4_9 ]); + features = mkFeatures (features.quote_0_6_4 or {}); + }; + quote_0_6_4_features = f: updateFeatures f (rec { + proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or false); + proc_macro2_0_4_9.proc-macro = + (f.proc_macro2_0_4_9.proc-macro or false) || + (quote_0_6_4.proc-macro or false) || + (f.quote_0_6_4.proc-macro or false); + quote_0_6_4.default = (f.quote_0_6_4.default or true); + quote_0_6_4.proc-macro = + (f.quote_0_6_4.proc-macro or false) || + (f.quote_0_6_4.default or false) || + (quote_0_6_4.default or false); + }) [ proc_macro2_0_4_9_features ]; + rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { + dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] + ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_42 ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + features = mkFeatures (features.rand_0_4_2 or {}); + }; + rand_0_4_2_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_3.default = true; + libc_0_2_42.default = true; + rand_0_4_2.default = (f.rand_0_4_2.default or true); + rand_0_4_2.i128_support = + (f.rand_0_4_2.i128_support or false) || + (f.rand_0_4_2.nightly or false) || + (rand_0_4_2.nightly or false); + rand_0_4_2.libc = + (f.rand_0_4_2.libc or false) || + (f.rand_0_4_2.std or false) || + (rand_0_4_2.std or false); + rand_0_4_2.std = + (f.rand_0_4_2.std or false) || + (f.rand_0_4_2.default or false) || + (rand_0_4_2.default or false); + winapi_0_3_5.default = true; + winapi_0_3_5.minwindef = true; + winapi_0_3_5.ntsecapi = true; + winapi_0_3_5.profileapi = true; + winapi_0_3_5.winnt = true; + }) [ fuchsia_zircon_0_3_3_features libc_0_2_42_features winapi_0_3_5_features ]; + redox_syscall_0_1_40 = { features?(redox_syscall_0_1_40_features {}) }: redox_syscall_0_1_40_ {}; + redox_syscall_0_1_40_features = f: updateFeatures f (rec { + redox_syscall_0_1_40.default = (f.redox_syscall_0_1_40.default or true); + }) []; + redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { + dependencies = mapFeatures features ([ redox_syscall_0_1_40 ]); + }; + redox_termios_0_1_1_features = f: updateFeatures f (rec { + redox_syscall_0_1_40.default = true; + redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); + }) [ redox_syscall_0_1_40_features ]; + regex_1_0_3 = { features?(regex_1_0_3_features {}) }: regex_1_0_3_ { + dependencies = mapFeatures features ([ aho_corasick_0_6_6 memchr_2_0_1 regex_syntax_0_6_2 thread_local_0_3_6 utf8_ranges_1_0_0 ]); + features = mkFeatures (features.regex_1_0_3 or {}); + }; + regex_1_0_3_features = f: updateFeatures f (rec { + aho_corasick_0_6_6.default = true; + memchr_2_0_1.default = true; + regex_1_0_3.default = (f.regex_1_0_3.default or true); + regex_1_0_3.pattern = + (f.regex_1_0_3.pattern or false) || + (f.regex_1_0_3.unstable or false) || + (regex_1_0_3.unstable or false); + regex_1_0_3.use_std = + (f.regex_1_0_3.use_std or false) || + (f.regex_1_0_3.default or false) || + (regex_1_0_3.default or false); + regex_syntax_0_6_2.default = true; + thread_local_0_3_6.default = true; + utf8_ranges_1_0_0.default = true; + }) [ aho_corasick_0_6_6_features memchr_2_0_1_features regex_syntax_0_6_2_features thread_local_0_3_6_features utf8_ranges_1_0_0_features ]; + regex_syntax_0_6_2 = { features?(regex_syntax_0_6_2_features {}) }: regex_syntax_0_6_2_ { + dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); + }; + regex_syntax_0_6_2_features = f: updateFeatures f (rec { + regex_syntax_0_6_2.default = (f.regex_syntax_0_6_2.default or true); + ucd_util_0_1_1.default = true; + }) [ ucd_util_0_1_1_features ]; + relay_0_1_1 = { features?(relay_0_1_1_features {}) }: relay_0_1_1_ { + dependencies = mapFeatures features ([ futures_0_1_23 ]); + }; + relay_0_1_1_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + relay_0_1_1.default = (f.relay_0_1_1.default or true); + }) [ futures_0_1_23_features ]; + remove_dir_all_0_5_1 = { features?(remove_dir_all_0_5_1_features {}) }: remove_dir_all_0_5_1_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + }; + remove_dir_all_0_5_1_features = f: updateFeatures f (rec { + remove_dir_all_0_5_1.default = (f.remove_dir_all_0_5_1.default or true); + winapi_0_3_5.default = true; + winapi_0_3_5.errhandlingapi = true; + winapi_0_3_5.fileapi = true; + winapi_0_3_5.std = true; + winapi_0_3_5.winbase = true; + winapi_0_3_5.winerror = true; + }) [ winapi_0_3_5_features ]; + reqwest_0_8_7 = { features?(reqwest_0_8_7_features {}) }: reqwest_0_8_7_ { + dependencies = mapFeatures features ([ bytes_0_4_9 encoding_rs_0_7_2 futures_0_1_23 hyper_0_11_27 hyper_tls_0_1_4 libflate_0_1_16 log_0_4_3 mime_guess_2_0_0_alpha_6 native_tls_0_1_5 serde_1_0_70 serde_json_1_0_24 serde_urlencoded_0_5_2 tokio_core_0_1_17 tokio_io_0_1_7 tokio_tls_0_1_4 url_1_7_1 uuid_0_6_5 ]); + features = mkFeatures (features.reqwest_0_8_7 or {}); + }; + reqwest_0_8_7_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + encoding_rs_0_7_2.default = true; + futures_0_1_23.default = true; + hyper_0_11_27.default = (f.hyper_0_11_27.default or false); + hyper_tls_0_1_4.default = true; + libflate_0_1_16.default = true; + log_0_4_3.default = true; + mime_guess_2_0_0_alpha_6.default = true; + native_tls_0_1_5.default = true; + reqwest_0_8_7.default = (f.reqwest_0_8_7.default or true); + serde_1_0_70.default = true; + serde_json_1_0_24.default = true; + serde_urlencoded_0_5_2.default = true; + tokio_core_0_1_17.default = true; + tokio_io_0_1_7.default = true; + tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or false); + url_1_7_1.default = true; + uuid_0_6_5.default = true; + uuid_0_6_5.v4 = true; + }) [ bytes_0_4_9_features encoding_rs_0_7_2_features futures_0_1_23_features hyper_0_11_27_features hyper_tls_0_1_4_features libflate_0_1_16_features log_0_4_3_features mime_guess_2_0_0_alpha_6_features native_tls_0_1_5_features serde_1_0_70_features serde_json_1_0_24_features serde_urlencoded_0_5_2_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_tls_0_1_4_features url_1_7_1_features uuid_0_6_5_features ]; + rustc_demangle_0_1_9 = { features?(rustc_demangle_0_1_9_features {}) }: rustc_demangle_0_1_9_ {}; + rustc_demangle_0_1_9_features = f: updateFeatures f (rec { + rustc_demangle_0_1_9.default = (f.rustc_demangle_0_1_9.default or true); + }) []; + safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {}; + safemem_0_2_0_features = f: updateFeatures f (rec { + safemem_0_2_0.default = (f.safemem_0_2_0.default or true); + }) []; + schannel_0_1_13 = { features?(schannel_0_1_13_features {}) }: schannel_0_1_13_ { + dependencies = mapFeatures features ([ lazy_static_1_0_2 winapi_0_3_5 ]); + }; + schannel_0_1_13_features = f: updateFeatures f (rec { + lazy_static_1_0_2.default = true; + schannel_0_1_13.default = (f.schannel_0_1_13.default or true); + winapi_0_3_5.default = true; + winapi_0_3_5.lmcons = true; + winapi_0_3_5.minschannel = true; + winapi_0_3_5.schannel = true; + winapi_0_3_5.securitybaseapi = true; + winapi_0_3_5.sysinfoapi = true; + winapi_0_3_5.timezoneapi = true; + winapi_0_3_5.winbase = true; + winapi_0_3_5.wincrypt = true; + winapi_0_3_5.winerror = true; + }) [ lazy_static_1_0_2_features winapi_0_3_5_features ]; + scoped_tls_0_1_2 = { features?(scoped_tls_0_1_2_features {}) }: scoped_tls_0_1_2_ { + features = mkFeatures (features.scoped_tls_0_1_2 or {}); + }; + scoped_tls_0_1_2_features = f: updateFeatures f (rec { + scoped_tls_0_1_2.default = (f.scoped_tls_0_1_2.default or true); + }) []; + scopeguard_0_3_3 = { features?(scopeguard_0_3_3_features {}) }: scopeguard_0_3_3_ { + features = mkFeatures (features.scopeguard_0_3_3 or {}); + }; + scopeguard_0_3_3_features = f: updateFeatures f (rec { + scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or true); + scopeguard_0_3_3.use_std = + (f.scopeguard_0_3_3.use_std or false) || + (f.scopeguard_0_3_3.default or false) || + (scopeguard_0_3_3.default or false); + }) []; + security_framework_0_1_16 = { features?(security_framework_0_1_16_features {}) }: security_framework_0_1_16_ { + dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_42 security_framework_sys_0_1_16 ]); + features = mkFeatures (features.security_framework_0_1_16 or {}); + }; + security_framework_0_1_16_features = f: updateFeatures f (rec { + core_foundation_0_2_3.default = true; + core_foundation_sys_0_2_3.default = true; + libc_0_2_42.default = true; + security_framework_0_1_16.OSX_10_10 = + (f.security_framework_0_1_16.OSX_10_10 or false) || + (f.security_framework_0_1_16.OSX_10_11 or false) || + (security_framework_0_1_16.OSX_10_11 or false); + security_framework_0_1_16.OSX_10_11 = + (f.security_framework_0_1_16.OSX_10_11 or false) || + (f.security_framework_0_1_16.OSX_10_12 or false) || + (security_framework_0_1_16.OSX_10_12 or false); + security_framework_0_1_16.OSX_10_8 = + (f.security_framework_0_1_16.OSX_10_8 or false) || + (f.security_framework_0_1_16.OSX_10_9 or false) || + (security_framework_0_1_16.OSX_10_9 or false); + security_framework_0_1_16.OSX_10_9 = + (f.security_framework_0_1_16.OSX_10_9 or false) || + (f.security_framework_0_1_16.OSX_10_10 or false) || + (security_framework_0_1_16.OSX_10_10 or false); + security_framework_0_1_16.default = (f.security_framework_0_1_16.default or true); + security_framework_sys_0_1_16.OSX_10_10 = + (f.security_framework_sys_0_1_16.OSX_10_10 or false) || + (security_framework_0_1_16.OSX_10_10 or false) || + (f.security_framework_0_1_16.OSX_10_10 or false); + security_framework_sys_0_1_16.OSX_10_11 = + (f.security_framework_sys_0_1_16.OSX_10_11 or false) || + (security_framework_0_1_16.OSX_10_11 or false) || + (f.security_framework_0_1_16.OSX_10_11 or false) || + (security_framework_0_1_16.OSX_10_12 or false) || + (f.security_framework_0_1_16.OSX_10_12 or false); + security_framework_sys_0_1_16.OSX_10_8 = + (f.security_framework_sys_0_1_16.OSX_10_8 or false) || + (security_framework_0_1_16.OSX_10_8 or false) || + (f.security_framework_0_1_16.OSX_10_8 or false); + security_framework_sys_0_1_16.OSX_10_9 = + (f.security_framework_sys_0_1_16.OSX_10_9 or false) || + (security_framework_0_1_16.OSX_10_9 or false) || + (f.security_framework_0_1_16.OSX_10_9 or false); + security_framework_sys_0_1_16.default = true; + }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_42_features security_framework_sys_0_1_16_features ]; + security_framework_sys_0_1_16 = { features?(security_framework_sys_0_1_16_features {}) }: security_framework_sys_0_1_16_ { + dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]); + features = mkFeatures (features.security_framework_sys_0_1_16 or {}); + }; + security_framework_sys_0_1_16_features = f: updateFeatures f (rec { + core_foundation_sys_0_2_3.default = true; + libc_0_2_42.default = true; + security_framework_sys_0_1_16.OSX_10_10 = + (f.security_framework_sys_0_1_16.OSX_10_10 or false) || + (f.security_framework_sys_0_1_16.OSX_10_11 or false) || + (security_framework_sys_0_1_16.OSX_10_11 or false); + security_framework_sys_0_1_16.OSX_10_11 = + (f.security_framework_sys_0_1_16.OSX_10_11 or false) || + (f.security_framework_sys_0_1_16.OSX_10_12 or false) || + (security_framework_sys_0_1_16.OSX_10_12 or false); + security_framework_sys_0_1_16.OSX_10_8 = + (f.security_framework_sys_0_1_16.OSX_10_8 or false) || + (f.security_framework_sys_0_1_16.OSX_10_9 or false) || + (security_framework_sys_0_1_16.OSX_10_9 or false); + security_framework_sys_0_1_16.OSX_10_9 = + (f.security_framework_sys_0_1_16.OSX_10_9 or false) || + (f.security_framework_sys_0_1_16.OSX_10_10 or false) || + (security_framework_sys_0_1_16.OSX_10_10 or false); + security_framework_sys_0_1_16.default = (f.security_framework_sys_0_1_16.default or true); + }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ]; + semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ { + dependencies = mapFeatures features ([ semver_parser_0_7_0 ] + ++ (if features.semver_0_9_0.serde or false then [ serde_1_0_70 ] else [])); + features = mkFeatures (features.semver_0_9_0 or {}); + }; + semver_0_9_0_features = f: updateFeatures f (rec { + semver_0_9_0.default = (f.semver_0_9_0.default or true); + semver_0_9_0.serde = + (f.semver_0_9_0.serde or false) || + (f.semver_0_9_0.ci or false) || + (semver_0_9_0.ci or false); + semver_parser_0_7_0.default = true; + serde_1_0_70.default = true; + }) [ semver_parser_0_7_0_features serde_1_0_70_features ]; + semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; + semver_parser_0_7_0_features = f: updateFeatures f (rec { + semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); + }) []; + serde_1_0_70 = { features?(serde_1_0_70_features {}) }: serde_1_0_70_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_1_0_70 or {}); + }; + serde_1_0_70_features = f: updateFeatures f (rec { + serde_1_0_70.default = (f.serde_1_0_70.default or true); + serde_1_0_70.serde_derive = + (f.serde_1_0_70.serde_derive or false) || + (f.serde_1_0_70.derive or false) || + (serde_1_0_70.derive or false); + serde_1_0_70.std = + (f.serde_1_0_70.std or false) || + (f.serde_1_0_70.default or false) || + (serde_1_0_70.default or false); + serde_1_0_70.unstable = + (f.serde_1_0_70.unstable or false) || + (f.serde_1_0_70.alloc or false) || + (serde_1_0_70.alloc or false); + }) []; + serde_derive_1_0_75 = { features?(serde_derive_1_0_75_features {}) }: serde_derive_1_0_75_ { + dependencies = mapFeatures features ([ proc_macro2_0_4_9 quote_0_6_4 syn_0_14_5 ]); + features = mkFeatures (features.serde_derive_1_0_75 or {}); + }; + serde_derive_1_0_75_features = f: updateFeatures f (rec { + proc_macro2_0_4_9.default = true; + quote_0_6_4.default = true; + serde_derive_1_0_75.default = (f.serde_derive_1_0_75.default or true); + syn_0_14_5.default = true; + syn_0_14_5.visit = true; + }) [ proc_macro2_0_4_9_features quote_0_6_4_features syn_0_14_5_features ]; + serde_json_1_0_24 = { features?(serde_json_1_0_24_features {}) }: serde_json_1_0_24_ { + dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 ]); + features = mkFeatures (features.serde_json_1_0_24 or {}); + }; + serde_json_1_0_24_features = f: updateFeatures f (rec { + dtoa_0_4_3.default = true; + itoa_0_4_2.default = true; + serde_1_0_70.default = true; + serde_json_1_0_24.default = (f.serde_json_1_0_24.default or true); + serde_json_1_0_24.indexmap = + (f.serde_json_1_0_24.indexmap or false) || + (f.serde_json_1_0_24.preserve_order or false) || + (serde_json_1_0_24.preserve_order or false); + }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features ]; + serde_urlencoded_0_5_2 = { features?(serde_urlencoded_0_5_2_features {}) }: serde_urlencoded_0_5_2_ { + dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 url_1_7_1 ]); + }; + serde_urlencoded_0_5_2_features = f: updateFeatures f (rec { + dtoa_0_4_3.default = true; + itoa_0_4_2.default = true; + serde_1_0_70.default = true; + serde_urlencoded_0_5_2.default = (f.serde_urlencoded_0_5_2.default or true); + url_1_7_1.default = true; + }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features url_1_7_1_features ]; + siphasher_0_2_3 = { features?(siphasher_0_2_3_features {}) }: siphasher_0_2_3_ {}; + siphasher_0_2_3_features = f: updateFeatures f (rec { + siphasher_0_2_3.default = (f.siphasher_0_2_3.default or true); + }) []; + slab_0_4_0 = { features?(slab_0_4_0_features {}) }: slab_0_4_0_ {}; + slab_0_4_0_features = f: updateFeatures f (rec { + slab_0_4_0.default = (f.slab_0_4_0.default or true); + }) []; + strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; + strsim_0_7_0_features = f: updateFeatures f (rec { + strsim_0_7_0.default = (f.strsim_0_7_0.default or true); + }) []; + syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ { + dependencies = mapFeatures features ([ ] + ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else []) + ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else []) + ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else [])); + features = mkFeatures (features.syn_0_11_11 or {}); + }; + syn_0_11_11_features = f: updateFeatures f (rec { + quote_0_3_15.default = true; + syn_0_11_11.default = (f.syn_0_11_11.default or true); + syn_0_11_11.parsing = + (f.syn_0_11_11.parsing or false) || + (f.syn_0_11_11.default or false) || + (syn_0_11_11.default or false); + syn_0_11_11.printing = + (f.syn_0_11_11.printing or false) || + (f.syn_0_11_11.default or false) || + (syn_0_11_11.default or false); + syn_0_11_11.quote = + (f.syn_0_11_11.quote or false) || + (f.syn_0_11_11.printing or false) || + (syn_0_11_11.printing or false); + syn_0_11_11.synom = + (f.syn_0_11_11.synom or false) || + (f.syn_0_11_11.parsing or false) || + (syn_0_11_11.parsing or false); + syn_0_11_11.unicode-xid = + (f.syn_0_11_11.unicode-xid or false) || + (f.syn_0_11_11.parsing or false) || + (syn_0_11_11.parsing or false); + synom_0_11_3.default = true; + unicode_xid_0_0_4.default = true; + }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; + syn_0_14_5 = { features?(syn_0_14_5_features {}) }: syn_0_14_5_ { + dependencies = mapFeatures features ([ proc_macro2_0_4_9 unicode_xid_0_1_0 ] + ++ (if features.syn_0_14_5.quote or false then [ quote_0_6_4 ] else [])); + features = mkFeatures (features.syn_0_14_5 or {}); + }; + syn_0_14_5_features = f: updateFeatures f (rec { + proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or false); + proc_macro2_0_4_9.proc-macro = + (f.proc_macro2_0_4_9.proc-macro or false) || + (syn_0_14_5.proc-macro or false) || + (f.syn_0_14_5.proc-macro or false); + quote_0_6_4.default = (f.quote_0_6_4.default or false); + quote_0_6_4.proc-macro = + (f.quote_0_6_4.proc-macro or false) || + (syn_0_14_5.proc-macro or false) || + (f.syn_0_14_5.proc-macro or false); + syn_0_14_5.clone-impls = + (f.syn_0_14_5.clone-impls or false) || + (f.syn_0_14_5.default or false) || + (syn_0_14_5.default or false); + syn_0_14_5.default = (f.syn_0_14_5.default or true); + syn_0_14_5.derive = + (f.syn_0_14_5.derive or false) || + (f.syn_0_14_5.default or false) || + (syn_0_14_5.default or false); + syn_0_14_5.parsing = + (f.syn_0_14_5.parsing or false) || + (f.syn_0_14_5.default or false) || + (syn_0_14_5.default or false); + syn_0_14_5.printing = + (f.syn_0_14_5.printing or false) || + (f.syn_0_14_5.default or false) || + (syn_0_14_5.default or false); + syn_0_14_5.proc-macro = + (f.syn_0_14_5.proc-macro or false) || + (f.syn_0_14_5.default or false) || + (syn_0_14_5.default or false); + syn_0_14_5.quote = + (f.syn_0_14_5.quote or false) || + (f.syn_0_14_5.printing or false) || + (syn_0_14_5.printing or false); + unicode_xid_0_1_0.default = true; + }) [ proc_macro2_0_4_9_features quote_0_6_4_features unicode_xid_0_1_0_features ]; + synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ { + dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]); + }; + synom_0_11_3_features = f: updateFeatures f (rec { + synom_0_11_3.default = (f.synom_0_11_3.default or true); + unicode_xid_0_0_4.default = true; + }) [ unicode_xid_0_0_4_features ]; + synstructure_0_6_1 = { features?(synstructure_0_6_1_features {}) }: synstructure_0_6_1_ { + dependencies = mapFeatures features ([ quote_0_3_15 syn_0_11_11 ]); + features = mkFeatures (features.synstructure_0_6_1 or {}); + }; + synstructure_0_6_1_features = f: updateFeatures f (rec { + quote_0_3_15.default = true; + syn_0_11_11.default = true; + syn_0_11_11.visit = true; + synstructure_0_6_1.default = (f.synstructure_0_6_1.default or true); + }) [ quote_0_3_15_features syn_0_11_11_features ]; + tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ { + dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_1 ]); + }; + tempdir_0_3_7_features = f: updateFeatures f (rec { + rand_0_4_2.default = true; + remove_dir_all_0_5_1.default = true; + tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); + }) [ rand_0_4_2_features remove_dir_all_0_5_1_features ]; + termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []); + }; + termcolor_0_3_6_features = f: updateFeatures f (rec { + termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true); + wincolor_0_1_6.default = true; + }) [ wincolor_0_1_6_features ]; + termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { + dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_42 ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 redox_termios_0_1_1 ]) else []); + }; + termion_1_5_1_features = f: updateFeatures f (rec { + libc_0_2_42.default = true; + redox_syscall_0_1_40.default = true; + redox_termios_0_1_1.default = true; + termion_1_5_1.default = (f.termion_1_5_1.default or true); + }) [ libc_0_2_42_features redox_syscall_0_1_40_features redox_termios_0_1_1_features ]; + thread_local_0_3_6 = { features?(thread_local_0_3_6_features {}) }: thread_local_0_3_6_ { + dependencies = mapFeatures features ([ lazy_static_1_0_2 ]); + }; + thread_local_0_3_6_features = f: updateFeatures f (rec { + lazy_static_1_0_2.default = true; + thread_local_0_3_6.default = (f.thread_local_0_3_6.default or true); + }) [ lazy_static_1_0_2_features ]; + time_0_1_40 = { features?(time_0_1_40_features {}) }: time_0_1_40_ { + dependencies = mapFeatures features ([ libc_0_2_42 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); + }; + time_0_1_40_features = f: updateFeatures f (rec { + libc_0_2_42.default = true; + redox_syscall_0_1_40.default = true; + time_0_1_40.default = (f.time_0_1_40.default or true); + winapi_0_3_5.default = true; + winapi_0_3_5.minwinbase = true; + winapi_0_3_5.minwindef = true; + winapi_0_3_5.ntdef = true; + winapi_0_3_5.profileapi = true; + winapi_0_3_5.std = true; + winapi_0_3_5.sysinfoapi = true; + winapi_0_3_5.timezoneapi = true; + }) [ libc_0_2_42_features redox_syscall_0_1_40_features winapi_0_3_5_features ]; + tokio_0_1_7 = { features?(tokio_0_1_7_features {}) }: tokio_0_1_7_ { + dependencies = mapFeatures features ([ futures_0_1_23 mio_0_6_15 tokio_executor_0_1_2 tokio_fs_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_tcp_0_1_0 tokio_threadpool_0_1_5 tokio_timer_0_2_4 tokio_udp_0_1_1 ]); + }; + tokio_0_1_7_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + mio_0_6_15.default = true; + tokio_0_1_7.default = (f.tokio_0_1_7.default or true); + tokio_executor_0_1_2.default = true; + tokio_fs_0_1_2.default = true; + tokio_io_0_1_7.default = true; + tokio_reactor_0_1_2.default = true; + tokio_tcp_0_1_0.default = true; + tokio_threadpool_0_1_5.default = true; + tokio_timer_0_2_4.default = true; + tokio_udp_0_1_1.default = true; + }) [ futures_0_1_23_features mio_0_6_15_features tokio_executor_0_1_2_features tokio_fs_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_tcp_0_1_0_features tokio_threadpool_0_1_5_features tokio_timer_0_2_4_features tokio_udp_0_1_1_features ]; + tokio_codec_0_1_0 = { features?(tokio_codec_0_1_0_features {}) }: tokio_codec_0_1_0_ { + dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 tokio_io_0_1_7 ]); + }; + tokio_codec_0_1_0_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + tokio_codec_0_1_0.default = (f.tokio_codec_0_1_0.default or true); + tokio_io_0_1_7.default = true; + }) [ bytes_0_4_9_features futures_0_1_23_features tokio_io_0_1_7_features ]; + tokio_core_0_1_17 = { features?(tokio_core_0_1_17_features {}) }: tokio_core_0_1_17_ { + dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 log_0_4_3 mio_0_6_15 scoped_tls_0_1_2 tokio_0_1_7 tokio_executor_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_timer_0_2_4 ]); + }; + tokio_core_0_1_17_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + iovec_0_1_2.default = true; + log_0_4_3.default = true; + mio_0_6_15.default = true; + scoped_tls_0_1_2.default = true; + tokio_0_1_7.default = true; + tokio_core_0_1_17.default = (f.tokio_core_0_1_17.default or true); + tokio_executor_0_1_2.default = true; + tokio_io_0_1_7.default = true; + tokio_reactor_0_1_2.default = true; + tokio_timer_0_2_4.default = true; + }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features log_0_4_3_features mio_0_6_15_features scoped_tls_0_1_2_features tokio_0_1_7_features tokio_executor_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_timer_0_2_4_features ]; + tokio_executor_0_1_2 = { features?(tokio_executor_0_1_2_features {}) }: tokio_executor_0_1_2_ { + dependencies = mapFeatures features ([ futures_0_1_23 ]); + features = mkFeatures (features.tokio_executor_0_1_2 or {}); + }; + tokio_executor_0_1_2_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + tokio_executor_0_1_2.default = (f.tokio_executor_0_1_2.default or true); + tokio_executor_0_1_2.futures2 = + (f.tokio_executor_0_1_2.futures2 or false) || + (f.tokio_executor_0_1_2.unstable-futures or false) || + (tokio_executor_0_1_2.unstable-futures or false); + }) [ futures_0_1_23_features ]; + tokio_fs_0_1_2 = { features?(tokio_fs_0_1_2_features {}) }: tokio_fs_0_1_2_ { + dependencies = mapFeatures features ([ futures_0_1_23 tokio_io_0_1_7 tokio_threadpool_0_1_5 ]); + }; + tokio_fs_0_1_2_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + tokio_fs_0_1_2.default = (f.tokio_fs_0_1_2.default or true); + tokio_io_0_1_7.default = true; + tokio_threadpool_0_1_5.default = true; + }) [ futures_0_1_23_features tokio_io_0_1_7_features tokio_threadpool_0_1_5_features ]; + tokio_io_0_1_7 = { features?(tokio_io_0_1_7_features {}) }: tokio_io_0_1_7_ { + dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 ]); + }; + tokio_io_0_1_7_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + log_0_4_3.default = true; + tokio_io_0_1_7.default = (f.tokio_io_0_1_7.default or true); + }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features ]; + tokio_reactor_0_1_2 = { features?(tokio_reactor_0_1_2_features {}) }: tokio_reactor_0_1_2_ { + dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 mio_0_6_15 slab_0_4_0 tokio_executor_0_1_2 tokio_io_0_1_7 ]); + }; + tokio_reactor_0_1_2_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + log_0_4_3.default = true; + mio_0_6_15.default = true; + slab_0_4_0.default = true; + tokio_executor_0_1_2.default = true; + tokio_io_0_1_7.default = true; + tokio_reactor_0_1_2.default = (f.tokio_reactor_0_1_2.default or true); + }) [ futures_0_1_23_features log_0_4_3_features mio_0_6_15_features slab_0_4_0_features tokio_executor_0_1_2_features tokio_io_0_1_7_features ]; + tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ { + dependencies = mapFeatures features ([ futures_0_1_23 ]); + }; + tokio_service_0_1_0_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true); + }) [ futures_0_1_23_features ]; + tokio_tcp_0_1_0 = { features?(tokio_tcp_0_1_0_features {}) }: tokio_tcp_0_1_0_ { + dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 mio_0_6_15 tokio_io_0_1_7 tokio_reactor_0_1_2 ]); + features = mkFeatures (features.tokio_tcp_0_1_0 or {}); + }; + tokio_tcp_0_1_0_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + iovec_0_1_2.default = true; + mio_0_6_15.default = true; + tokio_io_0_1_7.default = true; + tokio_reactor_0_1_2.default = true; + tokio_tcp_0_1_0.default = (f.tokio_tcp_0_1_0.default or true); + tokio_tcp_0_1_0.futures2 = + (f.tokio_tcp_0_1_0.futures2 or false) || + (f.tokio_tcp_0_1_0.unstable-futures or false) || + (tokio_tcp_0_1_0.unstable-futures or false); + }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features mio_0_6_15_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ]; + tokio_threadpool_0_1_5 = { features?(tokio_threadpool_0_1_5_features {}) }: tokio_threadpool_0_1_5_ { + dependencies = mapFeatures features ([ crossbeam_deque_0_3_1 futures_0_1_23 log_0_4_3 num_cpus_1_8_0 rand_0_4_2 tokio_executor_0_1_2 ]); + }; + tokio_threadpool_0_1_5_features = f: updateFeatures f (rec { + crossbeam_deque_0_3_1.default = true; + futures_0_1_23.default = true; + log_0_4_3.default = true; + num_cpus_1_8_0.default = true; + rand_0_4_2.default = true; + tokio_executor_0_1_2.default = true; + tokio_threadpool_0_1_5.default = (f.tokio_threadpool_0_1_5.default or true); + }) [ crossbeam_deque_0_3_1_features futures_0_1_23_features log_0_4_3_features num_cpus_1_8_0_features rand_0_4_2_features tokio_executor_0_1_2_features ]; + tokio_timer_0_2_4 = { features?(tokio_timer_0_2_4_features {}) }: tokio_timer_0_2_4_ { + dependencies = mapFeatures features ([ futures_0_1_23 tokio_executor_0_1_2 ]); + }; + tokio_timer_0_2_4_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + tokio_executor_0_1_2.default = true; + tokio_timer_0_2_4.default = (f.tokio_timer_0_2_4.default or true); + }) [ futures_0_1_23_features tokio_executor_0_1_2_features ]; + tokio_tls_0_1_4 = { features?(tokio_tls_0_1_4_features {}) }: tokio_tls_0_1_4_ { + dependencies = mapFeatures features ([ futures_0_1_23 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 ]) + ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else []) + ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else []) + ++ (if kernel == "windows" then mapFeatures features ([]) else []); + }; + tokio_tls_0_1_4_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + native_tls_0_1_5.default = true; + tokio_core_0_1_17.default = true; + tokio_io_0_1_7.default = true; + tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or true); + }) [ futures_0_1_23_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features ]; + tokio_udp_0_1_1 = { features?(tokio_udp_0_1_1_features {}) }: tokio_udp_0_1_1_ { + dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 mio_0_6_15 tokio_codec_0_1_0 tokio_io_0_1_7 tokio_reactor_0_1_2 ]); + }; + tokio_udp_0_1_1_features = f: updateFeatures f (rec { + bytes_0_4_9.default = true; + futures_0_1_23.default = true; + log_0_4_3.default = true; + mio_0_6_15.default = true; + tokio_codec_0_1_0.default = true; + tokio_io_0_1_7.default = true; + tokio_reactor_0_1_2.default = true; + tokio_udp_0_1_1.default = (f.tokio_udp_0_1_1.default or true); + }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features mio_0_6_15_features tokio_codec_0_1_0_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ]; + toml_edit_0_1_3 = { features?(toml_edit_0_1_3_features {}) }: toml_edit_0_1_3_ { + dependencies = mapFeatures features ([ chrono_0_4_5 combine_3_3_6 linked_hash_map_0_5_1 ]); + features = mkFeatures (features.toml_edit_0_1_3 or {}); + }; + toml_edit_0_1_3_features = f: updateFeatures f (rec { + chrono_0_4_5.default = true; + combine_3_3_6.default = true; + linked_hash_map_0_5_1.default = true; + toml_edit_0_1_3.default = (f.toml_edit_0_1_3.default or true); + }) [ chrono_0_4_5_features combine_3_3_6_features linked_hash_map_0_5_1_features ]; + try_lock_0_1_0 = { features?(try_lock_0_1_0_features {}) }: try_lock_0_1_0_ {}; + try_lock_0_1_0_features = f: updateFeatures f (rec { + try_lock_0_1_0.default = (f.try_lock_0_1_0.default or true); + }) []; + ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; + ucd_util_0_1_1_features = f: updateFeatures f (rec { + ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); + }) []; + unicase_1_4_2 = { features?(unicase_1_4_2_features {}) }: unicase_1_4_2_ { + dependencies = mapFeatures features ([]); + buildDependencies = mapFeatures features ([ version_check_0_1_4 ]); + features = mkFeatures (features.unicase_1_4_2 or {}); + }; + unicase_1_4_2_features = f: updateFeatures f (rec { + unicase_1_4_2.default = (f.unicase_1_4_2.default or true); + unicase_1_4_2.heapsize = + (f.unicase_1_4_2.heapsize or false) || + (f.unicase_1_4_2.heap_size or false) || + (unicase_1_4_2.heap_size or false); + unicase_1_4_2.heapsize_plugin = + (f.unicase_1_4_2.heapsize_plugin or false) || + (f.unicase_1_4_2.heap_size or false) || + (unicase_1_4_2.heap_size or false); + version_check_0_1_4.default = true; + }) [ version_check_0_1_4_features ]; + unicase_2_1_0 = { features?(unicase_2_1_0_features {}) }: unicase_2_1_0_ { + buildDependencies = mapFeatures features ([ version_check_0_1_4 ]); + features = mkFeatures (features.unicase_2_1_0 or {}); + }; + unicase_2_1_0_features = f: updateFeatures f (rec { + unicase_2_1_0.default = (f.unicase_2_1_0.default or true); + version_check_0_1_4.default = true; + }) [ version_check_0_1_4_features ]; + unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ { + dependencies = mapFeatures features ([ matches_0_1_7 ]); + features = mkFeatures (features.unicode_bidi_0_3_4 or {}); + }; + unicode_bidi_0_3_4_features = f: updateFeatures f (rec { + matches_0_1_7.default = true; + unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true); + unicode_bidi_0_3_4.flame = + (f.unicode_bidi_0_3_4.flame or false) || + (f.unicode_bidi_0_3_4.flame_it or false) || + (unicode_bidi_0_3_4.flame_it or false); + unicode_bidi_0_3_4.flamer = + (f.unicode_bidi_0_3_4.flamer or false) || + (f.unicode_bidi_0_3_4.flame_it or false) || + (unicode_bidi_0_3_4.flame_it or false); + unicode_bidi_0_3_4.serde = + (f.unicode_bidi_0_3_4.serde or false) || + (f.unicode_bidi_0_3_4.with_serde or false) || + (unicode_bidi_0_3_4.with_serde or false); + }) [ matches_0_1_7_features ]; + unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {}; + unicode_normalization_0_1_7_features = f: updateFeatures f (rec { + unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true); + }) []; + unicode_width_0_1_5 = { features?(unicode_width_0_1_5_features {}) }: unicode_width_0_1_5_ { + features = mkFeatures (features.unicode_width_0_1_5 or {}); + }; + unicode_width_0_1_5_features = f: updateFeatures f (rec { + unicode_width_0_1_5.default = (f.unicode_width_0_1_5.default or true); + }) []; + unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ { + features = mkFeatures (features.unicode_xid_0_0_4 or {}); + }; + unicode_xid_0_0_4_features = f: updateFeatures f (rec { + unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true); + }) []; + unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { + features = mkFeatures (features.unicode_xid_0_1_0 or {}); + }; + unicode_xid_0_1_0_features = f: updateFeatures f (rec { + unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); + }) []; + unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { + dependencies = mapFeatures features ([ void_1_0_2 ]); + }; + unreachable_1_0_0_features = f: updateFeatures f (rec { + unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); + void_1_0_2.default = (f.void_1_0_2.default or false); + }) [ void_1_0_2_features ]; + url_1_7_1 = { features?(url_1_7_1_features {}) }: url_1_7_1_ { + dependencies = mapFeatures features ([ idna_0_1_5 matches_0_1_7 percent_encoding_1_0_1 ]); + features = mkFeatures (features.url_1_7_1 or {}); + }; + url_1_7_1_features = f: updateFeatures f (rec { + idna_0_1_5.default = true; + matches_0_1_7.default = true; + percent_encoding_1_0_1.default = true; + url_1_7_1.default = (f.url_1_7_1.default or true); + url_1_7_1.encoding = + (f.url_1_7_1.encoding or false) || + (f.url_1_7_1.query_encoding or false) || + (url_1_7_1.query_encoding or false); + url_1_7_1.heapsize = + (f.url_1_7_1.heapsize or false) || + (f.url_1_7_1.heap_size or false) || + (url_1_7_1.heap_size or false); + }) [ idna_0_1_5_features matches_0_1_7_features percent_encoding_1_0_1_features ]; + utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; + utf8_ranges_1_0_0_features = f: updateFeatures f (rec { + utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); + }) []; + uuid_0_6_5 = { features?(uuid_0_6_5_features {}) }: uuid_0_6_5_ { + dependencies = mapFeatures features ([ cfg_if_0_1_4 ] + ++ (if features.uuid_0_6_5.rand or false then [ rand_0_4_2 ] else [])); + features = mkFeatures (features.uuid_0_6_5 or {}); + }; + uuid_0_6_5_features = f: updateFeatures f (rec { + cfg_if_0_1_4.default = true; + rand_0_4_2.default = true; + uuid_0_6_5.byteorder = + (f.uuid_0_6_5.byteorder or false) || + (f.uuid_0_6_5.u128 or false) || + (uuid_0_6_5.u128 or false); + uuid_0_6_5.default = (f.uuid_0_6_5.default or true); + uuid_0_6_5.md5 = + (f.uuid_0_6_5.md5 or false) || + (f.uuid_0_6_5.v3 or false) || + (uuid_0_6_5.v3 or false); + uuid_0_6_5.nightly = + (f.uuid_0_6_5.nightly or false) || + (f.uuid_0_6_5.const_fn or false) || + (uuid_0_6_5.const_fn or false); + uuid_0_6_5.rand = + (f.uuid_0_6_5.rand or false) || + (f.uuid_0_6_5.v3 or false) || + (uuid_0_6_5.v3 or false) || + (f.uuid_0_6_5.v4 or false) || + (uuid_0_6_5.v4 or false) || + (f.uuid_0_6_5.v5 or false) || + (uuid_0_6_5.v5 or false); + uuid_0_6_5.sha1 = + (f.uuid_0_6_5.sha1 or false) || + (f.uuid_0_6_5.v5 or false) || + (uuid_0_6_5.v5 or false); + uuid_0_6_5.std = + (f.uuid_0_6_5.std or false) || + (f.uuid_0_6_5.default or false) || + (uuid_0_6_5.default or false) || + (f.uuid_0_6_5.use_std or false) || + (uuid_0_6_5.use_std or false); + }) [ cfg_if_0_1_4_features rand_0_4_2_features ]; + vcpkg_0_2_4 = { features?(vcpkg_0_2_4_features {}) }: vcpkg_0_2_4_ {}; + vcpkg_0_2_4_features = f: updateFeatures f (rec { + vcpkg_0_2_4.default = (f.vcpkg_0_2_4.default or true); + }) []; + version_check_0_1_4 = { features?(version_check_0_1_4_features {}) }: version_check_0_1_4_ {}; + version_check_0_1_4_features = f: updateFeatures f (rec { + version_check_0_1_4.default = (f.version_check_0_1_4.default or true); + }) []; + void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { + features = mkFeatures (features.void_1_0_2 or {}); + }; + void_1_0_2_features = f: updateFeatures f (rec { + void_1_0_2.default = (f.void_1_0_2.default or true); + void_1_0_2.std = + (f.void_1_0_2.std or false) || + (f.void_1_0_2.default or false) || + (void_1_0_2.default or false); + }) []; + want_0_0_4 = { features?(want_0_0_4_features {}) }: want_0_0_4_ { + dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 try_lock_0_1_0 ]); + }; + want_0_0_4_features = f: updateFeatures f (rec { + futures_0_1_23.default = true; + log_0_4_3.default = true; + try_lock_0_1_0.default = true; + want_0_0_4.default = (f.want_0_0_4.default or true); + }) [ futures_0_1_23_features log_0_4_3_features try_lock_0_1_0_features ]; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_0_3_5 = { features?(winapi_0_3_5_features {}) }: winapi_0_3_5_ { + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); + features = mkFeatures (features.winapi_0_3_5 or {}); + }; + winapi_0_3_5_features = f: updateFeatures f (rec { + winapi_0_3_5.default = (f.winapi_0_3_5.default or true); + winapi_i686_pc_windows_gnu_0_4_0.default = true; + winapi_x86_64_pc_windows_gnu_0_4_0.default = true; + }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; + winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; + winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); + }) []; + winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; + winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); + }) []; + wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ { + dependencies = mapFeatures features ([ winapi_0_3_5 ]); + }; + wincolor_0_1_6_features = f: updateFeatures f (rec { + winapi_0_3_5.consoleapi = true; + winapi_0_3_5.default = true; + winapi_0_3_5.minwindef = true; + winapi_0_3_5.processenv = true; + winapi_0_3_5.winbase = true; + winapi_0_3_5.wincon = true; + wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true); + }) [ winapi_0_3_5_features ]; + ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + ws2_32_sys_0_2_1_features = f: updateFeatures f (rec { + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true); + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; +} diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix deleted file mode 100644 index 7224c11f183f..000000000000 --- a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix +++ /dev/null @@ -1,1905 +0,0 @@ -# Generated by carnix 0.6.6: carnix -o cargo-edit.nix --src ./. Cargo.lock --standalone -{ pkgs }: - -with pkgs; -let kernel = stdenv.buildPlatform.parsed.kernel.name; - updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); - mapFeatures = features: map (fun: fun { features = features; }); - mkFeatures = feat: lib.lists.foldl (features: featureName: - if feat.${featureName} or false then - [ featureName ] ++ features - else - features - ) [] (builtins.attrNames feat); -in -rec { - cargo_edit = f: cargo_edit_0_2_0 { features = cargo_edit_0_2_0_features { cargo_edit_0_2_0 = f; }; }; - adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "adler32"; - version = "1.0.0"; - authors = [ "Remi Rampin " ]; - sha256 = "0pj35a7m4apn5xjg9n63gsdj6w8iw76zg4p9znrij43xnfqp084w"; - inherit dependencies buildDependencies features; - }; - advapi32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "advapi32-sys"; - version = "0.2.0"; - authors = [ "Peter Atashian " ]; - sha256 = "1l6789hkz2whd9gklwz1m379kcvyizaj8nnzj3rn4a5h79yg59v7"; - libName = "advapi32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.6.3"; - authors = [ "Andrew Gallant " ]; - sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k"; - libName = "aho_corasick"; - crateBin = [ { name = "aho-corasick-dot"; } ]; - inherit dependencies buildDependencies features; - }; - assert_cli_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "assert_cli"; - version = "0.4.0"; - authors = [ "Pascal Hertleif " ]; - sha256 = "0jq138q0wma5b149ixjv43al19xnzwgp67s908mh4cma1ar4rxbn"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - backtrace_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace"; - version = "0.3.2"; - authors = [ "Alex Crichton " "The Rust Project Developers" ]; - sha256 = "0cj0ynv5p2f5ghisw58yjwrw4gvpji6sh12kk9j0228j7bhjznv7"; - inherit dependencies buildDependencies features; - }; - backtrace_sys_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace-sys"; - version = "0.1.11"; - authors = [ "Alex Crichton " ]; - sha256 = "06c6s9hsygix25awgcfa1gnzvihc7kvv5apnmf6p15l4phwzz6x6"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - base64_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "base64"; - version = "0.6.0"; - authors = [ "Alice Maz " "Marshall Pierce " ]; - sha256 = "0ql1rmczbnww3iszc0pfc6mqa47ravpsdf525vp6s8r32nyzspl5"; - inherit dependencies buildDependencies features; - }; - bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.9.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; - inherit dependencies buildDependencies features; - }; - byteorder_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "byteorder"; - version = "1.1.0"; - authors = [ "Andrew Gallant " ]; - sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp"; - inherit dependencies buildDependencies features; - }; - bytes_0_4_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bytes"; - version = "0.4.4"; - authors = [ "Carl Lerche " ]; - sha256 = "028l4zlrjbr62y92slr84zil8h1bypqr7g545i566gf7cbss7hsp"; - inherit dependencies buildDependencies features; - }; - cargo_edit_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cargo-edit"; - version = "0.2.0"; - authors = [ "Without Boats " "Pascal Hertleif " "Sebastian Garrido " "Jonas Platte " "Benjamin Gill " "Andronik Ordian " ]; - src = ./.; - crateBin = [ { name = "cargo-add"; path = "src/bin/add/main.rs"; } { name = "cargo-rm"; path = "src/bin/rm/main.rs"; } { name = "cargo-upgrade"; path = "src/bin/upgrade/main.rs"; } ]; - inherit dependencies buildDependencies features; - }; - cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cfg-if"; - version = "0.1.2"; - authors = [ "Alex Crichton " ]; - sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; - inherit dependencies buildDependencies features; - }; - colored_1_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "colored"; - version = "1.5.2"; - authors = [ "Thomas Wickham " ]; - sha256 = "0d7c6vpqzlabph7qr29hdjgsks8z9hqcarzl8z5dfb8cnnrfrhzn"; - inherit dependencies buildDependencies features; - }; - core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "core-foundation"; - version = "0.2.3"; - authors = [ "The Servo Project Developers" ]; - sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm"; - inherit dependencies buildDependencies features; - }; - core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "core-foundation-sys"; - version = "0.2.3"; - authors = [ "The Servo Project Developers" ]; - sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - crypt32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "crypt32-sys"; - version = "0.2.0"; - authors = [ "Peter Atashian " ]; - sha256 = "1vy1q3ayc7f4wiwyxw31hd12cvs7791x3by6ka9wbxhm5gzfs3d0"; - libName = "crypt32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dbghelp-sys"; - version = "0.2.0"; - authors = [ "Peter Atashian " ]; - sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq"; - libName = "dbghelp"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - difference_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "difference"; - version = "1.0.0"; - authors = [ "Johann Hofmann " ]; - sha256 = "0r1p2diin8zykfiifv6v9i3ajimdb1rg6qzxkrfw2n2iy57846qn"; - crateBin = [ { name = "difference"; } ]; - inherit dependencies buildDependencies features; - }; - docopt_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "docopt"; - version = "0.8.1"; - authors = [ "Andrew Gallant " ]; - sha256 = "0kmqy534qgcc2hh81nd248jmnvdjb5y4wclddd7y2jjm27rzibss"; - crateBin = [ { name = "docopt-wordlist"; path = "src/wordlist.rs"; } ]; - inherit dependencies buildDependencies features; - }; - dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dtoa"; - version = "0.4.1"; - authors = [ "David Tolnay " ]; - sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw"; - inherit dependencies buildDependencies features; - }; - error_chain_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "error-chain"; - version = "0.10.0"; - authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; - sha256 = "1xxbzd8cjlpzsb9fsih7mdnndhzrvykj0w77yg90qc85az1xwy5z"; - inherit dependencies buildDependencies features; - }; - foreign_types_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "foreign-types"; - version = "0.2.0"; - authors = [ "Steven Fackler " ]; - sha256 = "1sznwg2py4xi7hyrx0gg1sirlwgh87wsanvjx3zb475g6c4139jh"; - inherit dependencies buildDependencies features; - }; - futures_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "futures"; - version = "0.1.14"; - authors = [ "Alex Crichton " ]; - sha256 = "1s53l50dy9abbycc88ghz1s76yfacygrxr3vnkl132m9ja0qi9nl"; - inherit dependencies buildDependencies features; - }; - futures_cpupool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "futures-cpupool"; - version = "0.1.5"; - authors = [ "Alex Crichton " ]; - sha256 = "1i001y0qv8pvvqd2ch1gsxw97286bcf789mlnhaindjzhm7x8fi6"; - inherit dependencies buildDependencies features; - }; - gcc_0_3_51_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "gcc"; - version = "0.3.51"; - authors = [ "Alex Crichton " ]; - sha256 = "0h2lnfakbvyn7lzpi5x41y30d5pzwz3172bdjzxxm4j59ipby563"; - inherit dependencies buildDependencies features; - }; - getopts_0_2_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "getopts"; - version = "0.2.14"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1wdz34vls97g9868h8kiw4wmwkbyxg4xm3xzvr1542hc3w4c7z0a"; - inherit dependencies buildDependencies features; - }; - httparse_1_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "httparse"; - version = "1.2.3"; - authors = [ "Sean McArthur " ]; - sha256 = "13x17y9bip0bija06y4vwpgh8jdmdi2gsvjq02kyfy0fbp5cqa93"; - inherit dependencies buildDependencies features; - }; - hyper_0_11_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hyper"; - version = "0.11.1"; - authors = [ "Sean McArthur " ]; - sha256 = "0al73rns6d18f09v872hasr5sf56mpzg4cpzi9g0118fy6v2z21a"; - inherit dependencies buildDependencies features; - }; - hyper_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hyper-tls"; - version = "0.1.2"; - authors = [ "Sean McArthur " ]; - sha256 = "0n39sb8sc2pzdg501nshmv35q0r9pnrfjh8r1pdlygwxgcni9n3d"; - inherit dependencies buildDependencies features; - }; - idna_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "idna"; - version = "0.1.4"; - authors = [ "The rust-url developers" ]; - sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336"; - inherit dependencies buildDependencies features; - }; - iovec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "iovec"; - version = "0.1.0"; - authors = [ "Carl Lerche " ]; - sha256 = "01gmbcaamfms70ll964wj3akqbj5bf6zzi7nfj5y2hvzjxd959sj"; - inherit dependencies buildDependencies features; - }; - itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itoa"; - version = "0.3.1"; - authors = [ "David Tolnay " ]; - sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k"; - inherit dependencies buildDependencies features; - }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian " ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "language-tags"; - version = "0.2.2"; - authors = [ "Pyfisch " ]; - sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy"; - inherit dependencies buildDependencies features; - }; - lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "0.2.8"; - authors = [ "Marvin Löbel " ]; - sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl"; - inherit dependencies buildDependencies features; - }; - lazycell_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazycell"; - version = "0.4.0"; - authors = [ "Alex Crichton " "Nikita Pekin " ]; - sha256 = "1vgxv62l8qh3m8gvjyrd7wkx44hih724ivssc1mwj7vq9gnhgl0d"; - inherit dependencies buildDependencies features; - }; - libc_0_2_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.26"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0938y1yh2sr08zy8vpgj9wqk3nildip4ngpy2krvarzc8aqgvxrc"; - inherit dependencies buildDependencies features; - }; - libflate_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libflate"; - version = "0.1.10"; - authors = [ "Takeru Ohta " ]; - sha256 = "123m6wz1qvczv8fnak0k71hb7gj2kkiw3sj3rv55gfmir2kgf6gk"; - inherit dependencies buildDependencies features; - }; - log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "log"; - version = "0.3.8"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; - inherit dependencies buildDependencies features; - }; - matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "matches"; - version = "0.1.6"; - authors = [ "Simon Sapin " ]; - sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - memchr_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "1.0.1"; - authors = [ "Andrew Gallant " "bluss" ]; - sha256 = "071m5y0zm9p1k7pzqm20f44ixvmycf71xsrpayqaypxrjwchnkxm"; - inherit dependencies buildDependencies features; - }; - mime_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "mime"; - version = "0.3.2"; - authors = [ "Sean McArthur " ]; - sha256 = "10yv7sq2gbq8xdh4imrga3wqiar652y8y31f8jqxw313pwsks3m5"; - inherit dependencies buildDependencies features; - }; - mio_0_6_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "mio"; - version = "0.6.9"; - authors = [ "Carl Lerche " ]; - sha256 = "0fbx9mxqqzcp0jzm1xkg9h4l4l43vphv3zca4zpdc8ahadvfw6qh"; - inherit dependencies buildDependencies features; - }; - miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "miow"; - version = "0.2.1"; - authors = [ "Alex Crichton " ]; - sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0"; - inherit dependencies buildDependencies features; - }; - native_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "native-tls"; - version = "0.1.4"; - authors = [ "Steven Fackler " ]; - sha256 = "0q5y5i96mfpjbhx8y7w9rdq65mksw67m60bw4xqlybc8y6jkr99v"; - inherit dependencies buildDependencies features; - }; - net2_0_2_30_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "net2"; - version = "0.2.30"; - authors = [ "Alex Crichton " ]; - sha256 = "1gd7r0d646sa3fdj7rwyyx43fj7m9amqvmn0h4gv6sqcwgb7rlad"; - inherit dependencies buildDependencies features; - }; - num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.1.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; - inherit dependencies buildDependencies features; - }; - num_cpus_1_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num_cpus"; - version = "1.6.2"; - authors = [ "Sean McArthur " ]; - sha256 = "0wxfzxsk05xbkph5qcvdqyi334zn0pnpahzi7n7iagxbb68145rm"; - inherit dependencies buildDependencies features; - }; - openssl_0_9_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "openssl"; - version = "0.9.14"; - authors = [ "Steven Fackler " ]; - sha256 = "0z8bza11x7fbhzsa3xrp4hzv4sl83102yxaiigmsdh2a480xg6jl"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - openssl_sys_0_9_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "openssl-sys"; - version = "0.9.14"; - authors = [ "Alex Crichton " "Steven Fackler " ]; - sha256 = "0wq8hanw6lsm7h49ql62b3z5immbk8dcbp61vddd0pi5rk53cb2w"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - pad_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pad"; - version = "0.1.4"; - authors = [ "Ben S " ]; - sha256 = "1ca30d5s6yx1cb5qa3hwxgl53m69cnn037disw3kr6cv7sy7mw1n"; - inherit dependencies buildDependencies features; - }; - percent_encoding_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "percent-encoding"; - version = "1.0.0"; - authors = [ "The rust-url developers" ]; - sha256 = "0c91wp8inj7z270i2kilxjl00kcagqalxxnnjg7fsdlimdwb7q1z"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.9"; - authors = [ "Alex Crichton " ]; - sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; - inherit dependencies buildDependencies features; - }; - pretty_assertions_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pretty_assertions"; - version = "0.2.1"; - authors = [ "Colin Kiegel " ]; - sha256 = "06i0q8xjs1kbv3g0amx997axm93znwvpmj560vxrzn7s55hb9a8i"; - inherit dependencies buildDependencies features; - }; - pulldown_cmark_0_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pulldown-cmark"; - version = "0.0.3"; - authors = [ "Raph Levien " ]; - sha256 = "08wgdjqjnaz8yjvamdwcf1cqz18z795frkmbal9rgp9g2i1yrzwy"; - inherit dependencies buildDependencies features; - }; - quick_error_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quick-error"; - version = "1.2.0"; - authors = [ "Paul Colomiets " "Colin Kiegel " ]; - sha256 = "1gc95wll0algrl2cqrym6x97sg07hslczn6wkbnkxfikrfissmga"; - inherit dependencies buildDependencies features; - }; - quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quote"; - version = "0.3.15"; - authors = [ "David Tolnay " ]; - sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; - inherit dependencies buildDependencies features; - }; - rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.3.15"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; - inherit dependencies buildDependencies features; - }; - redox_syscall_0_1_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.26"; - authors = [ "Jeremy Soller " ]; - sha256 = "0hfnc05jwlkkkjpvzzfbx8anzgc2n81n92pmvb065hkqlarbjz85"; - libName = "syscall"; - inherit dependencies buildDependencies features; - }; - regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex"; - version = "0.2.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7"; - inherit dependencies buildDependencies features; - }; - regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.4.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls"; - inherit dependencies buildDependencies features; - }; - reqwest_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "reqwest"; - version = "0.7.1"; - authors = [ "Sean McArthur " ]; - sha256 = "0w3x0f6wmha09jcv83dkw00gpl11afi2k4gsavl43ccfdfa4b2nh"; - inherit dependencies buildDependencies features; - }; - rustc_demangle_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc-demangle"; - version = "0.1.4"; - authors = [ "Alex Crichton " ]; - sha256 = "0q7myf1m5r7cilayw5r2n5qraxwlcpdr7s2mq8c63pxrz48h24qv"; - inherit dependencies buildDependencies features; - }; - rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc_version"; - version = "0.1.7"; - authors = [ "Marvin Löbel " ]; - sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; - inherit dependencies buildDependencies features; - }; - safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "safemem"; - version = "0.2.0"; - authors = [ "Austin Bonander " ]; - sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm"; - inherit dependencies buildDependencies features; - }; - schannel_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "schannel"; - version = "0.1.7"; - authors = [ "Steven Fackler " "Steffen Butzer " ]; - sha256 = "1np6wzxwj8r4kqmmz0a3w9dfs2zfwh0m7mrv7xpzxkpm4c4hcn5f"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - scoped_tls_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "scoped-tls"; - version = "0.1.0"; - authors = [ "Alex Crichton " ]; - sha256 = "1j8azxa15srljafrg7wc221npvxb3700sbfk6jjav0rw2zclsnf5"; - inherit dependencies buildDependencies features; - }; - secur32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "secur32-sys"; - version = "0.2.0"; - authors = [ "Peter Atashian " ]; - sha256 = "0sp46ix9mx1156bidpfiq30xxsgmpva5jffls3259kxjqlxifcnx"; - libName = "secur32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - security_framework_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "security-framework"; - version = "0.1.14"; - authors = [ "Steven Fackler " ]; - sha256 = "0xxxasrqls0ssflxjl2bf6bvljig0piy13pscbgkxd4zqw7w8i7q"; - inherit dependencies buildDependencies features; - }; - security_framework_sys_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "security-framework-sys"; - version = "0.1.14"; - authors = [ "Steven Fackler " ]; - sha256 = "15ggkd39aq01yzrg0fxchciz9gf5wncl7k3mgvqmi7vk7hfhkcw7"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver"; - version = "0.1.20"; - authors = [ "The Rust Project Developers" ]; - sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; - inherit dependencies buildDependencies features; - }; - semver_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver"; - version = "0.7.0"; - authors = [ "Steve Klabnik " "The Rust Project Developers" ]; - sha256 = "079944bh20ldr41i96nk9b31igj555dl2d8mg51m4h0ccwric4l8"; - inherit dependencies buildDependencies features; - }; - semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver-parser"; - version = "0.7.0"; - authors = [ "Steve Klabnik " ]; - sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; - inherit dependencies buildDependencies features; - }; - serde_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "1.0.10"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1p71hm8xpa7gfmhr2hzb4ah1ajhsmf3gh3i1fknf9ch8dn0qfycv"; - inherit dependencies buildDependencies features; - }; - serde_derive_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.10"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1m5if144vqsjx9fk6g7b9x0cy8mam6w78yghv3fykngminklcjw6"; - procMacro = true; - inherit dependencies buildDependencies features; - }; - serde_derive_internals_0_15_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive_internals"; - version = "0.15.1"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "0s2i03rv2sppywan0z5qiif65b2wqc6lp5r5l71mz4nigrh04zrj"; - inherit dependencies buildDependencies features; - }; - serde_json_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_json"; - version = "1.0.2"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "0vabw2zciy8vy0hgj0khm1vwbvng4whwry7ylfl3ypd0inx84mn6"; - inherit dependencies buildDependencies features; - }; - serde_urlencoded_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_urlencoded"; - version = "0.5.1"; - authors = [ "Anthony Ramine " ]; - sha256 = "0zh2wlnapmcwqhxnnq1mdlmg8vily7j54wvj01s7cvapzg5jphdl"; - inherit dependencies buildDependencies features; - }; - skeptic_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "skeptic"; - version = "0.5.0"; - authors = [ "Brian Anderson " ]; - sha256 = "06vf19309psngmx61sg33czbkx1cg9bmw0wr66n9mqdhvwa4y52d"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - slab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "slab"; - version = "0.3.0"; - authors = [ "Carl Lerche " ]; - sha256 = "0y6lhjggksh57hyfd3l6p9wgv5nhvw9c6djrysq7jnalz8fih21k"; - inherit dependencies buildDependencies features; - }; - smallvec_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "smallvec"; - version = "0.2.1"; - authors = [ "Simon Sapin " ]; - sha256 = "0rnsll9af52bpjngz0067dpm1ndqmh76i64a58fc118l4lvnjxw2"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.6.0"; - authors = [ "Danny Guo " ]; - sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; - inherit dependencies buildDependencies features; - }; - syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "syn"; - version = "0.11.11"; - authors = [ "David Tolnay " ]; - sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; - inherit dependencies buildDependencies features; - }; - synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "synom"; - version = "0.11.3"; - authors = [ "David Tolnay " ]; - sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; - inherit dependencies buildDependencies features; - }; - take_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "take"; - version = "0.1.0"; - authors = [ "Carl Lerche " ]; - sha256 = "17rfh39di5n8w9aghpic2r94cndi3dr04l60nkjylmxfxr3iwlhd"; - inherit dependencies buildDependencies features; - }; - tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tempdir"; - version = "0.3.5"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz"; - inherit dependencies buildDependencies features; - }; - thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.4"; - authors = [ "Amanieu d'Antras " ]; - sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; - inherit dependencies buildDependencies features; - }; - time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "time"; - version = "0.1.38"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp"; - inherit dependencies buildDependencies features; - }; - tokio_core_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-core"; - version = "0.1.8"; - authors = [ "Alex Crichton " ]; - sha256 = "1wikhmk648j13dxy4dpi435dm943ph5bf4ldfhpxn23cbzlr2kcp"; - inherit dependencies buildDependencies features; - }; - tokio_io_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-io"; - version = "0.1.2"; - authors = [ "Alex Crichton " ]; - sha256 = "07ab05gmzq0xmi5h26wpvjzircax5bwfjgc3zzn62ll4rarz4pva"; - inherit dependencies buildDependencies features; - }; - tokio_proto_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-proto"; - version = "0.1.1"; - authors = [ "Carl Lerche " ]; - sha256 = "030q9h8pn1ngm80klff5irglxxki60hf5maw0mppmmr46k773z66"; - inherit dependencies buildDependencies features; - }; - tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-service"; - version = "0.1.0"; - authors = [ "Carl Lerche " ]; - sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih"; - inherit dependencies buildDependencies features; - }; - tokio_tls_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-tls"; - version = "0.1.3"; - authors = [ "Carl Lerche " "Alex Crichton " ]; - sha256 = "0ib58y81qr64m3gg0pn7k06b71r8b05cmvakzpgfqdsw0qj08sva"; - inherit dependencies buildDependencies features; - }; - toml_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "toml"; - version = "0.4.2"; - authors = [ "Alex Crichton " ]; - sha256 = "12v5l461czglhspc0crn29brb9p67xx7n6karrrs87slvq4xc7f1"; - inherit dependencies buildDependencies features; - }; - unicase_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicase"; - version = "2.0.0"; - authors = [ "Sean McArthur " ]; - sha256 = "1nmidnfn5cwp6dr6aln2ffk8yvdfsf3si3bq1znss5swi3i5v64w"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-bidi"; - version = "0.3.4"; - authors = [ "The Servo Project Developers" ]; - sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; - libName = "unicode_bidi"; - inherit dependencies buildDependencies features; - }; - unicode_normalization_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-normalization"; - version = "0.1.5"; - authors = [ "kwantam " ]; - sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.4"; - authors = [ "kwantam " ]; - sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; - inherit dependencies buildDependencies features; - }; - unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.0.4"; - authors = [ "erick.tryzelaar " "kwantam " ]; - sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; - inherit dependencies buildDependencies features; - }; - unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unreachable"; - version = "1.0.0"; - authors = [ "Jonathan Reem " ]; - sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; - inherit dependencies buildDependencies features; - }; - url_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "url"; - version = "1.5.1"; - authors = [ "The rust-url developers" ]; - sha256 = "1l2m7jdl2x09fdz60mjk63f61m3fjk1w5ykiadi9lxayg3bvppcw"; - inherit dependencies buildDependencies features; - }; - utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "utf8-ranges"; - version = "1.0.0"; - authors = [ "Andrew Gallant " ]; - sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; - inherit dependencies buildDependencies features; - }; - void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "void"; - version = "1.0.2"; - authors = [ "Jonathan Reem " ]; - sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; - inherit dependencies buildDependencies features; - }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - authors = [ "Peter Atashian " ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - inherit dependencies buildDependencies features; - }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - authors = [ "Peter Atashian " ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - inherit dependencies buildDependencies features; - }; - ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ws2_32-sys"; - version = "0.2.1"; - authors = [ "Peter Atashian " ]; - sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc"; - libName = "ws2_32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {}; - adler32_1_0_0_features = f: updateFeatures f (rec { - adler32_1_0_0.default = (f.adler32_1_0_0.default or true); - }) []; - advapi32_sys_0_2_0 = { features?(advapi32_sys_0_2_0_features {}) }: advapi32_sys_0_2_0_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - advapi32_sys_0_2_0_features = f: updateFeatures f (rec { - advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - aho_corasick_0_6_3 = { features?(aho_corasick_0_6_3_features {}) }: aho_corasick_0_6_3_ { - dependencies = mapFeatures features ([ memchr_1_0_1 ]); - }; - aho_corasick_0_6_3_features = f: updateFeatures f (rec { - aho_corasick_0_6_3.default = (f.aho_corasick_0_6_3.default or true); - memchr_1_0_1.default = true; - }) [ memchr_1_0_1_features ]; - assert_cli_0_4_0 = { features?(assert_cli_0_4_0_features {}) }: assert_cli_0_4_0_ { - dependencies = mapFeatures features ([ colored_1_5_2 difference_1_0_0 error_chain_0_10_0 ]); - buildDependencies = mapFeatures features ([ skeptic_0_5_0 ]); - }; - assert_cli_0_4_0_features = f: updateFeatures f (rec { - assert_cli_0_4_0.default = (f.assert_cli_0_4_0.default or true); - colored_1_5_2.default = true; - difference_1_0_0.default = true; - error_chain_0_10_0.default = true; - skeptic_0_5_0.default = true; - }) [ colored_1_5_2_features difference_1_0_0_features error_chain_0_10_0_features skeptic_0_5_0_features ]; - backtrace_0_3_2 = { features?(backtrace_0_3_2_features {}) }: backtrace_0_3_2_ { - dependencies = mapFeatures features ([ cfg_if_0_1_2 libc_0_2_26 rustc_demangle_0_1_4 ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_2.backtrace-sys or false then [ backtrace_sys_0_1_11 ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_2.dbghelp-sys or false then [ dbghelp_sys_0_2_0 ] else []) - ++ (if features.backtrace_0_3_2.kernel32-sys or false then [ kernel32_sys_0_2_2 ] else []) - ++ (if features.backtrace_0_3_2.winapi or false then [ winapi_0_2_8 ] else [])) else []); - features = mkFeatures (features.backtrace_0_3_2 or {}); - }; - backtrace_0_3_2_features = f: updateFeatures f (rec { - backtrace_0_3_2.backtrace-sys = - (f.backtrace_0_3_2.backtrace-sys or false) || - (f.backtrace_0_3_2.libbacktrace or false) || - (backtrace_0_3_2.libbacktrace or false); - backtrace_0_3_2.coresymbolication = - (f.backtrace_0_3_2.coresymbolication or false) || - (f.backtrace_0_3_2.default or false) || - (backtrace_0_3_2.default or false); - backtrace_0_3_2.dbghelp = - (f.backtrace_0_3_2.dbghelp or false) || - (f.backtrace_0_3_2.default or false) || - (backtrace_0_3_2.default or false); - backtrace_0_3_2.dbghelp-sys = - (f.backtrace_0_3_2.dbghelp-sys or false) || - (f.backtrace_0_3_2.dbghelp or false) || - (backtrace_0_3_2.dbghelp or false); - backtrace_0_3_2.default = (f.backtrace_0_3_2.default or true); - backtrace_0_3_2.dladdr = - (f.backtrace_0_3_2.dladdr or false) || - (f.backtrace_0_3_2.default or false) || - (backtrace_0_3_2.default or false); - backtrace_0_3_2.kernel32-sys = - (f.backtrace_0_3_2.kernel32-sys or false) || - (f.backtrace_0_3_2.dbghelp or false) || - (backtrace_0_3_2.dbghelp or false); - backtrace_0_3_2.libbacktrace = - (f.backtrace_0_3_2.libbacktrace or false) || - (f.backtrace_0_3_2.default or false) || - (backtrace_0_3_2.default or false); - backtrace_0_3_2.libunwind = - (f.backtrace_0_3_2.libunwind or false) || - (f.backtrace_0_3_2.default or false) || - (backtrace_0_3_2.default or false); - backtrace_0_3_2.rustc-serialize = - (f.backtrace_0_3_2.rustc-serialize or false) || - (f.backtrace_0_3_2.serialize-rustc or false) || - (backtrace_0_3_2.serialize-rustc or false); - backtrace_0_3_2.serde = - (f.backtrace_0_3_2.serde or false) || - (f.backtrace_0_3_2.serialize-serde or false) || - (backtrace_0_3_2.serialize-serde or false); - backtrace_0_3_2.serde_derive = - (f.backtrace_0_3_2.serde_derive or false) || - (f.backtrace_0_3_2.serialize-serde or false) || - (backtrace_0_3_2.serialize-serde or false); - backtrace_0_3_2.winapi = - (f.backtrace_0_3_2.winapi or false) || - (f.backtrace_0_3_2.dbghelp or false) || - (backtrace_0_3_2.dbghelp or false); - backtrace_sys_0_1_11.default = true; - cfg_if_0_1_2.default = true; - dbghelp_sys_0_2_0.default = true; - kernel32_sys_0_2_2.default = true; - libc_0_2_26.default = true; - rustc_demangle_0_1_4.default = true; - winapi_0_2_8.default = true; - }) [ cfg_if_0_1_2_features libc_0_2_26_features rustc_demangle_0_1_4_features backtrace_sys_0_1_11_features dbghelp_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; - backtrace_sys_0_1_11 = { features?(backtrace_sys_0_1_11_features {}) }: backtrace_sys_0_1_11_ { - dependencies = mapFeatures features ([ libc_0_2_26 ]); - buildDependencies = mapFeatures features ([ gcc_0_3_51 ]); - }; - backtrace_sys_0_1_11_features = f: updateFeatures f (rec { - backtrace_sys_0_1_11.default = (f.backtrace_sys_0_1_11.default or true); - gcc_0_3_51.default = true; - libc_0_2_26.default = true; - }) [ libc_0_2_26_features gcc_0_3_51_features ]; - base64_0_6_0 = { features?(base64_0_6_0_features {}) }: base64_0_6_0_ { - dependencies = mapFeatures features ([ byteorder_1_1_0 safemem_0_2_0 ]); - }; - base64_0_6_0_features = f: updateFeatures f (rec { - base64_0_6_0.default = (f.base64_0_6_0.default or true); - byteorder_1_1_0.default = true; - safemem_0_2_0.default = true; - }) [ byteorder_1_1_0_features safemem_0_2_0_features ]; - bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { - features = mkFeatures (features.bitflags_0_9_1 or {}); - }; - bitflags_0_9_1_features = f: updateFeatures f (rec { - bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); - bitflags_0_9_1.example_generated = - (f.bitflags_0_9_1.example_generated or false) || - (f.bitflags_0_9_1.default or false) || - (bitflags_0_9_1.default or false); - }) []; - byteorder_1_1_0 = { features?(byteorder_1_1_0_features {}) }: byteorder_1_1_0_ { - features = mkFeatures (features.byteorder_1_1_0 or {}); - }; - byteorder_1_1_0_features = f: updateFeatures f (rec { - byteorder_1_1_0.default = (f.byteorder_1_1_0.default or true); - byteorder_1_1_0.std = - (f.byteorder_1_1_0.std or false) || - (f.byteorder_1_1_0.default or false) || - (byteorder_1_1_0.default or false); - }) []; - bytes_0_4_4 = { features?(bytes_0_4_4_features {}) }: bytes_0_4_4_ { - dependencies = mapFeatures features ([ byteorder_1_1_0 iovec_0_1_0 ]); - }; - bytes_0_4_4_features = f: updateFeatures f (rec { - byteorder_1_1_0.default = true; - bytes_0_4_4.default = (f.bytes_0_4_4.default or true); - iovec_0_1_0.default = true; - }) [ byteorder_1_1_0_features iovec_0_1_0_features ]; - cargo_edit_0_2_0 = { features?(cargo_edit_0_2_0_features {}) }: cargo_edit_0_2_0_ { - dependencies = mapFeatures features ([ docopt_0_8_1 pad_0_1_4 quick_error_1_2_0 regex_0_2_2 reqwest_0_7_1 semver_0_7_0 serde_1_0_10 serde_derive_1_0_10 serde_json_1_0_2 toml_0_4_2 ]); - features = mkFeatures (features.cargo_edit_0_2_0 or {}); - }; - cargo_edit_0_2_0_features = f: updateFeatures f (rec { - cargo_edit_0_2_0.default = (f.cargo_edit_0_2_0.default or true); - docopt_0_8_1.default = true; - pad_0_1_4.default = true; - quick_error_1_2_0.default = true; - regex_0_2_2.default = true; - reqwest_0_7_1.default = true; - semver_0_7_0.default = true; - semver_0_7_0.serde = true; - serde_1_0_10.default = true; - serde_derive_1_0_10.default = true; - serde_json_1_0_2.default = true; - toml_0_4_2.default = true; - }) [ docopt_0_8_1_features pad_0_1_4_features quick_error_1_2_0_features regex_0_2_2_features reqwest_0_7_1_features semver_0_7_0_features serde_1_0_10_features serde_derive_1_0_10_features serde_json_1_0_2_features toml_0_4_2_features ]; - cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; - cfg_if_0_1_2_features = f: updateFeatures f (rec { - cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); - }) []; - colored_1_5_2 = { features?(colored_1_5_2_features {}) }: colored_1_5_2_ { - dependencies = mapFeatures features ([ lazy_static_0_2_8 ]); - features = mkFeatures (features.colored_1_5_2 or {}); - }; - colored_1_5_2_features = f: updateFeatures f (rec { - colored_1_5_2.default = (f.colored_1_5_2.default or true); - lazy_static_0_2_8.default = true; - }) [ lazy_static_0_2_8_features ]; - core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ { - dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_26 ]); - }; - core_foundation_0_2_3_features = f: updateFeatures f (rec { - core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true); - core_foundation_sys_0_2_3.default = true; - libc_0_2_26.default = true; - }) [ core_foundation_sys_0_2_3_features libc_0_2_26_features ]; - core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ { - dependencies = mapFeatures features ([ libc_0_2_26 ]); - }; - core_foundation_sys_0_2_3_features = f: updateFeatures f (rec { - core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true); - libc_0_2_26.default = true; - }) [ libc_0_2_26_features ]; - crypt32_sys_0_2_0 = { features?(crypt32_sys_0_2_0_features {}) }: crypt32_sys_0_2_0_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - crypt32_sys_0_2_0_features = f: updateFeatures f (rec { - crypt32_sys_0_2_0.default = (f.crypt32_sys_0_2_0.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - dbghelp_sys_0_2_0 = { features?(dbghelp_sys_0_2_0_features {}) }: dbghelp_sys_0_2_0_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - dbghelp_sys_0_2_0_features = f: updateFeatures f (rec { - dbghelp_sys_0_2_0.default = (f.dbghelp_sys_0_2_0.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - difference_1_0_0 = { features?(difference_1_0_0_features {}) }: difference_1_0_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.difference_1_0_0 or {}); - }; - difference_1_0_0_features = f: updateFeatures f (rec { - difference_1_0_0.default = (f.difference_1_0_0.default or true); - difference_1_0_0.getopts = - (f.difference_1_0_0.getopts or false) || - (f.difference_1_0_0.bin or false) || - (difference_1_0_0.bin or false); - }) []; - docopt_0_8_1 = { features?(docopt_0_8_1_features {}) }: docopt_0_8_1_ { - dependencies = mapFeatures features ([ lazy_static_0_2_8 regex_0_2_2 serde_1_0_10 serde_derive_1_0_10 strsim_0_6_0 ]); - }; - docopt_0_8_1_features = f: updateFeatures f (rec { - docopt_0_8_1.default = (f.docopt_0_8_1.default or true); - lazy_static_0_2_8.default = true; - regex_0_2_2.default = true; - serde_1_0_10.default = true; - serde_derive_1_0_10.default = true; - strsim_0_6_0.default = true; - }) [ lazy_static_0_2_8_features regex_0_2_2_features serde_1_0_10_features serde_derive_1_0_10_features strsim_0_6_0_features ]; - dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {}; - dtoa_0_4_1_features = f: updateFeatures f (rec { - dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true); - }) []; - error_chain_0_10_0 = { features?(error_chain_0_10_0_features {}) }: error_chain_0_10_0_ { - dependencies = mapFeatures features ([ ] - ++ (if features.error_chain_0_10_0.backtrace or false then [ backtrace_0_3_2 ] else [])); - features = mkFeatures (features.error_chain_0_10_0 or {}); - }; - error_chain_0_10_0_features = f: updateFeatures f (rec { - backtrace_0_3_2.default = true; - error_chain_0_10_0.backtrace = - (f.error_chain_0_10_0.backtrace or false) || - (f.error_chain_0_10_0.default or false) || - (error_chain_0_10_0.default or false); - error_chain_0_10_0.default = (f.error_chain_0_10_0.default or true); - error_chain_0_10_0.example_generated = - (f.error_chain_0_10_0.example_generated or false) || - (f.error_chain_0_10_0.default or false) || - (error_chain_0_10_0.default or false); - }) [ backtrace_0_3_2_features ]; - foreign_types_0_2_0 = { features?(foreign_types_0_2_0_features {}) }: foreign_types_0_2_0_ {}; - foreign_types_0_2_0_features = f: updateFeatures f (rec { - foreign_types_0_2_0.default = (f.foreign_types_0_2_0.default or true); - }) []; - futures_0_1_14 = { features?(futures_0_1_14_features {}) }: futures_0_1_14_ { - features = mkFeatures (features.futures_0_1_14 or {}); - }; - futures_0_1_14_features = f: updateFeatures f (rec { - futures_0_1_14.default = (f.futures_0_1_14.default or true); - futures_0_1_14.use_std = - (f.futures_0_1_14.use_std or false) || - (f.futures_0_1_14.default or false) || - (futures_0_1_14.default or false); - futures_0_1_14.with-deprecated = - (f.futures_0_1_14.with-deprecated or false) || - (f.futures_0_1_14.default or false) || - (futures_0_1_14.default or false); - }) []; - futures_cpupool_0_1_5 = { features?(futures_cpupool_0_1_5_features {}) }: futures_cpupool_0_1_5_ { - dependencies = mapFeatures features ([ futures_0_1_14 num_cpus_1_6_2 ]); - features = mkFeatures (features.futures_cpupool_0_1_5 or {}); - }; - futures_cpupool_0_1_5_features = f: updateFeatures f (rec { - futures_0_1_14.default = (f.futures_0_1_14.default or false); - futures_0_1_14.use_std = true; - futures_0_1_14.with-deprecated = - (f.futures_0_1_14.with-deprecated or false) || - (futures_cpupool_0_1_5.with-deprecated or false) || - (f.futures_cpupool_0_1_5.with-deprecated or false); - futures_cpupool_0_1_5.default = (f.futures_cpupool_0_1_5.default or true); - futures_cpupool_0_1_5.with-deprecated = - (f.futures_cpupool_0_1_5.with-deprecated or false) || - (f.futures_cpupool_0_1_5.default or false) || - (futures_cpupool_0_1_5.default or false); - num_cpus_1_6_2.default = true; - }) [ futures_0_1_14_features num_cpus_1_6_2_features ]; - gcc_0_3_51 = { features?(gcc_0_3_51_features {}) }: gcc_0_3_51_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.gcc_0_3_51 or {}); - }; - gcc_0_3_51_features = f: updateFeatures f (rec { - gcc_0_3_51.default = (f.gcc_0_3_51.default or true); - gcc_0_3_51.rayon = - (f.gcc_0_3_51.rayon or false) || - (f.gcc_0_3_51.parallel or false) || - (gcc_0_3_51.parallel or false); - }) []; - getopts_0_2_14 = { features?(getopts_0_2_14_features {}) }: getopts_0_2_14_ {}; - getopts_0_2_14_features = f: updateFeatures f (rec { - getopts_0_2_14.default = (f.getopts_0_2_14.default or true); - }) []; - httparse_1_2_3 = { features?(httparse_1_2_3_features {}) }: httparse_1_2_3_ { - features = mkFeatures (features.httparse_1_2_3 or {}); - }; - httparse_1_2_3_features = f: updateFeatures f (rec { - httparse_1_2_3.default = (f.httparse_1_2_3.default or true); - httparse_1_2_3.std = - (f.httparse_1_2_3.std or false) || - (f.httparse_1_2_3.default or false) || - (httparse_1_2_3.default or false); - }) []; - hyper_0_11_1 = { features?(hyper_0_11_1_features {}) }: hyper_0_11_1_ { - dependencies = mapFeatures features ([ base64_0_6_0 bytes_0_4_4 futures_0_1_14 futures_cpupool_0_1_5 httparse_1_2_3 language_tags_0_2_2 log_0_3_8 mime_0_3_2 percent_encoding_1_0_0 time_0_1_38 tokio_core_0_1_8 tokio_io_0_1_2 tokio_proto_0_1_1 tokio_service_0_1_0 unicase_2_0_0 ]); - features = mkFeatures (features.hyper_0_11_1 or {}); - }; - hyper_0_11_1_features = f: updateFeatures f (rec { - base64_0_6_0.default = true; - bytes_0_4_4.default = true; - futures_0_1_14.default = true; - futures_cpupool_0_1_5.default = true; - httparse_1_2_3.default = true; - hyper_0_11_1.default = (f.hyper_0_11_1.default or true); - language_tags_0_2_2.default = true; - log_0_3_8.default = true; - mime_0_3_2.default = true; - percent_encoding_1_0_0.default = true; - time_0_1_38.default = true; - tokio_core_0_1_8.default = true; - tokio_io_0_1_2.default = true; - tokio_proto_0_1_1.default = true; - tokio_service_0_1_0.default = true; - unicase_2_0_0.default = true; - }) [ base64_0_6_0_features bytes_0_4_4_features futures_0_1_14_features futures_cpupool_0_1_5_features httparse_1_2_3_features language_tags_0_2_2_features log_0_3_8_features mime_0_3_2_features percent_encoding_1_0_0_features time_0_1_38_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_proto_0_1_1_features tokio_service_0_1_0_features unicase_2_0_0_features ]; - hyper_tls_0_1_2 = { features?(hyper_tls_0_1_2_features {}) }: hyper_tls_0_1_2_ { - dependencies = mapFeatures features ([ futures_0_1_14 hyper_0_11_1 native_tls_0_1_4 tokio_core_0_1_8 tokio_io_0_1_2 tokio_service_0_1_0 tokio_tls_0_1_3 ]); - }; - hyper_tls_0_1_2_features = f: updateFeatures f (rec { - futures_0_1_14.default = true; - hyper_0_11_1.default = true; - hyper_tls_0_1_2.default = (f.hyper_tls_0_1_2.default or true); - native_tls_0_1_4.default = true; - tokio_core_0_1_8.default = true; - tokio_io_0_1_2.default = true; - tokio_service_0_1_0.default = true; - tokio_tls_0_1_3.default = true; - }) [ futures_0_1_14_features hyper_0_11_1_features native_tls_0_1_4_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_service_0_1_0_features tokio_tls_0_1_3_features ]; - idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ { - dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_5 ]); - }; - idna_0_1_4_features = f: updateFeatures f (rec { - idna_0_1_4.default = (f.idna_0_1_4.default or true); - matches_0_1_6.default = true; - unicode_bidi_0_3_4.default = true; - unicode_normalization_0_1_5.default = true; - }) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_5_features ]; - iovec_0_1_0 = { features?(iovec_0_1_0_features {}) }: iovec_0_1_0_ { - dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []); - }; - iovec_0_1_0_features = f: updateFeatures f (rec { - iovec_0_1_0.default = (f.iovec_0_1_0.default or true); - libc_0_2_26.default = true; - winapi_0_2_8.default = true; - }) [ libc_0_2_26_features winapi_0_2_8_features ]; - itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {}; - itoa_0_3_1_features = f: updateFeatures f (rec { - itoa_0_3_1.default = (f.itoa_0_3_1.default or true); - }) []; - kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.language_tags_0_2_2 or {}); - }; - language_tags_0_2_2_features = f: updateFeatures f (rec { - language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true); - language_tags_0_2_2.heapsize = - (f.language_tags_0_2_2.heapsize or false) || - (f.language_tags_0_2_2.heap_size or false) || - (language_tags_0_2_2.heap_size or false); - language_tags_0_2_2.heapsize_plugin = - (f.language_tags_0_2_2.heapsize_plugin or false) || - (f.language_tags_0_2_2.heap_size or false) || - (language_tags_0_2_2.heap_size or false); - }) []; - lazy_static_0_2_8 = { features?(lazy_static_0_2_8_features {}) }: lazy_static_0_2_8_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_0_2_8 or {}); - }; - lazy_static_0_2_8_features = f: updateFeatures f (rec { - lazy_static_0_2_8.default = (f.lazy_static_0_2_8.default or true); - lazy_static_0_2_8.nightly = - (f.lazy_static_0_2_8.nightly or false) || - (f.lazy_static_0_2_8.spin_no_std or false) || - (lazy_static_0_2_8.spin_no_std or false); - lazy_static_0_2_8.spin = - (f.lazy_static_0_2_8.spin or false) || - (f.lazy_static_0_2_8.spin_no_std or false) || - (lazy_static_0_2_8.spin_no_std or false); - }) []; - lazycell_0_4_0 = { features?(lazycell_0_4_0_features {}) }: lazycell_0_4_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazycell_0_4_0 or {}); - }; - lazycell_0_4_0_features = f: updateFeatures f (rec { - lazycell_0_4_0.clippy = - (f.lazycell_0_4_0.clippy or false) || - (f.lazycell_0_4_0.nightly-testing or false) || - (lazycell_0_4_0.nightly-testing or false); - lazycell_0_4_0.default = (f.lazycell_0_4_0.default or true); - lazycell_0_4_0.nightly = - (f.lazycell_0_4_0.nightly or false) || - (f.lazycell_0_4_0.nightly-testing or false) || - (lazycell_0_4_0.nightly-testing or false); - }) []; - libc_0_2_26 = { features?(libc_0_2_26_features {}) }: libc_0_2_26_ { - features = mkFeatures (features.libc_0_2_26 or {}); - }; - libc_0_2_26_features = f: updateFeatures f (rec { - libc_0_2_26.default = (f.libc_0_2_26.default or true); - libc_0_2_26.use_std = - (f.libc_0_2_26.use_std or false) || - (f.libc_0_2_26.default or false) || - (libc_0_2_26.default or false); - }) []; - libflate_0_1_10 = { features?(libflate_0_1_10_features {}) }: libflate_0_1_10_ { - dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_1_0 ]); - }; - libflate_0_1_10_features = f: updateFeatures f (rec { - adler32_1_0_0.default = true; - byteorder_1_1_0.default = true; - libflate_0_1_10.default = (f.libflate_0_1_10.default or true); - }) [ adler32_1_0_0_features byteorder_1_1_0_features ]; - log_0_3_8 = { features?(log_0_3_8_features {}) }: log_0_3_8_ { - features = mkFeatures (features.log_0_3_8 or {}); - }; - log_0_3_8_features = f: updateFeatures f (rec { - log_0_3_8.default = (f.log_0_3_8.default or true); - log_0_3_8.use_std = - (f.log_0_3_8.use_std or false) || - (f.log_0_3_8.default or false) || - (log_0_3_8.default or false); - }) []; - matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {}; - matches_0_1_6_features = f: updateFeatures f (rec { - matches_0_1_6.default = (f.matches_0_1_6.default or true); - }) []; - memchr_1_0_1 = { features?(memchr_1_0_1_features {}) }: memchr_1_0_1_ { - dependencies = mapFeatures features ([ libc_0_2_26 ]); - features = mkFeatures (features.memchr_1_0_1 or {}); - }; - memchr_1_0_1_features = f: updateFeatures f (rec { - libc_0_2_26.default = (f.libc_0_2_26.default or false); - libc_0_2_26.use_std = - (f.libc_0_2_26.use_std or false) || - (memchr_1_0_1.use_std or false) || - (f.memchr_1_0_1.use_std or false); - memchr_1_0_1.default = (f.memchr_1_0_1.default or true); - memchr_1_0_1.use_std = - (f.memchr_1_0_1.use_std or false) || - (f.memchr_1_0_1.default or false) || - (memchr_1_0_1.default or false); - }) [ libc_0_2_26_features ]; - mime_0_3_2 = { features?(mime_0_3_2_features {}) }: mime_0_3_2_ { - dependencies = mapFeatures features ([ unicase_2_0_0 ]); - }; - mime_0_3_2_features = f: updateFeatures f (rec { - mime_0_3_2.default = (f.mime_0_3_2.default or true); - unicase_2_0_0.default = true; - }) [ unicase_2_0_0_features ]; - mio_0_6_9 = { features?(mio_0_6_9_features {}) }: mio_0_6_9_ { - dependencies = mapFeatures features ([ iovec_0_1_0 lazycell_0_4_0 log_0_3_8 net2_0_2_30 slab_0_3_0 ]) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []); - features = mkFeatures (features.mio_0_6_9 or {}); - }; - mio_0_6_9_features = f: updateFeatures f (rec { - iovec_0_1_0.default = true; - kernel32_sys_0_2_2.default = true; - lazycell_0_4_0.default = true; - libc_0_2_26.default = true; - log_0_3_8.default = true; - mio_0_6_9.default = (f.mio_0_6_9.default or true); - mio_0_6_9.with-deprecated = - (f.mio_0_6_9.with-deprecated or false) || - (f.mio_0_6_9.default or false) || - (mio_0_6_9.default or false); - miow_0_2_1.default = true; - net2_0_2_30.default = true; - slab_0_3_0.default = true; - winapi_0_2_8.default = true; - }) [ iovec_0_1_0_features lazycell_0_4_0_features log_0_3_8_features net2_0_2_30_features slab_0_3_0_features libc_0_2_26_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ]; - miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ { - dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_30 winapi_0_2_8 ws2_32_sys_0_2_1 ]); - }; - miow_0_2_1_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = true; - miow_0_2_1.default = (f.miow_0_2_1.default or true); - net2_0_2_30.default = (f.net2_0_2_30.default or false); - winapi_0_2_8.default = true; - ws2_32_sys_0_2_1.default = true; - }) [ kernel32_sys_0_2_2_features net2_0_2_30_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ]; - native_tls_0_1_4 = { features?(native_tls_0_1_4_features {}) }: native_tls_0_1_4_ { - dependencies = (if !(kernel == "windows" || kernel == "darwin") then mapFeatures features ([ openssl_0_9_14 ]) else []) - ++ (if kernel == "darwin" then mapFeatures features ([ security_framework_0_1_14 security_framework_sys_0_1_14 tempdir_0_3_5 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_7 ]) else []); - }; - native_tls_0_1_4_features = f: updateFeatures f (rec { - native_tls_0_1_4.default = (f.native_tls_0_1_4.default or true); - openssl_0_9_14.default = true; - schannel_0_1_7.default = true; - security_framework_0_1_14.OSX_10_8 = true; - security_framework_0_1_14.default = true; - security_framework_sys_0_1_14.default = true; - tempdir_0_3_5.default = true; - }) [ openssl_0_9_14_features security_framework_0_1_14_features security_framework_sys_0_1_14_features tempdir_0_3_5_features schannel_0_1_7_features ]; - net2_0_2_30 = { features?(net2_0_2_30_features {}) }: net2_0_2_30_ { - dependencies = mapFeatures features ([ cfg_if_0_1_2 ]) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ws2_32_sys_0_2_1 ]) else []) - ++ (if kernel == "i686-apple-darwin" then mapFeatures features ([ libc_0_2_26 ]) else []) - ++ (if kernel == "i686-unknown-linux-gnu" then mapFeatures features ([ libc_0_2_26 ]) else []) - ++ (if kernel == "x86_64-apple-darwin" then mapFeatures features ([ libc_0_2_26 ]) else []) - ++ (if kernel == "x86_64-unknown-linux-gnu" then mapFeatures features ([ libc_0_2_26 ]) else []); - features = mkFeatures (features.net2_0_2_30 or {}); - }; - net2_0_2_30_features = f: updateFeatures f (rec { - cfg_if_0_1_2.default = true; - kernel32_sys_0_2_2.default = true; - libc_0_2_26.default = true; - net2_0_2_30.default = (f.net2_0_2_30.default or true); - net2_0_2_30.duration = - (f.net2_0_2_30.duration or false) || - (f.net2_0_2_30.default or false) || - (net2_0_2_30.default or false); - winapi_0_2_8.default = true; - ws2_32_sys_0_2_1.default = true; - }) [ cfg_if_0_1_2_features libc_0_2_26_features kernel32_sys_0_2_2_features winapi_0_2_8_features ws2_32_sys_0_2_1_features libc_0_2_26_features libc_0_2_26_features libc_0_2_26_features libc_0_2_26_features ]; - num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {}; - num_traits_0_1_40_features = f: updateFeatures f (rec { - num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true); - }) []; - num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ { - dependencies = mapFeatures features ([ libc_0_2_26 ]); - }; - num_cpus_1_6_2_features = f: updateFeatures f (rec { - libc_0_2_26.default = true; - num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true); - }) [ libc_0_2_26_features ]; - openssl_0_9_14 = { features?(openssl_0_9_14_features {}) }: openssl_0_9_14_ { - dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_2_0 lazy_static_0_2_8 libc_0_2_26 openssl_sys_0_9_14 ]); - features = mkFeatures (features.openssl_0_9_14 or {}); - }; - openssl_0_9_14_features = f: updateFeatures f (rec { - bitflags_0_9_1.default = true; - foreign_types_0_2_0.default = true; - lazy_static_0_2_8.default = true; - libc_0_2_26.default = true; - openssl_0_9_14.default = (f.openssl_0_9_14.default or true); - openssl_sys_0_9_14.default = true; - }) [ bitflags_0_9_1_features foreign_types_0_2_0_features lazy_static_0_2_8_features libc_0_2_26_features openssl_sys_0_9_14_features ]; - openssl_sys_0_9_14 = { features?(openssl_sys_0_9_14_features {}) }: openssl_sys_0_9_14_ { - dependencies = mapFeatures features ([ libc_0_2_26 ]); - buildDependencies = mapFeatures features ([ gcc_0_3_51 pkg_config_0_3_9 ]); - }; - openssl_sys_0_9_14_features = f: updateFeatures f (rec { - gcc_0_3_51.default = true; - libc_0_2_26.default = true; - openssl_sys_0_9_14.default = (f.openssl_sys_0_9_14.default or true); - pkg_config_0_3_9.default = true; - }) [ libc_0_2_26_features gcc_0_3_51_features pkg_config_0_3_9_features ]; - pad_0_1_4 = { features?(pad_0_1_4_features {}) }: pad_0_1_4_ { - dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); - }; - pad_0_1_4_features = f: updateFeatures f (rec { - pad_0_1_4.default = (f.pad_0_1_4.default or true); - unicode_width_0_1_4.default = true; - }) [ unicode_width_0_1_4_features ]; - percent_encoding_1_0_0 = { features?(percent_encoding_1_0_0_features {}) }: percent_encoding_1_0_0_ {}; - percent_encoding_1_0_0_features = f: updateFeatures f (rec { - percent_encoding_1_0_0.default = (f.percent_encoding_1_0_0.default or true); - }) []; - pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; - pkg_config_0_3_9_features = f: updateFeatures f (rec { - pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); - }) []; - pretty_assertions_0_2_1 = { features?(pretty_assertions_0_2_1_features {}) }: pretty_assertions_0_2_1_ { - dependencies = mapFeatures features ([ difference_1_0_0 ]); - }; - pretty_assertions_0_2_1_features = f: updateFeatures f (rec { - difference_1_0_0.default = true; - pretty_assertions_0_2_1.default = (f.pretty_assertions_0_2_1.default or true); - }) [ difference_1_0_0_features ]; - pulldown_cmark_0_0_3 = { features?(pulldown_cmark_0_0_3_features {}) }: pulldown_cmark_0_0_3_ { - dependencies = mapFeatures features ([ getopts_0_2_14 ]); - }; - pulldown_cmark_0_0_3_features = f: updateFeatures f (rec { - getopts_0_2_14.default = true; - pulldown_cmark_0_0_3.default = (f.pulldown_cmark_0_0_3.default or true); - }) [ getopts_0_2_14_features ]; - quick_error_1_2_0 = { features?(quick_error_1_2_0_features {}) }: quick_error_1_2_0_ {}; - quick_error_1_2_0_features = f: updateFeatures f (rec { - quick_error_1_2_0.default = (f.quick_error_1_2_0.default or true); - }) []; - quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {}; - quote_0_3_15_features = f: updateFeatures f (rec { - quote_0_3_15.default = (f.quote_0_3_15.default or true); - }) []; - rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ { - dependencies = mapFeatures features ([ libc_0_2_26 ]); - }; - rand_0_3_15_features = f: updateFeatures f (rec { - libc_0_2_26.default = true; - rand_0_3_15.default = (f.rand_0_3_15.default or true); - }) [ libc_0_2_26_features ]; - redox_syscall_0_1_26 = { features?(redox_syscall_0_1_26_features {}) }: redox_syscall_0_1_26_ {}; - redox_syscall_0_1_26_features = f: updateFeatures f (rec { - redox_syscall_0_1_26.default = (f.redox_syscall_0_1_26.default or true); - }) []; - regex_0_2_2 = { features?(regex_0_2_2_features {}) }: regex_0_2_2_ { - dependencies = mapFeatures features ([ aho_corasick_0_6_3 memchr_1_0_1 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]); - features = mkFeatures (features.regex_0_2_2 or {}); - }; - regex_0_2_2_features = f: updateFeatures f (rec { - aho_corasick_0_6_3.default = true; - memchr_1_0_1.default = true; - regex_0_2_2.default = (f.regex_0_2_2.default or true); - regex_0_2_2.simd = - (f.regex_0_2_2.simd or false) || - (f.regex_0_2_2.simd-accel or false) || - (regex_0_2_2.simd-accel or false); - regex_syntax_0_4_1.default = true; - thread_local_0_3_4.default = true; - utf8_ranges_1_0_0.default = true; - }) [ aho_corasick_0_6_3_features memchr_1_0_1_features regex_syntax_0_4_1_features thread_local_0_3_4_features utf8_ranges_1_0_0_features ]; - regex_syntax_0_4_1 = { features?(regex_syntax_0_4_1_features {}) }: regex_syntax_0_4_1_ {}; - regex_syntax_0_4_1_features = f: updateFeatures f (rec { - regex_syntax_0_4_1.default = (f.regex_syntax_0_4_1.default or true); - }) []; - reqwest_0_7_1 = { features?(reqwest_0_7_1_features {}) }: reqwest_0_7_1_ { - dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 hyper_0_11_1 hyper_tls_0_1_2 libflate_0_1_10 log_0_3_8 native_tls_0_1_4 serde_1_0_10 serde_json_1_0_2 serde_urlencoded_0_5_1 tokio_core_0_1_8 tokio_io_0_1_2 tokio_tls_0_1_3 url_1_5_1 ]); - features = mkFeatures (features.reqwest_0_7_1 or {}); - }; - reqwest_0_7_1_features = f: updateFeatures f (rec { - bytes_0_4_4.default = true; - futures_0_1_14.default = true; - hyper_0_11_1.default = true; - hyper_tls_0_1_2.default = true; - libflate_0_1_10.default = true; - log_0_3_8.default = true; - native_tls_0_1_4.default = true; - reqwest_0_7_1.default = (f.reqwest_0_7_1.default or true); - serde_1_0_10.default = true; - serde_json_1_0_2.default = true; - serde_urlencoded_0_5_1.default = true; - tokio_core_0_1_8.default = true; - tokio_io_0_1_2.default = true; - tokio_tls_0_1_3.default = true; - url_1_5_1.default = true; - }) [ bytes_0_4_4_features futures_0_1_14_features hyper_0_11_1_features hyper_tls_0_1_2_features libflate_0_1_10_features log_0_3_8_features native_tls_0_1_4_features serde_1_0_10_features serde_json_1_0_2_features serde_urlencoded_0_5_1_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_tls_0_1_3_features url_1_5_1_features ]; - rustc_demangle_0_1_4 = { features?(rustc_demangle_0_1_4_features {}) }: rustc_demangle_0_1_4_ {}; - rustc_demangle_0_1_4_features = f: updateFeatures f (rec { - rustc_demangle_0_1_4.default = (f.rustc_demangle_0_1_4.default or true); - }) []; - rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ { - dependencies = mapFeatures features ([ semver_0_1_20 ]); - }; - rustc_version_0_1_7_features = f: updateFeatures f (rec { - rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true); - semver_0_1_20.default = true; - }) [ semver_0_1_20_features ]; - safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {}; - safemem_0_2_0_features = f: updateFeatures f (rec { - safemem_0_2_0.default = (f.safemem_0_2_0.default or true); - }) []; - schannel_0_1_7 = { features?(schannel_0_1_7_features {}) }: schannel_0_1_7_ { - dependencies = mapFeatures features ([ advapi32_sys_0_2_0 crypt32_sys_0_2_0 kernel32_sys_0_2_2 lazy_static_0_2_8 secur32_sys_0_2_0 winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - schannel_0_1_7_features = f: updateFeatures f (rec { - advapi32_sys_0_2_0.default = true; - crypt32_sys_0_2_0.default = true; - kernel32_sys_0_2_2.default = true; - lazy_static_0_2_8.default = true; - schannel_0_1_7.default = (f.schannel_0_1_7.default or true); - secur32_sys_0_2_0.default = true; - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ advapi32_sys_0_2_0_features crypt32_sys_0_2_0_features kernel32_sys_0_2_2_features lazy_static_0_2_8_features secur32_sys_0_2_0_features winapi_0_2_8_features winapi_build_0_1_1_features ]; - scoped_tls_0_1_0 = { features?(scoped_tls_0_1_0_features {}) }: scoped_tls_0_1_0_ {}; - scoped_tls_0_1_0_features = f: updateFeatures f (rec { - scoped_tls_0_1_0.default = (f.scoped_tls_0_1_0.default or true); - }) []; - secur32_sys_0_2_0 = { features?(secur32_sys_0_2_0_features {}) }: secur32_sys_0_2_0_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - secur32_sys_0_2_0_features = f: updateFeatures f (rec { - secur32_sys_0_2_0.default = (f.secur32_sys_0_2_0.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - security_framework_0_1_14 = { features?(security_framework_0_1_14_features {}) }: security_framework_0_1_14_ { - dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_26 security_framework_sys_0_1_14 ]); - features = mkFeatures (features.security_framework_0_1_14 or {}); - }; - security_framework_0_1_14_features = f: updateFeatures f (rec { - core_foundation_0_2_3.default = true; - core_foundation_sys_0_2_3.default = true; - libc_0_2_26.default = true; - security_framework_0_1_14.OSX_10_10 = - (f.security_framework_0_1_14.OSX_10_10 or false) || - (f.security_framework_0_1_14.OSX_10_11 or false) || - (security_framework_0_1_14.OSX_10_11 or false); - security_framework_0_1_14.OSX_10_8 = - (f.security_framework_0_1_14.OSX_10_8 or false) || - (f.security_framework_0_1_14.OSX_10_9 or false) || - (security_framework_0_1_14.OSX_10_9 or false); - security_framework_0_1_14.OSX_10_9 = - (f.security_framework_0_1_14.OSX_10_9 or false) || - (f.security_framework_0_1_14.OSX_10_10 or false) || - (security_framework_0_1_14.OSX_10_10 or false); - security_framework_0_1_14.default = (f.security_framework_0_1_14.default or true); - security_framework_sys_0_1_14.OSX_10_10 = - (f.security_framework_sys_0_1_14.OSX_10_10 or false) || - (security_framework_0_1_14.OSX_10_10 or false) || - (f.security_framework_0_1_14.OSX_10_10 or false); - security_framework_sys_0_1_14.OSX_10_11 = - (f.security_framework_sys_0_1_14.OSX_10_11 or false) || - (security_framework_0_1_14.OSX_10_11 or false) || - (f.security_framework_0_1_14.OSX_10_11 or false); - security_framework_sys_0_1_14.OSX_10_8 = - (f.security_framework_sys_0_1_14.OSX_10_8 or false) || - (security_framework_0_1_14.OSX_10_8 or false) || - (f.security_framework_0_1_14.OSX_10_8 or false); - security_framework_sys_0_1_14.OSX_10_9 = - (f.security_framework_sys_0_1_14.OSX_10_9 or false) || - (security_framework_0_1_14.OSX_10_9 or false) || - (f.security_framework_0_1_14.OSX_10_9 or false); - security_framework_sys_0_1_14.default = true; - }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_26_features security_framework_sys_0_1_14_features ]; - security_framework_sys_0_1_14 = { features?(security_framework_sys_0_1_14_features {}) }: security_framework_sys_0_1_14_ { - dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_26 ]); - features = mkFeatures (features.security_framework_sys_0_1_14 or {}); - }; - security_framework_sys_0_1_14_features = f: updateFeatures f (rec { - core_foundation_sys_0_2_3.default = true; - libc_0_2_26.default = true; - security_framework_sys_0_1_14.OSX_10_10 = - (f.security_framework_sys_0_1_14.OSX_10_10 or false) || - (f.security_framework_sys_0_1_14.OSX_10_11 or false) || - (security_framework_sys_0_1_14.OSX_10_11 or false); - security_framework_sys_0_1_14.OSX_10_8 = - (f.security_framework_sys_0_1_14.OSX_10_8 or false) || - (f.security_framework_sys_0_1_14.OSX_10_9 or false) || - (security_framework_sys_0_1_14.OSX_10_9 or false); - security_framework_sys_0_1_14.OSX_10_9 = - (f.security_framework_sys_0_1_14.OSX_10_9 or false) || - (f.security_framework_sys_0_1_14.OSX_10_10 or false) || - (security_framework_sys_0_1_14.OSX_10_10 or false); - security_framework_sys_0_1_14.default = (f.security_framework_sys_0_1_14.default or true); - }) [ core_foundation_sys_0_2_3_features libc_0_2_26_features ]; - semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {}; - semver_0_1_20_features = f: updateFeatures f (rec { - semver_0_1_20.default = (f.semver_0_1_20.default or true); - }) []; - semver_0_7_0 = { features?(semver_0_7_0_features {}) }: semver_0_7_0_ { - dependencies = mapFeatures features ([ semver_parser_0_7_0 ] - ++ (if features.semver_0_7_0.serde or false then [ serde_1_0_10 ] else [])); - features = mkFeatures (features.semver_0_7_0 or {}); - }; - semver_0_7_0_features = f: updateFeatures f (rec { - semver_0_7_0.default = (f.semver_0_7_0.default or true); - semver_0_7_0.serde = - (f.semver_0_7_0.serde or false) || - (f.semver_0_7_0.ci or false) || - (semver_0_7_0.ci or false); - semver_parser_0_7_0.default = true; - serde_1_0_10.default = true; - }) [ semver_parser_0_7_0_features serde_1_0_10_features ]; - semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; - semver_parser_0_7_0_features = f: updateFeatures f (rec { - semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); - }) []; - serde_1_0_10 = { features?(serde_1_0_10_features {}) }: serde_1_0_10_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_10 or {}); - }; - serde_1_0_10_features = f: updateFeatures f (rec { - serde_1_0_10.default = (f.serde_1_0_10.default or true); - serde_1_0_10.serde_derive = - (f.serde_1_0_10.serde_derive or false) || - (f.serde_1_0_10.derive or false) || - (serde_1_0_10.derive or false) || - (f.serde_1_0_10.playground or false) || - (serde_1_0_10.playground or false); - serde_1_0_10.std = - (f.serde_1_0_10.std or false) || - (f.serde_1_0_10.default or false) || - (serde_1_0_10.default or false); - serde_1_0_10.unstable = - (f.serde_1_0_10.unstable or false) || - (f.serde_1_0_10.alloc or false) || - (serde_1_0_10.alloc or false); - }) []; - serde_derive_1_0_10 = { features?(serde_derive_1_0_10_features {}) }: serde_derive_1_0_10_ { - dependencies = mapFeatures features ([ quote_0_3_15 serde_derive_internals_0_15_1 syn_0_11_11 ]); - }; - serde_derive_1_0_10_features = f: updateFeatures f (rec { - quote_0_3_15.default = true; - serde_derive_1_0_10.default = (f.serde_derive_1_0_10.default or true); - serde_derive_internals_0_15_1.default = (f.serde_derive_internals_0_15_1.default or false); - syn_0_11_11.default = true; - syn_0_11_11.visit = true; - }) [ quote_0_3_15_features serde_derive_internals_0_15_1_features syn_0_11_11_features ]; - serde_derive_internals_0_15_1 = { features?(serde_derive_internals_0_15_1_features {}) }: serde_derive_internals_0_15_1_ { - dependencies = mapFeatures features ([ syn_0_11_11 synom_0_11_3 ]); - }; - serde_derive_internals_0_15_1_features = f: updateFeatures f (rec { - serde_derive_internals_0_15_1.default = (f.serde_derive_internals_0_15_1.default or true); - syn_0_11_11.default = (f.syn_0_11_11.default or false); - syn_0_11_11.parsing = true; - synom_0_11_3.default = true; - }) [ syn_0_11_11_features synom_0_11_3_features ]; - serde_json_1_0_2 = { features?(serde_json_1_0_2_features {}) }: serde_json_1_0_2_ { - dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_40 serde_1_0_10 ]); - features = mkFeatures (features.serde_json_1_0_2 or {}); - }; - serde_json_1_0_2_features = f: updateFeatures f (rec { - dtoa_0_4_1.default = true; - itoa_0_3_1.default = true; - num_traits_0_1_40.default = true; - serde_1_0_10.default = true; - serde_json_1_0_2.default = (f.serde_json_1_0_2.default or true); - serde_json_1_0_2.linked-hash-map = - (f.serde_json_1_0_2.linked-hash-map or false) || - (f.serde_json_1_0_2.preserve_order or false) || - (serde_json_1_0_2.preserve_order or false); - }) [ dtoa_0_4_1_features itoa_0_3_1_features num_traits_0_1_40_features serde_1_0_10_features ]; - serde_urlencoded_0_5_1 = { features?(serde_urlencoded_0_5_1_features {}) }: serde_urlencoded_0_5_1_ { - dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 serde_1_0_10 url_1_5_1 ]); - }; - serde_urlencoded_0_5_1_features = f: updateFeatures f (rec { - dtoa_0_4_1.default = true; - itoa_0_3_1.default = true; - serde_1_0_10.default = true; - serde_urlencoded_0_5_1.default = (f.serde_urlencoded_0_5_1.default or true); - url_1_5_1.default = true; - }) [ dtoa_0_4_1_features itoa_0_3_1_features serde_1_0_10_features url_1_5_1_features ]; - skeptic_0_5_0 = { features?(skeptic_0_5_0_features {}) }: skeptic_0_5_0_ { - dependencies = mapFeatures features ([ pulldown_cmark_0_0_3 tempdir_0_3_5 ]); - }; - skeptic_0_5_0_features = f: updateFeatures f (rec { - pulldown_cmark_0_0_3.default = true; - skeptic_0_5_0.default = (f.skeptic_0_5_0.default or true); - tempdir_0_3_5.default = true; - }) [ pulldown_cmark_0_0_3_features tempdir_0_3_5_features ]; - slab_0_3_0 = { features?(slab_0_3_0_features {}) }: slab_0_3_0_ {}; - slab_0_3_0_features = f: updateFeatures f (rec { - slab_0_3_0.default = (f.slab_0_3_0.default or true); - }) []; - smallvec_0_2_1 = { features?(smallvec_0_2_1_features {}) }: smallvec_0_2_1_ {}; - smallvec_0_2_1_features = f: updateFeatures f (rec { - smallvec_0_2_1.default = (f.smallvec_0_2_1.default or true); - }) []; - strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; - strsim_0_6_0_features = f: updateFeatures f (rec { - strsim_0_6_0.default = (f.strsim_0_6_0.default or true); - }) []; - syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ { - dependencies = mapFeatures features ([ ] - ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else []) - ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else []) - ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else [])); - features = mkFeatures (features.syn_0_11_11 or {}); - }; - syn_0_11_11_features = f: updateFeatures f (rec { - quote_0_3_15.default = true; - syn_0_11_11.default = (f.syn_0_11_11.default or true); - syn_0_11_11.parsing = - (f.syn_0_11_11.parsing or false) || - (f.syn_0_11_11.default or false) || - (syn_0_11_11.default or false); - syn_0_11_11.printing = - (f.syn_0_11_11.printing or false) || - (f.syn_0_11_11.default or false) || - (syn_0_11_11.default or false); - syn_0_11_11.quote = - (f.syn_0_11_11.quote or false) || - (f.syn_0_11_11.printing or false) || - (syn_0_11_11.printing or false); - syn_0_11_11.synom = - (f.syn_0_11_11.synom or false) || - (f.syn_0_11_11.parsing or false) || - (syn_0_11_11.parsing or false); - syn_0_11_11.unicode-xid = - (f.syn_0_11_11.unicode-xid or false) || - (f.syn_0_11_11.parsing or false) || - (syn_0_11_11.parsing or false); - synom_0_11_3.default = true; - unicode_xid_0_0_4.default = true; - }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; - synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ { - dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]); - }; - synom_0_11_3_features = f: updateFeatures f (rec { - synom_0_11_3.default = (f.synom_0_11_3.default or true); - unicode_xid_0_0_4.default = true; - }) [ unicode_xid_0_0_4_features ]; - take_0_1_0 = { features?(take_0_1_0_features {}) }: take_0_1_0_ {}; - take_0_1_0_features = f: updateFeatures f (rec { - take_0_1_0.default = (f.take_0_1_0.default or true); - }) []; - tempdir_0_3_5 = { features?(tempdir_0_3_5_features {}) }: tempdir_0_3_5_ { - dependencies = mapFeatures features ([ rand_0_3_15 ]); - }; - tempdir_0_3_5_features = f: updateFeatures f (rec { - rand_0_3_15.default = true; - tempdir_0_3_5.default = (f.tempdir_0_3_5.default or true); - }) [ rand_0_3_15_features ]; - thread_local_0_3_4 = { features?(thread_local_0_3_4_features {}) }: thread_local_0_3_4_ { - dependencies = mapFeatures features ([ lazy_static_0_2_8 unreachable_1_0_0 ]); - }; - thread_local_0_3_4_features = f: updateFeatures f (rec { - lazy_static_0_2_8.default = true; - thread_local_0_3_4.default = (f.thread_local_0_3_4.default or true); - unreachable_1_0_0.default = true; - }) [ lazy_static_0_2_8_features unreachable_1_0_0_features ]; - time_0_1_38 = { features?(time_0_1_38_features {}) }: time_0_1_38_ { - dependencies = mapFeatures features ([ libc_0_2_26 ]) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_26 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); - }; - time_0_1_38_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = true; - libc_0_2_26.default = true; - redox_syscall_0_1_26.default = true; - time_0_1_38.default = (f.time_0_1_38.default or true); - winapi_0_2_8.default = true; - }) [ libc_0_2_26_features redox_syscall_0_1_26_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; - tokio_core_0_1_8 = { features?(tokio_core_0_1_8_features {}) }: tokio_core_0_1_8_ { - dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 iovec_0_1_0 log_0_3_8 mio_0_6_9 scoped_tls_0_1_0 slab_0_3_0 tokio_io_0_1_2 ]); - }; - tokio_core_0_1_8_features = f: updateFeatures f (rec { - bytes_0_4_4.default = true; - futures_0_1_14.default = true; - iovec_0_1_0.default = true; - log_0_3_8.default = true; - mio_0_6_9.default = true; - scoped_tls_0_1_0.default = true; - slab_0_3_0.default = true; - tokio_core_0_1_8.default = (f.tokio_core_0_1_8.default or true); - tokio_io_0_1_2.default = true; - }) [ bytes_0_4_4_features futures_0_1_14_features iovec_0_1_0_features log_0_3_8_features mio_0_6_9_features scoped_tls_0_1_0_features slab_0_3_0_features tokio_io_0_1_2_features ]; - tokio_io_0_1_2 = { features?(tokio_io_0_1_2_features {}) }: tokio_io_0_1_2_ { - dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 log_0_3_8 ]); - }; - tokio_io_0_1_2_features = f: updateFeatures f (rec { - bytes_0_4_4.default = true; - futures_0_1_14.default = true; - log_0_3_8.default = true; - tokio_io_0_1_2.default = (f.tokio_io_0_1_2.default or true); - }) [ bytes_0_4_4_features futures_0_1_14_features log_0_3_8_features ]; - tokio_proto_0_1_1 = { features?(tokio_proto_0_1_1_features {}) }: tokio_proto_0_1_1_ { - dependencies = mapFeatures features ([ futures_0_1_14 log_0_3_8 net2_0_2_30 rand_0_3_15 slab_0_3_0 smallvec_0_2_1 take_0_1_0 tokio_core_0_1_8 tokio_io_0_1_2 tokio_service_0_1_0 ]); - }; - tokio_proto_0_1_1_features = f: updateFeatures f (rec { - futures_0_1_14.default = true; - log_0_3_8.default = true; - net2_0_2_30.default = true; - rand_0_3_15.default = true; - slab_0_3_0.default = true; - smallvec_0_2_1.default = true; - take_0_1_0.default = true; - tokio_core_0_1_8.default = true; - tokio_io_0_1_2.default = true; - tokio_proto_0_1_1.default = (f.tokio_proto_0_1_1.default or true); - tokio_service_0_1_0.default = true; - }) [ futures_0_1_14_features log_0_3_8_features net2_0_2_30_features rand_0_3_15_features slab_0_3_0_features smallvec_0_2_1_features take_0_1_0_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_service_0_1_0_features ]; - tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ { - dependencies = mapFeatures features ([ futures_0_1_14 ]); - }; - tokio_service_0_1_0_features = f: updateFeatures f (rec { - futures_0_1_14.default = true; - tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true); - }) [ futures_0_1_14_features ]; - tokio_tls_0_1_3 = { features?(tokio_tls_0_1_3_features {}) }: tokio_tls_0_1_3_ { - dependencies = mapFeatures features ([ futures_0_1_14 native_tls_0_1_4 tokio_core_0_1_8 tokio_io_0_1_2 ]) - ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else []) - ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else []) - ++ (if kernel == "windows" then mapFeatures features ([]) else []); - }; - tokio_tls_0_1_3_features = f: updateFeatures f (rec { - futures_0_1_14.default = true; - native_tls_0_1_4.default = true; - tokio_core_0_1_8.default = true; - tokio_io_0_1_2.default = true; - tokio_tls_0_1_3.default = (f.tokio_tls_0_1_3.default or true); - }) [ futures_0_1_14_features native_tls_0_1_4_features tokio_core_0_1_8_features tokio_io_0_1_2_features ]; - toml_0_4_2 = { features?(toml_0_4_2_features {}) }: toml_0_4_2_ { - dependencies = mapFeatures features ([ serde_1_0_10 ]); - }; - toml_0_4_2_features = f: updateFeatures f (rec { - serde_1_0_10.default = true; - toml_0_4_2.default = (f.toml_0_4_2.default or true); - }) [ serde_1_0_10_features ]; - unicase_2_0_0 = { features?(unicase_2_0_0_features {}) }: unicase_2_0_0_ { - buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]); - features = mkFeatures (features.unicase_2_0_0 or {}); - }; - unicase_2_0_0_features = f: updateFeatures f (rec { - rustc_version_0_1_7.default = true; - unicase_2_0_0.default = (f.unicase_2_0_0.default or true); - }) [ rustc_version_0_1_7_features ]; - unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ { - dependencies = mapFeatures features ([ matches_0_1_6 ]); - features = mkFeatures (features.unicode_bidi_0_3_4 or {}); - }; - unicode_bidi_0_3_4_features = f: updateFeatures f (rec { - matches_0_1_6.default = true; - unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true); - unicode_bidi_0_3_4.flame = - (f.unicode_bidi_0_3_4.flame or false) || - (f.unicode_bidi_0_3_4.flame_it or false) || - (unicode_bidi_0_3_4.flame_it or false); - unicode_bidi_0_3_4.flamer = - (f.unicode_bidi_0_3_4.flamer or false) || - (f.unicode_bidi_0_3_4.flame_it or false) || - (unicode_bidi_0_3_4.flame_it or false); - unicode_bidi_0_3_4.serde = - (f.unicode_bidi_0_3_4.serde or false) || - (f.unicode_bidi_0_3_4.with_serde or false) || - (unicode_bidi_0_3_4.with_serde or false); - }) [ matches_0_1_6_features ]; - unicode_normalization_0_1_5 = { features?(unicode_normalization_0_1_5_features {}) }: unicode_normalization_0_1_5_ {}; - unicode_normalization_0_1_5_features = f: updateFeatures f (rec { - unicode_normalization_0_1_5.default = (f.unicode_normalization_0_1_5.default or true); - }) []; - unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { - features = mkFeatures (features.unicode_width_0_1_4 or {}); - }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { - unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); - }) []; - unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ { - features = mkFeatures (features.unicode_xid_0_0_4 or {}); - }; - unicode_xid_0_0_4_features = f: updateFeatures f (rec { - unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true); - }) []; - unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { - dependencies = mapFeatures features ([ void_1_0_2 ]); - }; - unreachable_1_0_0_features = f: updateFeatures f (rec { - unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); - void_1_0_2.default = (f.void_1_0_2.default or false); - }) [ void_1_0_2_features ]; - url_1_5_1 = { features?(url_1_5_1_features {}) }: url_1_5_1_ { - dependencies = mapFeatures features ([ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_0 ]); - features = mkFeatures (features.url_1_5_1 or {}); - }; - url_1_5_1_features = f: updateFeatures f (rec { - idna_0_1_4.default = true; - matches_0_1_6.default = true; - percent_encoding_1_0_0.default = true; - url_1_5_1.default = (f.url_1_5_1.default or true); - url_1_5_1.encoding = - (f.url_1_5_1.encoding or false) || - (f.url_1_5_1.query_encoding or false) || - (url_1_5_1.query_encoding or false); - url_1_5_1.heapsize = - (f.url_1_5_1.heapsize or false) || - (f.url_1_5_1.heap_size or false) || - (url_1_5_1.heap_size or false); - }) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_0_features ]; - utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; - utf8_ranges_1_0_0_features = f: updateFeatures f (rec { - utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); - }) []; - void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { - features = mkFeatures (features.void_1_0_2 or {}); - }; - void_1_0_2_features = f: updateFeatures f (rec { - void_1_0_2.default = (f.void_1_0_2.default or true); - void_1_0_2.std = - (f.void_1_0_2.std or false) || - (f.void_1_0_2.default or false) || - (void_1_0_2.default or false); - }) []; - winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { - winapi_0_2_8.default = (f.winapi_0_2_8.default or true); - }) []; - winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { - winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); - }) []; - ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - ws2_32_sys_0_2_1_features = f: updateFeatures f (rec { - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true); - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; -} diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 37f543b66b64..19c08541ea60 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -1,16 +1,17 @@ -{ stdenv, pkgs, darwin, defaultCrateOverrides, fetchFromGitHub }: +{ stdenv, lib, buildPlatform, fetchgit, fetchFromGitHub, darwin +, buildRustCrate, defaultCrateOverrides }: -((import ./cargo-edit.nix { inherit pkgs; }).cargo_edit {}).override { +((import ./Cargo.nix { inherit lib buildPlatform buildRustCrate fetchgit; }).cargo_edit {}).override { crateOverrides = defaultCrateOverrides // { cargo-edit = attrs: rec { name = "cargo-edit-${version}"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "killercup"; repo = "cargo-edit"; rev = "v${version}"; - sha256 = "1jxppbb7s50pwg24qxf79fqvm1clwm2zdnv0xlkay7y05nd5bc0c"; + sha256 = "0ngxyzqy5pfc0fqbvqw7kd40jhqzp67qvpzvh3yggk9yxa1jzsp0"; }; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From c9fcabcf4b268a6e0d49c16b0045c193dd4f1477 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 5 Sep 2018 14:34:58 +0000 Subject: [PATCH 093/600] nix: fix a tiny option bug --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index edb78d1b63a8..74e3963b733f 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -74,7 +74,7 @@ let stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system ) ''--with-system=${stdenv.hostPlatform.nix.system}'' # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 - ++ lib.optional (!libseccomp.meta.available) "--disable-seccomp-sandboxing"; + ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; makeFlags = "profiledir=$(out)/etc/profile.d"; From bf0cec40ca6bcf88c92c8549ca9d4cffa8374ae5 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 5 Sep 2018 16:35:12 +0200 Subject: [PATCH 094/600] qutebrowser: 1.4.1 -> 1.4.2 (#46096) --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 47a273e99f98..5ffb8a076bc8 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -28,12 +28,12 @@ let in python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.4.1"; + version = "1.4.2"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0n2z92vb91gpfchdm9wsm712r9grbvxwdp4npl5c1nbq247dxwm3"; + sha256 = "1pnj47mllg1x34qakxs7s59x8mj262nfhdxgihsb2h2ywjq4fpgx"; }; # Needs tox From 4e735835e01a85ba29a6e1a8b5161e4a495e42da Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 5 Sep 2018 14:35:15 +0000 Subject: [PATCH 095/600] nix: make AWS support optional --- pkgs/tools/package-management/nix/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 74e3963b733f..7b4517624164 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost +, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , busybox-sandbox-shell , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" , withLibseccomp ? libseccomp.meta.available, libseccomp +, withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp }: let @@ -31,7 +32,7 @@ let ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals is20 [ brotli boost ] ++ lib.optional withLibseccomp libseccomp - ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) + ++ lib.optional (withAWS && is20) ((aws-sdk-cpp.override { apis = ["s3" "transfer"]; customMemoryManagement = false; From ba52f4cb76cbc8cc877077bd19c1ab3811c244e6 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 5 Sep 2018 16:48:14 +0200 Subject: [PATCH 096/600] statsd: mark broken, disable nixos test (#46097) It's broken with node v8 and the upstream project is dead (last commit Nov. 2016), see #45946 and https://github.com/etsy/statsd/issues/646 --- nixos/release.nix | 2 +- pkgs/development/node-packages/default-v8.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 17f51d977c98..0fd8d694641f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -399,7 +399,7 @@ in rec { tests.slurm = callTest tests/slurm.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; tests.snapper = callTest tests/snapper.nix {}; - tests.statsd = callTest tests/statsd.nix {}; + #tests.statsd = callTest tests/statsd.nix {}; # statsd is broken: #45946 tests.strongswan-swanctl = callTest tests/strongswan-swanctl.nix {}; tests.sudo = callTest tests/sudo.nix {}; tests.systemd = callTest tests/systemd.nix {}; diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index 3b7182e27b37..e67a91b90a14 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -77,6 +77,12 @@ nodePackages // { ''; }; + statsd = nodePackages.statsd.override { + # broken with node v8, dead upstream, + # see #45946 and https://github.com/etsy/statsd/issues/646 + meta.broken = true; + }; + webdrvr = nodePackages.webdrvr.override { buildInputs = [ pkgs.phantomjs ]; From 11e2009821decf55aa20589447076aab5f998464 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 6 Sep 2018 00:11:02 +0900 Subject: [PATCH 097/600] haskellPackages.tensorflow-mnist-input-data: fetch Prefetch data so that the package doesn't try to connect to the internet. --- .../configuration-tensorflow.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index dfc93686405c..d1ca474ba4f4 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -62,6 +62,30 @@ in { mkDerivation, base, bytestring, Cabal, cryptonite, directory , filepath, HTTP, network-uri, stdenv }: + + let + urlPrefix = "http://yann.lecun.com/exdb/mnist/"; + + # File names relative to 'urlPrefix' and their sha256. + fileInfos = [ + [ "train-images-idx3-ubyte.gz" + "440fcabf73cc546fa21475e81ea370265605f56be210a4024d2ca8f203523609" + ] + + [ "train-labels-idx1-ubyte.gz" + "3552534a0a558bbed6aed32b30c495cca23d567ec52cac8be1a0730e8010255c" + ] + + [ "t10k-images-idx3-ubyte.gz" + "8d422c7b0a1c1c79245a5bcf07fe86e33eeafee792b84584aec276f5a2dbc4e6" + ] + + [ "t10k-labels-idx1-ubyte.gz" + "f7ae60f92e00ec6debd23a6088c31dbd2371eca3ffa0defaefb259924204aec6" + ] + ]; + downloads = map (x: pkgs.fetchurl { url = urlPrefix + builtins.head x; sha256= builtins.tail x;}) fileInfos; + in mkDerivation { pname = "tensorflow-mnist-input-data"; version = "0.1.0.0"; @@ -71,6 +95,9 @@ in base bytestring Cabal cryptonite directory filepath HTTP network-uri ]; + preConfigure = pkgs.lib.strings.concatStringsSep "\n" ( + map (x: "cp ${x} data/$(stripHash ${x})") downloads + ); libraryHaskellDepends = [ base ]; homepage = "https://github.com/tensorflow/haskell#readme"; description = "Downloader of input data for training MNIST"; From 51907d257cac16eb7d45a3a35a57bad69bbe8c46 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 5 Sep 2018 11:40:29 -0400 Subject: [PATCH 098/600] stdenv, neovim: Use `lib.warn` for deprecation warnings --- pkgs/applications/editors/neovim/wrapper.nix | 2 +- pkgs/stdenv/generic/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 17cf49521f1d..568043f96687 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -30,7 +30,7 @@ let /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */ compatFun = funOrList: (if builtins.isList funOrList then - (_: builtins.trace "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList) + (_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList) else funOrList); extraPythonPackagesFun = compatFun extraPythonPackages; extraPython3PackagesFun = compatFun extraPython3Packages; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index f5da78807106..ac727034b8e7 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -123,7 +123,7 @@ let inherit (hostPlatform) isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; - isArm = builtins.trace + isArm = lib.warn "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead" hostPlatform.isAarch32; From e51f736076548459f36a1250de4bf6867f880b66 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 27 Aug 2018 14:39:58 -0400 Subject: [PATCH 099/600] top-level: Deprecate top-level `{build,host,target}Platform` I don't know when we can/should remove them, but this at least gets people to stop using them. The preferred alternatives also date back to 17.09 so writing forward-compatable code without extra conditions is easy. Beginning with these as they are the least controversial. --- doc/cross-compilation.xml | 10 +++------- pkgs/top-level/stage.nix | 16 +++++++++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 3b90596bcc2c..c7187d86d1b3 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -47,13 +47,9 @@ In Nixpkgs, these three platforms are defined as attribute sets under the - names buildPlatform, hostPlatform, - and targetPlatform. All three are always defined as - attributes in the standard environment, and at the top level. That means - one can get at them just like a dependency in a function that is imported - with callPackage: -{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform... - , or just off stdenv: + names buildPlatform, hostPlatform, and + targetPlatform. They are always defined as attributes in + the standard environment. That means one can access them like: { stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform... . diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 06978d1067bf..5ca8b72b8b8e 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -79,11 +79,17 @@ let # The old identifiers for cross-compiling. These should eventually be removed, # and the packages that rely on them refactored accordingly. - platformCompat = self: super: let - inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; - in { - inherit buildPlatform hostPlatform targetPlatform; - inherit (buildPlatform) system; + platformCompat = self: super: { + buildPlatform = lib.warn + "top-level `buildPlatform` is deprecated since 18.09. Please use `stdenv.buildPlatform`." + super.stdenv.buildPlatform; + hostPlatform = lib.warn + "top-level `hostPlatform` is deprecated since 18.09. Please use `stdenv.hostPlatform`." + super.stdenv.hostPlatform; + targetPlatform = lib.warn + "top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`." + super.stdenv.targetPlatform; + inherit (super.stdenv.buildPlatform) system; }; splice = self: super: import ./splice.nix lib self (buildPackages != null); From a9a380b259df806bb351a2c4a013ed7858813988 Mon Sep 17 00:00:00 2001 From: Jethro Kuan Date: Thu, 6 Sep 2018 00:38:23 +0800 Subject: [PATCH 100/600] pythonPackages.tflearn: 0.2.1 -> 0.3.2 (#46102) --- .../python-modules/tflearn/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/tflearn/default.nix diff --git a/pkgs/development/python-modules/tflearn/default.nix b/pkgs/development/python-modules/tflearn/default.nix new file mode 100644 index 000000000000..341c1da56801 --- /dev/null +++ b/pkgs/development/python-modules/tflearn/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage, fetchurl, pytest, scipy, h5py +, pillow, tensorflow }: + +buildPythonPackage rec { + pname = "tflearn"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "034lvbslcivyj64r4w6xmr90ckmyxmrnkka9kal50x4175h02n1z"; + }; + + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ scipy h5py pillow tensorflow ]; + + doCheck = false; + + meta = with lib; { + description = "Deep learning library featuring a higher-level API for TensorFlow"; + homepage = "https://github.com/tflearn/tflearn"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ef8626d72ed..9b98a1af7891 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16809,22 +16809,7 @@ EOF cudaSupport = true; }; - tflearn = buildPythonPackage rec { - name = "tflearn-0.2.1"; - - meta = { - description = "Deep learning library featuring a higher-level API for TensorFlow"; - homepage = "https://github.com/tflearn/tflearn"; - license = licenses.mit; - }; - - propagatedBuildInputs = with self; [ scipy h5py pillow tensorflow ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tflearn/${name}.tar.gz"; - sha256 = "1n884c4j35409id2bncyj5fvmmfpdqj3pk6wrv0s1znnvs0lkii0"; - }; - }; + tflearn = callPackage ../development/python-modules/tflearn { }; simpleai = buildPythonPackage rec { version = "0.7.11"; From 2ad99bcc82050fc9cdcfca7b582386394c30b316 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 5 Sep 2018 00:28:02 +0000 Subject: [PATCH 101/600] texinfo: fix perl issues by applying patches from upstream --- .../development/tools/misc/texinfo/common.nix | 3 ++ .../development/tools/misc/texinfo/perl.patch | 43 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/tools/misc/texinfo/perl.patch diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 101298cd3052..c6877ed4d1a1 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { inherit sha256; }; + # TODO: fix on mass rebuild + ${if interactive then "patches" else null} = optional (version == "6.5") ./perl.patch; + # We need a native compiler to build perl XS extensions # when cross-compiling. depsBuildBuild = [ buildPackages.stdenv.cc perl ]; diff --git a/pkgs/development/tools/misc/texinfo/perl.patch b/pkgs/development/tools/misc/texinfo/perl.patch new file mode 100644 index 000000000000..e651b37371c7 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/perl.patch @@ -0,0 +1,43 @@ +Adapted from http://svn.savannah.gnu.org/viewvc/texinfo/ +Author: gavin +--- trunk/tp/Texinfo/Parser.pm 2018-06-04 19:51:36 UTC (rev 8006) ++++ trunk/tp/Texinfo/Parser.pm 2018-07-13 15:31:28 UTC (rev 8007) +@@ -5531,11 +5531,11 @@ + } + } elsif ($command eq 'clickstyle') { + # REMACRO +- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { ++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) { + $args = ['@'.$1]; + $self->{'clickstyle'} = $1; + $remaining = $line; +- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; ++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//; + $has_comment = 1 if (defined($4)); + } else { + $self->line_error (sprintf($self->__( +--- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:31:28 UTC (rev 8007) ++++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:39:29 UTC (rev 8008) +@@ -248,6 +248,11 @@ + + dTHX; + ++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) ++ /* needed due to thread-safe locale handling in newer perls */ ++ switch_to_global_locale(); ++#endif ++ + if (setlocale (LC_CTYPE, "en_US.UTF-8") + || setlocale (LC_CTYPE, "en_US.utf8")) + goto success; +@@ -320,6 +325,10 @@ + { + success: ; + free (utf8_locale); ++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) ++ /* needed due to thread-safe locale handling in newer perls */ ++ sync_locale(); ++#endif + /* + fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n"); + fprintf (stderr, "character encoding is: %s\n", From 0b89ece569b44635404c019fe090711549853371 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 4 Sep 2018 21:53:19 +0000 Subject: [PATCH 102/600] Revert "texinfoInteractive: fixup build by using older perl" This reverts commit 7a22083e1271869294a074cbe7a971f2d8abb4f4. --- pkgs/top-level/all-packages.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f563f0dfe243..67385abb505b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8743,13 +8743,9 @@ with pkgs; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; texinfo = texinfo6; - texinfoInteractive = appendToName "interactive" (texinfo.override { - interactive = true; - # doCheck = true -> some xlocale.h problem with perl 5.28.0 - # (it's mistakenly trying to include the non-existent header) - perl = perl526; - buildPackages = buildPackages // { perl = buildPackages.perl526; }; - }); + texinfoInteractive = appendToName "interactive" ( + texinfo.override { interactive = true; } + ); texi2html = callPackage ../development/tools/misc/texi2html { }; From eadb7b1589ddc11dadf98daab3fd82f2074fa12c Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Wed, 5 Sep 2018 19:06:18 +0200 Subject: [PATCH 103/600] qutebrowser: patch scripts (#37316) --- .../networking/browsers/qutebrowser/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 5ffb8a076bc8..a3b6c0364169 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -71,15 +71,26 @@ in python3Packages.buildPythonApplication rec { install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" install -Dm644 misc/qutebrowser.desktop \ "$out/share/applications/qutebrowser.desktop" + + # Install icons for i in 16 24 32 48 64 128 256 512; do install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \ "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png" done install -Dm644 icons/qutebrowser.svg \ "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" + + # Install scripts + sed -i "s,/usr/bin/qutebrowser,$out/bin/qutebrowser,g" scripts/open_url_in_instance.sh + install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/open_url_in_instance.sh install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* - install -Dm755 -t "$out/share/qutebrowser/scripts/" \ - scripts/{importer.py,dictcli.py,keytester.py,open_url_in_instance.sh,utils.py} + + # Install and patch python scripts + buildPythonPath "$out $propagatedBuildInputs" + for i in importer dictcli keytester utils; do + install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/$i.py + patchPythonScript "$out/share/qutebrowser/scripts/$i.py" + done ''; postFixup = lib.optionalString (! withWebEngineDefault) '' From f0a0ccabcc51ccee0884c6a1656c2de07750feef Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 5 Sep 2018 17:12:13 +0000 Subject: [PATCH 104/600] ocamlPackages.seq: init at 0.1 --- .../development/ocaml-modules/seq/default.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/seq/default.nix diff --git a/pkgs/development/ocaml-modules/seq/default.nix b/pkgs/development/ocaml-modules/seq/default.nix new file mode 100644 index 000000000000..f4918b420c40 --- /dev/null +++ b/pkgs/development/ocaml-modules/seq/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation rec { + version = "0.1"; + name = "ocaml${ocaml.version}-seq-${version}"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "seq"; + rev = version; + sha256 = "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + meta = { + description = "Compatibility package for OCaml’s standard iterator type starting from 4.07"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7b6af70ebcf9..f5e5cfb3972b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -564,6 +564,8 @@ let result = callPackage ../development/ocaml-modules/ocaml-result { }; + seq = callPackage ../development/ocaml-modules/seq { }; + sequence = callPackage ../development/ocaml-modules/sequence { }; spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; From 48708a9c43edfef3e8ef479df641bf5be0216f46 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 5 Sep 2018 17:14:47 +0000 Subject: [PATCH 105/600] ocamlPackages.re: 1.7.3 -> 1.8.0 --- pkgs/development/ocaml-modules/re/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index c6f1b6d17581..4994ceca7fb3 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit, seq }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "re is not available for OCaml ${ocaml.version}" @@ -6,14 +6,15 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-re-${version}"; - version = "1.7.3"; + version = "1.8.0"; src = fetchzip { url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; - sha256 = "1pb6w9wqg6gzcfaaw6ckv1bqjgjpmrzzqz7r0mp9w16qbf3i54zr"; + sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i"; }; buildInputs = [ ocaml findlib jbuilder ounit ]; + propagatedBuildInputs = [ seq ]; doCheck = true; checkPhase = "jbuilder runtest"; From 7e740131902cb455e20383431cf16b3ea4ab7c79 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 5 Sep 2018 11:31:58 -0700 Subject: [PATCH 106/600] gocode: c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1 -> 00e7f5ac290aeb20a3d8d31e737ae560a191a1d5 (#46107) Also, switch to the now-maintained fork of gocode available at github.com/mdempsky/gocode --- pkgs/development/tools/gocode/default.nix | 41 +++++++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index a20e1658988c..64921ec6e10e 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,20 +1,47 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gocode-${version}"; - version = "20170903-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1"; + version = "20180727-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "00e7f5ac290aeb20a3d8d31e737ae560a191a1d5"; - goPackagePath = "github.com/nsf/gocode"; + goPackagePath = "github.com/mdempsky/gocode"; # we must allow references to the original `go` package, # because `gocode` needs to dig into $GOROOT to provide completions for the # standard packages. allowGoReference = true; - src = fetchgit { + src = fetchFromGitHub { + owner = "mdempsky"; + repo = "gocode"; inherit rev; - url = "https://github.com/nsf/gocode"; - sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb"; + sha256 = "0vrwjq4r90za47hm88yx5h2mvkv7y4yaj2xbx3skg62wq2drsq31"; + }; + + preBuild = '' + # getting an error building the testdata because they contain invalid files + # on purpose as part of the testing. + rm -r go/src/$goPackagePath/internal/suggest/testdata + ''; + + meta = with stdenv.lib; { + description = "An autocompletion daemon for the Go programming language"; + longDescription = '' + Gocode is a helper tool which is intended to be integrated with your + source code editor, like vim, neovim and emacs. It provides several + advanced capabilities, which currently includes: + + - Context-sensitive autocompletion + + It is called daemon, because it uses client/server architecture for + caching purposes. In particular, it makes autocompletions very fast. + Typical autocompletion time with warm cache is 30ms, which is barely + noticeable. + ''; + homepage = https://github.com/mdempsky/gocode; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ kalbasit ]; }; } From 318c9296faff4ed6eec0ec508c696c4dc9a6598c Mon Sep 17 00:00:00 2001 From: Renato Garcia Date: Wed, 5 Sep 2018 16:46:17 -0300 Subject: [PATCH 107/600] snakemake: add maintainers (#46117) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/science/misc/snakemake/default.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6356c0c7cefe..bd266dda300c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3396,6 +3396,11 @@ github = "relrod"; name = "Ricky Elrod"; }; + renatoGarcia = { + email = "fgarcia.renato@gmail.com"; + github = "renatoGarcia"; + name = "Renato Garcia"; + }; renzo = { email = "renzocarbonara@gmail.com"; github = "k0001"; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 6b0570814f2b..6f04d436877f 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -37,5 +37,6 @@ python.buildPythonPackage rec { workflows are essentially Python scripts extended by declarative code to define rules. Rules describe how to create output files from input files. ''; + maintainers = with maintainers; [ helkafen renatoGarcia ]; }; } From 085cc293237629b7c2ac8d2275cdca312d682046 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Wed, 5 Sep 2018 22:26:25 +0200 Subject: [PATCH 108/600] pythonPackages.pymetar: fix license --- pkgs/development/python-modules/pymetar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index a918528bdf87..4b7388d49dbd 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { 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; + license = licenses.gpl2Plus; maintainers = with maintainers; [ erosennin ]; }; } From ee841c57bf29959bd604c0668c30f3ce526aa6bd Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Wed, 5 Sep 2018 22:32:08 +0200 Subject: [PATCH 109/600] pythonPackages.pymetar: 0.21 -> 1.0 --- pkgs/development/python-modules/pymetar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index 4b7388d49dbd..d41eec818183 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pymetar"; - version = "0.21"; + version = "1.0"; - disabled = isPy3k; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k"; + sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap"; }; meta = with stdenv.lib; { From f70dc57ad3b63211cdc348bb3346139519aefced Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 5 Sep 2018 22:36:17 +0200 Subject: [PATCH 110/600] nixos/tests/opensmtpd: prevent non-deterministic failure (#46071) A sporadic failure occured on Hydra because a request was sent to smtpd after the systemd unit was started, but before the daemon was actually listening. Fix by checking for open ports first. --- nixos/tests/opensmtpd.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index 5079779f35b4..4c0cbca21010 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -102,11 +102,17 @@ import ./make-test.nix { testScript = '' startAll; - $client->waitForUnit("network.target"); + $client->waitForUnit("network-online.target"); $smtp1->waitForUnit('opensmtpd'); $smtp2->waitForUnit('opensmtpd'); $smtp2->waitForUnit('dovecot2'); + # To prevent sporadic failures during daemon startup, make sure + # services are listening on their ports before sending requests + $smtp1->waitForOpenPort(25); + $smtp2->waitForOpenPort(25); + $smtp2->waitForOpenPort(143); + $client->succeed('send-a-test-mail'); $smtp1->waitUntilFails('smtpctl show queue | egrep .'); $smtp2->waitUntilFails('smtpctl show queue | egrep .'); From df05618f2a075c2c727bdcb6d44741d5d5c2ef16 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Sep 2018 22:48:47 +0200 Subject: [PATCH 111/600] nixos/activation: fix activation script for non-POSIX shells (#46042) This fixes an issue with shells like fish that are not fully POSIX compliant. The syntax `ENV=val cmd' doesn't work properly in there. This issue has been addressed in #45932 and #45945, however it has been recommended to use a single shell (`stdenv.shell' which is either `bash' or `sh') to significantly reduce the maintenance overload in the future. See https://github.com/NixOS/nixpkgs/issues/45897#issuecomment-417923464 Fixes #45897 /cc @FRidh @xaverdh @etu --- nixos/modules/system/activation/switch-to-configuration.pl | 2 +- nixos/modules/system/activation/top-level.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index b3fe6caf62dc..c3e469e4b8a1 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -419,7 +419,7 @@ while (my $f = <$listActiveUsers>) { my ($uid, $name) = ($+{uid}, $+{user}); print STDERR "reloading user units for $name...\n"; - system("su", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload"); + system("su", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload"); } close $listActiveUsers; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index fff88e2c2bf3..9797ef641e4f 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -115,6 +115,7 @@ let inherit (pkgs) utillinux coreutils; systemd = config.systemd.package; + inherit (pkgs.stdenv) shell; inherit children; kernelParams = config.boot.kernelParams; From e5d9c16f2a046ccc063683e57e1fca5f931c0b91 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Wed, 5 Sep 2018 23:01:15 +0200 Subject: [PATCH 112/600] gnu-smalltalk: fix build disable format hardening --- pkgs/development/compilers/gnu-smalltalk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 21c0a5ede91b..39d1652fc700 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -34,6 +34,8 @@ in stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs"; + hardeningDisable = [ "format" ]; + installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp"; # For some reason the tests fail if executated with nix-build, but pass if From 7de5708e9ed312b331bbf0953f4fd30ea8a94e22 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Wed, 5 Sep 2018 22:56:18 +0200 Subject: [PATCH 113/600] pythonPackages.pymetar: enable tests --- pkgs/development/python-modules/pymetar/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index d41eec818183..339ddcbc7910 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: +{ stdenv, python, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pymetar"; @@ -11,6 +11,16 @@ buildPythonPackage rec { sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap"; }; + checkPhase = '' + cd testing/smoketest + tar xzf reports.tgz + mkdir logs + patchShebangs runtests.sh + substituteInPlace runtests.sh --replace "break" "exit 1" # fail properly + export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}" + ./runtests.sh + ''; + 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; From c90f96ad32ff948cfe13cf55db1c77ef338aa23d Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Thu, 6 Sep 2018 09:12:12 +1200 Subject: [PATCH 114/600] kakoune: 2018.08.05 -> 2018.09.04 --- pkgs/applications/editors/kakoune/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index ad408081e1fd..e50625fa0e89 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-unstable-${version}"; - version = "2018-08-05"; + version = "2018.09.04"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "ae75032936ed9ffa2bf14589fef115d3d684a7c6"; - sha256 = "1qm6i8vzr4wjxxdvhr54pan0ysxq1sn880bz8p2w9y6qa91yd3m3"; + rev = "v${version}"; + sha256 = "08v55hh7whm6hx6a047gszh0h5g35k3r8r52aggv7r2ybzrrw6w1"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; From 12c0dd5432e8d43c05e4ed81239ab2ea358c2943 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Wed, 5 Sep 2018 12:37:28 +0100 Subject: [PATCH 115/600] python.pkgs.nipype: Futures is python 2 only. Also fix building. --- pkgs/development/python-modules/nipype/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 8b0ee06b3495..a092123da826 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -18,6 +18,8 @@ , psutil , pydot , pytest +, pytest_xdist +, pytest-forked , scipy , simplejson , traits @@ -47,8 +49,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace nipype/interfaces/base/tests/test_core.py \ --replace "/usr/bin/env bash" "${bash}/bin/bash" - - rm pytest.ini ''; propagatedBuildInputs = [ @@ -56,7 +56,6 @@ buildPythonPackage rec { dateutil funcsigs future - futures networkx nibabel numpy @@ -70,9 +69,10 @@ buildPythonPackage rec { xvfbwrapper ] ++ stdenv.lib.optional (!isPy3k) [ configparser + futures ]; - checkInputs = [ pytest mock pytestcov codecov which glibcLocales ]; + checkInputs = [ pytest mock pytestcov pytest_xdist pytest-forked codecov which glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype From 041043420f38842f4fb83bb5c3589ac374a80580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 5 Sep 2018 23:28:31 +0200 Subject: [PATCH 116/600] python.pkgs.py3status: fix build --- pkgs/development/python-modules/py3status/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 8a7dcc63f572..fd42faaad213 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchpatch , requests , pytz , tzlocal @@ -19,10 +20,18 @@ buildPythonPackage rec { pname = "py3status"; version = "3.12"; + src = fetchPypi { inherit pname version; sha256 = "c9ef49f72c2d83976d2841ab7e70faee3c77f4d7dbb2d3390ef0f0509473ea9a"; }; + + # ImportError: cannot import name '_to_ascii' + patches = fetchpatch { + url = "${meta.homepage}/commit/8a48e01cb68b514b532f56037e4f5a6c19662de5.patch"; + sha256 = "0v1yja5lvdjk6vh13lvh07n7aw5hjcy7v9lrs2dfb0y0cjw4kx9n"; + }; + doCheck = false; propagatedBuildInputs = [ pytz requests tzlocal ]; buildInputs = [ file ]; From f051f66c9abe9bdc96bf754021625035ecb17238 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 5 Sep 2018 23:04:26 +0200 Subject: [PATCH 117/600] phe: init at 1.4.0 --- .../python-modules/phe/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/phe/default.nix diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix new file mode 100644 index 000000000000..b016a9bd92c3 --- /dev/null +++ b/pkgs/development/python-modules/phe/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } : + +let + pname = "phe"; + version = "1.4.0"; +in + +buildPythonPackage { + inherit pname version; + + # https://github.com/n1analytics/python-paillier/issues/51 + disabled = isPyPy || ! isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0wzlk7d24kp0f5kpm0kvvc88mm42144f5cg9pcpb1dsfha75qy5m"; + }; + + buildInputs = [ click gmpy2 numpy ]; + + # 29/233 tests fail + doCheck = false; + + meta = with stdenv.lib; { + description = "A library for Partially Homomorphic Encryption in Python"; + homepage = https://github.com/n1analytics/python-paillier; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ba335146ce3..d962649f71b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3732,6 +3732,8 @@ in { }; }; + phe = callPackage ../development/python-modules/phe { }; + phpserialize = callPackage ../development/python-modules/phpserialize { }; plaid-python = callPackage ../development/python-modules/plaid-python { }; From 7339a4004c8080a00ab64100a1c45c1ac1d40432 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 5 Sep 2018 23:33:42 +0200 Subject: [PATCH 118/600] gmpy: move outside python-packages.nix --- .../python-modules/gmpy/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/gmpy/default.nix diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix new file mode 100644 index 000000000000..81af4b5e5501 --- /dev/null +++ b/pkgs/development/python-modules/gmpy/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, fetchurl, isPyPy, gmp } : + +let + pname = "gmpy"; + version = "1.17"; +in + +buildPythonPackage { + inherit pname version; + + disabled = isPyPy; + + src = fetchurl { + url = "mirror://pypi/g/gmpy/${pname}-${version}.zip"; + sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14"; + }; + + buildInputs = [ gmp ]; + + meta = { + description = "GMP or MPIR interface to Python 2.4+ and 3.x"; + homepage = http://code.google.com/p/gmpy/; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d962649f71b4..c77cd8b64947 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2624,25 +2624,7 @@ in { GeoIP = callPackage ../development/python-modules/GeoIP { }; - gmpy = buildPythonPackage rec { - name = "gmpy-1.17"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/gmpy/${name}.zip"; - sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14"; - }; - - buildInputs = [ - pkgs.gcc - pkgs.gmp - ]; - - meta = { - description = "GMP or MPIR interface to Python 2.4+ and 3.x"; - homepage = http://code.google.com/p/gmpy/; - }; - }; + gmpy = callPackage ../development/python-modules/gmpy { }; gmpy2 = buildPythonPackage rec { name = "gmpy2-2.0.6"; From e053386c9236f7f67b203c55ce6a63f39990f805 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 5 Sep 2018 23:34:08 +0200 Subject: [PATCH 119/600] gmpy2: 2.0.6 -> 2.0.8 Also move outside python-packages.nix --- .../python-modules/gmpy2/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +---------------- 2 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/gmpy2/default.nix diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix new file mode 100644 index 000000000000..5d1f82356a01 --- /dev/null +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchurl, isPyPy, gmp, mpfr, libmpc } : + +let + pname = "gmpy2"; + version = "2.0.8"; +in + +buildPythonPackage { + inherit pname version; + + disabled = isPyPy; + + src = fetchurl { + url = "mirror://pypi/g/gmpy2/${pname}-${version}.zip"; + sha256 = "0grx6zmi99iaslm07w6c2aqpnmbkgrxcqjrqpfq223xri0r3w8yx"; + }; + + buildInputs = [ gmp mpfr libmpc ]; + + meta = with stdenv.lib; { + description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"; + homepage = http://code.google.com/p/gmpy/; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c77cd8b64947..7e9e362b3dea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2626,28 +2626,7 @@ in { gmpy = callPackage ../development/python-modules/gmpy { }; - gmpy2 = buildPythonPackage rec { - name = "gmpy2-2.0.6"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/gmpy2/${name}.zip"; - sha256 = "5041d0ae24407c24487106099f5bcc4abb1a5f58d90e6712cc95321975eddbd4"; - }; - - buildInputs = [ - pkgs.gcc - pkgs.gmp - pkgs.mpfr - pkgs.libmpc - ]; - - meta = { - description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"; - homepage = http://code.google.com/p/gmpy/; - license = licenses.gpl3Plus; - }; - }; + gmpy2 = callPackage ../development/python-modules/gmpy2 { }; gmusicapi = with pkgs; buildPythonPackage rec { name = "gmusicapi-10.1.0"; From 1510f324a31880c7f7727f11ae8270d35e384fa4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Sep 2018 01:12:03 +0200 Subject: [PATCH 120/600] nix: 2.1 -> 2.1.1 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++---- pkgs/tools/package-management/nix/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 6611a6ca0790..cb182a08a830 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/r9i30v8nasafg2851wflg71ln49fw03y-nix-2.1"; - i686-linux = "/nix/store/dsg3pr7wwrk51f7la9wgby173j18llqh-nix-2.1"; - aarch64-linux = "/nix/store/m3qgnch4xin21pmd1azas8kkcp9rhkr6-nix-2.1"; - x86_64-darwin = "/nix/store/n7fvy0k555gwkkdszdkhi3h0aahca8h3-nix-2.1"; + x86_64-linux = "/nix/store/h180y3n5k1ypxgm1pcvj243qix5j45zz-nix-2.1.1"; + i686-linux = "/nix/store/v2y4k4v9ml07jmfq739wyflapg3b7b5k-nix-2.1.1"; + aarch64-linux = "/nix/store/v485craglq7xm5996ci8qy5dyc17dab0-nix-2.1.1"; + x86_64-darwin = "/nix/store/lc3ymlix73kaad5srjdgaxp9ngr1sg6g-nix-2.1.1"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 7b4517624164..7d78fef39742 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -148,10 +148,10 @@ in rec { }) // { perl-bindings = nix1; }; nixStable = (common rec { - name = "nix-2.1"; + name = "nix-2.1.1"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "0ed68e0c50f13810768fcf510abb2c56d735172c39a325aac7453ccf7ae152fc"; + sha256 = "63b1d49ea678162ada6996e42abb62cbc6e65cfefa4faa5436ae37100504720b"; }; }) // { perl-bindings = perl-bindings { nix = nixStable; From f89d6d92b7b4b79015836f12c5a114f53fa4eccb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Sep 2018 21:02:09 -0400 Subject: [PATCH 121/600] linux: Remove 4.17 --- pkgs/os-specific/linux/kernel/linux-4.17.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 11 ----------- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.17.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix deleted file mode 100644 index 5c13f366221e..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "4.17.19"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; - - # 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 = "05wz76qq70bfhfwd1zwzfmzq4rlgz40jpi9plb31njx1y7vkx6xs"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3cb6069caf8..26409db6d01d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14003,16 +14003,6 @@ with pkgs; ]; }; - linux_4_17 = callPackage ../os-specific/linux/kernel/linux-4.17.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - # kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14235,7 +14225,6 @@ with pkgs; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); - linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17); linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18); # Don't forget to update linuxPackages_latest! From 5704642a3f8dd29ef6e280de69171186ca327b6a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 8 Aug 2018 15:25:40 -0400 Subject: [PATCH 122/600] pythonPackages.pytest-faulthandler: init at 1.5.0 - compatible with 2.7 and 3+ - all test pass. --- .../pytest-faulthandler/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-faulthandler/default.nix diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/pkgs/development/python-modules/pytest-faulthandler/default.nix new file mode 100644 index 000000000000..852de1fd49cd --- /dev/null +++ b/pkgs/development/python-modules/pytest-faulthandler/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +, pytest-mock +, pythonOlder +, faulthandler +}: + +buildPythonPackage rec { + pname = "pytest-faulthandler"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bf8634c3fd6309ef786ec03b913a5366163fdb094ebcfdebc35626400d790e0d"; + }; + + buildInputs = [ setuptools_scm pytest ]; + checkInputs = [ pytest-mock ]; + propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Py.test plugin that activates the fault handler module for tests"; + homepage = https://github.com/pytest-dev/pytest-faulthandler; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb58f67c5970..267d283cbb90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1885,6 +1885,8 @@ in { pytest-django = callPackage ../development/python-modules/pytest-django { }; + pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { }; + pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; pytest-forked = callPackage ../development/python-modules/pytest-forked { }; From 3a56e314b85a7bec2d19fb156713562e5ae3a7b1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 8 Aug 2018 15:27:47 -0400 Subject: [PATCH 123/600] pythonPackages.python-lz4: init at 2.1.0 Fetching from github repository instead of pypi so that all tests can be run. - compatible with 2.7, 3+ - all tests pass --- .../python-modules/python-lz4/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/python-lz4/default.nix diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix new file mode 100644 index 000000000000..a0fe6666d849 --- /dev/null +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestrunner +, pytest +, psutil +, setuptools_scm +, pkgconfig +, isPy3k +, future +}: + +buildPythonPackage rec { + pname = "python-lz4"; + version = "2.1.0"; + + # get full repository inorder to run tests + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1vjfplj37jcw1mf8l810dv76dx0raia3ylgyfy7sfsb3g17brjq6"; + }; + + buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; + checkInputs = [ pytest psutil ]; + propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; + + # give a hint to setuptools_scm on package version + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}" + ''; + + meta = { + description = "LZ4 Bindings for Python"; + homepage = https://github.com/python-lz4/python-lz4; + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 267d283cbb90..26b31958c32f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -461,6 +461,8 @@ in { python-hosts = callPackage ../development/python-modules/python-hosts { }; + python-lz4 = callPackage ../development/python-modules/python-lz4 { }; + python3-openid = callPackage ../development/python-modules/python3-openid { }; python-periphery = callPackage ../development/python-modules/python-periphery { }; From 05890dda3db11a77c13d4aa88084bc6a6680e772 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 8 Aug 2018 15:30:26 -0400 Subject: [PATCH 124/600] pythonPackages.joblib: 0.12.1 -> 0.12.2 In order to get all the tests passing the Github repository was downloaded instead of from pypi so that the `conftest.py` is available. In addition to updating the version: - compatible with 2.7, 3+ now - all tests are running and passing --- .../python-modules/joblib/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 8b42e6e1ea1d..d96752ba05f3 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,29 +1,36 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , sphinx , numpydoc , pytest +, python-lz4 }: buildPythonPackage rec { pname = "joblib"; - version = "0.12.1"; - src = fetchPypi { - inherit pname version; - sha256 = "68e6128e4734196616a39e2d48830ec7d61551c7f5748849e4c91478d2444524"; + version = "0.12.4"; + + # get full repository inorder to run tests + src = fetchFromGitHub { + owner = "joblib"; + repo = pname; + rev = version; + sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb"; }; checkInputs = [ sphinx numpydoc pytest ]; + propagatedBuildInputs = [ python-lz4 ]; checkPhase = '' - py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test + py.test joblib ''; meta = { description = "Lightweight pipelining: using Python functions as pipeline jobs"; homepage = https://pythonhosted.org/joblib/; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ costrouc ]; }; } From 7b920172dbd64f27e34568605a4894981158c65e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 8 Aug 2018 15:32:52 -0400 Subject: [PATCH 125/600] pythonPackages.pytest-repeat: init at 0.6.0 - compatible with 2.7, 3+ - all tests pass and running --- .../python-modules/pytest-repeat/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-repeat/default.nix diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix new file mode 100644 index 000000000000..eca14c8289a9 --- /dev/null +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-repeat"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "84aba2fcca5dc2f32ae626a01708f469f17b3384ec3d1f507698077f274909d6"; + }; + + buildInputs = [ setuptools_scm pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Pytest plugin for repeating tests"; + homepage = https://github.com/pytest-dev/pytest-repeat; + maintainers = with lib.maintainers; [ costrouc ]; + license = lib.licenses.mpl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26b31958c32f..fb86b350cc7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1913,6 +1913,8 @@ in { pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; + pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; + pytestrunner = callPackage ../development/python-modules/pytestrunner { }; pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; From 4f70170f8ab2b97f371f018e89e157219d22dcb6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 8 Aug 2018 15:36:58 -0400 Subject: [PATCH 126/600] pythonPackages.distributed: 1.15.1 -> 1.22.1 The github repository was downloaded instead of the pypi repository for testing (needed `conftest.py`). Major work was done on the underlying dependencies to make distributed work on python 2.7, 3+. Note that the test **do** take a significant amount of time (10-15 minutes). - moved to `python-modules` - compatible with 2.7, 3+ - all tests pass (previously tests were not run) --- .../python-modules/distributed/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +--------- 2 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/distributed/default.nix diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix new file mode 100644 index 000000000000..d909a6993a04 --- /dev/null +++ b/pkgs/development/python-modules/distributed/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, pytest-repeat +, pytest-faulthandler +, pytest-timeout +, mock +, joblib +, click +, cloudpickle +, dask +, msgpack +, psutil +, six +, sortedcontainers +, tblib +, toolz +, tornado +, zict +, pyyaml +, pythonOlder +, futures +, singledispatch +}: + +buildPythonPackage rec { + pname = "distributed"; + version = "1.22.1"; + + # get full repository need conftest.py to run tests + src = fetchFromGitHub { + owner = "dask"; + repo = pname; + rev = version; + sha256 = "0xvx55rhbhlyys3kjndihwq6y6260qzy9mr3miclh5qddaiw2d5z"; + }; + + checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; + propagatedBuildInputs = [ + click cloudpickle dask msgpack psutil six + sortedcontainers tblib toolz tornado zict pyyaml + ] ++ lib.optional (pythonOlder "3.2") [ futures ] + ++ lib.optional (pythonOlder "3.4") [ singledispatch ]; + + # tests take about 10-15 minutes + # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses + # these tests are not critical to the library (only the cli) + checkPhase = '' + py.test distributed -m "not avoid-travis" -r s --timeout-method=thread --timeout=0 --durations=20 --ignore="distributed/cli/tests" + ''; + + meta = { + description = "Distributed computation in Python."; + homepage = http://distributed.readthedocs.io/en/latest/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ teh costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb86b350cc7f..114e41b30dec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -272,6 +272,8 @@ in { distorm3 = callPackage ../development/python-modules/distorm3 { }; + distributed = callPackage ../development/python-modules/distributed { }; + dogtail = callPackage ../development/python-modules/dogtail { }; diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; @@ -1982,34 +1984,6 @@ in { zict = callPackage ../development/python-modules/zict { }; - distributed = buildPythonPackage rec { - - name = "distributed-${version}"; - version = "1.15.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/distributed/${name}.tar.gz"; - sha256 = "037a07sdf2ch1d360nqwqz3b4ld8msydng7mw4i5s902v7xr05l6"; - }; - - buildInputs = with self; [ pytest docutils ]; - propagatedBuildInputs = with self; [ - dask six boto3 s3fs tblib locket msgpack-python click cloudpickle tornado - psutil botocore zict lz4 sortedcollections sortedcontainers - ] ++ (if !isPy3k then [ singledispatch ] else []); - - # py.test not picking up local config file, even when running - # manually: E ValueError: no option named '--runslow' - doCheck = false; - - meta = { - description = "Distributed computation in Python."; - homepage = "http://distributed.readthedocs.io/en/latest/"; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - }; - }; - digital-ocean = callPackage ../development/python-modules/digitalocean { }; leather = callPackage ../development/python-modules/leather { }; From 63cf879d6cc895e9210702c6f0cfc894a80aa35c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 6 Sep 2018 00:04:28 -0400 Subject: [PATCH 127/600] pythonPackages.pymatgen: 2018.8.10 -> 2018.9.1 Also 2018.8.10 does not build in previous state because auto updating from pypi did not account for a new requirement `networkx`. This has been added. --- pkgs/development/python-modules/pymatgen/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index d810a5d6b4df..523e7f808064 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas }: +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, networkx }: buildPythonPackage rec { pname = "pymatgen"; - version = "2018.8.10"; + version = "2018.9.1"; src = fetchPypi { inherit pname version; - sha256 = "9bb3b170ca8654c956fa2efdd31107570c0610f7585d90e4a541eb99cee41603"; + sha256 = "dee5dbd8008081de9f27759c20c550d09a07136eeebfe941e3d05fd88ccace18"; }; nativeBuildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas ]; - + propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas networkx ]; + # No tests in pypi tarball. doCheck = false; @@ -22,4 +22,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - From 6bd8799448dd3d4a7f92f569202010e1fe5b9a33 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 6 Sep 2018 08:43:04 +0200 Subject: [PATCH 128/600] haskellPackages.tensorflow-mnist-input-data: use an attribute set to specify the data files This is more understandable and safer than using a nested list. --- .../configuration-tensorflow.nix | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index d1ca474ba4f4..10ee30d81c85 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -64,27 +64,17 @@ in }: let - urlPrefix = "http://yann.lecun.com/exdb/mnist/"; - - # File names relative to 'urlPrefix' and their sha256. - fileInfos = [ - [ "train-images-idx3-ubyte.gz" - "440fcabf73cc546fa21475e81ea370265605f56be210a4024d2ca8f203523609" - ] - - [ "train-labels-idx1-ubyte.gz" - "3552534a0a558bbed6aed32b30c495cca23d567ec52cac8be1a0730e8010255c" - ] - - [ "t10k-images-idx3-ubyte.gz" - "8d422c7b0a1c1c79245a5bcf07fe86e33eeafee792b84584aec276f5a2dbc4e6" - ] - - [ "t10k-labels-idx1-ubyte.gz" - "f7ae60f92e00ec6debd23a6088c31dbd2371eca3ffa0defaefb259924204aec6" - ] - ]; - downloads = map (x: pkgs.fetchurl { url = urlPrefix + builtins.head x; sha256= builtins.tail x;}) fileInfos; + fileInfos = { + "train-images-idx3-ubyte.gz" = "440fcabf73cc546fa21475e81ea370265605f56be210a4024d2ca8f203523609"; + "train-labels-idx1-ubyte.gz" = "3552534a0a558bbed6aed32b30c495cca23d567ec52cac8be1a0730e8010255c"; + "t10k-images-idx3-ubyte.gz" = "8d422c7b0a1c1c79245a5bcf07fe86e33eeafee792b84584aec276f5a2dbc4e6"; + "t10k-labels-idx1-ubyte.gz" = "f7ae60f92e00ec6debd23a6088c31dbd2371eca3ffa0defaefb259924204aec6"; + }; + downloads = with pkgs.lib; flip mapAttrsToList fileInfos (name: sha256: + pkgs.fetchurl { + url = "http://yann.lecun.com/exdb/mnist/${name}"; + inherit sha256; + }); in mkDerivation { pname = "tensorflow-mnist-input-data"; From 641025d410ec7212996ba9d7cea4d12ce8218886 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 6 Sep 2018 08:44:19 +0200 Subject: [PATCH 129/600] haskellPackages.tensorflow-mnist-input-data: link data files instead of copying This prevents duplication in the nix store. --- pkgs/development/haskell-modules/configuration-tensorflow.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index 10ee30d81c85..dedcaf0cbc76 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -86,7 +86,7 @@ in network-uri ]; preConfigure = pkgs.lib.strings.concatStringsSep "\n" ( - map (x: "cp ${x} data/$(stripHash ${x})") downloads + map (x: "ln -s ${x} data/$(stripHash ${x})") downloads ); libraryHaskellDepends = [ base ]; homepage = "https://github.com/tensorflow/haskell#readme"; From a5f08c17e5034ad00c170e1599d19f6d77aa19ca Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 6 Sep 2018 08:49:17 +0200 Subject: [PATCH 130/600] haskellPackages.tensorflow-mnist: fix missing dependency on tensorflow-mnist-input-data --- .../haskell-modules/configuration-tensorflow.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index dedcaf0cbc76..43a3b82923ba 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -55,9 +55,11 @@ in tensorflow-logging = super.tensorflow-logging.override { inherit proto-lens; }; - tensorflow-mnist = super.tensorflow-mnist.override { + tensorflow-mnist = overrideCabal (super.tensorflow-mnist.override { inherit proto-lens; - }; + # https://github.com/tensorflow/haskell/issues/215 + tensorflow-mnist-input-data = self.tensorflow-mnist-input-data; + }) (_drv: { broken = false; }); tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage ( { mkDerivation, base, bytestring, Cabal, cryptonite, directory , filepath, HTTP, network-uri, stdenv From 39d35e77ee51c24c688d028f0dc0b9fb761db1d7 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 6 Sep 2018 08:54:12 +0200 Subject: [PATCH 131/600] Revert "libtensorflow: fix hashes for darwin and cuda downloads" This reverts commit 93ed13f86b624dc3214f58d09c3f3318f9900afa. libtensorflow is only used by the Haskell tensorflow packages and they don't work with tensorflow-1.10 yet. So the easiest solution is to just revert this commit and add it back when they do gain support. --- pkgs/development/libraries/libtensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index b4e616409c4f..2bc83b31423a 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { sha256 = if system == "linux-x86_64" then if cudaSupport - then "0v66sscxpyixjrf9yjshl001nix233i6chc61akx0kx7ial4l1wn" + then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3" else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb" else if system == "darwin-x86_64" then if cudaSupport then unavailable - else "11p0f77m4wycpc024mh7jx0kbdhgm0wp6ir6dsa8lkcpdb59bn59" + else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657" else unavailable; }; From 6e14b9fc2d738b18948d221367899c16db92f622 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 6 Sep 2018 08:56:09 +0200 Subject: [PATCH 132/600] Revert "libtensorflow: 1.9.0 -> 1.10.0" This reverts commit 713991132eb7b01f5732a301da4d377bafe32e8b. libtensorflow is only used by the Haskell tensorflow packages and they don't work with tensorflow-1.10 yet. So the easiest solution is to just revert this commit and add it back when they do gain support. --- pkgs/development/libraries/libtensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index 2bc83b31423a..e6cd140c4e4b 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { pname = "libtensorflow"; - version = "1.10.0"; + version = "1.9.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz"; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { if system == "linux-x86_64" then if cudaSupport then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3" - else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb" + else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21" else if system == "darwin-x86_64" then if cudaSupport then unavailable From 1fc5a6d2b6bf3acfd5e4761fd2cb0c549c6045f0 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 6 Sep 2018 09:00:07 +0200 Subject: [PATCH 133/600] haskell: build the tensorflow packages on hydra since they now build successfully --- .../haskell-modules/configuration-hackage2nix.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3aee4857f993..4a26fcbffc17 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9054,12 +9054,6 @@ dont-distribute-packages: temporary-resourcet: [ i686-linux, x86_64-linux, x86_64-darwin ] tempus: [ i686-linux, x86_64-linux, x86_64-darwin ] tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-core-ops: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-opgen: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-ops: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-proto: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ] term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] termcolor: [ i686-linux, x86_64-linux, x86_64-darwin ] From ec7d4a80893c1337f53008135acdd044bf5d0257 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 2 Sep 2018 17:04:57 +0200 Subject: [PATCH 134/600] skaware: update tools & libraries to summer 2018 release https://www.mail-archive.com/skaware@list.skarnet.org/msg01217.html No support for yet. --- pkgs/development/libraries/skalibs/default.nix | 4 ++-- pkgs/os-specific/linux/s6-linux-utils/default.nix | 5 +++-- pkgs/tools/misc/execline/default.nix | 5 +++-- pkgs/tools/misc/s6-portable-utils/default.nix | 4 ++-- pkgs/tools/networking/s6-dns/default.nix | 4 ++-- pkgs/tools/networking/s6-networking/default.nix | 5 +++-- pkgs/tools/system/s6-rc/default.nix | 4 ++-- pkgs/tools/system/s6/default.nix | 5 +++-- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 9d5bd170e20d..85b1b060700f 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.6.4.0"; + version = "2.7.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "13icrwxxb7k3cj37dl07h0apk6lwyrg1qrwjwh4l82i8f32bnjz2"; + sha256 = "068pkbl91mi35amlhv491dwrbzyfifrlxijss0g2vf693xvx6lxm"; }; outputs = [ "lib" "dev" "doc" "out" ]; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index dbef7c41c067..1c07dd6f0544 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.4.0.2"; + version = "2.5.0.0"; in stdenv.mkDerivation rec { @@ -10,13 +10,14 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; - sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip"; + sha256 = "04q2z71dkzahd2ppga2zikclz2qk014c23gm7rigqxjc8rs1amvq"; }; outputs = [ "bin" "dev" "doc" "out" ]; dontDisableStatic = true; + # TODO: nsss support configureFlags = [ "--enable-absolute-paths" "--bindir=\${bin}/bin" diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 360808f4280b..70301cc89e62 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.5.0.0"; + version = "2.5.0.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/execline"; rev = "refs/tags/v${version}"; - sha256 = "19vd8252g5bmzm4i9gybpj7i2mhsflcgfl4ns5k3g1vv7f69i1dn"; + sha256 = "0d4gvixz7xja03hnwc2bf13xrgh1jq27ij4m1jlrpgrzhfpqz37q"; }; outputs = [ "bin" "lib" "dev" "doc" "out" ]; @@ -20,6 +20,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + # TODO: nsss support configureFlags = [ "--enable-absolute-paths" "--libdir=\${lib}/lib" diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 5f56daf3a48d..c11bd13c799a 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "s6-portable-utils-${version}"; - version = "2.2.1.1"; + version = "2.2.1.2"; src = fetchurl { url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka"; + sha256 = "0if77z07rfygd1yk9d2abxkdbx3dg52vcjhb20isb8kvqxhkg8ih"; }; outputs = [ "bin" "dev" "doc" "out" ]; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 29d66e4be2ce..ee669b8f9282 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -2,7 +2,7 @@ let - version = "2.3.0.0"; + version = "2.3.0.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-dns"; rev = "refs/tags/v${version}"; - sha256 = "1hczdg3dzi9z6f0wicm2qa2239fiax915zp66xspdz6qd23nqrxb"; + sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb"; }; outputs = [ "bin" "lib" "dev" "doc" "out" ]; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index f7278d5c6a24..d96cff167d90 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -9,7 +9,7 @@ let inherit (stdenv) lib; - version = "2.3.0.2"; + version = "2.3.0.3"; sslSupportEnabled = sslSupport != false; sslLibs = { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-networking"; rev = "refs/tags/v${version}"; - sha256 = "1qrhca8yjaysrqf7nx3yjfyfi9yly3rxpgrd2sqj0a0ckk73rv42"; + sha256 = "06kv2l31ch0zw538bpivgnwymb056x5hpmqafglffgkbq3izp7wc"; }; outputs = [ "bin" "lib" "dev" "doc" "out" ]; @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # TODO: nsss support configureFlags = [ "--enable-absolute-paths" "--libdir=\${lib}/lib" diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 40c999d80f13..b5cfa8ea4425 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -2,7 +2,7 @@ let - version = "0.4.0.1"; + version = "0.4.1.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-rc"; rev = "refs/tags/v${version}"; - sha256 = "10gkkdbvkb4s2yshx425v9diwm7vvbl320a2bm0c3wz71xr94wsw"; + sha256 = "1as7jhlp4cvh1bzvcli1hk1pbdzkac8gys1h379blymfy8hmp805"; }; outputs = [ "bin" "lib" "dev" "doc" "out" ]; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index d7ade3cdb290..85140bce1ec9 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.7.1.1"; + version = "2.7.2.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "0dncw3h9wc4cgc9q8zjwicgbcqcn6722yhk8g9bvrhs7h4fkfqav"; + sha256 = "07j4is7kxkynschwbf83q5rw1872kg3ij2vhxyfp3bg71k5pw1az"; }; # NOTE lib: cannot split lib from bin at the moment, @@ -24,6 +24,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + # TODO: nsss support configureFlags = [ "--enable-absolute-paths" "--libdir=\${out}/lib" From 57b431590b3c555469f4ebeffa2dc524ef806293 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 2 Sep 2018 17:37:44 +0200 Subject: [PATCH 135/600] skaware: bundle all skaware packages into an attrset They are normally updated in lockstep, this makes maintenance more convenient. --- pkgs/top-level/all-packages.nix | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38755b611e54..dccad6918ca5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2385,7 +2385,7 @@ with pkgs; exempi = callPackage ../development/libraries/exempi { }; - execline = callPackage ../tools/misc/execline { }; + execline = skawarePackages.execline; exif = callPackage ../tools/graphics/exif { }; @@ -5066,13 +5066,13 @@ with pkgs; s3gof3r = callPackage ../tools/networking/s3gof3r { }; - s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-dns = skawarePackages.s6-dns; - s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-linux-utils = skawarePackages.s6-linux-utils; - s6-networking = callPackage ../tools/networking/s6-networking { }; + s6-networking = skawarePackages.s6-networking; - s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; + s6-portable-utils = skawarePackages.s6-portable-utils; sablotron = callPackage ../tools/text/xml/sablotron { }; @@ -12003,7 +12003,19 @@ with pkgs; shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; - skalibs = callPackage ../development/libraries/skalibs { }; + skalibs = skawarePackages.skalibs; + + skawarePackages = recurseIntoAttrs { + skalibs = callPackage ../development/libraries/skalibs { }; + execline = callPackage ../tools/misc/execline { }; + + s6 = callPackage ../tools/system/s6 { }; + s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-networking = callPackage ../tools/networking/s6-networking { }; + s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; + s6-rc = callPackage ../tools/system/s6-rc { }; + }; skydive = callPackage ../tools/networking/skydive { }; @@ -13415,9 +13427,9 @@ with pkgs; boost = boost159; }; - s6 = callPackage ../tools/system/s6 { }; + s6 = skawarePackages.s6; - s6-rc = callPackage ../tools/system/s6-rc { }; + s6-rc = skawarePackages.s6-rc; supervise = callPackage ../tools/system/supervise { }; From 0071ae1d4f1a18542b19a815d06d2b7bbf292dd4 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 2 Sep 2018 23:31:26 +0200 Subject: [PATCH 136/600] skawarePackages: factor out the common parts Introduce a `skawarePackages.buildPackage` function that contains the common setup, removing a lot of duplication. In particular, we require that the build directory has to be empty after the `fixupPhase`, to make sure every relevant file is moved to the outputs. A next step would be to deduplicate the `configureFlags` attributes and only require a `skawareInputs` field. --- .../skaware/build-skaware-package.nix | 128 ++++++++++++++++++ .../development/libraries/skalibs/default.nix | 45 ++---- .../linux/s6-linux-utils/default.nix | 34 ++--- pkgs/tools/misc/execline/default.nix | 39 ++---- pkgs/tools/misc/s6-portable-utils/default.nix | 42 ++---- pkgs/tools/networking/s6-dns/default.nix | 40 ++---- .../networking/s6-networking/default.nix | 41 ++---- pkgs/tools/system/s6-rc/default.nix | 40 ++---- pkgs/tools/system/s6/default.nix | 40 ++---- pkgs/top-level/all-packages.nix | 2 + 10 files changed, 228 insertions(+), 223 deletions(-) create mode 100644 pkgs/build-support/skaware/build-skaware-package.nix diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix new file mode 100644 index 000000000000..5f6951cb25fa --- /dev/null +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -0,0 +1,128 @@ +{ stdenv, fetchgit, writeScript, file }: +let lib = stdenv.lib; +in { + # : string + pname + # : string +, version + # : string +, sha256 + # : string +, description + # : list Platform +, platforms ? lib.platforms.all + # : list string +, outputs ? [ "bin" "lib" "dev" "doc" "out" ] + # TODO(Profpatsch): automatically infer most of these + # : list string +, configureFlags + # mostly for moving and deleting files from the build directory + # : lines +, postInstall + # : list Maintainer +, maintainers ? [] + + +}: + +let + + # File globs that can always be deleted + commonNoiseFiles = [ + ".gitignore" + "Makefile" + "INSTALL" + "configure" + "patch-for-solaris" + "src/**/*" + "tools/**/*" + "package/**/*" + "config.mak" + ]; + + # File globs that should be moved to $doc + commonMetaFiles = [ + "COPYING" + "AUTHORS" + "NEWS" + "CHANGELOG" + "README" + "README.*" + ]; + + globWith = stdenv.lib.concatMapStringsSep "\n"; + rmNoise = globWith (f: + ''rm -rf ${f}'') commonNoiseFiles; + mvMeta = globWith + (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') + commonMetaFiles; + + # Move & remove actions, taking the package doc directory + commonFileActions = writeScript "common-file-actions.sh" '' + #!${stdenv.shell} + set -e + DOCDIR="$1" + shopt -s globstar extglob nullglob + ${rmNoise} + mkdir -p "$DOCDIR" + ${mvMeta} + ''; + + +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchgit { + url = "git://git.skarnet.org/${pname}"; + rev = "refs/tags/v${version}"; + inherit sha256; + }; + + inherit outputs; + + dontDisableStatic = true; + enableParallelBuilding = true; + + configureFlags = configureFlags ++ [ + "--enable-absolute-paths" + (if stdenv.isDarwin + then "--disable-shared" + else "--enable-shared") + ] + # On darwin, the target triplet from -dumpmachine includes version number, + # but skarnet.org software uses the triplet to test binary compatibility. + # Explicitly setting target ensures code can be compiled against a skalibs + # binary built on a different version of darwin. + # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph + ++ (lib.optional stdenv.isDarwin + "--build=${stdenv.hostPlatform.system}"); + + # TODO(Profpatsch): ensure that there is always a $doc output! + postInstall = '' + echo "Cleaning & moving common files" + mkdir -p $doc/share/doc/${pname} + ${commonFileActions} $doc/share/doc/${pname} + + ${postInstall} + ''; + + postFixup = '' + echo "Checking for remaining source files" + rem=$(find -mindepth 1 -xtype f -print0 \ + | tee $TMP/remaining-files) + if [[ "$rem" != "" ]]; then + echo "ERROR: These files should be either moved or deleted:" + cat $TMP/remaining-files | xargs -0 ${file}/bin/file + exit 1 + fi + ''; + + meta = { + homepage = "https://skarnet.org/software/${pname}/"; + inherit description platforms; + license = stdenv.lib.licenses.isc; + maintainers = with lib.maintainers; + [ pmahoney Profpatsch ] ++ maintainers; + }; + +} diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 85b1b060700f..98977381f0f1 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -1,51 +1,30 @@ -{ stdenv, fetchgit }: +{ stdenv, skawarePackages }: -let +with skawarePackages; +buildPackage { + pname = "skalibs"; version = "2.7.0.0"; + sha256 = "068pkbl91mi35amlhv491dwrbzyfifrlxijss0g2vf693xvx6lxm"; -in stdenv.mkDerivation rec { - - name = "skalibs-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/skalibs"; - rev = "refs/tags/v${version}"; - sha256 = "068pkbl91mi35amlhv491dwrbzyfifrlxijss0g2vf693xvx6lxm"; - }; + description = "A set of general-purpose C programming libraries"; outputs = [ "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - configureFlags = [ - "--enable-force-devr" # assume /dev/random works + # assume /dev/random works + "--enable-force-devr" "--libdir=\${lib}/lib" "--dynlibdir=\${lib}/lib" "--includedir=\${dev}/include" "--sysdepdir=\${lib}/lib/skalibs/sysdeps" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - # On darwin, the target triplet from -dumpmachine includes version number, but - # skarnet.org software uses the triplet to test binary compatibility. - # Explicitly setting target ensures code can be compiled against a skalibs - # binary built on a different version of darwin. - # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/skalibs + rm -rf sysdeps.cfg + rm libskarnet.* + mv doc $doc/share/doc/skalibs/html ''; - meta = { - homepage = http://skarnet.org/software/skalibs/; - description = "A set of general-purpose C programming libraries"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 1c07dd6f0544..95dd3736c040 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -1,25 +1,19 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv, skawarePackages }: -let +with skawarePackages; +buildPackage { + pname = "s6-linux-utils"; version = "2.5.0.0"; + sha256 = "0wbxwki2alyym6dm44s5ajp9ndw6sgrqvizkznz71c30i0dlxrnf"; -in stdenv.mkDerivation rec { - - name = "s6-linux-utils-${version}"; - - src = fetchurl { - url = "https://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; - sha256 = "04q2z71dkzahd2ppga2zikclz2qk014c23gm7rigqxjc8rs1amvq"; - }; + description = "A set of minimalistic Linux-specific system utilities"; + platforms = stdenv.lib.platforms.linux; outputs = [ "bin" "dev" "doc" "out" ]; - dontDisableStatic = true; - # TODO: nsss support configureFlags = [ - "--enable-absolute-paths" "--bindir=\${bin}/bin" "--includedir=\${dev}/include" "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" @@ -29,16 +23,10 @@ in stdenv.mkDerivation rec { ]; postInstall = '' - mkdir -p $doc/share/doc/s6-networking/ - mv doc $doc/share/doc/s6-networking/html + # remove all s6 executables from build directory + rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) + + mv doc $doc/share/doc/s6-linux-utils/html ''; - meta = { - homepage = http://www.skarnet.org/software/s6-linux-utils/; - description = "A set of minimalistic Linux-specific system utilities"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 70301cc89e62..00faab0a66f8 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -1,28 +1,18 @@ -{ stdenv, fetchgit, skalibs }: +{ stdenv, skawarePackages }: -let +with skawarePackages; +buildPackage { + pname = "execline"; version = "2.5.0.1"; + sha256 = "0d4gvixz7xja03hnwc2bf13xrgh1jq27ij4m1jlrpgrzhfpqz37q"; -in stdenv.mkDerivation rec { - - name = "execline-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/execline"; - rev = "refs/tags/v${version}"; - sha256 = "0d4gvixz7xja03hnwc2bf13xrgh1jq27ij4m1jlrpgrzhfpqz37q"; - }; + description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - # TODO: nsss support configureFlags = [ - "--enable-absolute-paths" "--libdir=\${lib}/lib" "--dynlibdir=\${lib}/lib" "--bindir=\${bin}/bin" @@ -31,22 +21,15 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs.dev}/include" "--with-lib=${skalibs.lib}/lib" "--with-dynlib=${skalibs.lib}/lib" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/execline + # remove all execline executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libexecline.* + mv doc $doc/share/doc/execline/html mv examples $doc/share/doc/execline/examples ''; - meta = { - homepage = http://skarnet.org/software/execline/; - description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index c11bd13c799a..04874dedc6e6 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,47 +1,35 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv, skawarePackages }: -with stdenv.lib; +with skawarePackages; -stdenv.mkDerivation rec { - name = "s6-portable-utils-${version}"; +let + pname = "s6-portable-utils"; + +in buildPackage { + pname = pname; version = "2.2.1.2"; + sha256 = "1zfanja5mbyafmzw28dlx1bb3fixa7lidbs62sxf849ly3z0zqp2"; - src = fetchurl { - url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "0if77z07rfygd1yk9d2abxkdbx3dg52vcjhb20isb8kvqxhkg8ih"; - }; + description = "A set of tiny general Unix utilities optimized for simplicity and small size"; outputs = [ "bin" "dev" "doc" "out" ]; - dontDisableStatic = true; - configureFlags = [ - "--enable-absolute-paths" "--bindir=\${bin}/bin" "--includedir=\${dev}/include" "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" "--with-include=${skalibs.dev}/include" "--with-lib=${skalibs.lib}/lib" "--with-dynlib=${skalibs.lib}/lib" - ] - # On darwin, the target triplet from -dumpmachine includes version number, but - # skarnet.org software uses the triplet to test binary compatibility. - # Explicitly setting target ensures code can be compiled against a skalibs - # binary built on a different version of darwin. - # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/s6-portable-utils/ - mv doc $doc/share/doc/s6-portable-utils/html + # remove all s6 executables from build directory + rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) + rm seekablepipe + + mv doc $doc/share/doc/${pname}/html ''; - meta = { - homepage = http://www.skarnet.org/software/s6-portable-utils/; - description = "A set of tiny general Unix utilities optimized for simplicity and small size"; - platforms = platforms.all; - license = licenses.isc; - maintainers = with maintainers; [ pmahoney Profpatsch ]; - }; } diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index ee669b8f9282..6d514d56ed39 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -1,27 +1,17 @@ -{ stdenv, fetchgit, skalibs }: +{ stdenv, skawarePackages }: -let +with skawarePackages; +buildPackage { + pname = "s6-dns"; version = "2.3.0.1"; + sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb"; -in stdenv.mkDerivation rec { - - name = "s6-dns-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/s6-dns"; - rev = "refs/tags/v${version}"; - sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb"; - }; + description = "A suite of DNS client programs and libraries for Unix systems"; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - configureFlags = [ - "--enable-absolute-paths" "--libdir=\${lib}/lib" "--libexecdir=\${lib}/libexec" "--dynlibdir=\${lib}/lib" @@ -31,21 +21,15 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs.dev}/include" "--with-lib=${skalibs.lib}/lib" "--with-dynlib=${skalibs.lib}/lib" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/s6-dns/ + # remove all s6-dns executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libs6dns.* + rm libskadns.* + mv doc $doc/share/doc/s6-dns/html ''; - meta = { - homepage = http://www.skarnet.org/software/s6-dns/; - description = "A suite of DNS client programs and libraries for Unix systems"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index d96cff167d90..032287ece835 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -1,4 +1,4 @@ -{ stdenv, execline, fetchgit, s6, s6-dns, skalibs +{ stdenv, skawarePackages # Whether to build the TLS/SSL tools and what library to use # acceptable values: "libressl", false @@ -6,11 +6,9 @@ , sslSupport ? "libressl" , libressl }: +with skawarePackages; let inherit (stdenv) lib; - - version = "2.3.0.3"; - sslSupportEnabled = sslSupport != false; sslLibs = { "libressl" = libressl; @@ -19,25 +17,18 @@ let in assert sslSupportEnabled -> sslLibs ? ${sslSupport}; -stdenv.mkDerivation rec { - name = "s6-networking-${version}"; +buildPackage { + pname = "s6-networking"; + version = "2.3.0.3"; + sha256 = "06kv2l31ch0zw538bpivgnwymb056x5hpmqafglffgkbq3izp7wc"; - src = fetchgit { - url = "git://git.skarnet.org/s6-networking"; - rev = "refs/tags/v${version}"; - sha256 = "06kv2l31ch0zw538bpivgnwymb056x5hpmqafglffgkbq3izp7wc"; - }; + description = "A suite of small networking utilities for Unix systems"; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - # TODO: nsss support configureFlags = [ - "--enable-absolute-paths" "--libdir=\${lib}/lib" "--libexecdir=\${lib}/libexec" "--dynlibdir=\${lib}/lib" @@ -61,20 +52,16 @@ stdenv.mkDerivation rec { "--enable-ssl=${sslSupport}" "--with-include=${lib.getDev sslLibs.${sslSupport}}/include" "--with-lib=${lib.getLib sslLibs.${sslSupport}}/lib" - ]) - ++ (lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + "--with-dynlib=${lib.getLib sslLibs.${sslSupport}}/lib" + ]); postInstall = '' - mkdir -p $doc/share/doc/s6-networking/ + # remove all s6 executables from build directory + rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) + rm minidentd + rm libs6net.* libstls.* + mv doc $doc/share/doc/s6-networking/html ''; - meta = { - homepage = http://www.skarnet.org/software/s6-networking/; - description = "A suite of small networking utilities for Unix systems"; - platforms = lib.platforms.all; - license = lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index b5cfa8ea4425..3edb0c0fb608 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -1,27 +1,18 @@ -{ stdenv, execline, fetchgit, skalibs, s6 }: +{ stdenv, skawarePackages }: -let +with skawarePackages; +buildPackage { + pname = "s6-rc"; version = "0.4.1.0"; + sha256 = "1as7jhlp4cvh1bzvcli1hk1pbdzkac8gys1h379blymfy8hmp805"; -in stdenv.mkDerivation rec { - - name = "s6-rc-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/s6-rc"; - rev = "refs/tags/v${version}"; - sha256 = "1as7jhlp4cvh1bzvcli1hk1pbdzkac8gys1h379blymfy8hmp805"; - }; + description = "A service manager for s6-based systems"; + platforms = stdenv.lib.platforms.linux; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - configureFlags = [ - "--enable-absolute-paths" "--libdir=\${lib}/lib" "--libexecdir=\${lib}/libexec" "--dynlibdir=\${lib}/lib" @@ -37,22 +28,15 @@ in stdenv.mkDerivation rec { "--with-dynlib=${skalibs.lib}/lib" "--with-dynlib=${execline.lib}/lib" "--with-dynlib=${s6.out}/lib" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/s6-rc/ + # remove all s6 executables from build directory + rm $(find -name "s6-rc-*" -type f -mindepth 1 -maxdepth 1 -executable) + rm s6-rc libs6rc.* + mv doc $doc/share/doc/s6-rc/html mv examples $doc/share/doc/s6-rc/examples ''; - meta = { - homepage = http://skarnet.org/software/s6-rc/; - description = "A service manager for s6-based systems"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 85140bce1ec9..f459c6242606 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -1,32 +1,21 @@ -{ stdenv, execline, fetchgit, skalibs }: +{ stdenv, skawarePackages }: -let +with skawarePackages; +buildPackage { + pname = "s6"; version = "2.7.2.0"; + sha256 = "07j4is7kxkynschwbf83q5rw1872kg3ij2vhxyfp3bg71k5pw1az"; -in stdenv.mkDerivation rec { - - name = "s6-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/s6"; - rev = "refs/tags/v${version}"; - sha256 = "07j4is7kxkynschwbf83q5rw1872kg3ij2vhxyfp3bg71k5pw1az"; - }; + description = "skarnet.org's small & secure supervision software suite"; # NOTE lib: cannot split lib from bin at the moment, # since some parts of lib depend on executables in bin. # (the `*_startf` functions in `libs6`) - outputs = [ /*"bin" "lib"*/ "out" "dev" "doc" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - # TODO: nsss support configureFlags = [ - "--enable-absolute-paths" "--libdir=\${out}/lib" "--libexecdir=\${out}/libexec" "--dynlibdir=\${out}/lib" @@ -39,22 +28,15 @@ in stdenv.mkDerivation rec { "--with-lib=${execline.lib}/lib" "--with-dynlib=${skalibs.lib}/lib" "--with-dynlib=${execline.lib}/lib" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/s6/ + # remove all s6 executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libs6.* + mv doc $doc/share/doc/s6/html mv examples $doc/share/doc/s6/examples ''; - meta = { - homepage = http://www.skarnet.org/software/s6/; - description = "skarnet.org's small & secure supervision software suite"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dccad6918ca5..7d5e65e4d4bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12006,6 +12006,8 @@ with pkgs; skalibs = skawarePackages.skalibs; skawarePackages = recurseIntoAttrs { + buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { }; + skalibs = callPackage ../development/libraries/skalibs { }; execline = callPackage ../tools/misc/execline { }; From e8f336fac272a92ac063b4ecd65f680518971044 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 3 Sep 2018 10:10:46 +0200 Subject: [PATCH 137/600] skawarePackages.nsss: init at 0.0.1.0 --- pkgs/development/libraries/nsss/default.nix | 33 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/nsss/default.nix diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix new file mode 100644 index 000000000000..bd56acb76e6c --- /dev/null +++ b/pkgs/development/libraries/nsss/default.nix @@ -0,0 +1,33 @@ +{ stdenv, skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "nsss"; + version = "0.0.1.0"; + sha256 = "0pw7qk4j4q4sl3h01bbqcr44ppxkdvaw08xlhsnnkiv9jypfwx7w"; + + description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; + + # TODO: nsss support + configureFlags = [ + "--libdir=\${lib}/lib" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" + ]; + + postInstall = '' + # remove all nsss executables from build directory + rm $(find -name "nsssd-*" -type f -mindepth 1 -maxdepth 1 -executable) + rm libnsss.* libnsssd.* + + mv doc $doc/share/doc/nsss/html + mv examples $doc/share/doc/nsss/examples + ''; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d5e65e4d4bc..fd0bf1a76da8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11311,6 +11311,8 @@ with pkgs; nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; + nsss = skawarePackages.nsss; + ntbtls = callPackage ../development/libraries/ntbtls { }; ntk = callPackage ../development/libraries/audio/ntk { }; @@ -12017,6 +12019,9 @@ with pkgs; s6-networking = callPackage ../tools/networking/s6-networking { }; s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; s6-rc = callPackage ../tools/system/s6-rc { }; + + nsss = callPackage ../development/libraries/nsss { }; + }; skydive = callPackage ../tools/networking/skydive { }; From 4616ef1f4135cb1908893362371ecbca6b067d24 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 4 Sep 2018 21:55:47 +0200 Subject: [PATCH 138/600] skaware: switch from git repos to tarballs It should be more performant this way. --- pkgs/build-support/skaware/build-skaware-package.nix | 7 +++---- pkgs/development/libraries/nsss/default.nix | 2 +- pkgs/development/libraries/skalibs/default.nix | 2 +- pkgs/os-specific/linux/s6-linux-utils/default.nix | 2 +- pkgs/tools/misc/execline/default.nix | 2 +- pkgs/tools/misc/s6-portable-utils/default.nix | 2 +- pkgs/tools/networking/s6-dns/default.nix | 2 +- pkgs/tools/networking/s6-networking/default.nix | 2 +- pkgs/tools/system/s6-rc/default.nix | 2 +- pkgs/tools/system/s6/default.nix | 2 +- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 5f6951cb25fa..51921fdfbdc7 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, writeScript, file }: +{ stdenv, fetchurl, writeScript, file }: let lib = stdenv.lib; in { # : string @@ -72,9 +72,8 @@ let in stdenv.mkDerivation { name = "${pname}-${version}"; - src = fetchgit { - url = "git://git.skarnet.org/${pname}"; - rev = "refs/tags/v${version}"; + src = fetchurl { + url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix index bd56acb76e6c..6c4a23ccaf28 100644 --- a/pkgs/development/libraries/nsss/default.nix +++ b/pkgs/development/libraries/nsss/default.nix @@ -5,7 +5,7 @@ with skawarePackages; buildPackage { pname = "nsss"; version = "0.0.1.0"; - sha256 = "0pw7qk4j4q4sl3h01bbqcr44ppxkdvaw08xlhsnnkiv9jypfwx7w"; + sha256 = "0f285bvpvhk40cqjpkc1jb36il0fkzzzjmc89gbbq3awl3w4r1i0"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 98977381f0f1..0667e1265b34 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -5,7 +5,7 @@ with skawarePackages; buildPackage { pname = "skalibs"; version = "2.7.0.0"; - sha256 = "068pkbl91mi35amlhv491dwrbzyfifrlxijss0g2vf693xvx6lxm"; + sha256 = "0mnprdf4w4ami0db22rwd111m037cdmn2p8xa4i8cbwxcrv4sjcn"; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 95dd3736c040..0d208a6eb55f 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -5,7 +5,7 @@ with skawarePackages; buildPackage { pname = "s6-linux-utils"; version = "2.5.0.0"; - sha256 = "0wbxwki2alyym6dm44s5ajp9ndw6sgrqvizkznz71c30i0dlxrnf"; + sha256 = "04q2z71dkzahd2ppga2zikclz2qk014c23gm7rigqxjc8rs1amvq"; description = "A set of minimalistic Linux-specific system utilities"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 00faab0a66f8..f0dc3ab64604 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -5,7 +5,7 @@ with skawarePackages; buildPackage { pname = "execline"; version = "2.5.0.1"; - sha256 = "0d4gvixz7xja03hnwc2bf13xrgh1jq27ij4m1jlrpgrzhfpqz37q"; + sha256 = "0j8hwdw8wn0rv8njdza8fbgmvyjg7hqp3qlbw00i7fwskr7d21wd"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 04874dedc6e6..ae4385a0048a 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -8,7 +8,7 @@ let in buildPackage { pname = pname; version = "2.2.1.2"; - sha256 = "1zfanja5mbyafmzw28dlx1bb3fixa7lidbs62sxf849ly3z0zqp2"; + sha256 = "0if77z07rfygd1yk9d2abxkdbx3dg52vcjhb20isb8kvqxhkg8ih"; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 6d514d56ed39..f422dabaff64 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -5,7 +5,7 @@ with skawarePackages; buildPackage { pname = "s6-dns"; version = "2.3.0.1"; - sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb"; + sha256 = "16ymalc4yxbwc0kapwmissxlw2bdk4sx3b33zp1gwx3n6hkcgh8c"; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 032287ece835..3f0e83ad9ce0 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -21,7 +21,7 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; version = "2.3.0.3"; - sha256 = "06kv2l31ch0zw538bpivgnwymb056x5hpmqafglffgkbq3izp7wc"; + sha256 = "1kfjl7da6wkmyq1mvq9irkbzk2wbi0axjfbcw5cym5y11mqswsjs"; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 3edb0c0fb608..2712186ec5d1 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -5,7 +5,7 @@ with skawarePackages; buildPackage { pname = "s6-rc"; version = "0.4.1.0"; - sha256 = "1as7jhlp4cvh1bzvcli1hk1pbdzkac8gys1h379blymfy8hmp805"; + sha256 = "1xl37xi509pcm5chcvn8l7gb952sr5mkpxhpkbsxhsllj791bfa2"; description = "A service manager for s6-based systems"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index f459c6242606..031439d56d5c 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -5,7 +5,7 @@ with skawarePackages; buildPackage { pname = "s6"; version = "2.7.2.0"; - sha256 = "07j4is7kxkynschwbf83q5rw1872kg3ij2vhxyfp3bg71k5pw1az"; + sha256 = "02canrzmhr66gi16ldyylk378jlmyfl73vn72ayr12h2wyxgqm5g"; description = "skarnet.org's small & secure supervision software suite"; From a0a71e9be623ca7069e28708955de9a552d21eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Thu, 6 Sep 2018 12:32:53 +0200 Subject: [PATCH 139/600] kops: 1.9.0 -> 1.10.0 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 5f7a2e8e2843..6ffe40d6a3de 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.9.0"; + version = "1.10.0"; goPackagePath = "k8s.io/kops"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "03avkm7gk2dqyvd7245qsca1sbhwk41j9yhc208gcmjgjhkx2vn7"; + sha256 = "1ga83sbhvhcazran6xfwgv95sg8ygg2w59vql0yjicj8r2q01vqp"; }; buildInputs = [go-bindata]; From 7c1b85cf6de1dc431e5736bff8adf01224e6abe5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 6 Sep 2018 12:18:25 +0200 Subject: [PATCH 140/600] signal-desktop: 1.15.5 -> 1.16.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 516abb4c9c00..99cd8371aa94 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.15.5"; + version = "1.16.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1a63kyxbhdaz6izprg8wryvscmvfjii50xi1v5pxlf74x2pkxs8k"; + sha256 = "0hw5h1m8fijhqybx0xijrkifn5wl50qibaxkn2mxqf4mjwlvaw9a"; }; phases = [ "unpackPhase" "installPhase" ]; From 9e25ebc03ad0e303a9e3c3b4c2f49376be75266d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 26 Jul 2018 19:40:23 +0200 Subject: [PATCH 141/600] nixos/iperf: Init the module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/iperf3.nix | 87 ++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 nixos/modules/services/networking/iperf3.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4795922abcfb..0a42ecc20a2e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -518,6 +518,7 @@ ./services/networking/i2pd.nix ./services/networking/i2p.nix ./services/networking/iodine.nix + ./services/networking/iperf3.nix ./services/networking/ircd-hybrid/default.nix ./services/networking/iwd.nix ./services/networking/keepalived/default.nix diff --git a/nixos/modules/services/networking/iperf3.nix b/nixos/modules/services/networking/iperf3.nix new file mode 100644 index 000000000000..742404a5692f --- /dev/null +++ b/nixos/modules/services/networking/iperf3.nix @@ -0,0 +1,87 @@ +{ config, lib, pkgs, ... }: with lib; +let + cfg = config.services.iperf3; + + api = { + enable = mkEnableOption "iperf3 network throughput testing server"; + port = mkOption { + type = types.ints.u16; + default = 5201; + description = "Server port to listen on for iperf3 client requsts."; + }; + affinity = mkOption { + type = types.nullOr types.ints.unsigned; + default = null; + description = "CPU affinity for the process."; + }; + bind = mkOption { + type = types.nullOr types.str; + default = null; + description = "Bind to the specific interface associated with the given address."; + }; + verbose = mkOption { + type = types.bool; + default = false; + description = "Give more detailed output."; + }; + forceFlush = mkOption { + type = types.bool; + default = false; + description = "Force flushing output at every interval."; + }; + debug = mkOption { + type = types.bool; + default = false; + description = "Emit debugging output."; + }; + rsaPrivateKey = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to the RSA private key (not password-protected) used to decrypt authentication credentials from the client."; + }; + authorizedUsersFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to the configuration file containing authorized users credentials to run iperf tests."; + }; + extraFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Extra flags to pass to iperf3(1)."; + }; + }; + + imp = { + systemd.services.iperf3 = { + description = "iperf3 daemon"; + unitConfig.Documentation = "man:iperf3(1) https://iperf.fr/iperf-doc.php"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + Restart = "on-failure"; + RestartSec = 2; + DynamicUser = true; + PrivateDevices = true; + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + ExecStart = '' + ${pkgs.iperf3}/bin/iperf \ + --server \ + --port ${toString cfg.port} \ + ${optionalString (cfg.affinity != null) "--affinity ${toString cfg.affinity}"} \ + ${optionalString (cfg.bind != null) "--bind ${cfg.bind}"} \ + ${optionalString (cfg.rsaPrivateKey != null) "--rsa-private-key-path ${cfg.rsaPrivateKey}"} \ + ${optionalString (cfg.authorizedUsersFile != null) "--authorized-users-path ${cfg.authorizedUsersFile}"} \ + ${optionalString cfg.verbose "--verbose"} \ + ${optionalString cfg.debug "--debug"} \ + ${optionalString cfg.forceFlush "--forceflush"} \ + ${escapeShellArgs cfg.extraFlags} + ''; + }; + }; + }; +in { + options.services.iperf3 = api; + config = mkIf cfg.enable imp; +} From 773233ca771a359e63328a57216f57fd45092e60 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 27 Aug 2018 14:39:58 -0400 Subject: [PATCH 142/600] top-level, stdenv: Make `system` and `stdenv.system` describe the hostPlatform. Intuitively, one cares mainly about the host platform: Platforms differ in meaningful ways but compilation is morally a pure process and probably doesn't care, or those difference are already abstracted away. @Dezgeg also empirically confirmed that > 95% of checks are indeed of the host platform. Yet these attributes in the old cross infrastructure were defined to be the build platform, for expediency. And this was never before changed. (For native builds build and host coincide, so it isn't clear what the intention was.) Fixing this doesn't affect native builds, since again they coincide. It also doesn't affect cross builds of anything in Nixpkgs, as these are no longer used. It could affect external cross builds, but I deem that unlikely as anyone thinking about cross would use more explicit attributes for clarity, all the more so because the rarity of inspecting the build platform. --- pkgs/stdenv/generic/default.nix | 3 +++ pkgs/top-level/stage.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index ac727034b8e7..be9d38f9780a 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -127,6 +127,9 @@ let "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead" hostPlatform.isAarch32; + # The derivation's `system` is `buildPlatform.system`. + inherit (buildPlatform) system; + # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 5ca8b72b8b8e..ff09fa5ad1fd 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -89,7 +89,7 @@ let targetPlatform = lib.warn "top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`." super.stdenv.targetPlatform; - inherit (super.stdenv.buildPlatform) system; + inherit (super.stdenv.hostPlatform) system; }; splice = self: super: import ./splice.nix lib self (buildPackages != null); From 1245621497fcf4326eb758e5784a1da3b5c43351 Mon Sep 17 00:00:00 2001 From: Yannik Sander Date: Thu, 6 Sep 2018 14:49:57 +0200 Subject: [PATCH 143/600] build with pythonPackages --- pkgs/applications/misc/solaar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index afe944e868e7..e26071dd3612 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,5 +1,5 @@ -{fetchFromGitHub, stdenv, gtk3, python34Packages, gobjectIntrospection}: -python34Packages.buildPythonApplication rec { +{fetchFromGitHub, stdenv, gtk3, pythonPackages, gobjectIntrospection}: +pythonPackages.buildPythonApplication rec { name = "solaar-unstable-${version}"; version = "2018-02-02"; namePrefix = ""; @@ -10,7 +10,7 @@ python34Packages.buildPythonApplication rec { sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3"; }; - propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3]; + propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobjectIntrospection gtk3]; postInstall = '' wrapProgram "$out/bin/solaar" \ --prefix PYTHONPATH : "$PYTHONPATH" \ From 656b59e3db7a95e9b943aedfcfce239305573705 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 6 Sep 2018 15:09:48 +0200 Subject: [PATCH 144/600] monkeysphere: 0.37 -> 0.41 TODO(WIP): This needs more testing and a module. --- pkgs/tools/security/monkeysphere/default.nix | 15 +++-- .../security/monkeysphere/monkeysphere.patch | 65 +++++++------------ 2 files changed, 34 insertions(+), 46 deletions(-) diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index d1266ca495ed..badea48cec48 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, perl, makeWrapper, perlPackages }: +{ stdenv, fetchurl, makeWrapper +, perl, perlPackages, libassuan, libgcrypt +}: stdenv.mkDerivation rec { name = "monkeysphere-${version}"; - version = "0.37"; + version = "0.41"; src = fetchurl { - url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz"; - sha256 = "0nbfd220miflah5l2y20qlmgfpbqi0j8h7qgx1b06h7v2jjbh45m"; + url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz"; + sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li"; }; - buildInputs = [ makeWrapper perl ]; + buildInputs = [ makeWrapper perl libassuan libgcrypt ]; patches = [ ./monkeysphere.patch ]; @@ -43,7 +45,8 @@ stdenv.mkDerivation rec { TLS/SSL communications through the normal use of tools you are familiar with, such as your web browser0 or secure shell. ''; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch index 8b343b93454f..f341ee747bbc 100644 --- a/pkgs/tools/security/monkeysphere/monkeysphere.patch +++ b/pkgs/tools/security/monkeysphere/monkeysphere.patch @@ -1,51 +1,34 @@ -diff -rupN monkeysphere-0.37/Makefile monkeysphere-0.37-patched/Makefile ---- monkeysphere-0.37/Makefile 2014-08-06 19:27:38.000000000 +0200 -+++ monkeysphere-0.37-patched/Makefile 2015-07-31 19:51:57.539373097 +0200 -@@ -42,11 +42,11 @@ install: all installman - mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere - printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION - install src/monkeysphere $(DESTDIR)$(PREFIX)/bin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/bin/monkeysphere - install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host - install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication - install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere - install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere - install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere -@@ -59,8 +59,8 @@ install: all installman - ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2pem - ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2spki - install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23 -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28 -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23 -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28 - install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions - install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m - install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh -diff -rupN monkeysphere-0.37/src/share/checkperms monkeysphere-0.37-patched/src/share/checkperms ---- monkeysphere-0.37/src/share/checkperms 2014-08-06 19:27:38.000000000 +0200 -+++ monkeysphere-0.37-patched/src/share/checkperms 2015-07-31 19:52:18.170675985 +0200 +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,7 @@ clean: + replaced/%: % + mkdir -p $(dir $@) + sed < $< > $@ \ +- -e 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' \ ++ -e 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' \ + -e 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' \ + -e 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' + +diff --git a/src/share/checkperms b/src/share/checkperms +--- a/src/share/checkperms ++++ b/src/share/checkperms @@ -1,4 +1,4 @@ -#!/usr/bin/perl -T +#!/usr/bin/perl # checkperms: ensure as best we can that a given file can only be # modified by the given user (or the superuser, naturally). This -diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/share/keytrans ---- monkeysphere-0.37/src/share/keytrans 2014-08-06 19:27:38.000000000 +0200 -+++ monkeysphere-0.37-patched/src/share/keytrans 2015-07-31 20:13:36.664514290 +0200 +diff --git a/src/share/keytrans b/src/share/keytrans +--- a/src/share/keytrans ++++ b/src/share/keytrans @@ -1,4 +1,4 @@ -#!/usr/bin/perl -T +#!/usr/bin/perl # keytrans: this is an RSA key translation utility; it is capable of # transforming RSA keys (both public keys and secret keys) between -@@ -1069,7 +1069,7 @@ sub packetwalk { +@@ -1083,7 +1083,7 @@ sub packetwalk { for (basename($0)) { @@ -54,7 +37,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh my $rsa; my $stdin; -@@ -1107,7 +1107,7 @@ for (basename($0)) { +@@ -1121,7 +1121,7 @@ for (basename($0)) { } ); } @@ -63,7 +46,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh my $fpr = shift; my $instream; open($instream,'-'); -@@ -1123,7 +1123,7 @@ for (basename($0)) { +@@ -1137,7 +1137,7 @@ for (basename($0)) { die "No matching key found.\n"; } } @@ -72,7 +55,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh my $fpr = shift; my $instream; open($instream,'-'); -@@ -1139,7 +1139,7 @@ for (basename($0)) { +@@ -1153,7 +1153,7 @@ for (basename($0)) { die "No matching key found.\n"; } } @@ -81,7 +64,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh my $fpr = shift; my $instream; open($instream,'-'); -@@ -1151,7 +1151,7 @@ for (basename($0)) { +@@ -1165,7 +1165,7 @@ for (basename($0)) { die "No matching key found.\n"; } } @@ -90,3 +73,5 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh # subcommands when keytrans is invoked directly are UNSUPPORTED, # UNDOCUMENTED, and WILL NOT BE MAINTAINED. my $subcommand = shift; +-- +2.16.3 From 8ae27030aa4989d42f9335d4b80a5a4d3d6d039c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 27 Aug 2018 14:39:58 -0400 Subject: [PATCH 145/600] doc: Add changelog entry for new definition of `system` and `stdenv.system` See the previous commit for details. --- nixos/doc/manual/release-notes/rl-1809.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 421208ec0f8c..be225f18c24e 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -283,6 +283,14 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' from your config without any issues. + + + stdenv.system and system in nixpkgs now refer to the host platform instead of the build platform. + For native builds this is not change, let alone a breaking one. + For cross builds, it is a breaking change, and stdenv.buildPlatform.system can be used instead for the old behavior. + They should be using that anyways for clarity. + + From 037813906d09062d2b7330893bfb36ce412e8889 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 10 Aug 2018 15:15:22 +0800 Subject: [PATCH 146/600] wp-cli: use 1 store path instead of 4 --- pkgs/development/tools/wp-cli/default.nix | 56 ++++++++++++----------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 2f5552945714..780accd76bfd 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,42 +1,46 @@ { stdenv, lib, fetchurl, writeScript, writeText, php }: let - name = "wp-cli-${version}"; version = "2.0.0"; - src = fetchurl { - url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp"; - }; - completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; }; - bin = writeScript "wp" '' - #! ${stdenv.shell} - - set -euo pipefail - - exec ${lib.getBin php}/bin/php \ - -c ${ini} \ - -f ${src} -- "$@" - ''; - - ini = writeText "wp-cli.ini" '' - [PHP] - memory_limit = -1 ; no limit as composer uses a lot of memory - - [Phar] - phar.readonly = Off - ''; - in stdenv.mkDerivation rec { - inherit name version; + name = "wp-cli-${version}"; + inherit version; + + src = fetchurl { + url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; + sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp"; + }; buildCommand = '' - install -Dm755 ${bin} $out/bin/wp + dir=$out/share/wp-cli + mkdir -p $out/bin $dir + + cat <<_EOF > $out/bin/wp +#!${stdenv.shell} + +set -euo pipefail + +exec ${lib.getBin php}/bin/php \\ + -c $dir/php.ini \\ + -f $dir/wp-cli -- "\$@" +_EOF + chmod 0755 $out/bin/wp + + cat <<_EOF > $dir/php.ini +[PHP] +memory_limit = -1 ; no limit as composer uses a lot of memory + +[Phar] +phar.readonly = Off +_EOF + + install -Dm644 ${src} $dir/wp-cli install -Dm644 ${completion} $out/share/bash-completion/completions/wp # this is a very basic run test From a278414b32ad99bf11ce63c2ef0c970920bf761d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 6 Sep 2018 21:35:56 +0800 Subject: [PATCH 147/600] wp-cli: 2.0.0 -> 2.0.1 --- pkgs/development/tools/wp-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 780accd76bfd..e2250297c8eb 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, writeScript, writeText, php }: let - version = "2.0.0"; + version = "2.0.1"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp"; + sha256 = "05lbay4c0477465vv4h8d2j94pk3haz1a7f0ncb127fvxz3a2pcg"; }; buildCommand = '' From f66257cfcea37acd0d24b99b74694898f3493fd5 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 6 Sep 2018 09:21:38 -0400 Subject: [PATCH 148/600] doc: Add release notes for top-level {build,host,target}Platform deprecation I forgot to do this in e51f736076548459f36a1250de4bf6867f880b66. --- nixos/doc/manual/release-notes/rl-1809.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 63775d503c98..9ec465d8955e 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -544,6 +544,13 @@ inherit (pkgs.nixos { a new paragraph. + + + Top-level buildPlatform, hostPlatform, and targetPlatform in Nixpkgs are deprecated. + Please use their equivalents in stdenv instead: + stdenv.buildPlatform, stdenv.hostPlatform, and stdenv.targetPlatform. + + From 6ea0c3e2714d79df33a5fa9bfd7d5259e4475b4d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 6 Sep 2018 17:16:34 +0300 Subject: [PATCH 149/600] matrix-synapse: 0.33.3 -> 0.33.3.1 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 74cd233710cd..2aea521611c4 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,13 +26,13 @@ let }; in python2Packages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.33.3"; + version = "0.33.3.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "0yxxrs8yrrkp3pffdfab8apdmyhdcl90wgmglryy4q8vsksxn7d4"; + sha256 = "0q7rjh2qwj1ym5alnv9dvgw07bm7kk7igfai9ix72c6n7qb4z4i3"; }; patches = [ From 5b58c6ac7648bc6a216e5bebd394680227de1e85 Mon Sep 17 00:00:00 2001 From: Sebastien Maret Date: Thu, 6 Sep 2018 16:10:21 +0200 Subject: [PATCH 150/600] gildas: add alternative url for the source code (#46145) For each new release, the upstream developers of Gildas move the source code of the previous release to a different directory. Add this directory to the list of url to avoid build failure at each new release. --- pkgs/applications/science/astronomy/gildas/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index d74eee4190df..82575d9c6ff0 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { name = "gildas-${version}"; src = fetchurl { - url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"; + # For each new release, the upstream developers of Gildas move the + # source code of the previous release to a different directory + urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz" + "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ]; sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1"; }; From f3bc6aec00cc5c7ce5dcd2afa1bd7eee897dac06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 07:38:41 -0700 Subject: [PATCH 151/600] xcbutilxrm: 1.2 -> 1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from xcb-util-xrm --- pkgs/servers/x11/xorg/xcb-util-xrm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index 5a315b99b08b..0a008227b9fb 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: stdenv.mkDerivation rec { - version = "1.2"; + version = "1.3"; name = "xcb-util-xrm-${version}"; src = fetchurl { url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0vbqhag51i0njc8d5fc8c6aa12496cwrc3s6s7sa5kfc17cwhppp"; + sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h"; }; nativeBuildInputs = [ pkgconfig m4 ]; From fc2c606a7ac8fb48be4181f777d029bd75c0c58a Mon Sep 17 00:00:00 2001 From: Paul TREHIOU Date: Thu, 6 Sep 2018 18:02:33 +0200 Subject: [PATCH 152/600] jackett: 0.9.41 -> 0.10.160 (#46114) * jackett: update mono to 5.8 Jackett needs mono version >= 5.8 https://github.com/Jackett/Jackett/blob/master/README.md#supported-systems * jackett: 0.9.41 -> 0.10.160 --- pkgs/servers/jackett/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 774f8df94a7d..49f7b59ddc6f 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.9.41"; + version = "0.10.160"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0ndzn1p876rkj56g6vscgkmyzi1k0gmqby4rmrb4ilxzjpskii8m"; + sha256 = "1msy11s89r63vcan6d8mjn2jic1zwvl2j852mjj06bfb3yldx6vq"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd0bf1a76da8..3d0e6ae15da8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3356,7 +3356,7 @@ with pkgs; jaaa = callPackage ../applications/audio/jaaa { }; jackett = callPackage ../servers/jackett { - mono = mono50; + mono = mono5; }; jade = callPackage ../tools/text/sgml/jade { }; From 0e2aa97f3aa1341693885511fd78394b828c6477 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 26 Jul 2018 20:45:55 +0200 Subject: [PATCH 153/600] lib/trivial: add assertMsg --- lib/default.nix | 3 ++- lib/trivial.nix | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index dd6fcec75e21..fd3be3c6f4bc 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -59,7 +59,8 @@ let inherit (trivial) id const concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info nixpkgsVersion version mod compare - splitByAndCompare functionArgs setFunctionArgs isFunction; + splitByAndCompare functionArgs setFunctionArgs isFunction + assertMsg; inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; diff --git a/lib/trivial.nix b/lib/trivial.nix index e702b8cdcc9f..bba284548d98 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -188,6 +188,26 @@ rec { warn = msg: builtins.trace "WARNING: ${msg}"; info = msg: builtins.trace "INFO: ${msg}"; + /* Print a trace message if pred is false. + Intended to be used to augment asserts with helpful error messages. + + Example: + assertMsg false "nope" + => false + stderr> trace: nope + + assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); "" + stderr> trace: foo is not bar, silly + stderr> assert failed at … + + Type: + assertMsg :: Bool -> String -> Bool + */ + assertMsg = pred: msg: + if pred + then true + else builtins.trace msg false; + ## Function annotations From 320cdecd1697020cb367adc1f8408dbf689ca254 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 6 Aug 2018 01:35:48 +0200 Subject: [PATCH 154/600] lib/trivial: add assertOneOf --- lib/default.nix | 2 +- lib/trivial.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index fd3be3c6f4bc..358c8ca0b8f9 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -60,7 +60,7 @@ let boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction - assertMsg; + assertMsg assertOneOf; inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; diff --git a/lib/trivial.nix b/lib/trivial.nix index bba284548d98..f1001ee10ca3 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -203,11 +203,29 @@ rec { Type: assertMsg :: Bool -> String -> Bool */ + # TODO(Profpatsch): add tests that check stderr assertMsg = pred: msg: if pred then true else builtins.trace msg false; + /* Specialized `assertMsg` for checking if val is one of the elements + of a list. Useful for checking enums. + + Example: + let sslLibrary = "libressl" + in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ] + => false + stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl" + + Type: + assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool + */ + assertOneOf = name: val: xs: assertMsg + (lib.elem val xs) + "${name} must be one of ${ + lib.generators.toPretty {} xs}, but is: ${ + lib.generators.toPretty {} val}"; ## Function annotations From 3e45b61a9920466a8ea06b8ad9350d56ade435bc Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 6 Aug 2018 01:36:09 +0200 Subject: [PATCH 155/600] lib/trivial: add a few examples of usage of assertMsg/assertOneOf --- lib/lists.nix | 7 +++++-- lib/strings.nix | 7 +++++-- lib/types.nix | 8 ++++++-- pkgs/applications/misc/lilyterm/default.nix | 5 ++--- pkgs/applications/science/math/ripser/default.nix | 3 ++- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/lib/lists.nix b/lib/lists.nix index 288882924fff..9a75f179e964 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -509,7 +509,8 @@ rec { => 3 */ last = list: - assert list != []; elemAt list (length list - 1); + assert assertMsg (list != []) "lists.last: list must not be empty!"; + elemAt list (length list - 1); /* Return all elements but the last @@ -517,7 +518,9 @@ rec { init [ 1 2 3 ] => [ 1 2 ] */ - init = list: assert list != []; take (length list - 1) list; + init = list: + assert assertMsg (list != []) "lists.init: list must not be empty!"; + take (length list - 1) list; /* return the image of the cross product of some lists by a function diff --git a/lib/strings.nix b/lib/strings.nix index 833f69d2fbfe..0c4095bb55cd 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -410,7 +410,7 @@ rec { components = splitString "/" url; filename = lib.last components; name = builtins.head (splitString sep filename); - in assert name != filename; name; + in assert name != filename; name; /* Create an --{enable,disable}- string that can be passed to standard GNU Autoconf scripts. @@ -468,7 +468,10 @@ rec { strw = lib.stringLength str; reqWidth = width - (lib.stringLength filler); in - assert strw <= width; + assert lib.assertMsg (strw <= width) + "fixedWidthString: requested string length (${ + toString width}) must not be shorter than actual length (${ + toString strw})"; if strw == width then str else filler + fixedWidthString reqWidth filler str; /* Format a number adding leading zeroes up to fixed width. diff --git a/lib/types.nix b/lib/types.nix index 4d6ac51c8988..441af98cb9b6 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -119,7 +119,9 @@ rec { let betweenDesc = lowest: highest: "${toString lowest} and ${toString highest} (both inclusive)"; - between = lowest: highest: assert lowest <= highest; + between = lowest: highest: + assert lib.assertMsg (lowest <= highest) + "ints.between: lowest must be smaller than highest"; addCheck int (x: x >= lowest && x <= highest) // { name = "intBetween"; description = "integer between ${betweenDesc lowest highest}"; @@ -439,7 +441,9 @@ rec { # Either value of type `finalType` or `coercedType`, the latter is # converted to `finalType` using `coerceFunc`. coercedTo = coercedType: coerceFunc: finalType: - assert coercedType.getSubModules == null; + assert assertMsg (coercedType.getSubModules == null) + "coercedTo: coercedType must not have submodules (it’s a ${ + coercedType.description})"; mkOptionType rec { name = "coercedTo"; description = "${finalType.description} or ${coercedType.description} convertible to it"; diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 72cb1e85802a..948ae7b14a11 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromGitHub , pkgconfig , autoconf, automake, intltool, gettext , gtk, vte -# "stable" or "git" , flavour ? "stable" }: -assert flavour == "stable" || flavour == "git"; +assert lib.assertOneOf "flavour" flavour [ "stable" "git" ]; let stuff = diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 21948a279d07..5e0b7fc300ba 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -8,7 +8,8 @@ with stdenv.lib; -assert elem fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"]; +assert assertOneOf "fileFormat" fileFormat + ["lowerTriangularCsv" "upperTriangularCsv" "dipha"]; assert useGoogleHashmap -> sparsehash != null; let From efdf618330a22f837f0e5e446028e918a5b4dd8a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 8 Aug 2018 19:26:52 +0200 Subject: [PATCH 156/600] lib: move assertMsg and assertOneOf to their own library file Since the `assertOneOf` uses `lib.generators`, they are not really trivial anymore and should go into their own library file. --- lib/asserts.nix | 44 ++++++++++++++++++++++++++++++++++++++++++++ lib/default.nix | 9 +++++---- lib/lists.nix | 4 ++-- lib/trivial.nix | 40 +--------------------------------------- lib/types.nix | 2 +- 5 files changed, 53 insertions(+), 46 deletions(-) create mode 100644 lib/asserts.nix diff --git a/lib/asserts.nix b/lib/asserts.nix new file mode 100644 index 000000000000..8a5f1fb3feb7 --- /dev/null +++ b/lib/asserts.nix @@ -0,0 +1,44 @@ +{ lib }: + +rec { + + /* Print a trace message if pred is false. + Intended to be used to augment asserts with helpful error messages. + + Example: + assertMsg false "nope" + => false + stderr> trace: nope + + assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); "" + stderr> trace: foo is not bar, silly + stderr> assert failed at … + + Type: + assertMsg :: Bool -> String -> Bool + */ + # TODO(Profpatsch): add tests that check stderr + assertMsg = pred: msg: + if pred + then true + else builtins.trace msg false; + + /* Specialized `assertMsg` for checking if val is one of the elements + of a list. Useful for checking enums. + + Example: + let sslLibrary = "libressl" + in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ] + => false + stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl" + + Type: + assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool + */ + assertOneOf = name: val: xs: assertMsg + (lib.elem val xs) + "${name} must be one of ${ + lib.generators.toPretty {} xs}, but is: ${ + lib.generators.toPretty {} val}"; + +} diff --git a/lib/default.nix b/lib/default.nix index 358c8ca0b8f9..d7a05fec8338 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -38,10 +38,11 @@ let systems = callLibs ./systems; # misc + asserts = callLibs ./asserts.nix; debug = callLibs ./debug.nix; - generators = callLibs ./generators.nix; misc = callLibs ./deprecated.nix; + # domain-specific fetchers = callLibs ./fetchers.nix; @@ -59,9 +60,7 @@ let inherit (trivial) id const concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info nixpkgsVersion version mod compare - splitByAndCompare functionArgs setFunctionArgs isFunction - assertMsg assertOneOf; - + splitByAndCompare functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; inherit (attrsets) attrByPath hasAttrByPath setAttrByPath @@ -118,6 +117,8 @@ let unknownModule mkOption; inherit (types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; + inherit (asserts) + assertMsg assertOneOf; inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal diff --git a/lib/lists.nix b/lib/lists.nix index 9a75f179e964..9ecd8f220038 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -509,7 +509,7 @@ rec { => 3 */ last = list: - assert assertMsg (list != []) "lists.last: list must not be empty!"; + assert lib.assertMsg (list != []) "lists.last: list must not be empty!"; elemAt list (length list - 1); /* Return all elements but the last @@ -519,7 +519,7 @@ rec { => [ 1 2 ] */ init = list: - assert assertMsg (list != []) "lists.init: list must not be empty!"; + assert lib.assertMsg (list != []) "lists.init: list must not be empty!"; take (length list - 1) list; diff --git a/lib/trivial.nix b/lib/trivial.nix index f1001ee10ca3..b1eea0bf1247 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -171,7 +171,7 @@ rec { builtins.fromJSON (builtins.readFile path); - ## Warnings and asserts + ## Warnings /* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these to expand to Nix builtins that carry metadata so that Nix can filter out @@ -188,44 +188,6 @@ rec { warn = msg: builtins.trace "WARNING: ${msg}"; info = msg: builtins.trace "INFO: ${msg}"; - /* Print a trace message if pred is false. - Intended to be used to augment asserts with helpful error messages. - - Example: - assertMsg false "nope" - => false - stderr> trace: nope - - assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); "" - stderr> trace: foo is not bar, silly - stderr> assert failed at … - - Type: - assertMsg :: Bool -> String -> Bool - */ - # TODO(Profpatsch): add tests that check stderr - assertMsg = pred: msg: - if pred - then true - else builtins.trace msg false; - - /* Specialized `assertMsg` for checking if val is one of the elements - of a list. Useful for checking enums. - - Example: - let sslLibrary = "libressl" - in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ] - => false - stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl" - - Type: - assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool - */ - assertOneOf = name: val: xs: assertMsg - (lib.elem val xs) - "${name} must be one of ${ - lib.generators.toPretty {} xs}, but is: ${ - lib.generators.toPretty {} val}"; ## Function annotations diff --git a/lib/types.nix b/lib/types.nix index 441af98cb9b6..4e44e7521c4b 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -441,7 +441,7 @@ rec { # Either value of type `finalType` or `coercedType`, the latter is # converted to `finalType` using `coerceFunc`. coercedTo = coercedType: coerceFunc: finalType: - assert assertMsg (coercedType.getSubModules == null) + assert lib.assertMsg (coercedType.getSubModules == null) "coercedTo: coercedType must not have submodules (it’s a ${ coercedType.description})"; mkOptionType rec { From 13050ccc0b315082ea20bc418448204b071bb9c8 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 6 Sep 2018 01:33:10 +0900 Subject: [PATCH 157/600] python3Packages.genanki: init at 0.6.0 Library to generate anki flashcards. --- .../python-modules/genanki/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/genanki/default.nix diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix new file mode 100644 index 000000000000..bcc462e7237d --- /dev/null +++ b/pkgs/development/python-modules/genanki/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner +}: + +buildPythonPackage rec { + pname = "genanki"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xj8yd3acl8h457sh42balvcd0z4mg5idd4q63f7qlfzc5wgbb74"; + }; + + propagatedBuildInputs = [ + pytestrunner + cached-property + frozendict + pystache + pyyaml + ]; + + checkInputs = [ pytest ]; + + disabled = !isPy3k; + + # relies on upstream anki + doCheck = false; + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = http://github.com/kerrickstaley/genanki; + description = "Generate Anki decks programmatically"; + license = licenses.mit; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 137463b74db6..dcb9961c01fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -298,6 +298,8 @@ in { fire = callPackage ../development/python-modules/fire { }; + genanki = callPackage ../development/python-modules/genanki { }; + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; From 1d6fd659570082ef852407f08d0f78ada8209da8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 6 Sep 2018 12:13:27 -0400 Subject: [PATCH 158/600] pythonPackages.geopandas: 0.3.0 -> 0.4.0 Additionally fix issue with tests failing for 18.09 release. Tests required url fetch. Disabled with "not web". --- pkgs/development/python-modules/geopandas/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index cab25a60f3b4..976df0952615 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -1,23 +1,23 @@ { stdenv, buildPythonPackage, fetchFromGitHub , pandas, shapely, fiona, descartes, pyproj -, pytest }: +, pytest, Rtree }: buildPythonPackage rec { pname = "geopandas"; - version = "0.3.0"; + version = "0.4.0"; name = pname + "-" + version; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "0maafafr7sjjmlg2f19bizg06c8a5z5igmbcgq6kgmi7rklx8xxz"; + sha256 = "025zpgck5pnmidvzk0805pr345rd7k6z66qb2m34gjh1814xjkhv"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest Rtree ]; checkPhase = '' - py.test geopandas + py.test geopandas -m "not web" ''; propagatedBuildInputs = [ From 3fc7c5b5913e254615698e5bfe7e4084b816f435 Mon Sep 17 00:00:00 2001 From: xplat Date: Thu, 6 Sep 2018 13:18:34 -0400 Subject: [PATCH 159/600] opam: 1.2.2 -> 2.0.0 (#45806) --- pkgs/development/tools/ocaml/opam/1.2.2.nix | 92 +++++++++++++ pkgs/development/tools/ocaml/opam/default.nix | 106 ++++++++------ .../tools/ocaml/opam/opam-mccs-darwin.patch | 18 +++ .../tools/ocaml/opam/opam-pull-3487.patch | 23 ++++ .../tools/ocaml/opam/opam-shebangs.patch | 128 +++++++++++++++++ pkgs/development/tools/ocaml/opam/opam.nix.pl | 130 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 7 files changed, 457 insertions(+), 43 deletions(-) create mode 100644 pkgs/development/tools/ocaml/opam/1.2.2.nix create mode 100644 pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch create mode 100644 pkgs/development/tools/ocaml/opam/opam-pull-3487.patch create mode 100644 pkgs/development/tools/ocaml/opam/opam-shebangs.patch create mode 100755 pkgs/development/tools/ocaml/opam/opam.nix.pl diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix new file mode 100644 index 000000000000..7e84719ae47d --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -0,0 +1,92 @@ +{ stdenv, lib, fetchurl, makeWrapper, + ocaml, unzip, ncurses, curl, aspcud +}: + +assert lib.versionAtLeast ocaml.version "3.12.1"; + +let + srcs = { + cudf = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz"; + sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701"; + }; + extlib = fetchurl { + url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; + sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; + }; + ocaml_re = fetchurl { + url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; + sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; + }; + ocamlgraph = fetchurl { + url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz"; + sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f"; + }; + dose3 = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz"; + sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e"; + }; + cmdliner = fetchurl { + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz"; + sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a"; + }; + uutf = fetchurl { + url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz"; + sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877"; + }; + jsonm = fetchurl { + url = "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz"; + sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; + }; + opam = fetchurl { + url = "https://github.com/ocaml/opam/archive/1.2.2.zip"; + sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e"; + }; + }; +in stdenv.mkDerivation rec { + name = "opam-${version}"; + version = "1.2.2"; + + buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; + + src = srcs.opam; + + postUnpack = '' + ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} + ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} + ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} + ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} + ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} + ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} + ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name} + ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name} + ''; + + preConfigure = '' + substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" + ''; + + postConfigure = "make lib-ext"; + + # Dirty, but apparently ocp-build requires a TERM + makeFlags = ["TERM=screen"]; + + # change argv0 to "opam" as a workaround for + # https://github.com/ocaml/opam/issues/2142 + postInstall = '' + mv $out/bin/opam $out/bin/.opam-wrapped + makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ + --argv0 "opam" \ + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin + ''; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A package manager for OCaml"; + homepage = http://opam.ocamlpro.com/; + maintainers = [ maintainers.henrytill ]; + platforms = platforms.all; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 7e84719ae47d..8e89dd3fadd2 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,69 +1,87 @@ -{ stdenv, lib, fetchurl, makeWrapper, - ocaml, unzip, ncurses, curl, aspcud +{ stdenv, lib, fetchurl, makeWrapper, getconf, + ocaml, unzip, ncurses, curl, aspcud, bubblewrap }: -assert lib.versionAtLeast ocaml.version "3.12.1"; +assert lib.versionAtLeast ocaml.version "4.02.3"; let srcs = { + cmdliner = fetchurl { + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz"; + sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; + }; + cppo = fetchurl { + url = "https://github.com/mjambon/cppo/archive/v1.6.4.tar.gz"; + sha256 = "0jdb7d21lfa3ck4k59mrqs5pljzq5rb504jq57nnrc6klljm42j7"; + }; cudf = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz"; - sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701"; - }; - extlib = fetchurl { - url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; - sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; - }; - ocaml_re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; - sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; - }; - ocamlgraph = fetchurl { - url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz"; - sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f"; + url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; + sha256 = "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr"; }; dose3 = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz"; - sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e"; + url = "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz"; + sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; }; - cmdliner = fetchurl { - url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz"; - sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a"; + extlib = fetchurl { + url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; + sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; }; - uutf = fetchurl { - url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz"; - sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877"; + jbuilder = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/1.0+beta20/jbuilder-1.0.beta20.tbz"; + sha256 = "07hl9as5llffgd6hbw41rs76i1ibgn3n9r0dba5h0mdlkapcwb10"; }; - jsonm = fetchurl { - url = "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz"; - sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; + mccs = fetchurl { + url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+8.tar.gz"; + sha256 = "0xavfvxfrcf3lmry8ymma1yzy0hw3ijbx94c9zq3pzlwnylrapa4"; + }; + ocamlgraph = fetchurl { + url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz"; + sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"; + }; + opam-file-format = fetchurl { + url = "https://github.com/ocaml/opam-file-format/archive/2.0.0-rc2.tar.gz"; + sha256 = "1mgk08msp7hxn0hs0m82vky3yv6hcq4pw5402b3vhx4c49431jsb"; + }; + re = fetchurl { + url = "https://github.com/ocaml/ocaml-re/releases/download/1.7.3/re-1.7.3.tbz"; + sha256 = "0nv933qfl8y9i19cqvhsalwzif3dkm28vg478rpnr4hgfqjlfryr"; + }; + result = fetchurl { + url = "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz"; + sha256 = "1lrnbxdq80gbhnp85mqp1kfk0bkh6q1c93sfz2qgnq2qyz60w4sk"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.2.2.zip"; - sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e"; + url = "https://github.com/ocaml/opam/archive/2.0.0.zip"; + sha256 = "0m4ilsldrfkkn0vlvl119bk76j2pwvqvdi8mpg957z4kqflfbfp8"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "1.2.2"; + version = "2.0.0"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; + buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; src = srcs.opam; postUnpack = '' - ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} - ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} - ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} - ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} - ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} - ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} - ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name} - ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name} + ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/cmdliner.tbz + ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tar.gz + ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz + ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz + ln -sv ${srcs.extlib} $sourceRoot/src_ext/extlib.tar.gz + ln -sv ${srcs.jbuilder} $sourceRoot/src_ext/jbuilder.tbz + ln -sv ${srcs.mccs} $sourceRoot/src_ext/mccs.tar.gz + ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz + ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz + ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz + ln -sv ${srcs.result} $sourceRoot/src_ext/result.tbz ''; + patches = [ ./opam-pull-3487.patch ./opam-shebangs.patch ./opam-mccs-darwin.patch ]; + preConfigure = '' substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" + patchShebangs src/state/shellscripts ''; postConfigure = "make lib-ext"; @@ -71,13 +89,17 @@ in stdenv.mkDerivation rec { # Dirty, but apparently ocp-build requires a TERM makeFlags = ["TERM=screen"]; + outputs = [ "out" "installer" ]; + setOutputFlags = false; + # change argv0 to "opam" as a workaround for # https://github.com/ocaml/opam/issues/2142 postInstall = '' mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin + $out/bin/opam-installer --prefix=$installer opam-installer.install ''; doCheck = false; @@ -87,6 +109,6 @@ in stdenv.mkDerivation rec { homepage = http://opam.ocamlpro.com/; maintainers = [ maintainers.henrytill ]; platforms = platforms.all; - license = licenses.lgpl21Plus; }; } +# Generated by: ./opam.nix.pl -v 2.0.0 -p opam-pull-3487.patch,opam-shebangs.patch,opam-mccs-darwin.patch diff --git a/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch new file mode 100644 index 000000000000..501242c40a01 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch @@ -0,0 +1,18 @@ +diff --git a/src_ext/patches/mccs/build-on-darwin.patch b/src_ext/patches/mccs/build-on-darwin.patch +new file mode 100644 +index 00000000..157e2094 +--- /dev/null ++++ b/src_ext/patches/mccs/build-on-darwin.patch +@@ -0,0 +1,12 @@ ++diff --git a/src/context_flags.ml b/src/context_flags.ml ++index 7470030..6e07370 100644 ++--- a/src/context_flags.ml +++++ b/src/context_flags.ml ++@@ -24,6 +24,7 @@ let ifc c x = if c then x else [] ++ ++ let cxxflags = ++ let flags = +++ (ifc (Config.system = "macosx") ["-x"; "c++"]) @ ++ (ifc (Sys.win32 && Config.ccomp_type = "msvc") ["/EHsc"]) @ ++ (ifc useGLPK ["-DUSEGLPK"]) @ ++ (ifc useCOIN ["-DUSECOIN"]) @ diff --git a/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch new file mode 100644 index 000000000000..e047c8298bc3 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch @@ -0,0 +1,23 @@ +diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh +index 6f5d7dbea..3e1a3e1b4 100755 +--- a/src/state/shellscripts/bwrap.sh ++++ b/src/state/shellscripts/bwrap.sh +@@ -1,4 +1,6 @@ +-#!/bin/bash -ue ++#!/usr/bin/env bash ++ ++set -ue + + if ! command -v bwrap >/dev/null; then + echo "The 'bwrap' command was not found. Install 'bubblewrap' on your system, or" >&2 +@@ -11,7 +13,9 @@ fi + + ARGS=(--unshare-net --new-session) + ARGS=("${ARGS[@]}" --proc /proc --dev /dev) +-ARGS=("${ARGS[@]}" --bind /tmp /tmp --tmpfs /run --tmpfs /var) ++ARGS=("${ARGS[@]}" --bind "${TMPDIR:-/tmp}" /tmp) ++ARGS=("${ARGS[@]}" --setenv TMPDIR /tmp --setenv TMP /tmp --setenv TEMPDIR /tmp --setenv TEMP /tmp) ++ARGS=("${ARGS[@]}" --tmpfs /run --tmpfs /var) + + add_mounts() { + case "$1" in diff --git a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch new file mode 100644 index 000000000000..f74ac84ca6b2 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch @@ -0,0 +1,128 @@ +diff --git a/src/client/opamInitDefaults.ml b/src/client/opamInitDefaults.ml +index eca13a7c..1fd66f43 100644 +--- a/src/client/opamInitDefaults.ml ++++ b/src/client/opamInitDefaults.ml +@@ -35,11 +35,15 @@ let eval_variables = [ + let os_filter os = + FOp (FIdent ([], OpamVariable.of_string "os", None), `Eq, FString os) + ++let os_distribution_filter distro = ++ FOp (FIdent ([], OpamVariable.of_string "os-distribution", None), `Eq, FString distro) ++ + let linux_filter = os_filter "linux" + let macos_filter = os_filter "macos" + let openbsd_filter = os_filter "openbsd" + let freebsd_filter = os_filter "freebsd" + let sandbox_filter = FOr (linux_filter, macos_filter) ++let nixos_filter = os_distribution_filter "nixos" + + let gpatch_filter = FOr (openbsd_filter, freebsd_filter) + let patch_filter = FNot gpatch_filter +@@ -50,6 +54,11 @@ let wrappers ~sandboxing () = + CString t, None; + ] in + let w = OpamFile.Wrappers.empty in ++ let w = { w with ++ OpamFile.Wrappers. ++ pre_build = [[CString "%{hooks}%/shebangs.sh", None], Some nixos_filter]; ++ } ++ in + if sandboxing then + { w with + OpamFile.Wrappers. +@@ -113,6 +122,7 @@ let required_tools ~sandboxing () = + let init_scripts () = [ + ("sandbox.sh", OpamScript.bwrap), Some bwrap_filter; + ("sandbox.sh", OpamScript.sandbox_exec), Some macos_filter; ++ ("shebangs.sh", OpamScript.patch_shebangs), Some nixos_filter; + ] + + module I = OpamFile.InitConfig +diff --git a/src/state/opamScript.mli b/src/state/opamScript.mli +index 03449970..83de0b53 100644 +--- a/src/state/opamScript.mli ++++ b/src/state/opamScript.mli +@@ -20,3 +20,4 @@ val env_hook : string + val env_hook_zsh : string + val env_hook_csh : string + val env_hook_fish : string ++val patch_shebangs : string +diff --git a/src/state/shellscripts/patch_shebangs.sh b/src/state/shellscripts/patch_shebangs.sh +new file mode 100755 +index 00000000..3ea84e2d +--- /dev/null ++++ b/src/state/shellscripts/patch_shebangs.sh +@@ -0,0 +1,73 @@ ++#!/usr/bin/env bash ++# This setup hook causes the fixup phase to rewrite all script ++# interpreter file names (`#! /path') to paths found in $PATH. E.g., ++# /bin/sh will be rewritten to /nix/store/-some-bash/bin/sh. ++# /usr/bin/env gets special treatment so that ".../bin/env python" is ++# rewritten to /nix/store//bin/python. Interpreters that are ++# already in the store are left untouched. ++ ++header() { echo "$1"; } ++stopNest() { true; } ++ ++fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi') ++ ++patchShebangs() { ++ local dir="$1" ++ header "patching script interpreter paths in $dir" ++ local f ++ local oldPath ++ local newPath ++ local arg0 ++ local args ++ local oldInterpreterLine ++ local newInterpreterLine ++ ++ find "$dir" -type f -perm -0100 | while read f; do ++ if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then ++ # missing shebang => not a script ++ continue ++ fi ++ ++ oldInterpreterLine=$(head -1 "$f" | tail -c+3) ++ read -r oldPath arg0 args <<< "$oldInterpreterLine" ++ ++ if $(echo "$oldPath" | grep -q "/bin/env$"); then ++ # Check for unsupported 'env' functionality: ++ # - options: something starting with a '-' ++ # - environment variables: foo=bar ++ if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then ++ echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" ++ exit 1 ++ fi ++ newPath="$(command -v "$arg0" || true)" ++ else ++ if [ "$oldPath" = "" ]; then ++ # If no interpreter is specified linux will use /bin/sh. Set ++ # oldpath="/bin/sh" so that we get /nix/store/.../sh. ++ oldPath="/bin/sh" ++ fi ++ newPath="$(command -v "$(basename "$oldPath")" || true)" ++ args="$arg0 $args" ++ fi ++ ++ # Strip trailing whitespace introduced when no arguments are present ++ newInterpreterLine="$(echo "$newPath $args" | sed 's/[[:space:]]*$//')" ++ ++ if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then ++ if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then ++ echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" ++ # escape the escape chars so that sed doesn't interpret them ++ escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g') ++ # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281 ++ touch -r "$f" "$f.timestamp" ++ sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" ++ touch -r "$f.timestamp" "$f" ++ rm "$f.timestamp" ++ fi ++ fi ++ done ++ ++ stopNest ++} ++ ++patchShebangs . diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl new file mode 100755 index 000000000000..1862add452d6 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -0,0 +1,130 @@ +#!/usr/bin/env perl + +use strict; +use warnings qw; +use Getopt::Std; + +my $gencmd = "# Generated by: " . join(" ", $0, @ARGV) . "\n"; + +our $opt_v; +our $opt_p; +our $opt_r; +our $opt_t; +getopts "v:p:t:r:"; + +my $OPAM_RELEASE = $opt_v // "2.0.0"; +my $OPAM_TAG = $opt_t // $OPAM_RELEASE; +my $OPAM_GITHUB_REPO = $opt_r // "ocaml/opam"; +my $OPAM_RELEASE_URL = "https://github.com/$OPAM_GITHUB_REPO/archive/$OPAM_TAG.zip"; +my $OPAM_RELEASE_SHA256 = `nix-prefetch-url \Q$OPAM_RELEASE_URL\E`; +chomp $OPAM_RELEASE_SHA256; + +my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG"; +my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`; +my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^available: ocaml-version >= "(.*)"$/m + or die "could not parse ocaml version bound\n"; + +print <<"EOF"; +{ stdenv, lib, fetchurl, makeWrapper, getconf, + ocaml, unzip, ncurses, curl, aspcud, bubblewrap +}: + +assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION"; + +let + srcs = { +EOF + +my %urls = (); +my %md5s = (); + +open(SOURCES, "-|", "curl", "-L", "--url", "$OPAM_BASE_URL/src_ext/Makefile.sources"); +while () { + if (/^URL_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) { + $urls{$1} = $2; + } elsif (/^MD5_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) { + $md5s{$1} = $2; + } +} +for my $src (sort keys %urls) { + my ($sha256,$store_path) = split /\n/, `nix-prefetch-url --print-path \Q$urls{$src}\E`; + system "echo \Q$md5s{$src}\E' *'\Q$store_path\E | md5sum -c 1>&2"; + die "md5 check failed for $urls{$src}\n" if $?; + print <<"EOF"; + $src = fetchurl { + url = "$urls{$src}"; + sha256 = "$sha256"; + }; +EOF +} + +print <<"EOF"; + opam = fetchurl { + url = "$OPAM_RELEASE_URL"; + sha256 = "$OPAM_RELEASE_SHA256"; + }; + }; +in stdenv.mkDerivation rec { + name = "opam-\${version}"; + version = "$OPAM_RELEASE"; + + buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + + src = srcs.opam; + + postUnpack = '' +EOF +for my $src (sort keys %urls) { + my($ext) = $urls{$src} =~ /(\.(?:t(?:ar\.|)|)(?:gz|bz2?))$/ + or die "could not find extension for $urls{$src}\n"; + print <<"EOF"; + ln -sv \${srcs.$src} \$sourceRoot/src_ext/$src$ext +EOF +} +print <<'EOF'; + ''; + +EOF +if (defined $opt_p) { + print " patches = [ "; + for my $patch (split /[, ]/, $opt_p) { + $patch =~ s/^(?=[^\/]*$)/.\//; + print "$patch "; + } + print "];\n\n"; +} +print <<'EOF'; + preConfigure = '' + substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" + patchShebangs src/state/shellscripts + ''; + + postConfigure = "make lib-ext"; + + # Dirty, but apparently ocp-build requires a TERM + makeFlags = ["TERM=screen"]; + + outputs = [ "out" "installer" ]; + setOutputFlags = false; + + # change argv0 to "opam" as a workaround for + # https://github.com/ocaml/opam/issues/2142 + postInstall = '' + mv $out/bin/opam $out/bin/.opam-wrapped + makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ + --argv0 "opam" \ + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin + $out/bin/opam-installer --prefix=$installer opam-installer.install + ''; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A package manager for OCaml"; + homepage = http://opam.ocamlpro.com/; + maintainers = [ maintainers.henrytill ]; + platforms = platforms.all; + }; +} +EOF +print $gencmd; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d0e6ae15da8..abf914f87103 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7135,7 +7135,8 @@ with pkgs; opaline = callPackage ../development/tools/ocaml/opaline { }; - opam = callPackage ../development/tools/ocaml/opam { + opam = callPackage ../development/tools/ocaml/opam { }; + opam_1_2 = callPackage ../development/tools/ocaml/opam/1.2.2.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; From 7cf3891b75af8506a03dc9054dc0e6e746beadc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 10:41:27 -0700 Subject: [PATCH 160/600] tortoisehg: 4.6.1 -> 4.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from tortoisehg --- pkgs/applications/version-management/tortoisehg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 5a37857fa479..71369709b5da 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.6.1"; + version = "4.7"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "1argpi5h0fv4ilahi52c98xgvsvz27lvqi41hzw1f81mhjgyhqik"; + sha256 = "1s99dmz8izsyj5mpnqlx9dasw8ar2lr68r3m1wyafzbqlqmbjbqm"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; From 6d3a2f6f441805f91e604b12939895a147fd2690 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 11:01:24 -0700 Subject: [PATCH 161/600] linuxPackages.sysdig: 0.22.1 -> 0.23.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from sysdig --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 9b0f3ff767c2..20ecdb5b5773 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.22.1"; + version = "0.23.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1wbvpsalm2ccwh8xz6fa4gqviilvjd8lnwvdryixhsdsf7j8w0j0"; + sha256 = "0q52yfag97n6cvrnzgx7inx11zdg7bgwkvqn2idsg9874fd2wkzh"; }; buildInputs = [ From c42f0f95bb0c96bc3ae54ad80a107b643d5c5637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Sep 2018 20:22:56 +0200 Subject: [PATCH 162/600] home-assistant: 0.77.2 -> 0.77.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 12b96b3da125..a67de2dab1aa 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.77.2"; + version = "0.77.3"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ccc9bee51b99..e6bbd4ab259d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -75,7 +75,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.77.2"; + hassVersion = "0.77.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -90,7 +90,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0lqm8n54cs4ji9bqp1z70qswgqv8n9vl8jbip7c2f3icqx19zg10"; + sha256 = "1c459iqbkhs6dv563zld6qb9avpx3h0fnxng476zahj9x9m5rzk6"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index b14d76050f90..e04de7effcd4 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180831.0"; + version = "20180903.0"; src = fetchPypi { inherit pname version; - sha256 = "d0f897bed934bc2d557db04f8c76ad143db9514ea71943a0038c5bfb3b2151ec"; + sha256 = "54ba2ad2d1043952885f432d900025bd3eb11de180ac5147342cff585f44d4f9"; }; propagatedBuildInputs = [ user-agents ]; From 7bcc2870c75a6cf1b4058b856489203753eb5684 Mon Sep 17 00:00:00 2001 From: Christopher Ostrouchov Date: Thu, 6 Sep 2018 14:40:43 -0400 Subject: [PATCH 163/600] pythonPackages.jupyterlab_launcher: refactor (#46178) jupyterlab_launcher does not support python version < 3.5. Disabled for older versions --- .../development/python-modules/jupyterlab_launcher/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix index 1831b47ee792..af29b9155a58 100644 --- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix +++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix @@ -1,7 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook }: +{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook, pythonOlder }: buildPythonPackage rec { pname = "jupyterlab_launcher"; version = "0.13.1"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; From 788cab1ae7c58d900e30a0f6f1429d0599bacfa3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 07:44:03 -0700 Subject: [PATCH 164/600] woeusb: 3.2.1 -> 3.2.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from woeusb --- pkgs/tools/misc/woeusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 9c6211b13dfe..e75baac669a3 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.2.2"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "0qymdc216ws6adkzmzxz6hx43dim0hpwab9c4qmgg8jnkhnpvnj1"; + sha256 = "08spc7r5zgn483y7jmnlqi5417p6h1v6izyx10jnk39md6lv8pb3"; }; buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; From 765a8c8cd53df402999c0bc67c8b532358d685d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Aug 2018 11:56:29 -0700 Subject: [PATCH 165/600] plantuml: 1.2018.9 -> 1.2018.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from plantuml --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 51844c8e5faa..08df665aede6 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2018.9"; + version = "1.2018.10"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0g5wd80brwqb0v9rbs66y3clv9jsccc8937jzz4r9gzp38rkvzmn"; + sha256 = "19s3zrfri388nfykcs67sfk0dhmiw0rcv0dvj1j4c0fkyhl41bjs"; }; # It's only a .jar file and a shell wrapper From 56a605c8b9bce331bd562778b8f56cd957a8c90f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 6 Sep 2018 15:14:29 -0400 Subject: [PATCH 166/600] nix-plugins: 4.0.5 -> 5.0.0. Fixes build against nix 2.1. --- pkgs/development/libraries/nix-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index ff8a54f87f2a..d3a4b21b4b61 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: -let version = "4.0.5"; in +let version = "5.0.0"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "170f365rnik62fp9wllbqlspr8lf1yb96pmn2z708i2wjlkdnrny"; + sha256 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 43c8aa89a6b62181c3c3604f79a3a9db82581aee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 12:44:14 -0700 Subject: [PATCH 167/600] remmina: 1.2.31.3 -> 1.2.31.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from remmina --- pkgs/applications/networking/remote/remmina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 14ab36c78fd2..fb138a1e8d45 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.2.31.3"; + version = "1.2.31.4"; desktopItem = makeDesktopItem { name = "remmina"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "0lvang4587wz292c3k3s8n4icc25cia1phmij34ndrl1f9lg34dp"; + sha256 = "1jx704f5zjns3nqy0ffgyfaxfxcxp83mfm5k539xfnqjn5g5h1qr"; }; nativeBuildInputs = [ pkgconfig ]; From 574f2a33c05ccfebe125229468a8540713f6d33b Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 6 Sep 2018 19:40:14 +0000 Subject: [PATCH 168/600] kodiPlugins.steam-launcher: fix what is clearly a bug --- pkgs/applications/video/kodi/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 5a0583202e6d..2ba23e72a2ed 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -246,7 +246,7 @@ rec { maintainers = with maintainers; [ edwtjo ]; }; }).override { - propagatedBuildinputs = [ steam ]; + propagatedBuildInputs = [ steam ]; }; pdfreader = mkKodiPlugin rec { From 88d69df250a546952666ead4068d400446cfec84 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 6 Sep 2018 19:40:16 +0000 Subject: [PATCH 169/600] kodi: wrapper: simplify --- pkgs/applications/video/kodi/wrapper.nix | 58 ++++++------------------ 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index e6d3fbb090fc..27a7a9d34662 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -1,54 +1,24 @@ -{ stdenv, lib, makeWrapper, kodi, plugins }: +{ stdenv, lib, makeWrapper, buildEnv, kodi, plugins }: -let +buildEnv { + name = "kodi-with-plugins-${(builtins.parseDrvName kodi.name).version}"; - p = builtins.parseDrvName kodi.name; - -in - -stdenv.mkDerivation { - - name = "kodi-" + p.version; - version = p.version; + paths = [ kodi ] ++ plugins; + pathsToLink = [ "/share" ]; buildInputs = [ makeWrapper ]; - buildCommand = '' - mkdir -p $out/share/kodi/addons - ${stdenv.lib.concatMapStrings - (plugin: "ln -s ${plugin.out - + plugin.kodiPlugin - + "/" + plugin.namespace - } $out/share/kodi/addons/.;") plugins} - $(for plugin in ${kodi}/share/kodi/addons/* + postBuild = '' + mkdir $out/bin + for exe in kodi{,-standalone} do - $(ln -s $plugin/ $out/share/kodi/addons/.) - done) - $(for share in ${kodi}/share/kodi/* - do - $(ln -s $share $out/share/kodi/.) - done) - $(for passthrough in icons xsessions applications - do - ln -s ${kodi}/share/$passthrough $out/share/ - done) - $(for exe in kodi{,-standalone} - do - makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ - --prefix KODI_HOME : $out/share/kodi; - done) + makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ + --prefix KODI_HOME : $out/share/kodi + done ''; - preferLocalBuild = true; - - meta = with kodi.meta; { - inherit license homepage; - description = description - + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins)) - + ")"; - - platforms = stdenv.lib.platforms.linux; + meta = kodi.meta // { + description = kodi.meta.description + + " (with plugins: ${lib.concatMapStringsSep ", " (x: x.name) plugins})"; }; - } From 02557dade2d31be4921f52687db411b3f1137baf Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 6 Sep 2018 19:40:18 +0000 Subject: [PATCH 170/600] kodi: passthu pythonPackages --- pkgs/applications/video/kodi/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 454665455c51..9272d3c8e269 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper -, pkgconfig, cmake, gnumake, yasm, python2 +, pkgconfig, cmake, gnumake, yasm, python2Packages , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which @@ -119,7 +119,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gnutls libidn libtasn1 nasm p11-kit - libxml2 yasm python2 + libxml2 yasm python2Packages.python boost libmicrohttpd gettext pcre-cpp yajl fribidi libva libdrm openssl gperf tinyxml2 taglib libssh swig jre @@ -187,7 +187,7 @@ in stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \ + --prefix PATH ":" "${lib.makeBinPath [ python2Packages.python glxinfo xdpyinfo ]}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath ([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}" done @@ -200,6 +200,10 @@ in stdenv.mkDerivation rec { installCheckPhase = "$out/bin/kodi --version"; + passthru = { + pythonPackages = python2Packages; + }; + meta = with stdenv.lib; { description = "Media center"; homepage = https://kodi.tv/; From 1d64f70bd75277bd5a69bc9f89c06ece24ed0877 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 6 Sep 2018 19:40:19 +0000 Subject: [PATCH 171/600] kodi: wrapper: set PYTHONPATH from plugins --- pkgs/applications/video/kodi/wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 27a7a9d34662..d0dc9274a105 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -13,6 +13,7 @@ buildEnv { for exe in kodi{,-standalone} do makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ + --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \ --prefix KODI_HOME : $out/share/kodi done ''; From e883b86c0e894328eb7cb88f287c1c52047d51f1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 6 Sep 2018 19:40:21 +0000 Subject: [PATCH 172/600] kodiPlugins: inline commons.nix --- pkgs/applications/video/kodi/commons.nix | 83 ------------------------ pkgs/applications/video/kodi/plugins.nix | 78 +++++++++++++++++++++- 2 files changed, 76 insertions(+), 85 deletions(-) delete mode 100644 pkgs/applications/video/kodi/commons.nix diff --git a/pkgs/applications/video/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix deleted file mode 100644 index eff9b7871069..000000000000 --- a/pkgs/applications/video/kodi/commons.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv, fetchFromGitHub -, cmake, kodiPlain, libcec_platform, tinyxml }: - -rec { - - pluginDir = "/share/kodi/addons"; - - kodi-platform = stdenv.mkDerivation rec { - project = "kodi-platform"; - version = "17.1"; - name = "${project}-${version}"; - - src = fetchFromGitHub { - owner = "xbmc"; - repo = project; - rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; - sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; - }; - - buildInputs = [ cmake kodiPlain libcec_platform tinyxml ]; - - }; - - mkKodiAPIPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { - - inherit src meta sourceDir; - - name = "kodi-plugin-${plugin}-${version}"; - - passthru = { - kodiPlugin = pluginDir; - namespace = namespace; - }; - - dontStrip = true; - - installPhase = '' - ${if isNull sourceDir then "" else "cd $src/$sourceDir"} - d=$out${pluginDir}/${namespace} - mkdir -p $d - sauce="." - [ -d ${namespace} ] && sauce=${namespace} - cp -R "$sauce/"* $d - ''; - - }; - - mkKodiPlugin = mkKodiAPIPlugin; - - mkKodiABIPlugin = { plugin, namespace, version, src, meta - , extraBuildInputs ? [], sourceDir ? null, ... }: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { - - inherit src meta sourceDir; - - name = "kodi-plugin-${plugin}-${version}"; - - passthru = { - kodiPlugin = pluginDir; - namespace = namespace; - }; - - dontStrip = true; - - buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] - ++ extraBuildInputs; - - # disables check ensuring install prefix is that of kodi - cmakeFlags = [ - "-DOVERRIDE_PATHS=1" - ]; - - # kodi checks for plugin .so libs existance in the addon folder (share/...) - # and the non-wrapped kodi lib/... folder before even trying to dlopen - # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use - installPhase = let n = namespace; in '' - make install - ln -s $out/lib/addons/${n}/${n}.so.${version} $out/${pluginDir}/${n}/${n}.so.${version} - ''; - - }; -} diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 2ba23e72a2ed..e2e4dd28f8f5 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,10 +1,84 @@ { stdenv, callPackage, fetchurl, fetchFromGitHub, unzip +, cmake, kodiPlain, libcec_platform, tinyxml , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }: -with (callPackage ./commons.nix {}); - rec { + pluginDir = "/share/kodi/addons"; + + kodi-platform = stdenv.mkDerivation rec { + project = "kodi-platform"; + version = "17.1"; + name = "${project}-${version}"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = project; + rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; + sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; + }; + + buildInputs = [ cmake kodiPlain libcec_platform tinyxml ]; + }; + + mkKodiPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }: + stdenv.lib.makeOverridable stdenv.mkDerivation rec { + + inherit src meta sourceDir; + + name = "kodi-plugin-${plugin}-${version}"; + + passthru = { + kodiPlugin = pluginDir; + namespace = namespace; + }; + + dontStrip = true; + + installPhase = '' + ${if isNull sourceDir then "" else "cd $src/$sourceDir"} + d=$out${pluginDir}/${namespace} + mkdir -p $d + sauce="." + [ -d ${namespace} ] && sauce=${namespace} + cp -R "$sauce/"* $d + ''; + + }; + + mkKodiABIPlugin = { plugin, namespace, version, src, meta + , extraBuildInputs ? [], sourceDir ? null, ... }: + stdenv.lib.makeOverridable stdenv.mkDerivation rec { + + inherit src meta sourceDir; + + name = "kodi-plugin-${plugin}-${version}"; + + passthru = { + kodiPlugin = pluginDir; + namespace = namespace; + }; + + dontStrip = true; + + buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] + ++ extraBuildInputs; + + # disables check ensuring install prefix is that of kodi + cmakeFlags = [ + "-DOVERRIDE_PATHS=1" + ]; + + # kodi checks for plugin .so libs existance in the addon folder (share/...) + # and the non-wrapped kodi lib/... folder before even trying to dlopen + # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use + installPhase = let n = namespace; in '' + make install + ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version} + ''; + + }; + advanced-launcher = mkKodiPlugin rec { plugin = "advanced-launcher"; From 031e1cf674fddd71e998102cdd681ec5211c968a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 6 Sep 2018 19:40:22 +0000 Subject: [PATCH 173/600] kodiPlugins: simplify, generalize, implement kodiWithPlugins --- pkgs/applications/video/kodi/plugins.nix | 103 ++++++++++++----------- 1 file changed, 56 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index e2e4dd28f8f5..f2ceacdd799f 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -2,10 +2,36 @@ , cmake, kodiPlain, libcec_platform, tinyxml , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }: -rec { +with stdenv.lib; + +let self = rec { pluginDir = "/share/kodi/addons"; + kodi = kodiPlain; + + # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix + toKodiPlugin = drv: drv.overrideAttrs(oldAttrs: { + # Use passthru in order to prevent rebuilds when possible. + passthru = (oldAttrs.passthru or {})// { + kodiPluginFor = kodi; + requiredKodiPlugins = requiredKodiPlugins drv.propagatedBuildInputs; + }; + }); + + # Check whether a derivation provides a Kodi plugin. + hasKodiPlugin = drv: drv ? kodiPluginFor && drv.kodiPluginFor == kodi; + + # Get list of required Kodi plugins given a list of derivations. + requiredKodiPlugins = drvs: let + modules = filter hasKodiPlugin drvs; + in unique (modules ++ concatLists (catAttrs "requiredKodiPlugins" modules)); + + kodiWithPlugins = func: callPackage ./wrapper.nix { + inherit kodi; + plugins = requiredKodiPlugins (func self); + }; + kodi-platform = stdenv.mkDerivation rec { project = "kodi-platform"; version = "17.1"; @@ -21,18 +47,10 @@ rec { buildInputs = [ cmake kodiPlain libcec_platform tinyxml ]; }; - mkKodiPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { - - inherit src meta sourceDir; - + mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args: + toKodiPlugin (stdenv.mkDerivation (rec { name = "kodi-plugin-${plugin}-${version}"; - passthru = { - kodiPlugin = pluginDir; - namespace = namespace; - }; - dontStrip = true; installPhase = '' @@ -43,22 +61,12 @@ rec { [ -d ${namespace} ] && sauce=${namespace} cp -R "$sauce/"* $d ''; + } // args)); - }; - - mkKodiABIPlugin = { plugin, namespace, version, src, meta - , extraBuildInputs ? [], sourceDir ? null, ... }: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { - - inherit src meta sourceDir; - + mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args: + toKodiPlugin (stdenv.mkDerivation (rec { name = "kodi-plugin-${plugin}-${version}"; - passthru = { - kodiPlugin = pluginDir; - namespace = namespace; - }; - dontStrip = true; buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] @@ -76,8 +84,7 @@ rec { make install ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version} ''; - - }; + } // args)); advanced-launcher = mkKodiPlugin rec { @@ -92,7 +99,7 @@ rec { sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2"; }; - meta = with stdenv.lib; { + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=85724; description = "A program launcher for Kodi"; longDescription = '' @@ -122,7 +129,7 @@ rec { sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2"; }; - meta = with stdenv.lib; { + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=287826; description = "A program launcher for Kodi"; longDescription = '' @@ -149,7 +156,7 @@ rec { sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb"; }; - meta = with stdenv.lib; { + meta = { description = "Add support for different gaming controllers."; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; @@ -173,7 +180,7 @@ rec { // (mkController "ps") // (mkController "snes"); - exodus = (mkKodiPlugin rec { + exodus = mkKodiPlugin rec { plugin = "exodus"; namespace = "plugin.video.exodus"; @@ -184,13 +191,14 @@ rec { sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj"; }; - meta = with stdenv.lib; { + buildInputs = [ unzip ]; + + meta = { description = "A streaming plugin for Kodi"; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; }; - - }).override { buildInputs = [ unzip ]; }; + }; hyper-launcher = let pname = "hyper-launcher"; @@ -202,7 +210,7 @@ rec { rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6"; sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5"; }; - meta = with stdenv.lib; { + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=258159; description = "A ROM launcher for Kodi that uses HyperSpin assets."; maintainers = with maintainers; [ edwtjo ]; @@ -233,7 +241,7 @@ rec { sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh"; }; - meta = with stdenv.lib; { + meta = { description = "Binary addon for raw joystick input."; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; @@ -257,7 +265,7 @@ rec { sha256 = "0klk1jpjc243ak306k94mag4b4s17w68v69yb8lzzydszqkaqa7x"; }; - meta = with stdenv.lib; { + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=67110; description = "Watch content from SVT Play"; longDescription = '' @@ -286,7 +294,7 @@ rec { extraBuildInputs = [ libusb ]; - meta = with stdenv.lib; { + meta = { description = "Binary addon for steam controller."; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; @@ -294,7 +302,7 @@ rec { }; - steam-launcher = (mkKodiPlugin rec { + steam-launcher = mkKodiPlugin rec { plugin = "steam-launcher"; namespace = "script.steam.launcher"; @@ -307,7 +315,9 @@ rec { sha256 = "001a7zs3a4jfzj8ylxv2klc33mipmqsd5aqax7q81fbgwdlndvbm"; }; - meta = with stdenv.lib; { + propagatedBuildInputs = [ steam ]; + + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=157499; description = "Launch Steam in Big Picture Mode from Kodi"; longDescription = '' @@ -319,8 +329,6 @@ rec { ''; maintainers = with maintainers; [ edwtjo ]; }; - }).override { - propagatedBuildInputs = [ steam ]; }; pdfreader = mkKodiPlugin rec { @@ -336,7 +344,7 @@ rec { sha256 = "1iv7d030z3xvlflvp4p5v3riqnwg9g0yvzxszy63v1a6x5kpjkqa"; }; - meta = with stdenv.lib; { + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=187421; description = "A comic book reader"; maintainers = with maintainers; [ edwtjo ]; @@ -356,7 +364,7 @@ rec { sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/kodi-pvr/pvr.hts; description = "Kodi's Tvheadend HTSP client addon"; platforms = platforms.all; @@ -378,7 +386,7 @@ rec { sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/kodi-pvr/pvr.hdhomerun; description = "Kodi's HDHomeRun PVR client addon"; platforms = platforms.all; @@ -402,7 +410,7 @@ rec { sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/kodi-pvr/pvr.iptvsimple; description = "Kodi's IPTV Simple client addon"; platforms = platforms.all; @@ -426,7 +434,7 @@ rec { sha256 = "1b3fm02annsq58pcfc985glrmh21rmqksdj3q8wn6gyza06jdf3v"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/osmc/skin.osmc; description = "The default skin for OSMC"; platforms = platforms.all; @@ -434,4 +442,5 @@ rec { license = licenses.cc-by-nc-sa-30; }; }; -} + +}; in self From f72cba212cef160eb82a9f3c7cbf0e983f7af9d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 14:22:26 -0700 Subject: [PATCH 174/600] picard-tools: 2.18.11 -> 2.18.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from picard-tools --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 0ddbdab4c1b1..c141e6087bfc 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.18.11"; + version = "2.18.12"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "03wkyz3bjx3n8bwambhz9lr09271r1wxycmx4p7m2naqs4afxb89"; + sha256 = "0r5w71fcji4j3xjdhip9jlvmqi66x52af8b7mfxp4nz6xxl9ilxm"; }; buildInputs = [ jre makeWrapper ]; From c909dc2da402ebfdddf66aef3e69092908c32f61 Mon Sep 17 00:00:00 2001 From: qoli Date: Thu, 6 Sep 2018 15:27:57 -0700 Subject: [PATCH 175/600] Disable temperamental shutdown_close_pipe test on Aarch32. --- pkgs/development/libraries/libuv/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a0ace84bc67d..50b43c4e043d 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { "multiple_listen" "delayed_accept" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" "tty_pty" + ] ++ stdenv.lib.optionals stdenv.isAarch32 [ + # I observe this test failing with some regularity on ARMv7: + # https://github.com/libuv/libuv/issues/1871 + "shutdown_close_pipe" ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' From b710f4a85c80723dea90f9be826f2d6b26d36e61 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 15:41:10 -0700 Subject: [PATCH 176/600] kdeApplications.okteta: 0.25.2 -> 0.25.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from okteta --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index efe728f68494..a2337483bf1f 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "okteta-${version}"; - version = "0.25.2"; + version = "0.25.3"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; - sha256 = "00mw8gdqvn6vn6ir6kqnp7xi3lpn6iyp4f5aknxwq6mdcxgjmh1p"; + sha256 = "0mm6pmk7k9c581b12a3wl0ayhadvyymfzmscy9x32b391qy9inai"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; From 423e46a24f240a6e9a6ddcb788db51989f57eb58 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Fri, 7 Sep 2018 01:56:46 +0300 Subject: [PATCH 177/600] nixos/networkd: support MULTICAST flag on links Support Multicast= option in [Link] section of network units, introduced in systemd/systemd#9118. --- nixos/modules/system/boot/networkd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 4bacf0f126a4..8e748dd27d7d 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -249,11 +249,12 @@ let # .network files have a [Link] section with different options than in .netlink files checkNetworkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "MACAddress" "MTUBytes" "ARP" "Unmanaged" "RequiredForOnline" + "MACAddress" "MTUBytes" "ARP" "Multicast" "Unmanaged" "RequiredForOnline" ]) (assertMacAddress "MACAddress") (assertByteFormat "MTUBytes") (assertValueOneOf "ARP" boolValues) + (assertValueOneOf "Multicast" boolValues) (assertValueOneOf "Unmanaged" boolValues) (assertValueOneOf "RquiredForOnline" boolValues) ]; From 6d803b41c5f44619f4c6dbb9d1023e38e2ce287f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 15:57:40 -0700 Subject: [PATCH 178/600] oniguruma: 6.8.2 -> 6.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from onig --- pkgs/development/libraries/oniguruma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index f9a75801e101..956c8b58ffc1 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "onig-${version}"; - version = "6.8.2"; + version = "6.9.0"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "00ly5i26n7wajhyhq3xadsc7dxrf7qllhwilk8dza2qj5dhld4nd"; + sha256 = "064nk8nxygqrk5b6n7zvrksf5shrsapn12zdi6crbbfbw0s7pn8h"; }; nativeBuildInputs = [ cmake ]; From 8fdb6fba30a22c15bd86fb756a49559b9e5d590c Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Fri, 7 Sep 2018 02:01:21 +0300 Subject: [PATCH 179/600] nixos/networkd: fix handling of RequiredForOnline --- nixos/modules/system/boot/networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 8e748dd27d7d..5f1de572e5b1 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -256,7 +256,7 @@ let (assertValueOneOf "ARP" boolValues) (assertValueOneOf "Multicast" boolValues) (assertValueOneOf "Unmanaged" boolValues) - (assertValueOneOf "RquiredForOnline" boolValues) + (assertValueOneOf "RequiredForOnline" boolValues) ]; From 0a3f07077b003905ab42ac26a067afcd79e823fa Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 6 Sep 2018 23:32:44 +0900 Subject: [PATCH 180/600] firefox-esr: 60.1.0esr -> 60.2.0esr, mark 52.9.0esr insecure --- pkgs/applications/networking/browsers/firefox/packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 3559135a01dd..11222cc65ba3 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -60,6 +60,7 @@ rec { meta = firefox.meta // { description = "A web browser built from Firefox Extended Support Release source tree"; + knownVulnerabilities = [ "Support ended in August 2018." ]; }; updateScript = callPackage ./update.nix { attrPath = "firefox-esr-52-unwrapped"; @@ -69,10 +70,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - version = "60.1.0esr"; + version = "60.2.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2bg7zvkpy1x2ryiazvk4nn5m94v0addbhrcrlcf9djnqjf14rp5q50lbiymhxxz0988vgpicsvizifb8gb3hi7b8g17rdw6438ddhh6"; + sha512 = "1nf7nsycvzafvy4jjli5xh59d2mac17gfx91a1jh86f41w6qcsi3lvkfa8xhxsq8wfdsmqk1f4hmqzyx63h4m691qji7838g2nk49k7"; }; patches = nixpkgsPatches ++ [ From ecf73103abf1897a3121de2c7e87490b437266aa Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Fri, 7 Sep 2018 02:23:12 +0300 Subject: [PATCH 181/600] nixos/networkd: do not require gateway for routes A route via a tunnel interface does not require a gateway to be specified, so do not check for the Gateway= field on routes at all. --- nixos/modules/system/boot/networkd.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 5f1de572e5b1..63a6f7fbe099 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -208,7 +208,6 @@ let "InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck" "MTUBytes" ]) - (assertHasField "Gateway") ]; checkDhcp = checkUnitConfig "DHCP" [ From e5b17f61efa0b1f90f610b067212c209ac310ccf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 16:57:44 -0700 Subject: [PATCH 182/600] rednotebook: 2.3 -> 2.6.1 (#46200) --- pkgs/applications/editors/rednotebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 9456ea3150a4..8b37f0b74d5b 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.3"; + version = "2.6.1"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "0zkfid104hcsf20r6829v11wxdghqkd3j1zbgyvd1s7q4nxjn5lj"; + sha256 = "1x6acx0hagsawx84cv55qz17p8qjpq1v1zaf8rmm6ifsslsxw91h"; }; # We have not packaged tests. From a1f5f62b293ff05eb4c99555d73797fd250428df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 17:17:48 -0700 Subject: [PATCH 183/600] mediainfo: 18.05 -> 18.08 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from mediainfo --- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 5b2f8125f72c..d222ad1e53e0 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "18.05"; + version = "18.08"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r"; + sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From c8c091f09343e52bdc240596b5c7b9a2b04047b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 17:26:08 -0700 Subject: [PATCH 184/600] mediainfo-gui: 18.05 -> 18.08 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from mediainfo-gui --- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index b6ec3305cb3a..3ff07ba20084 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "18.05"; + version = "18.08"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r"; + sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 105ef781aee2fdb1f6985e61de2fefda4b683631 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 18:18:47 -0700 Subject: [PATCH 185/600] libmediainfo: 18.05 -> 18.08 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from libmediainfo --- pkgs/development/libraries/libmediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 3ba513f90781..c4f41663c848 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "18.05"; + version = "18.08"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "08ajrmbvqn2cvfq3jjdh64lma77kx4di5vg632c6bmbir89rcxbn"; + sha256 = "0h9fkfkil9y5xjxa7q4gxxihkn9kv9hak6ral2isvks5x3sy0ca8"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From dd74f16b366a9d8d2e4e3e806fb8ab57016965cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 18:33:20 -0700 Subject: [PATCH 186/600] kubernetes-helm: 2.9.1 -> 2.10.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from helm --- pkgs/applications/networking/cluster/helm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index d09e65a4caae..a84852f197dd 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -5,10 +5,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if isLinux - then "1fk6w6sajdi6iphxrzi9r7xfyaf923nxcqnl01s6x3f611fjvbjn" + then "1zig6ihmxcaw2wsbdd85yf1zswqcifw0hvbp1zws7r5ihd4yv8hg" else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv"; pname = "helm"; - version = "2.9.1"; + version = "2.10.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; From cdf82f6ddd2f3f6a849db2625f36fead123508a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 19:30:21 -0700 Subject: [PATCH 187/600] kipi-plugins: 5.2.0 -> 5.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from kipi-plugins --- pkgs/applications/graphics/kipi-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index 48a94a5253d0..f7faba7c41a5 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "kipi-plugins-${version}"; - version = "5.2.0"; + version = "5.9.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz"; - sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g"; + sha256 = "06qdalf2mwx2f43p3bljy3vn5bk8n3x539kha6ky2vzxvkp343b6"; }; prePatch = '' From baf51804f0e616ffd2b56d78b9767377a7940406 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 19:54:40 -0700 Subject: [PATCH 188/600] jmol: 14.29.17 -> 14.29.19 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from jmol --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index d5dae364cc3d..80415189d457 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.17"; + version = "14.29.19"; pname = "jmol"; name = "${pname}-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "1dnxbvi8ha9z2ldymkjpxydd216afv6k7fdp3j70sql10zgy0isk"; + sha256 = "0sfbbi6mgj9hqzvcz19cr5s96rna2f2b1nc1d4j28xvva7qaqjm5"; }; patchPhase = '' From a12c1aebb7aae84fa36c779495e3b8754e38c039 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 23:23:56 -0700 Subject: [PATCH 189/600] duplicity: 0.7.18 -> 0.7.18.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/duplicity/versions --- pkgs/tools/backup/duplicity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index e0c3ea4cf018..9fbe05c725ef 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; - version = "0.7.18"; + version = "0.7.18.1"; src = fetchurl { url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; - sha256 = "1qlika4l1k1nx8zr657ihcy0yzr1c1cdnjlbs325l5krvc3zbc5b"; + sha256 = "17c0203y5qz9w8iyhs26l44qf6a1vp26b5ykz1ypdr2kv6g02df9"; }; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; From b1d6d159aaaf24f7d7a33d7f4c78a81b851c151e Mon Sep 17 00:00:00 2001 From: Christopher Ostrouchov Date: Fri, 7 Sep 2018 02:28:12 -0400 Subject: [PATCH 190/600] pythonPackages.pyslurm: 20180604 -> 20180811 (#46187) Update version to support latest version of slurm. Fixes since previously did not build. --- pkgs/development/python-modules/pyslurm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 9057c3970e15..24704bd8f309 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20180604"; + version = "20180811"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "9dd4817e785fee138a9e29c3d71d2ea44898eedc"; - sha256 = "14ivwc27sjnk0z0jpfgyy9bd91m2bhcz11lzp1kk9xn4495i7wvj"; + rev = "2d4f0553de971309b7e465d4d64528b8a5fafb05"; + sha256 = "1cy57gyvvmzx0c8fx4h6p8dgan0ay6pdivdf24k1xiancjnw20xr"; }; buildInputs = [ cython slurm ]; From b5b48c0a91ef37841839619511c48f1887dbe964 Mon Sep 17 00:00:00 2001 From: Christopher Ostrouchov Date: Fri, 7 Sep 2018 02:38:41 -0400 Subject: [PATCH 191/600] pythonPackages.locustio: 0.8.1 -> 0.9.0 (#46191) Fixing build issue. Additionally fetching from github becuase pypi packge does not come with README which is a buildtime dependency. --- .../python-modules/locustio/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix index c3e27c8b36a0..18875f840644 100644 --- a/pkgs/development/python-modules/locustio/default.nix +++ b/pkgs/development/python-modules/locustio/default.nix @@ -1,8 +1,8 @@ { buildPythonPackage -, fetchPypi +, fetchFromGitHub , mock , unittest2 -, msgpack-python +, msgpack , requests , flask , gevent @@ -11,18 +11,16 @@ buildPythonPackage rec { pname = "locustio"; - version = "0.8.1"; + version = "0.9.0"; - src = fetchPypi { - inherit pname version; - sha256 = "64583987ba1c330bb071aee3e29d2eedbfb7c8b342fa064bfb74fafcff660d61"; + src = fetchFromGitHub { + owner = "locustio"; + repo = "locust"; + rev = "${version}"; + sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd"; }; - patchPhase = '' - sed -i s/"pyzmq=="/"pyzmq>="/ setup.py - ''; - - propagatedBuildInputs = [ msgpack-python requests flask gevent pyzmq ]; + propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ]; buildInputs = [ mock unittest2 ]; meta = { From 6586765a8f94c1540a928c249258a571d246946d Mon Sep 17 00:00:00 2001 From: Christopher Ostrouchov Date: Fri, 7 Sep 2018 02:41:24 -0400 Subject: [PATCH 192/600] pythonPackages.phonopy: refactor (#46161) Fixing phonopy not building. Tests were moved on Jul 30. --- pkgs/development/python-modules/phonopy/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index cf15ccc18fce..903b2b90c300 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -10,9 +10,12 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; - + checkPhase = '' - cd test/phonopy + cd test + # dynamic structure factor test ocassionally fails do to roundoff + # see issue https://github.com/atztogo/phonopy/issues/79 + rm spectrum/test_dynamic_structure_factor.py ${python.interpreter} -m unittest discover -b cd ../.. ''; @@ -24,4 +27,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - From 427e4910ec670a7c4f70bb0632933a86d089e0e7 Mon Sep 17 00:00:00 2001 From: Christopher Ostrouchov Date: Fri, 7 Sep 2018 03:26:07 -0400 Subject: [PATCH 193/600] pythonPackages.ordered-set: add missing dependency (#46183) missing dependency for doing tests (pytestrunner) added three months ago June https://github.com/LuminosoInsight/ordered-set/commit/c0b9308988a0c5953d98aecef63bb61f3a758609. --- pkgs/development/python-modules/ordered-set/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index bf20f7827be3..4044ad3f2fd1 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -1,10 +1,10 @@ -{ buildPythonPackage, fetchPypi, lib, pytest }: +{ buildPythonPackage, fetchPypi, lib, pytest, pytestrunner }: buildPythonPackage rec { pname = "ordered-set"; version = "3.0.1"; - buildInputs = [ pytest ]; + buildInputs = [ pytest pytestrunner ]; src = fetchPypi { inherit pname version; @@ -21,6 +21,3 @@ buildPythonPackage rec { maintainers = [ lib.maintainers.MostAwesomeDude ]; }; } - - - From 29cdfe021872dbb2e6a01f2f52a19737430a9a0e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Sep 2018 00:54:22 -0700 Subject: [PATCH 194/600] linuxPackages.bcc: 0.6.1 -> 0.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bcc/versions --- pkgs/os-specific/linux/bcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index a02127ab7989..5a40368f3ceb 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,14 +4,14 @@ }: python.pkgs.buildPythonApplication rec { - version = "0.6.1"; + version = "0.7.0"; name = "bcc-${version}"; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "1rfqjbq8ah8zrsnpbx0h5irq3h2snncfvi4pvaxl7574kciprjxj"; + sha256 = "1ww7l0chx2ivw9d2ahxjyhxmh6hz3w5z69r4lz02f0361rnrvk7f"; }; format = "other"; From 0e4197b34bf5dd877817165fedcb9401f019d656 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 7 Sep 2018 11:36:20 +0300 Subject: [PATCH 195/600] julia: readd julia_06 name, make julia an alias that selects a version, as we usually do for incompatible versions --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abf914f87103..0bbf7fb622c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6908,7 +6908,7 @@ with pkgs; jikes = callPackage ../development/compilers/jikes { }; - julia = callPackage ../development/compilers/julia { + julia_06 = callPackage ../development/compilers/julia { gmp = gmp6; openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; @@ -6927,6 +6927,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; + julia = julia_06; + jwasm = callPackage ../development/compilers/jwasm { }; kotlin = callPackage ../development/compilers/kotlin { }; From 54b665286880074d26026658e301245e9b4f596a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 7 Sep 2018 11:37:39 +0300 Subject: [PATCH 196/600] julia: add garrison as maintainer suggested in https://github.com/NixOS/nixpkgs/pull/44191#discussion_r215802530 participates in upstream development --- pkgs/development/compilers/julia/shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index 41c9c57bd034..e07c2c04b92d 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = https://julialang.org/; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin rob ]; + maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; broken = stdenv.isi686; }; From 1d497bbff1932942c1243650267d998ca7cbc6dd Mon Sep 17 00:00:00 2001 From: David Smith Date: Wed, 1 Aug 2018 13:36:16 +0100 Subject: [PATCH 197/600] nixos/riemann: refactor config Previously it was only possible to use very simple Riemann config. For more complicated scenarios you need a directory of clojure files and the config file that riemann starts with should be in this directory. --- nixos/modules/services/monitoring/riemann.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index 237de53456f9..13d2b1cc0602 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -17,9 +17,9 @@ let launcher = writeScriptBin "riemann" '' #!/bin/sh - exec ${jdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \ + exec ${jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOpts} \ -cp ${classpath} \ - riemann.bin ${writeText "riemann-config.clj" riemannConfig} + riemann.bin ${cfg.configFile} ''; in { @@ -37,7 +37,8 @@ in { config = mkOption { type = types.lines; description = '' - Contents of the Riemann configuration file. + Contents of the Riemann configuration file. For more complicated + config you should use configFile. ''; }; configFiles = mkOption { @@ -47,7 +48,15 @@ in { Extra files containing Riemann configuration. These files will be loaded at runtime by Riemann (with Clojure's load-file function) at the end of the - configuration. + configuration if you use the config option, this is ignored if you + use configFile. + ''; + }; + configFile = mkOption { + type = types.str; + description = '' + A Riemann config file. Any files in the same directory as this file + will be added to the classpath by Riemann. ''; }; extraClasspathEntries = mkOption { @@ -77,6 +86,10 @@ in { group = "riemann"; }; + services.riemann.configFile = mkDefault ( + writeText "riemann-config.clj" riemannConfig + ); + systemd.services.riemann = { wantedBy = [ "multi-user.target" ]; path = [ inetutils ]; @@ -84,6 +97,7 @@ in { User = "riemann"; ExecStart = "${launcher}/bin/riemann"; }; + serviceConfig.LimitNOFILE = 65536; }; }; From 66e12889621e33d0bbd33ceffc88835fdbeaf17c Mon Sep 17 00:00:00 2001 From: Christopher Ostrouchov Date: Fri, 7 Sep 2018 05:25:53 -0400 Subject: [PATCH 198/600] pythonPackages.kubernetes: add missing dependency (#46179) fix build issue from missing dependency `adal`. This is due to `adal` being added as a dependency in July 23rd. https://github.com/kubernetes-client/python/commit/9afec55f4a765b62e9e5b67dffa9d8f68a520987#diff-b4ef698db8ca845e5845c4618278f29a --- pkgs/development/python-modules/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 030766eb6982..55d29729db83 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, - ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, + ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, adal, isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; - propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth ]; + propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ]; meta = with stdenv.lib; { description = "Kubernetes python client"; From ec0f3bc0fb3444f08c17daca8e66c2fc01ae2232 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Sep 2018 02:26:59 -0700 Subject: [PATCH 199/600] calamares: 3.2.1 -> 3.2.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/calamares/versions --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index e154e217e951..c799b08bd446 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.2.1"; + version = "3.2.2"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "06i1fivcdzdf6fzj4db3izqcgy5q4wwgsmlx24szi88rd2j6prx9"; + sha256 = "14hsv2m0jza33kf68l3rhqfjj7224fmvgvk1kg2qwhvplpjdn16v"; }; buildInputs = [ From d710765f52f71e0cc6cf331678677a36aabfda1c Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 4 Sep 2018 14:42:54 +0200 Subject: [PATCH 200/600] google-cloud-sdk: 206.0.0 -> 215.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 8b98636b3475..016ea957f6c7 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,18 +19,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0fdcd5d63e231443b9e032de4e2c2be9e4f1c766a25054ad93410f5213e45645"; + sha256 = "1d5z575vw07jk7528bsqgdd875b3zwayrdnidvxpd2n8j4bip654"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "d39293914b2e969bfe18dd19eb77ba96d283995f8cf1e5d7ba6ac712a3c9479a"; + sha256 = "0ljslvp68ml5mglrl7kakgkqskbzglf3i5jv5d7jld28d0kbzj2c"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "206.0.0"; + version = "215.0.0"; src = fetchurl (sources name stdenv.hostPlatform.system); From 52d3fc4780dc8ba92627474118e8aaf2edfdde2c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 7 Sep 2018 12:22:56 +0200 Subject: [PATCH 201/600] monkeysphere: Wrap all relevant programs --- pkgs/tools/security/monkeysphere/default.nix | 37 ++++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index badea48cec48..bafe8cdf500b 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, makeWrapper -, perl, perlPackages, libassuan, libgcrypt +, perl, libassuan, libgcrypt +, perlPackages, lockfileProgs, gnupg }: stdenv.mkDerivation rec { @@ -11,27 +12,33 @@ stdenv.mkDerivation rec { sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li"; }; - buildInputs = [ makeWrapper perl libassuan libgcrypt ]; - patches = [ ./monkeysphere.patch ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl libassuan libgcrypt ]; + makeFlags = '' PREFIX=/ DESTDIR=$(out) ''; - postInstall = '' - wrapProgram $out/bin/openpgp2ssh --prefix PERL5LIB : \ - "${with perlPackages; stdenv.lib.makePerlPath [ - CryptOpenSSLRSA - CryptOpenSSLBignum - ]}" - wrapProgram $out/bin/monkeysphere --prefix PERL5LIB :\ - "${with perlPackages; stdenv.lib.makePerlPath [ - CryptOpenSSLRSA - CryptOpenSSLBignum - ]}" - ''; + postFixup = + let wrapMonkeysphere = runtimeDeps: program: + "wrapProgram $out/bin/${program} --prefix PERL5LIB : " + + (with perlPackages; stdenv.lib.makePerlPath [ + CryptOpenSSLRSA + CryptOpenSSLBignum + ]) + + stdenv.lib.optionalString + (builtins.length runtimeDeps > 0) + " --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}" + + "\n"; + wrapPrograms = runtimeDeps: programs: stdenv.lib.concatMapStrings + (wrapMonkeysphere runtimeDeps) + programs; + in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ] + + wrapPrograms [ ] [ "../share/monkeysphere/keytrans" "openpgp2ssh" ] + + wrapPrograms [ lockfileProgs ] [ "monkeysphere" ]; meta = with stdenv.lib; { homepage = http://web.monkeysphere.info/; From d261df5fc15d41a4745e1f1482fd630d207d3f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 7 Sep 2018 12:58:53 +0200 Subject: [PATCH 202/600] python2Packages.spacy_models: update all models to version 2.0.0 (#46182) Update the model list to those models that are compatibly with the latest spaCy version: https://github.com/explosion/spacy-models/blob/master/compatibility.json The updated model file evaluates to the following packages: python2Packages.spacy_models.de_core_news_sm python2Packages.spacy_models.en_core_web_lg python2Packages.spacy_models.en_core_web_md python2Packages.spacy_models.en_core_web_sm python2Packages.spacy_models.en_vectors_web_lg python2Packages.spacy_models.es_core_news_md python2Packages.spacy_models.es_core_news_sm python2Packages.spacy_models.fr_core_news_md python2Packages.spacy_models.fr_core_news_sm python2Packages.spacy_models.it_core_news_sm python2Packages.spacy_models.nl_core_news_sm python2Packages.spacy_models.pt_core_news_sm python2Packages.spacy_models.xx_ent_wiki_sm python3Packages.spacy_models.de_core_news_sm python3Packages.spacy_models.en_core_web_lg python3Packages.spacy_models.en_core_web_md python3Packages.spacy_models.en_core_web_sm python3Packages.spacy_models.en_vectors_web_lg python3Packages.spacy_models.es_core_news_md python3Packages.spacy_models.es_core_news_sm python3Packages.spacy_models.fr_core_news_md python3Packages.spacy_models.fr_core_news_sm python3Packages.spacy_models.it_core_news_sm python3Packages.spacy_models.nl_core_news_sm python3Packages.spacy_models.pt_core_news_sm python3Packages.spacy_models.xx_ent_wiki_sm --- .../python-modules/spacy/models.json | 82 +++++++++++++------ 1 file changed, 59 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index e9c163c65259..34b8082872b7 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,42 +1,78 @@ [{ - "pname": "es_core_web_md", - "version": "1.0.0", - "sha256": "0ikyakdhnj6rrfpr8k83695d1gd3z9n60a245hwwchv94jmr7r6s", + "pname": "de_core_news_sm", + "version": "2.0.0", + "sha256": "13fs4f46qg9mlxd9ynmh81gxizm11kfq3g52pk8d2m7wp89xfc6a", "license": "cc-by-sa-40" }, { - "pname": "fr_depvec_web_lg", - "version": "1.0.0", - "sha256": "0nxmdszs1s5by2874cz37azrmwamh1ngdsiylffkfihzq6s8bhka", - "license": "cc-by-nc-sa-40" + "pname": "en_core_web_lg", + "version": "2.0.0", + "sha256": "1r33l02jrkzjn78nd0bzzzd6rwjlz7qfgs3bg5yr2ki6q0m7qxvw", + "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "1.2.1", - "sha256": "12prr4hcbfdaky9rcna1y1ykr417jkhkks2r8l06g8fb7am3pvp3", - "license": "cc-by-sa-40" -}, -{ - "pname": "en_depent_web_md", - "version": "1.2.1", - "sha256": "0giyr35q5lpp5drpcamyvb5gsjnhj62mk3ndfr49nm1s6d5f6m52", + "version": "2.0.0", + "sha256": "1b5g5gma1gzm8ffj0pgli1pllccx5jpjvb7a19n7c8bfswpifxzc", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "1.2.0", - "sha256": "0vc4l77dcwa9lmzyqdci8ikjc0m2rhasl2zvyba547vf76qb0528", + "version": "2.0.0", + "sha256": "161298pl6kzc0cgf2g7ji84xbqv8ayrgsrmmg0hxiflwghfj77cx", "license": "cc-by-sa-40" }, { - "pname": "de_core_news_md", - "version": "1.0.0", - "sha256": "072jz2rdi1nckny7k16avp86vjg4didfdsw816kfl9zwr88iny6g", + "pname": "en_vectors_web_lg", + "version": "2.0.0", + "sha256": "15qfd8vzdv56x41fzghy7k5x1c8ql92ds70r37b6a8hkb87z9byw", "license": "cc-by-sa-40" }, { - "pname": "en_vectors_glove_md", - "version": "1.0.0", - "sha256": "1jbr27xnh5fdww8yphpvk2brfnzb174wfnxkzdqwv3iyi02zsin6", + "pname": "es_core_news_md", + "version": "2.0.0", + "sha256": "03056qz866r641q4nagymw6pc78qnn5vdvcp7p1ph2cvxh7081kp", + "license": "cc-by-sa-40" +}, +{ + "pname": "es_core_news_sm", + "version": "2.0.0", + "sha256": "1b91lcmw2kyqmcrxlfq7m5vlj1a57i3bb9a5h4y31smjgzmsr81s", + "license": "cc-by-sa-40" +}, +{ + "pname": "fr_core_news_md", + "version": "2.0.0", + "sha256": "06kva46l1nw819bidzj2vks69ap1a9fa7rnvpd28l3z2haci38ls", + "license": "cc-by-sa-40" +}, +{ + "pname": "fr_core_news_sm", + "version": "2.0.0", + "sha256": "1zlhm9646g3cwcv4cs33160f3v8gxmzdr02x8hx7jpw1fbnmc5mx", + "license": "cc-by-sa-40" +}, +{ + "pname": "it_core_news_sm", + "version": "2.0.0", + "sha256": "0fs68rdq19migb3x3hb510b96aabibsi01adlk1fipll1x48msaz", + "license": "cc-by-sa-40" +}, +{ + "pname": "nl_core_news_sm", + "version": "2.0.0", + "sha256": "0n5x61jp8rdxa3ki250ipbd68rjpp9li6xwbx3fbzycpngffwy8z", + "license": "cc-by-sa-40" +}, +{ + "pname": "pt_core_news_sm", + "version": "2.0.0", + "sha256": "1sg500b3f3qnx1ga32hbq9p4qfynqhpdzhlmdjrxgqw8i58ys23g", + "license": "cc-by-sa-40" +}, +{ + "pname": "xx_ent_wiki_sm", + "version": "2.0.0", + "sha256": "0mc3mm6nfjp31wbjysdj2x72akyi52hgprm1g54djxfypm3pmn35", "license": "cc-by-sa-40" }] From b54987715bf9240622a4d135217fe2201d7cd3d0 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 6 Jan 2018 13:25:13 +0000 Subject: [PATCH 203/600] weechat: add NixOS module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/weechat.nix | 67 +++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 nixos/modules/services/misc/weechat.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4795922abcfb..d3d298840de0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -406,6 +406,7 @@ ./services/misc/taskserver ./services/misc/tzupdate.nix ./services/misc/uhub.nix + ./services/misc/weechat.nix ./services/misc/xmr-stak.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix new file mode 100644 index 000000000000..535a7f9ef91f --- /dev/null +++ b/nixos/modules/services/misc/weechat.nix @@ -0,0 +1,67 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.weechat; +in + +{ + options.services.weechat = { + enable = mkEnableOption "weechat"; + init = mkOption { + description = "Weechat commands applied at start, one command per line."; + example = '' + /set relay.network.password correct-horse-battery-staple + /relay add weechat 9001 + ''; + type = types.str; + default = ""; + }; + root = mkOption { + description = "Weechat state directory."; + type = types.str; + default = "/var/lib/weechat"; + }; + }; + + config = mkIf cfg.enable { + users = { + users.weechat = { + createHome = true; + group = "weechat"; + home = cfg.root; + }; + }; + + systemd.services.weechat = { + environment.WEECHAT_HOME = cfg.root; + serviceConfig = { + User = "weechat"; + Group = "weechat"; + }; + script = "exec ${pkgs.screen}/bin/screen -D -m ${pkgs.weechat}/bin/weechat"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + }; + + systemd.paths.weechat-fifo = { + pathConfig = { + PathExists = "${cfg.root}/weechat_fifo"; + Unit = "weechat-apply-init.service"; + }; + wantedBy = [ "multi-user.target" ]; + }; + + systemd.services.weechat-apply-init = let + initFile = pkgs.writeText "weechat-init" cfg.init; + in { + script = "sed 's/^/*/' ${initFile} > ${cfg.root}/weechat_fifo"; + serviceConfig = { + Type = "oneshot"; + User = "weechat"; + Group = "weechat"; + }; + }; + }; +} From a8efe614123e6be5ecd0661c9a9f07e9a6c57ec3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Sep 2018 17:01:45 +0200 Subject: [PATCH 204/600] weechat: 2.1 -> 2.2; improve package configuration This aims to make the `weechat` package even more configurable. It allows to specify scripts and commands using the `configure` function inside a `weechat.override` expression. The package can be configured like this: ``` with import { }; weechat.override { plugins = { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; init = '' /set foo bar /server add freenode chat.freenode.org ''; scripts = [ "/path/to/script.py" ]; }; } ``` All commands are passed to `weechat --run-command "/set foo bar;/server ..."`. The `plugins' attribute is not necessarily required anymore, if it's sufficient to add `init' commands, the `plugins' will be `builtins.attrValues availablePlugins' by default. Additionally the result contains `weechat` and `weechat-headless` (introduced in WeeChat 2.1) now. --- doc/package-notes.xml | 51 ++++++++ .../irc/weechat/aggregate-commands.patch | 110 ++++++++++++++++++ .../networking/irc/weechat/default.nix | 90 ++++++++------ .../irc/weechat/scripts/default.nix | 11 ++ .../weechat-matrix-bridge/default.nix | 2 + .../weechat-matrix-bridge/library-path.patch | 0 .../weechat/scripts}/weechat-xmpp/default.nix | 2 + .../scripts}/weechat-xmpp/libpath.patch | 0 pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 8 +- 10 files changed, 236 insertions(+), 40 deletions(-) create mode 100644 pkgs/applications/networking/irc/weechat/aggregate-commands.patch create mode 100644 pkgs/applications/networking/irc/weechat/scripts/default.nix rename pkgs/applications/networking/{instant-messengers => irc/weechat/scripts}/weechat-matrix-bridge/default.nix (96%) rename pkgs/applications/networking/{instant-messengers => irc/weechat/scripts}/weechat-matrix-bridge/library-path.patch (100%) rename pkgs/applications/networking/{instant-messengers => irc/weechat/scripts}/weechat-xmpp/default.nix (95%) rename pkgs/applications/networking/{instant-messengers => irc/weechat/scripts}/weechat-xmpp/libpath.patch (100%) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index c2aef8937b06..1f088e8aaa0e 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -671,6 +671,8 @@ overrides = super: self: rec { plugins = with availablePlugins; [ python perl ]; } } + If the configure function returns an attrset without the plugins + attribute, availablePlugins will be used automatically. @@ -704,6 +706,55 @@ overrides = super: self: rec { }; } + + WeeChat allows to set defaults on startup using the --run-command. + The configure method can be used to pass commands to the program: +weechat.override { + configure = { availablePlugins, ... }: { + init = '' + /set foo bar + /server add freenode chat.freenode.org + ''; + }; +} + Further values can be added to the list of commands when running + weechat --run-command "your-commands". + + + Additionally it's possible to specify scripts to be loaded when starting weechat. + These will be loaded before the commands from init: +weechat.override { + configure = { availablePlugins, ... }: { + scripts = with pkgs.weechatScripts; [ + weechat-xmpp weechat-matrix-bridge wee-slack + ]; + init = '' + /set plugins.var.python.jabber.key "val" + '': + }; +} + + + In nixpkgs there's a subpackage which contains derivations for + WeeChat scripts. Such derivations expect a passthru.scripts attribute + which contains a list of all scripts inside the store path. Furthermore all scripts + have to live in $out/share. An exemplary derivation looks like this: +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "exemplary-weechat-script"; + src = fetchurl { + url = "https://scripts.tld/your-scripts.tar.gz"; + sha256 = "..."; + }; + passthru.scripts = [ "foo.py" "bar.lua" ]; + installPhase = '' + mkdir $out/share + cp foo.py $out/share + cp bar.lua $out/share + ''; +} +
Citrix Receiver diff --git a/pkgs/applications/networking/irc/weechat/aggregate-commands.patch b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch new file mode 100644 index 000000000000..41e3c54a2d57 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch @@ -0,0 +1,110 @@ +diff --git a/src/core/wee-command.c b/src/core/wee-command.c +index 91c3c068d..8105e4171 100644 +--- a/src/core/wee-command.c ++++ b/src/core/wee-command.c +@@ -8345,10 +8345,20 @@ command_exec_list (const char *command_list) + void + command_startup (int plugins_loaded) + { ++ int i; ++ + if (plugins_loaded) + { + command_exec_list (CONFIG_STRING(config_startup_command_after_plugins)); +- command_exec_list (weechat_startup_commands); ++ if (weechat_startup_commands) ++ { ++ for (i = 0; i < weelist_size (weechat_startup_commands); i++) ++ { ++ command_exec_list ( ++ weelist_string ( ++ weelist_get (weechat_startup_commands, i))); ++ } ++ } + } + else + command_exec_list (CONFIG_STRING(config_startup_command_before_plugins)); +diff --git a/src/core/weechat.c b/src/core/weechat.c +index f74598ad5..ff2e539d1 100644 +--- a/src/core/weechat.c ++++ b/src/core/weechat.c +@@ -60,6 +60,7 @@ + #include "wee-eval.h" + #include "wee-hdata.h" + #include "wee-hook.h" ++#include "wee-list.h" + #include "wee-log.h" + #include "wee-network.h" + #include "wee-proxy.h" +@@ -102,7 +103,8 @@ int weechat_no_gnutls = 0; /* remove init/deinit of gnutls */ + /* (useful with valgrind/electric-f.)*/ + int weechat_no_gcrypt = 0; /* remove init/deinit of gcrypt */ + /* (useful with valgrind) */ +-char *weechat_startup_commands = NULL; /* startup commands (-r flag) */ ++struct t_weelist *weechat_startup_commands = NULL; /* startup commands */ ++ /* (option -r) */ + + + /* +@@ -152,9 +154,13 @@ weechat_display_usage () + " -h, --help display this help\n" + " -l, --license display WeeChat license\n" + " -p, --no-plugin don't load any plugin at startup\n" +- " -r, --run-command run command(s) after startup\n" +- " (many commands can be separated by " +- "semicolons)\n" ++ " -P, --plugins load only these plugins at startup\n" ++ " (see /help weechat.plugin.autoload)\n" ++ " -r, --run-command run command(s) after startup;\n" ++ " many commands can be separated by " ++ "semicolons,\n" ++ " this option can be given multiple " ++ "times\n" + " -s, --no-script don't load any script at startup\n" + " --upgrade upgrade WeeChat using session files " + "(see /help upgrade in WeeChat)\n" +@@ -276,9 +282,10 @@ weechat_parse_args (int argc, char *argv[]) + { + if (i + 1 < argc) + { +- if (weechat_startup_commands) +- free (weechat_startup_commands); +- weechat_startup_commands = strdup (argv[++i]); ++ if (!weechat_startup_commands) ++ weechat_startup_commands = weelist_new (); ++ weelist_add (weechat_startup_commands, argv[++i], ++ WEECHAT_LIST_POS_END, NULL); + } + else + { +@@ -616,6 +623,8 @@ weechat_shutdown (int return_code, int crash) + free (weechat_home); + if (weechat_local_charset) + free (weechat_local_charset); ++ if (weechat_startup_commands) ++ weelist_free (weechat_startup_commands); + + if (crash) + abort (); +diff --git a/src/core/weechat.h b/src/core/weechat.h +index 9420ff415..cbb565a03 100644 +--- a/src/core/weechat.h ++++ b/src/core/weechat.h +@@ -96,6 +96,8 @@ + /* name of environment variable with an extra lib dir */ + #define WEECHAT_EXTRA_LIBDIR "WEECHAT_EXTRA_LIBDIR" + ++struct t_weelist; ++ + /* global variables and functions */ + extern int weechat_headless; + extern int weechat_debug_core; +@@ -112,7 +114,7 @@ extern char *weechat_local_charset; + extern int weechat_plugin_no_dlclose; + extern int weechat_no_gnutls; + extern int weechat_no_gcrypt; +-extern char *weechat_startup_commands; ++extern struct t_weelist *weechat_startup_commands; + + extern void weechat_term_check (); + extern void weechat_shutdown (int return_code, int crash); diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 16162435e09a..eaf7410a3171 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -12,7 +12,8 @@ , tclSupport ? true, tcl , extraBuildInputs ? [] , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } -, runCommand }: +, runCommand, buildEnv +}: let inherit (pythonPackages) python; @@ -29,12 +30,12 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.1"; + version = "2.2"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0fq68wgynv2c3319gmzi0lz4ln4yrrk755y5mbrlr7fc1sx7ffd8"; + sha256 = "0p4nhh7f7w4q77g7jm9i6fynndqlgjkc9dk5g1xb4gf9imiisqlg"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; @@ -69,6 +70,13 @@ let done ''; + # remove when bumping to the latest version. + # This patch basically rebases `fcf7469d7664f37e94d5f6d0b3fe6fce6413f88c` + # from weechat upstream to weechat-2.2. + patches = [ + ./aggregate-commands.patch + ]; + meta = { homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; @@ -78,38 +86,38 @@ let on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ma27 ]; platforms = stdenv.lib.platforms.unix; }; }; in if configure == null then weechat else let perlInterpreter = perl; - config = configure { - availablePlugins = let - simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";}; - in rec { - python = { - pluginFile = "${weechat.python}/lib/weechat/plugins/python.so"; - withPackages = pkgsFun: (python // { - extraEnv = '' - export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}" - ''; - }); - }; - perl = (simplePlugin "perl") // { + availablePlugins = let + simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";}; + in rec { + python = { + pluginFile = "${weechat.python}/lib/weechat/plugins/python.so"; + withPackages = pkgsFun: (python // { extraEnv = '' - export PATH="${perlInterpreter}/bin:$PATH" + export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}" ''; - }; - tcl = simplePlugin "tcl"; - ruby = simplePlugin "ruby"; - guile = simplePlugin "guile"; - lua = simplePlugin "lua"; + }); }; + perl = (simplePlugin "perl") // { + extraEnv = '' + export PATH="${perlInterpreter}/bin:$PATH" + ''; + }; + tcl = simplePlugin "tcl"; + ruby = simplePlugin "ruby"; + guile = simplePlugin "guile"; + lua = simplePlugin "lua"; }; - inherit (config) plugins; + config = configure { inherit availablePlugins; }; + + plugins = config.plugins or (builtins.attrValues availablePlugins); pluginsDir = runCommand "weechat-plugins" {} '' mkdir -p $out/plugins @@ -117,13 +125,29 @@ in if configure == null then weechat else ln -s $plugin $out/plugins done ''; - in (writeScriptBin "weechat" '' - #!${stdenv.shell} - export WEECHAT_EXTRA_LIBDIR=${pluginsDir} - ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} - exec ${weechat}/bin/weechat "$@" - '') // { - name = weechat.name; - unwrapped = weechat; - meta = weechat.meta; + + init = let + init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or ""); + + mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}"); + + scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv) + [ ] (config.scripts or [])); + in "${scripts}\n${init}"; + + mkWeechat = bin: (writeScriptBin bin '' + #!${stdenv.shell} + export WEECHAT_EXTRA_LIBDIR=${pluginsDir} + ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} + exec ${weechat}/bin/${bin} "$@" --run-command "${init}" + '') // { + inherit (weechat) name meta; + unwrapped = weechat; + }; + in buildEnv { + name = "weechat-bin-env"; + paths = [ + (mkWeechat "weechat") + (mkWeechat "weechat-headless") + ]; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix new file mode 100644 index 000000000000..2a524bc4efae --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -0,0 +1,11 @@ +{ callPackage, luaPackages, pythonPackages }: + +{ + weechat-xmpp = callPackage ./weechat-xmpp { + inherit (pythonPackages) pydns; + }; + + weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { + inherit (luaPackages) cjson; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix similarity index 96% rename from pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix rename to pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 4a8ffaaa261a..1018e46ec625 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { --replace "__NIX_LIB_PATH__" "$out/lib/?.so" ''; + passthru.scripts = [ "olm.lua" "matrix.lua" ]; + installPhase = '' mkdir -p $out/{share,lib} diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch similarity index 100% rename from pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch rename to pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix similarity index 95% rename from pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix rename to pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix index 4b92d1212c55..dad5b9c5e02a 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { }) ]; + passthru.scripts = [ "jabber.py" ]; + meta = with stdenv.lib; { description = "A fork of the jabber plugin for weechat"; homepage = "https://github.com/sleduc/weechat-xmpp"; diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch similarity index 100% rename from pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch rename to pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c05f01ec839e..fed02f40134d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -292,6 +292,8 @@ mapAliases ({ vimprobable2Wrapper = vimprobable2; # added 2015-01 virtviewer = virt-viewer; # added 2015-12-24 vorbisTools = vorbis-tools; # added 2016-01-26 + weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06 + weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 wireguard = wireguard-tools; # added 2018-05-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38755b611e54..c630965604c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19175,13 +19175,7 @@ with pkgs; guile = guile_2_0; }; - weechat-matrix-bridge = callPackage ../applications/networking/instant-messengers/weechat-matrix-bridge { - inherit (luaPackages) cjson; - }; - - weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp { - inherit (pythonPackages) pydns; - }; + weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { }; westonLite = weston.override { pango = null; From 71e6dfdaeac64673ede9f38acd938cf27b1b70cc Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 6 Sep 2018 15:17:52 +0100 Subject: [PATCH 205/600] strongswan: set the right dir for TLS CA cert This fixes an issue where the strongswan NM client is not able to connect to a VPN. By default it tries to load the trust CA from /usr/share/ca-certificates which doesn't exist in NixOS and most modern distros. See debian-related issue: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835095 --- pkgs/tools/networking/strongswan/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 2f19294784ec..d176c08829e5 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -78,7 +78,10 @@ stdenv.mkDerivation rec { "--with-tss=trousers" "--enable-aikgen" "--enable-sqlite" ] - ++ optional enableNetworkManager "--enable-nm"; + ++ optionals enableNetworkManager [ + "--enable-nm" + "--with-nm-ca-dir=/etc/ssl/certs" + ]; postInstall = '' # this is needed for l2tp From 18d419141df4958e8438b7883d6c061609f8170b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Sep 2018 17:01:57 +0200 Subject: [PATCH 206/600] nixos/weechat: cleanup module, add module documentation This adds several improvements the previously introduced `services.weechat` module: * Dropped `services.weechat.init` as the initialization script can now be done on package-level since 2af41719bc using the `configure` function. * Added `sessionName` option to explicitly configure a name for the `screen` session (by default: weechat-screen). * Added `binary` option to configure the binary name (e.g. `weechat-headless`). * Added docs regarding `screen` session and `weechat.service`. --- nixos/modules/services/misc/weechat.nix | 47 ++++++++----------- nixos/modules/services/misc/weechat.xml | 61 +++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 29 deletions(-) create mode 100644 nixos/modules/services/misc/weechat.xml diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix index 535a7f9ef91f..1fcfb440485d 100644 --- a/nixos/modules/services/misc/weechat.nix +++ b/nixos/modules/services/misc/weechat.nix @@ -9,28 +9,33 @@ in { options.services.weechat = { enable = mkEnableOption "weechat"; - init = mkOption { - description = "Weechat commands applied at start, one command per line."; - example = '' - /set relay.network.password correct-horse-battery-staple - /relay add weechat 9001 - ''; - type = types.str; - default = ""; - }; root = mkOption { description = "Weechat state directory."; type = types.str; default = "/var/lib/weechat"; }; + sessionName = mkOption { + description = "Name of the `screen' session for weechat."; + default = "weechat-screen"; + type = types.str; + }; + binary = mkOption { + description = "Binary to execute (by default \${weechat}/bin/weechat)."; + example = literalExample '' + ''${pkgs.weechat}/bin/weechat-headless + ''; + default = "${pkgs.weechat}/bin/weechat"; + }; }; config = mkIf cfg.enable { users = { + groups.weechat = {}; users.weechat = { createHome = true; group = "weechat"; home = cfg.root; + isSystemUser = true; }; }; @@ -39,29 +44,13 @@ in serviceConfig = { User = "weechat"; Group = "weechat"; + RemainAfterExit = "yes"; }; - script = "exec ${pkgs.screen}/bin/screen -D -m ${pkgs.weechat}/bin/weechat"; + script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}"; wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; }; - - systemd.paths.weechat-fifo = { - pathConfig = { - PathExists = "${cfg.root}/weechat_fifo"; - Unit = "weechat-apply-init.service"; - }; - wantedBy = [ "multi-user.target" ]; - }; - - systemd.services.weechat-apply-init = let - initFile = pkgs.writeText "weechat-init" cfg.init; - in { - script = "sed 's/^/*/' ${initFile} > ${cfg.root}/weechat_fifo"; - serviceConfig = { - Type = "oneshot"; - User = "weechat"; - Group = "weechat"; - }; - }; }; + + meta.doc = ./weechat.xml; } diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml new file mode 100644 index 000000000000..de86dede2eb5 --- /dev/null +++ b/nixos/modules/services/misc/weechat.xml @@ -0,0 +1,61 @@ + + +WeeChat +WeeChat is a fast and extensible IRC client. + +
Basic Usage + +By default, the module creates a +systemd unit +which runs the chat client in a detached +screen session. + + + + +This can be done by enabling the weechat service: + + +{ ... }: + +{ + services.weechat.enable = true; +} + + + +The service is managed by a dedicated user +named weechat in the state directory +/var/lib/weechat. + +
+
Re-attaching to WeeChat + +WeeChat runs in a screen session owned by a dedicated user. To explicitly +allow your another user to attach to this session, the screenrc needs to be tweaked +by adding multiuser support: + + +{ + programs.screen.screenrc = '' + multiuser on + acladd normal_user + ''; +} + + +Now, the session can be re-attached like this: + + +screen -r weechat-screen + + + +The session name can be changed using services.weechat.sessionName. + +
+ From f5becfb5b02f9071472abe61e86460e41dbb7a5c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 6 Sep 2018 15:10:37 +0200 Subject: [PATCH 207/600] weechatScripts.wee-slack: init at 2.1.1 --- .../irc/weechat/scripts/default.nix | 2 ++ .../irc/weechat/scripts/wee-slack/default.nix | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 2a524bc4efae..21038a2fa966 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -8,4 +8,6 @@ weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { inherit (luaPackages) cjson; }; + + wee-slack = callPackage ./wee-slack { }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix new file mode 100644 index 000000000000..1b6e52157449 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "wee-slack-${version}"; + version = "2.1.1"; + + src = fetchFromGitHub { + repo = "wee-slack"; + owner = "wee-slack"; + rev = "v${version}"; + sha256 = "05caackz645aw6kljmiihiy7xz9jld8b9blwpmh0cnaihavgj1wc"; + }; + + passthru.scripts = [ "wee_slack.py" ]; + + installPhase = '' + mkdir -p $out/share + cp wee_slack.py $out/share/wee_slack.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/wee-slack/wee-slack; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + description = '' + A WeeChat plugin for Slack.com. Synchronizes read markers, provides typing notification, search, etc.. + ''; + }; +} From 969104922005f4c99e87193bb2102984b7af4ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 7 Sep 2018 10:05:17 -0300 Subject: [PATCH 208/600] cogl: Add GL_ARB_shader_texture_lod and copy_sub_image support --- pkgs/development/libraries/cogl/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e06c71c15db4..c624f9537fb3 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl +{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3 , mesa_noglu , gstreamerSupport ? true, gst_all_1 }: @@ -14,6 +14,23 @@ in stdenv.mkDerivation rec { sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; }; + patches = [ + # Some deepin packages need the following patches. They have been + # submitted by Fedora on the GNOME Bugzilla + # (https://bugzilla.gnome.org/787443). Upstream thinks the patch + # could be merged, but dev can not make a new release. + + (fetchpatch { + url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589; + sha256 = "0f0d9iddg8zwy853phh7swikg4yzhxxv71fcag36f8gis0j5p998"; + }) + + (fetchpatch { + url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056; + sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490"; + }) + ]; + nativeBuildInputs = [ pkgconfig libintl ]; configureFlags = [ From d113ca46a789a37160a781df295965f486ceafa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 7 Sep 2018 10:06:41 -0300 Subject: [PATCH 209/600] clutter: enable evdev input (needed by some Deepin packages) --- pkgs/development/libraries/clutter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 705aa7252d1f..d8150fd11508 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib, -gobjectIntrospection, gtk3, gnome3 +, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib +, gobjectIntrospection, gtk3, gnome3, libinput, libgudev, libxkbcommon }: let @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json-glib gobjectIntrospection libxcb + atk json-glib gobjectIntrospection libxcb libinput libgudev libxkbcommon ]; configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK From 6d81d8254c56ea3820a5daa339b31915d2c73580 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 7 Sep 2018 13:07:10 +0200 Subject: [PATCH 210/600] monkeysphere: Correctly wrap the keytrans aliases (subcommands) --- pkgs/tools/security/monkeysphere/default.nix | 33 +++++++++----- .../security/monkeysphere/monkeysphere.patch | 45 ------------------- 2 files changed, 21 insertions(+), 57 deletions(-) diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index bafe8cdf500b..f4def72b728c 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -23,22 +23,31 @@ stdenv.mkDerivation rec { ''; postFixup = - let wrapMonkeysphere = runtimeDeps: program: - "wrapProgram $out/bin/${program} --prefix PERL5LIB : " - + (with perlPackages; stdenv.lib.makePerlPath [ - CryptOpenSSLRSA - CryptOpenSSLBignum - ]) - + stdenv.lib.optionalString - (builtins.length runtimeDeps > 0) - " --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}" - + "\n"; + let wrapperArgs = runtimeDeps: + "--prefix PERL5LIB : " + + (with perlPackages; stdenv.lib.makePerlPath [ + CryptOpenSSLRSA + CryptOpenSSLBignum + ]) + + stdenv.lib.optionalString + (builtins.length runtimeDeps > 0) + " --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}"; + wrapMonkeysphere = runtimeDeps: program: + "wrapProgram $out/bin/${program} ${wrapperArgs runtimeDeps}\n"; wrapPrograms = runtimeDeps: programs: stdenv.lib.concatMapStrings (wrapMonkeysphere runtimeDeps) programs; in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ] - + wrapPrograms [ ] [ "../share/monkeysphere/keytrans" "openpgp2ssh" ] - + wrapPrograms [ lockfileProgs ] [ "monkeysphere" ]; + + wrapPrograms [ lockfileProgs ] [ "monkeysphere" ] + + '' + # These 4 programs depend on the program name ($0): + for program in openpgp2pem openpgp2spki openpgp2ssh pem2openpgp; do + rm $out/bin/$program + ln -sf keytrans $out/share/monkeysphere/$program + makeWrapper $out/share/monkeysphere/$program $out/bin/$program \ + ${wrapperArgs [ ]} + done + ''; meta = with stdenv.lib; { homepage = http://web.monkeysphere.info/; diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch index f341ee747bbc..fdf4b9335b19 100644 --- a/pkgs/tools/security/monkeysphere/monkeysphere.patch +++ b/pkgs/tools/security/monkeysphere/monkeysphere.patch @@ -28,50 +28,5 @@ diff --git a/src/share/keytrans b/src/share/keytrans # keytrans: this is an RSA key translation utility; it is capable of # transforming RSA keys (both public keys and secret keys) between -@@ -1083,7 +1083,7 @@ sub packetwalk { - - - for (basename($0)) { -- if (/^pem2openpgp$/) { -+ if (/pem2openpgp/) { - my $rsa; - my $stdin; - -@@ -1121,7 +1121,7 @@ for (basename($0)) { - } - ); - } -- elsif (/^openpgp2ssh$/) { -+ elsif (/openpgp2ssh/) { - my $fpr = shift; - my $instream; - open($instream,'-'); -@@ -1137,7 +1137,7 @@ for (basename($0)) { - die "No matching key found.\n"; - } - } -- elsif (/^openpgp2pem$/) { -+ elsif (/openpgp2pem/) { - my $fpr = shift; - my $instream; - open($instream,'-'); -@@ -1153,7 +1153,7 @@ for (basename($0)) { - die "No matching key found.\n"; - } - } -- elsif (/^openpgp2spki$/) { -+ elsif (/openpgp2spki/) { - my $fpr = shift; - my $instream; - open($instream,'-'); -@@ -1165,7 +1165,7 @@ for (basename($0)) { - die "No matching key found.\n"; - } - } -- elsif (/^keytrans$/) { -+ elsif (/keytrans/) { - # subcommands when keytrans is invoked directly are UNSUPPORTED, - # UNDOCUMENTED, and WILL NOT BE MAINTAINED. - my $subcommand = shift; -- 2.16.3 From 2b49b7f608dd9411a48e2e7245225aba3cdf23b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 7 Sep 2018 10:22:12 -0300 Subject: [PATCH 211/600] deepin-mutter: init at 3.20.34 --- .../desktops/deepin/deepin-mutter/default.nix | 61 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-mutter/default.nix diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix new file mode 100644 index 000000000000..e397ab53576d --- /dev/null +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg, + libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, + libstartup_notification, libinput, cogl, clutter, systemd +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-mutter"; + version = "3.20.34"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0s427fmj806ljpdg6jdvpfislk5m1xvxpnnyrq3l8b7pkhjvp8wd"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + libtool + gnome3.gnome-common + ]; + + buildInputs = [ + gnome3.gtk + gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas + gnome3.libgudev + gnome3.zenity + upower + xorg.libxkbfile + libxkbcommon + libcanberra-gtk3 + libstartup_notification + libinput + xkeyboard_config + cogl + clutter + systemd + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--enable-native-backend" + "--enable-compile-warnings=minimum" + ]; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "Base window manager for deepin, fork of gnome mutter"; + homepage = https://github.com/linuxdeepin/deepin-mutter; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index d8fc63e4f912..c1438012ef51 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -8,6 +8,7 @@ let deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; deepin-icon-theme = callPackage ./deepin-icon-theme { }; deepin-menu = callPackage ./deepin-menu { }; + deepin-mutter = callPackage ./deepin-mutter { }; deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-terminal = callPackage ./deepin-terminal { inherit (pkgs.gnome3) libgee vte; From 11c3fe2258ab086f582a3377c3d3b572e6ad41f8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 6 Sep 2018 14:50:50 -0400 Subject: [PATCH 212/600] pythonPackages.selectors2: init at 2.0.1 Added package becuase now dependency of ncclient. --- .../python-modules/selectors2/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/selectors2/default.nix diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix new file mode 100644 index 000000000000..030178fef830 --- /dev/null +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, psutil, mock }: + +buildPythonPackage rec { + version = "2.0.1"; + pname = "selectors2"; + + src = fetchPypi { + inherit pname version; + sha256 = "81b77c4c6f607248b1d6bbdb5935403fef294b224b842a830bbfabb400c81884"; + }; + + checkInputs = [ nose psutil mock ]; + + checkPhase = '' + # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064 + # Trick to disable certain tests that depend on timing which + # will always fail on hydra + export TRAVIS="" + nosetests tests/test_selectors2.py + ''; + + meta = with stdenv.lib; { + homepage = https://www.github.com/SethMichaelLarson/selectors2; + description = "Back-ported, durable, and portable selectors"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 137463b74db6..3ba3cfa6f2f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -536,6 +536,8 @@ in { seekpath = callPackage ../development/python-modules/seekpath { }; + selectors2 = callPackage ../development/python-modules/selectors2 { }; + serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; simpleeval = callPackage ../development/python-modules/simpleeval { }; From a726956b42c92e7a30323d0c3fedbde032db93e3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 6 Sep 2018 14:51:24 -0400 Subject: [PATCH 213/600] pythonPackages.ncclient: refactor adding selectors2 as dependency of ncclient. Added recently 20 days ago in August. https://github.com/ncclient/ncclient/commit/8ef20f282877097c8f51604679277db49c39f80c --- pkgs/development/python-modules/ncclient/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 9dc7710ff28f..9933e849d0be 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , paramiko +, selectors2 , lxml , libxml2 , libxslt @@ -21,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ nose rednose ]; propagatedBuildInputs = [ - paramiko lxml libxml2 libxslt + paramiko lxml libxml2 libxslt selectors2 ]; checkPhase = '' From 82f980828df4037b98c11a6490d4f8916b01f570 Mon Sep 17 00:00:00 2001 From: stites Date: Fri, 7 Sep 2018 10:27:03 -0400 Subject: [PATCH 214/600] add stites to maintainers list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6356c0c7cefe..6585203ca216 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3888,6 +3888,11 @@ github = "StillerHarpo"; name = "Florian Engel"; }; + stites = { + email = "sam@stites.io"; + github = "stites"; + name = "Sam Stites"; + }; stumoss = { email = "samoss@gmail.com"; github = "stumoss"; From f1c30cf77227c2f1964921fa26a2675dd671ff93 Mon Sep 17 00:00:00 2001 From: stites Date: Fri, 7 Sep 2018 10:27:27 -0400 Subject: [PATCH 215/600] noti: init at 3.1.0 --- pkgs/tools/misc/noti/default.nix | 38 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/noti/default.nix diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix new file mode 100644 index 000000000000..ac5b4199c216 --- /dev/null +++ b/pkgs/tools/misc/noti/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "noti-${version}"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "variadico"; + repo = "noti"; + rev = "${version}"; + sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; + }; + + goPackagePath = "github.com/variadico/noti"; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X ${goPackagePath}/internal/command.Version=${version}") + ''; + + postInstall = '' + mkdir -p $out/share/man/man{1,5}/ + cp $src/docs/man/noti.1 $out/share/man/man1/ + cp $src/docs/man/noti.yaml.5 $out/share/man/man5/ + ''; + + meta = with stdenv.lib; { + description = "Monitor a process and trigger a notification."; + longDescription = '' + Monitor a process and trigger a notification. + + Never sit and wait for some long-running process to finish. Noti can alert you when it's done. You can receive messages on your computer or phone. + ''; + homepage = https://github.com/variadico/noti; + license = licenses.mit; + maintainers = [ maintainers.stites ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f563f0dfe243..ede07a467810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1462,6 +1462,8 @@ with pkgs; noteshrink = callPackage ../tools/misc/noteshrink { }; + noti = callPackage ../tools/misc/noti { }; + nrsc5 = callPackage ../applications/misc/nrsc5 { }; nwipe = callPackage ../tools/security/nwipe { }; From d7861ab8b665bdf7665a4e6b58ee6a779a96019b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 7 Sep 2018 17:32:42 +0300 Subject: [PATCH 216/600] sbcl: 1.4.7 -> 1.4.10 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index a860aa7dc734..34855838fe8b 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.7"; + version = "1.4.10"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1wmxly94pn8527092hyzg5mq58mg7qlc46nm31f268wb2dm67rvm"; + sha256 = "1j9wb608pkihpwgzl4qvnr4jl6mb7ngfqy559pxnvmnn1zlyfklh"; }; patchPhase = '' From 8d063d92a4c4337ae01590f1eff4d417ed8fb412 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 7 Sep 2018 11:36:28 -0400 Subject: [PATCH 217/600] geant4: limit platforms to linux --- pkgs/development/libraries/physics/geant4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 57d6a87b5943..7123858b8edc 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { homepage = http://www.geant4.org; license = licenses.g4sl; maintainers = with maintainers; [ tmplt ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 79ba5560206e84e11f3bf652ac05594bb166a972 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Sep 2018 08:48:26 -0700 Subject: [PATCH 218/600] bear: 2.3.12 -> 2.3.13 (#46308) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bear/versions --- pkgs/development/tools/build-managers/bear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index fb12b5a9c14a..51e8d12d3147 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.3.12"; + version = "2.3.13"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "1zzz2yiiny9pm4h6ayb82xzxc2j5djcpf8va2wagcw92m7w6miqw"; + sha256 = "0imvvs22gyr1v6ydgp5yn2nq8fb8llmz0ra1m733ikjaczl3jm7z"; }; nativeBuildInputs = [ cmake ]; From 6ae3f9a3f78551d6cb5a769a5003bd1f61ad7f9d Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 7 Sep 2018 17:56:17 +0200 Subject: [PATCH 219/600] phpPackages.composer: 1.6.5 -> 1.7.2 (#46203) --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ef6da6ed8042..e8c97f12676e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -335,11 +335,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.6.5"; + version = "1.7.2"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0d1lpvq8wylh5qgxhbqb5r7j3c6qk0bz4b5vg187jsl6z6fvxgk7"; + sha256 = "03km8qw3nshj7qzk5pidziha2ldx1l2yxhh2s7vpg25f9782hd7c"; }; unpackPhase = ":"; From da63c86e3ee6c17d9490a76e1c0068137cc76b31 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 7 Sep 2018 17:56:43 +0200 Subject: [PATCH 220/600] phpPackages.psysh: 0.9.6 -> 0.9.8 (#46206) --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e8c97f12676e..7b071e7c35cc 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -504,11 +504,11 @@ let psysh = pkgs.stdenv.mkDerivation rec { name = "psysh-${version}"; - version = "0.9.6"; + version = "0.9.8"; src = pkgs.fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "06icmyn7v229mpfplqj76kjnp1gh4ns0nrxa7bsckyqhzi425kc6"; + sha256 = "0xs9bl0hplkm2hajmm4qca65bm2x7wnx4vbmk0d2jxpvwrgqgnzd"; }; phases = [ "installPhase" ]; From 9466627d366b9b22b597093ff10cbf47b0aade28 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 7 Sep 2018 17:57:37 +0200 Subject: [PATCH 221/600] phpPackages.xdebug26: 2.6.0 -> 2.6.1 (#46205) --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7b071e7c35cc..f235cb639df4 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -198,9 +198,9 @@ let }; xdebug26 = assert isPhp7; buildPecl { - name = "xdebug-2.6.0"; + name = "xdebug-2.6.1"; - sha256 = "1p6b54ypi5lq4ka3pyy2gswdf1d5vjb9y8lp9fqcp3zn7g04q9mm"; + sha256 = "0xxxy6n4lv7ghi9liqx133yskg07lw316vhcds43n1sjq3b93rns"; doCheck = true; checkTarget = "test"; From 7521f2863d41724f68c66f7d8cb414d39dcbdfcb Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 7 Sep 2018 13:19:00 +0200 Subject: [PATCH 222/600] sage: fix numpy and scipy integration --- ...{numpy-1.14.3.patch => numpy-1.15.1.patch} | 207 +++++++++++++----- .../science/math/sage/sage-src.nix | 15 +- 2 files changed, 166 insertions(+), 56 deletions(-) rename pkgs/applications/science/math/sage/patches/{numpy-1.14.3.patch => numpy-1.15.1.patch} (78%) diff --git a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch b/pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch similarity index 78% rename from pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch rename to pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch index 5927bc116096..9e855ba4ad94 100644 --- a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch +++ b/pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch @@ -1,5 +1,5 @@ diff --git a/src/doc/en/faq/faq-usage.rst b/src/doc/en/faq/faq-usage.rst -index 79b4205fd3..9a89bd2136 100644 +index 2347a1190d..f5b0fe71a4 100644 --- a/src/doc/en/faq/faq-usage.rst +++ b/src/doc/en/faq/faq-usage.rst @@ -338,7 +338,7 @@ ints. For example:: @@ -174,7 +174,7 @@ index 5b89cd75ee..e50b2ea5d4 100644 This creates a random 5x5 matrix ``A``, and solves `Ax=b` where ``b=[0.0,1.0,2.0,3.0,4.0]``. There are many other routines in the :mod:`numpy.linalg` diff --git a/src/sage/calculus/riemann.pyx b/src/sage/calculus/riemann.pyx -index df85cce43d..34ea164be0 100644 +index 60f37f7557..4ac3dedf1d 100644 --- a/src/sage/calculus/riemann.pyx +++ b/src/sage/calculus/riemann.pyx @@ -1191,30 +1191,30 @@ cpdef complex_to_spiderweb(np.ndarray[COMPLEX_T, ndim = 2] z_values, @@ -248,7 +248,7 @@ index df85cce43d..34ea164be0 100644 TESTS:: diff --git a/src/sage/combinat/fully_packed_loop.py b/src/sage/combinat/fully_packed_loop.py -index 61b1003002..4baee9cbbd 100644 +index 0a9bd61267..d2193cc2d6 100644 --- a/src/sage/combinat/fully_packed_loop.py +++ b/src/sage/combinat/fully_packed_loop.py @@ -72,11 +72,11 @@ def _make_color_list(n, colors=None, color_map=None, randomize=False): @@ -269,10 +269,10 @@ index 61b1003002..4baee9cbbd 100644 ['blue', 'blue', 'red', 'blue', 'red', 'red', 'red', 'blue'] """ diff --git a/src/sage/finance/time_series.pyx b/src/sage/finance/time_series.pyx -index c37700d14e..49b7298d0b 100644 +index 28779365df..3ab0282861 100644 --- a/src/sage/finance/time_series.pyx +++ b/src/sage/finance/time_series.pyx -@@ -109,8 +109,8 @@ cdef class TimeSeries: +@@ -111,8 +111,8 @@ cdef class TimeSeries: sage: import numpy sage: v = numpy.array([[1,2], [3,4]], dtype=float); v @@ -283,7 +283,7 @@ index c37700d14e..49b7298d0b 100644 sage: finance.TimeSeries(v) [1.0000, 2.0000, 3.0000, 4.0000] sage: finance.TimeSeries(v[:,0]) -@@ -2098,14 +2098,14 @@ cdef class TimeSeries: +@@ -2100,14 +2100,14 @@ cdef class TimeSeries: sage: w[0] = 20 sage: w @@ -301,7 +301,7 @@ index c37700d14e..49b7298d0b 100644 sage: v [20.0000, -3.0000, 4.5000, -2.0000] diff --git a/src/sage/functions/hyperbolic.py b/src/sage/functions/hyperbolic.py -index 931a4b41e4..bf33fc483d 100644 +index aff552f450..7a6df931e7 100644 --- a/src/sage/functions/hyperbolic.py +++ b/src/sage/functions/hyperbolic.py @@ -214,7 +214,7 @@ class Function_coth(GinacFunction): @@ -341,7 +341,7 @@ index 931a4b41e4..bf33fc483d 100644 return arctanh(1.0 / x) diff --git a/src/sage/functions/orthogonal_polys.py b/src/sage/functions/orthogonal_polys.py -index 017c85a96f..33fbb499c5 100644 +index ed6365bef4..99b8b04dad 100644 --- a/src/sage/functions/orthogonal_polys.py +++ b/src/sage/functions/orthogonal_polys.py @@ -810,12 +810,12 @@ class Func_chebyshev_T(ChebyshevFunction): @@ -379,10 +379,10 @@ index 017c85a96f..33fbb499c5 100644 array([ 0.2 , -0.96]) """ diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py -index 679384c907..d63b295a4c 100644 +index 1883daa3e6..9885222817 100644 --- a/src/sage/functions/other.py +++ b/src/sage/functions/other.py -@@ -390,7 +390,7 @@ class Function_ceil(BuiltinFunction): +@@ -389,7 +389,7 @@ class Function_ceil(BuiltinFunction): sage: import numpy sage: a = numpy.linspace(0,2,6) sage: ceil(a) @@ -391,7 +391,7 @@ index 679384c907..d63b295a4c 100644 Test pickling:: -@@ -539,7 +539,7 @@ class Function_floor(BuiltinFunction): +@@ -553,7 +553,7 @@ class Function_floor(BuiltinFunction): sage: import numpy sage: a = numpy.linspace(0,2,6) sage: floor(a) @@ -400,7 +400,7 @@ index 679384c907..d63b295a4c 100644 sage: floor(x)._sympy_() floor(x) -@@ -840,7 +840,7 @@ def sqrt(x, *args, **kwds): +@@ -869,7 +869,7 @@ def sqrt(x, *args, **kwds): sage: import numpy sage: a = numpy.arange(2,5) sage: sqrt(a) @@ -409,11 +409,35 @@ index 679384c907..d63b295a4c 100644 """ if isinstance(x, float): return math.sqrt(x) +diff --git a/src/sage/functions/spike_function.py b/src/sage/functions/spike_function.py +index 1e021de3fe..56635ca98f 100644 +--- a/src/sage/functions/spike_function.py ++++ b/src/sage/functions/spike_function.py +@@ -157,7 +157,7 @@ class SpikeFunction: + sage: S = spike_function([(-3,4),(-1,1),(2,3)]); S + A spike function with spikes at [-3.0, -1.0, 2.0] + sage: P = S.plot_fft_abs(8) +- sage: p = P[0]; p.ydata ++ sage: p = P[0]; p.ydata # abs tol 1e-8 + [5.0, 5.0, 3.367958691924177, 3.367958691924177, 4.123105625617661, 4.123105625617661, 4.759921664218055, 4.759921664218055] + """ + w = self.vector(samples = samples, xmin=xmin, xmax=xmax) +@@ -176,8 +176,8 @@ class SpikeFunction: + sage: S = spike_function([(-3,4),(-1,1),(2,3)]); S + A spike function with spikes at [-3.0, -1.0, 2.0] + sage: P = S.plot_fft_arg(8) +- sage: p = P[0]; p.ydata +- [0.0, 0.0, -0.211524990023434..., -0.211524990023434..., 0.244978663126864..., 0.244978663126864..., -0.149106180027477..., -0.149106180027477...] ++ sage: p = P[0]; p.ydata # abs tol 1e-8 ++ [0.0, 0.0, -0.211524990023434, -0.211524990023434, 0.244978663126864, 0.244978663126864, -0.149106180027477, -0.149106180027477] + """ + w = self.vector(samples = samples, xmin=xmin, xmax=xmax) + xmin, xmax = self._ranges(xmin, xmax) diff --git a/src/sage/functions/trig.py b/src/sage/functions/trig.py -index e7e7a311cd..e7ff78a9de 100644 +index 501e7ff6b6..5f760912f0 100644 --- a/src/sage/functions/trig.py +++ b/src/sage/functions/trig.py -@@ -731,7 +731,7 @@ class Function_arccot(GinacFunction): +@@ -724,7 +724,7 @@ class Function_arccot(GinacFunction): sage: import numpy sage: a = numpy.arange(2, 5) sage: arccot(a) @@ -422,7 +446,7 @@ index e7e7a311cd..e7ff78a9de 100644 """ return math.pi/2 - arctan(x) -@@ -787,7 +787,7 @@ class Function_arccsc(GinacFunction): +@@ -780,7 +780,7 @@ class Function_arccsc(GinacFunction): sage: import numpy sage: a = numpy.arange(2, 5) sage: arccsc(a) @@ -431,7 +455,7 @@ index e7e7a311cd..e7ff78a9de 100644 """ return arcsin(1.0/x) -@@ -845,7 +845,7 @@ class Function_arcsec(GinacFunction): +@@ -838,7 +838,7 @@ class Function_arcsec(GinacFunction): sage: import numpy sage: a = numpy.arange(2, 5) sage: arcsec(a) @@ -440,7 +464,7 @@ index e7e7a311cd..e7ff78a9de 100644 """ return arccos(1.0/x) -@@ -920,13 +920,13 @@ class Function_arctan2(GinacFunction): +@@ -913,13 +913,13 @@ class Function_arctan2(GinacFunction): sage: a = numpy.linspace(1, 3, 3) sage: b = numpy.linspace(3, 6, 3) sage: atan2(a, b) @@ -458,10 +482,10 @@ index e7e7a311cd..e7ff78a9de 100644 TESTS:: diff --git a/src/sage/matrix/constructor.pyx b/src/sage/matrix/constructor.pyx -index 19a1d37df0..5780dfae1c 100644 +index 12136f1773..491bf22e62 100644 --- a/src/sage/matrix/constructor.pyx +++ b/src/sage/matrix/constructor.pyx -@@ -494,8 +494,8 @@ class MatrixFactory(object): +@@ -503,8 +503,8 @@ def matrix(*args, **kwds): [7 8 9] Full MatrixSpace of 3 by 3 dense matrices over Integer Ring sage: n = matrix(QQ, 2, 2, [1, 1/2, 1/3, 1/4]).numpy(); n @@ -473,10 +497,31 @@ index 19a1d37df0..5780dfae1c 100644 [ 1 1/2] [1/3 1/4] diff --git a/src/sage/matrix/matrix_double_dense.pyx b/src/sage/matrix/matrix_double_dense.pyx -index 48e0a8a97f..1be5d35b19 100644 +index 66e54a79a4..0498334f4b 100644 --- a/src/sage/matrix/matrix_double_dense.pyx +++ b/src/sage/matrix/matrix_double_dense.pyx -@@ -2546,7 +2546,7 @@ cdef class Matrix_double_dense(Matrix_dense): +@@ -606,6 +606,9 @@ cdef class Matrix_double_dense(Matrix_dense): + [ 3.0 + 9.0*I 4.0 + 16.0*I 5.0 + 25.0*I] + [6.0 + 36.0*I 7.0 + 49.0*I 8.0 + 64.0*I] + sage: B.condition() ++ doctest:warning ++ ... ++ ComplexWarning: Casting complex values to real discards the imaginary part + 203.851798... + sage: B.condition(p='frob') + 203.851798... +@@ -654,9 +657,7 @@ cdef class Matrix_double_dense(Matrix_dense): + True + sage: B = A.change_ring(CDF) + sage: B.condition() +- Traceback (most recent call last): +- ... +- LinAlgError: Singular matrix ++ +Infinity + + Improper values of ``p`` are caught. :: + +@@ -2519,7 +2520,7 @@ cdef class Matrix_double_dense(Matrix_dense): sage: P.is_unitary(algorithm='orthonormal') Traceback (most recent call last): ... @@ -485,7 +530,7 @@ index 48e0a8a97f..1be5d35b19 100644 TESTS:: -@@ -3662,8 +3662,8 @@ cdef class Matrix_double_dense(Matrix_dense): +@@ -3635,8 +3636,8 @@ cdef class Matrix_double_dense(Matrix_dense): [0.0 1.0 2.0] [3.0 4.0 5.0] sage: m.numpy() @@ -496,7 +541,7 @@ index 48e0a8a97f..1be5d35b19 100644 Alternatively, numpy automatically calls this function (via the magic :meth:`__array__` method) to convert Sage matrices -@@ -3674,16 +3674,16 @@ cdef class Matrix_double_dense(Matrix_dense): +@@ -3647,16 +3648,16 @@ cdef class Matrix_double_dense(Matrix_dense): [0.0 1.0 2.0] [3.0 4.0 5.0] sage: numpy.array(m) @@ -518,10 +563,10 @@ index 48e0a8a97f..1be5d35b19 100644 dtype('complex128') diff --git a/src/sage/matrix/special.py b/src/sage/matrix/special.py -index c698ba5e97..b743bab354 100644 +index ccbd208810..c3f9a65093 100644 --- a/src/sage/matrix/special.py +++ b/src/sage/matrix/special.py -@@ -705,7 +705,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True): +@@ -706,7 +706,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True): sage: import numpy sage: entries = numpy.array([1.2, 5.6]); entries @@ -530,7 +575,7 @@ index c698ba5e97..b743bab354 100644 sage: A = diagonal_matrix(3, entries); A [1.2 0.0 0.0] [0.0 5.6 0.0] -@@ -715,7 +715,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True): +@@ -716,7 +716,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True): sage: j = numpy.complex(0,1) sage: entries = numpy.array([2.0+j, 8.1, 3.4+2.6*j]); entries @@ -540,10 +585,10 @@ index c698ba5e97..b743bab354 100644 [2.0 + 1.0*I 0.0 0.0] [ 0.0 8.1 0.0] diff --git a/src/sage/modules/free_module_element.pyx b/src/sage/modules/free_module_element.pyx -index 230f142117..2ab1c0ae68 100644 +index 37d92c1282..955d083b34 100644 --- a/src/sage/modules/free_module_element.pyx +++ b/src/sage/modules/free_module_element.pyx -@@ -982,7 +982,7 @@ cdef class FreeModuleElement(Vector): # abstract base class +@@ -988,7 +988,7 @@ cdef class FreeModuleElement(Vector): # abstract base class sage: v.numpy() array([1, 2, 5/6], dtype=object) sage: v.numpy(dtype=float) @@ -552,7 +597,7 @@ index 230f142117..2ab1c0ae68 100644 sage: v.numpy(dtype=int) array([1, 2, 0]) sage: import numpy -@@ -993,7 +993,7 @@ cdef class FreeModuleElement(Vector): # abstract base class +@@ -999,7 +999,7 @@ cdef class FreeModuleElement(Vector): # abstract base class be more efficient but may have unintended consequences:: sage: v.numpy(dtype=None) @@ -596,22 +641,6 @@ index 39fc2970de..2badf98284 100644 """ if dtype is None or dtype is self._vector_numpy.dtype: from copy import copy -diff --git a/src/sage/numerical/optimize.py b/src/sage/numerical/optimize.py -index 17b5ebb84b..92ce35c502 100644 ---- a/src/sage/numerical/optimize.py -+++ b/src/sage/numerical/optimize.py -@@ -486,9 +486,9 @@ def minimize_constrained(func,cons,x0,gradient=None,algorithm='default', **args) - else: - min = optimize.fmin_tnc(f, x0, approx_grad=True, bounds=cons, messages=0, **args)[0] - elif isinstance(cons[0], function_type) or isinstance(cons[0], Expression): -- min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args) -+ min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args) - elif isinstance(cons, function_type) or isinstance(cons, Expression): -- min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args) -+ min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args) - return vector(RDF, min) - - diff --git a/src/sage/plot/complex_plot.pyx b/src/sage/plot/complex_plot.pyx index ad9693da62..758fb709b7 100644 --- a/src/sage/plot/complex_plot.pyx @@ -649,6 +678,76 @@ index ad9693da62..758fb709b7 100644 """ import numpy cdef unsigned int i, j, imax, jmax +diff --git a/src/sage/plot/histogram.py b/src/sage/plot/histogram.py +index 5d28473731..fc4b2046c0 100644 +--- a/src/sage/plot/histogram.py ++++ b/src/sage/plot/histogram.py +@@ -53,10 +53,17 @@ class Histogram(GraphicPrimitive): + """ + import numpy as np + self.datalist=np.asarray(datalist,dtype=float) ++ if 'normed' in options: ++ from sage.misc.superseded import deprecation ++ deprecation(25260, "the 'normed' option is deprecated. Use 'density' instead.") + if 'linestyle' in options: + from sage.plot.misc import get_matplotlib_linestyle + options['linestyle'] = get_matplotlib_linestyle( + options['linestyle'], return_type='long') ++ if options.get('range', None): ++ # numpy.histogram performs type checks on "range" so this must be ++ # actual floats ++ options['range'] = [float(x) for x in options['range']] + GraphicPrimitive.__init__(self, options) + + def get_minmax_data(self): +@@ -80,10 +87,14 @@ class Histogram(GraphicPrimitive): + {'xmax': 4.0, 'xmin': 0, 'ymax': 2, 'ymin': 0} + + TESTS:: +- + sage: h = histogram([10,3,5], normed=True)[0] +- sage: h.get_minmax_data() # rel tol 1e-15 +- {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.4761904761904765, 'ymin': 0} ++ doctest:warning...: ++ DeprecationWarning: the 'normed' option is deprecated. Use 'density' instead. ++ See https://trac.sagemath.org/25260 for details. ++ sage: h.get_minmax_data() ++ doctest:warning ...: ++ VisibleDeprecationWarning: Passing `normed=True` on non-uniform bins has always been broken, and computes neither the probability density function nor the probability mass function. The result is only correct if the bins are uniform, when density=True will produce the same result anyway. The argument will be removed in a future version of numpy. ++ {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.476190476190..., 'ymin': 0} + """ + import numpy + +@@ -152,7 +163,7 @@ class Histogram(GraphicPrimitive): + 'rwidth': 'The relative width of the bars as a fraction of the bin width', + 'cumulative': '(True or False) If True, then a histogram is computed in which each bin gives the counts in that bin plus all bins for smaller values. Negative values give a reversed direction of accumulation.', + 'range': 'A list [min, max] which define the range of the histogram. Values outside of this range are treated as outliers and omitted from counts.', +- 'normed': 'Deprecated alias for density', ++ 'normed': 'Deprecated. Use density instead.', + 'density': '(True or False) If True, the counts are normalized to form a probability density. (n/(len(x)*dbin)', + 'weights': 'A sequence of weights the same length as the data list. If supplied, then each value contributes its associated weight to the bin count.', + 'stacked': '(True or False) If True, multiple data are stacked on top of each other.', +@@ -199,7 +210,7 @@ class Histogram(GraphicPrimitive): + subplot.hist(self.datalist.transpose(), **options) + + +-@options(aspect_ratio='automatic',align='mid', weights=None, range=None, bins=10, edgecolor='black') ++@options(aspect_ratio='automatic', align='mid', weights=None, range=None, bins=10, edgecolor='black') + def histogram(datalist, **options): + """ + Computes and draws the histogram for list(s) of numerical data. +@@ -231,8 +242,9 @@ def histogram(datalist, **options): + - ``linewidth`` -- (float) width of the lines defining the bars + - ``linestyle`` -- (default: 'solid') Style of the line. One of 'solid' + or '-', 'dashed' or '--', 'dotted' or ':', 'dashdot' or '-.' +- - ``density`` -- (boolean - default: False) If True, the counts are +- normalized to form a probability density. ++ - ``density`` -- (boolean - default: False) If True, the result is the ++ value of the probability density function at the bin, normalized such ++ that the integral over the range is 1. + - ``range`` -- A list [min, max] which define the range of the + histogram. Values outside of this range are treated as outliers and + omitted from counts diff --git a/src/sage/plot/line.py b/src/sage/plot/line.py index 23f5e61446..3b1b51d7cf 100644 --- a/src/sage/plot/line.py @@ -718,7 +817,7 @@ index f3da57c370..3806f4b32f 100644 TESTS: diff --git a/src/sage/probability/probability_distribution.pyx b/src/sage/probability/probability_distribution.pyx -index f66cd898b9..35995886d5 100644 +index 1b119e323f..3290b00695 100644 --- a/src/sage/probability/probability_distribution.pyx +++ b/src/sage/probability/probability_distribution.pyx @@ -130,7 +130,17 @@ cdef class ProbabilityDistribution: @@ -741,10 +840,10 @@ index f66cd898b9..35995886d5 100644 import pylab l = [float(self.get_random_element()) for _ in range(num_samples)] diff --git a/src/sage/rings/rational.pyx b/src/sage/rings/rational.pyx -index a0bfe080f5..7d95e7a1a8 100644 +index 12ca1b222b..9bad7dae0c 100644 --- a/src/sage/rings/rational.pyx +++ b/src/sage/rings/rational.pyx -@@ -1056,7 +1056,7 @@ cdef class Rational(sage.structure.element.FieldElement): +@@ -1041,7 +1041,7 @@ cdef class Rational(sage.structure.element.FieldElement): dtype('O') sage: numpy.array([1, 1/2, 3/4]) @@ -754,10 +853,10 @@ index a0bfe080f5..7d95e7a1a8 100644 if mpz_cmp_ui(mpq_denref(self.value), 1) == 0: if mpz_fits_slong_p(mpq_numref(self.value)): diff --git a/src/sage/rings/real_mpfr.pyx b/src/sage/rings/real_mpfr.pyx -index 4c630867a4..64e2187f5b 100644 +index 9b90c8833e..1ce05b937d 100644 --- a/src/sage/rings/real_mpfr.pyx +++ b/src/sage/rings/real_mpfr.pyx -@@ -1438,7 +1438,7 @@ cdef class RealNumber(sage.structure.element.RingElement): +@@ -1439,7 +1439,7 @@ cdef class RealNumber(sage.structure.element.RingElement): sage: import numpy sage: numpy.arange(10.0) @@ -767,10 +866,10 @@ index 4c630867a4..64e2187f5b 100644 dtype('float64') sage: numpy.array([1.000000000000000000000000000000000000]).dtype diff --git a/src/sage/schemes/elliptic_curves/height.py b/src/sage/schemes/elliptic_curves/height.py -index 3d270ebf9d..1144f168e3 100644 +index de31fe9883..7a33ea6f5b 100644 --- a/src/sage/schemes/elliptic_curves/height.py +++ b/src/sage/schemes/elliptic_curves/height.py -@@ -1623,18 +1623,18 @@ class EllipticCurveCanonicalHeight: +@@ -1627,18 +1627,18 @@ class EllipticCurveCanonicalHeight: even:: sage: H.wp_on_grid(v,4) @@ -798,10 +897,10 @@ index 3d270ebf9d..1144f168e3 100644 tau = self.tau(v) fk, err = self.fk_intervals(v, 15, CDF) diff --git a/src/sage/symbolic/ring.pyx b/src/sage/symbolic/ring.pyx -index 2dcb0492b9..2b1a06385c 100644 +index 9da38002e8..d61e74bf82 100644 --- a/src/sage/symbolic/ring.pyx +++ b/src/sage/symbolic/ring.pyx -@@ -1135,7 +1135,7 @@ cdef class NumpyToSRMorphism(Morphism): +@@ -1136,7 +1136,7 @@ cdef class NumpyToSRMorphism(Morphism): sage: cos(numpy.int('2')) cos(2) sage: numpy.cos(numpy.int('2')) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 7fd49fe205cc..f74da33f4026 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -94,9 +94,20 @@ stdenv.mkDerivation rec { stripLen = 1; }) - # Only formatting changes. + (fetchpatch { + name = "matplotlib-2.2.2"; + url = "https://git.sagemath.org/sage.git/patch?id=0d6244ed53b71aba861ce3d683d33e542c0bf0b0"; + sha256 = "15x4cadxxlsdfh2sblgagqjj6ir13fgdzixxnwnvzln60saahb34"; + }) + + (fetchpatch { + name = "scipy-1.1.0"; + url = "https://git.sagemath.org/sage.git/patch?id=e0db968a51678b34ebd8d34906c7042900272378"; + sha256 = "0kq5zxqphhrmavrmg830wdr7hwp1bkzdqlf3jfqfr8r8xq12qwf7"; + }) + # https://trac.sagemath.org/ticket/25260 - ./patches/numpy-1.14.3.patch + ./patches/numpy-1.15.1.patch # https://trac.sagemath.org/ticket/25862 ./patches/eclib-20180710.patch From e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 7 Sep 2018 18:29:07 +0200 Subject: [PATCH 223/600] weechat: fix quoting for ${} syntax In my previous PR I missed that ${sec.foobar} (syntax to retrieve secrets in a weechat runtime) breaks the shell evaluation. Furthermore `;` shall be used rather than `\n` to concat scripts and the init config. --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index eaf7410a3171..a9de275559db 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -133,13 +133,13 @@ in if configure == null then weechat else scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv) [ ] (config.scripts or [])); - in "${scripts}\n${init}"; + in "${scripts};${init}"; mkWeechat = bin: (writeScriptBin bin '' #!${stdenv.shell} export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} - exec ${weechat}/bin/${bin} "$@" --run-command "${init}" + exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init} '') // { inherit (weechat) name meta; unwrapped = weechat; From 2729373cd1924b3e8ece946e5435efc760002113 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Sep 2018 10:19:10 -0700 Subject: [PATCH 224/600] clib: 1.8.0 -> 1.8.1 (#46292) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/clib/versions --- pkgs/tools/package-management/clib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 795a605b3b63..158db426c615 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "1.8.0"; + version = "1.8.1"; name = "clib-${version}"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "0w1qiwq0jjrk8p848bmwxq4wvzhbd2zghq3qm8ylaj3z0xdw7ppk"; + sha256 = "1kl8amlw0106jsvv71a7nifhff1jdvgsrxr7l7hfr75i506q8976"; }; hardeningDisable = [ "fortify" ]; From 2895560f4fc0e9fb1231cef572292d2aa1f3f70b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 7 Sep 2018 14:05:37 -0400 Subject: [PATCH 225/600] pythonPackages.markerlib: init at 0.6.0 --- .../python-modules/markerlib/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/markerlib/default.nix diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix new file mode 100644 index 000000000000..640b11a6f280 --- /dev/null +++ b/pkgs/development/python-modules/markerlib/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools +, nose +}: + +buildPythonPackage rec { + version = "0.6.0"; + pname = "markerlib"; + + src = fetchPypi { + inherit pname version; + sha256 = "2fdb3939441f5bf4f090b1979a34f84a11d33eed6c0e3995de88ae5c06b6e3ae"; + }; + + buildInputs = [ setuptools ]; + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = https://bitbucket.org/dholth/markerlib/; + description = "A compiler for PEP 345 environment markers"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 137463b74db6..e93e5411738c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -334,6 +334,8 @@ in { mail-parser = callPackage ../development/python-modules/mail-parser { }; + markerlib = callPackage ../development/python-modules/markerlib { }; + monty = callPackage ../development/python-modules/monty { }; mpi4py = callPackage ../development/python-modules/mpi4py { From 64c13ec01ccb5574716aa54bdcef98ae1a319565 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Sep 2018 11:12:53 -0700 Subject: [PATCH 226/600] smenu: 0.9.13 -> 0.9.14 (#46189) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from smenu --- pkgs/tools/misc/smenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 30475047c4f7..b5c963307dfd 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.13"; + version = "0.9.14"; name = "smenu-${version}"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "0ixfl1dxkvmzb3xy6zs1x94hlf8y7zmd14gmb50rp7gb7ff1ivm5"; + sha256 = "1q2jvzia5ggkifkawm791p2nkmnpm6cmd5x3al7zf76gpdm6j87d"; }; buildInputs = [ ncurses ]; From 0bb9b3c233fae8bfc846bcf20b951b72670e05e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Sep 2018 11:14:07 -0700 Subject: [PATCH 227/600] pmd: 6.5.0 -> 6.7.0 (#46213) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from pmd --- pkgs/development/tools/analysis/pmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 78dd57789622..187b2d7b03f9 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.5.0"; + version = "6.7.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "10jdgps1ikx75ljp2gi76ff7payg28pmiy5y3vp17gg47mv991aw"; + sha256 = "0bnbr8zq28dgvwka563g5lbya5jhmjrahnbwagcs4afpsrm7zj6c"; }; installPhase = '' From 22deabca3998ddaab493b2c014eaac9cdb445cf6 Mon Sep 17 00:00:00 2001 From: geistesk Date: Fri, 7 Sep 2018 20:31:27 +0200 Subject: [PATCH 228/600] openrct2: 0.2.0 -> 0.2.1 --- pkgs/games/openrct2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index e5783ec5396f..e41caa3db978 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,20 +5,20 @@ let name = "openrct2-${version}"; - version = "0.2.0"; + version = "0.2.1"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1nmz8war8b49iicpc70gk7zlqizrvvwpidqm70lfpa0p68m7m3px"; + sha256 = "0dl1f0gvq0ifaii66c7bwp8k822krcdn9l44prnyds6smrdmd3dq"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.2"; - sha256 = "1gl37fmhhrfgd6gilw0n7hfdq80a9b31bi5r0xhxg7d579jccb04"; + rev = "v1.0.6"; + sha256 = "1yhyafsk2lyasgj1r7h2n4k7vp5q792aj86ggpbmd6bcp4kk6hbm"; }; title-sequences-src = fetchFromGitHub { From fa76f75c7bf2bcb88d3d25c1f7716c730628317d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 7 Sep 2018 21:03:38 +0200 Subject: [PATCH 229/600] youtube-dl: 2018.08.28 -> 2018.09.01 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7ed8f3bfd71b..8284e4af34d4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.08.28"; + version = "2018.09.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1swdp4czvm0752psbi8a4qw5i9x18s7nhivh7iw92274pmqxq9wi"; + sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036"; }; nativeBuildInputs = [ makeWrapper ]; From 8ef940a038c9a4bbd020f164c33a78385867dbfa Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 7 Sep 2018 21:03:57 +0200 Subject: [PATCH 230/600] youtube-dl: fix youtube video download --- pkgs/tools/misc/youtube-dl/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 8284e4af34d4..e497f2a698c7 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc +, fetchpatch # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -22,6 +23,15 @@ buildPythonPackage rec { sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036"; }; + patches = [ + # https://github.com/rg3/youtube-dl/pull/17464 + (fetchpatch { + name = "youtube-js-player-fix.patch"; + url = "https://github.com/rg3/youtube-dl/pull/17464/commits/6d7359775ae4eef1d1213aae81e092467a2c675c.patch"; + sha256 = "12mwfmp7iwlawpx6r4rhz546b3anxrx6zc4nyjs8grbh5vxhj9yg"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; From 4d16b2036be2ec317b89c31136263973df6847ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 7 Sep 2018 21:30:24 +0200 Subject: [PATCH 231/600] kde-applications: 18.08.0 -> 18.08.1 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1712 ++++++++++++++++---------------- 2 files changed, 857 insertions(+), 857 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index c7cc617f163c..d4830a9e2390 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.08.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.08.1/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index decf0f4a314f..bc7b7407d6ab 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1715 +3,1715 @@ { akonadi = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-18.08.0.tar.xz"; - sha256 = "06a1n84w4bfljyariyajzpn1sajkn4dwpsrr47pz38vf1m6dp7mz"; - name = "akonadi-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-18.08.1.tar.xz"; + sha256 = "0fipz3xnbgqk7f9pxfm3p38fniddb76scpb80fvb2v6gn0snlabi"; + name = "akonadi-18.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-18.08.0.tar.xz"; - sha256 = "1qlqvsv4gs50v9dd3nbw8wyq0vgvxvslhnk1hnqpyvh0skcwslh5"; - name = "akonadi-calendar-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-calendar-18.08.1.tar.xz"; + sha256 = "1knwr8s1qn13fan1pq31pr3dk219cmv96mwvd36ir0bd2l7vkmcs"; + name = "akonadi-calendar-18.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-tools-18.08.0.tar.xz"; - sha256 = "1d5kr7nxfy7y9ybi4qnfbfci5kc44ya916j9wgb18r6rfdhdwsxr"; - name = "akonadi-calendar-tools-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-calendar-tools-18.08.1.tar.xz"; + sha256 = "1l4idxwi9h0bff1cwwsm7s4m9bcw4vp4ip5r87vc7687hhphc27l"; + name = "akonadi-calendar-tools-18.08.1.tar.xz"; }; }; akonadiconsole = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadiconsole-18.08.0.tar.xz"; - sha256 = "0qrwgjdmqa5jj8vcbs6n733v462sxnf4jcmh2khjddf2h5na6q86"; - name = "akonadiconsole-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadiconsole-18.08.1.tar.xz"; + sha256 = "031garrv2q3rv6qjjkzm3rmmd25f6j17sz2yv4hn3zgzydkjjskn"; + name = "akonadiconsole-18.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-contacts-18.08.0.tar.xz"; - sha256 = "0jqs0llpxq34j4glgzsfifk5yd24x6smky550s66bjzkyg3j2s2m"; - name = "akonadi-contacts-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-contacts-18.08.1.tar.xz"; + sha256 = "1p7192f7n6g7ihj05f7zzqpzl33sbvzsg479lkl120rmvzbjhfxn"; + name = "akonadi-contacts-18.08.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-import-wizard-18.08.0.tar.xz"; - sha256 = "00my9ja8clz758s3x2jjlsxlpc8zfs8vlq4vh9i2vmsacqwrfy24"; - name = "akonadi-import-wizard-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-import-wizard-18.08.1.tar.xz"; + sha256 = "0x80nfa04ffwdvv861ahpgrbnx48ad28ii5glcg5pp5a840jx72s"; + name = "akonadi-import-wizard-18.08.1.tar.xz"; }; }; akonadi-mime = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-mime-18.08.0.tar.xz"; - sha256 = "0jj9l1zjh72crj8gfifpn73c5xiyycjgv0cm1qalf370cd1sdx80"; - name = "akonadi-mime-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-mime-18.08.1.tar.xz"; + sha256 = "04xf5kbf30y5g4amx1x3nvkfypid232l4jamx3lnhia5x4kn2q5g"; + name = "akonadi-mime-18.08.1.tar.xz"; }; }; akonadi-notes = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-notes-18.08.0.tar.xz"; - sha256 = "0x2v8ylnli29ld6y9vqj18a4bph4zm34zymdmrp3swll1j6xib7q"; - name = "akonadi-notes-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-notes-18.08.1.tar.xz"; + sha256 = "1ib7a7y37mq0dj0arxg2f41a30d8i637359ixhcf9sgpcs3xysns"; + name = "akonadi-notes-18.08.1.tar.xz"; }; }; akonadi-search = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-search-18.08.0.tar.xz"; - sha256 = "0fsn7mm1h9m9h3zm2z2fdghbw7m6wdbgfhg7b4iish2br375qh1s"; - name = "akonadi-search-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-search-18.08.1.tar.xz"; + sha256 = "0r7bwfjq9z6ky3riap5gnffzb9k7hwslfprk0jad63dl0djj4qzw"; + name = "akonadi-search-18.08.1.tar.xz"; }; }; akregator = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akregator-18.08.0.tar.xz"; - sha256 = "1s044m9l8z6safqcarjplmlksappjkx7iry3k8s2p6ld4w377w3c"; - name = "akregator-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akregator-18.08.1.tar.xz"; + sha256 = "1js6fbz7hhj0pyjgaz5zhi5bbyw2l9v2gkpj8f8jw4ria2hiz4w8"; + name = "akregator-18.08.1.tar.xz"; }; }; analitza = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/analitza-18.08.0.tar.xz"; - sha256 = "1sqr94mbblqry9a1nkmg6py2w0p1wlnbim99kadmp56ypf483rw7"; - name = "analitza-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/analitza-18.08.1.tar.xz"; + sha256 = "11zzrgjl2fjbpjagzpzff0aq83ss5037pj4g83wi3qqvlkhphzf2"; + name = "analitza-18.08.1.tar.xz"; }; }; ark = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ark-18.08.0.tar.xz"; - sha256 = "0dp7lrc0nqwwshcsi1408lqyycqhxgx18bmnf1sq7ysh6d1w6i75"; - name = "ark-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ark-18.08.1.tar.xz"; + sha256 = "1k95qnjn4xgi0dnypfiwa86n0zwckkh5qnc54mv9g1xvvzah04cq"; + name = "ark-18.08.1.tar.xz"; }; }; artikulate = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/artikulate-18.08.0.tar.xz"; - sha256 = "12bkfxpaz352823c639q3bal9j6fcaamypv2ql08rn44h9zdjvk8"; - name = "artikulate-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/artikulate-18.08.1.tar.xz"; + sha256 = "1cvd6sm45j2gg0ga7j3vyz89lrl1ghlwq6516rsxrvsy3vg7vdmy"; + name = "artikulate-18.08.1.tar.xz"; }; }; audiocd-kio = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/audiocd-kio-18.08.0.tar.xz"; - sha256 = "0mh1cfz0dn28i9hqyjmz2cm50qkxzj0qkrvar59p03i2r8vqybf8"; - name = "audiocd-kio-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/audiocd-kio-18.08.1.tar.xz"; + sha256 = "11wz5glih8jf9l85ncfhg91nyvh7s6q25gfy0vnqk8k0a98h0ghi"; + name = "audiocd-kio-18.08.1.tar.xz"; }; }; baloo-widgets = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/baloo-widgets-18.08.0.tar.xz"; - sha256 = "026lm8m7bp8q1akwgfvzsyyam7jknndif3vmij4x5ra7yy5xa0s9"; - name = "baloo-widgets-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/baloo-widgets-18.08.1.tar.xz"; + sha256 = "1ab86j0akmz8vqkg3xhx1qlp27ndsg183irhfap313maw88bzwxp"; + name = "baloo-widgets-18.08.1.tar.xz"; }; }; blinken = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/blinken-18.08.0.tar.xz"; - sha256 = "0ivpv27vgzchm0r8zlb02w6l0a8xsi7q173660bjv1ynwalgn3bm"; - name = "blinken-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/blinken-18.08.1.tar.xz"; + sha256 = "0xzk8ddgr55sil00dl6b00m0x5az81yhd1cklr6mahjgg7w822br"; + name = "blinken-18.08.1.tar.xz"; }; }; bomber = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/bomber-18.08.0.tar.xz"; - sha256 = "0z83hkvs7h0pg91sczmvkkn7yc8xfch5hl7l25b7kac4c9qznzix"; - name = "bomber-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/bomber-18.08.1.tar.xz"; + sha256 = "0x4z8fa2klhabr99al3iyyf9aq3pm8rk1gi6cjghjgwrrcav7an7"; + name = "bomber-18.08.1.tar.xz"; }; }; bovo = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/bovo-18.08.0.tar.xz"; - sha256 = "0bbkm0c801rcvk8z0idbasn1m7cdd2mpbpb1ap9ghgv2vjbln7va"; - name = "bovo-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/bovo-18.08.1.tar.xz"; + sha256 = "1jwq9wjkdhy8bvkxg4lvb1m4qqw0zr84ws096nk6pccqk7xlkpr2"; + name = "bovo-18.08.1.tar.xz"; }; }; calendarsupport = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/calendarsupport-18.08.0.tar.xz"; - sha256 = "0ps4963c2wbmlwp7aks16jw2pz74fqlxarhsnjj3r339575inzw2"; - name = "calendarsupport-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/calendarsupport-18.08.1.tar.xz"; + sha256 = "0hh8jr81hcqyhm9fp0s27g52077d9li8x8rrg3bd18lw3flib0fq"; + name = "calendarsupport-18.08.1.tar.xz"; }; }; cantor = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/cantor-18.08.0.tar.xz"; - sha256 = "08sqr1nxn9a24z4jicmjn9zn64xv3yyy054rzblr2h2hi3n6fqdy"; - name = "cantor-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/cantor-18.08.1.tar.xz"; + sha256 = "05cvyrf17lvh85qrcg1yf8x2c9d3l9wgbvnlhw4idx06crhvwvbb"; + name = "cantor-18.08.1.tar.xz"; }; }; cervisia = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/cervisia-18.08.0.tar.xz"; - sha256 = "1avc18vv2lb27w5ybiajsr65c65zpvbv43ihz4gcjv7awqf754w7"; - name = "cervisia-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/cervisia-18.08.1.tar.xz"; + sha256 = "1hir8ssr2yjjkly8kh8qdxqlgaa29q94kpsrk1crcdl67vrc8pph"; + name = "cervisia-18.08.1.tar.xz"; }; }; dolphin = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/dolphin-18.08.0.tar.xz"; - sha256 = "1r3g3qssawhav3dx9a9qdd7dqcjj1ynm6ravj5wx39h4qdflrysy"; - name = "dolphin-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/dolphin-18.08.1.tar.xz"; + sha256 = "1f8w1315kg5mnz0jfdbynw5kapg529kwr3qc98nh83q4vfrjr7yj"; + name = "dolphin-18.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/dolphin-plugins-18.08.0.tar.xz"; - sha256 = "1j96bkc3xah4ca3a9asplpf152dp234r2bzs5wg25b3aw7zp5siv"; - name = "dolphin-plugins-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/dolphin-plugins-18.08.1.tar.xz"; + sha256 = "0wa09n3x255d3rn5sndvyybawj2aq0sm0fdvqz7sbnm1c67g6akd"; + name = "dolphin-plugins-18.08.1.tar.xz"; }; }; dragon = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/dragon-18.08.0.tar.xz"; - sha256 = "020vnnzd7crvrv8dbcf41h04hpr2ayrfk6ayxhxpazrzic1sxxx6"; - name = "dragon-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/dragon-18.08.1.tar.xz"; + sha256 = "1r9zdia4r1g77c456zi1yv3vjrccww6lqrhplwg90bw8091isc7s"; + name = "dragon-18.08.1.tar.xz"; }; }; eventviews = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/eventviews-18.08.0.tar.xz"; - sha256 = "1ca499dzqsy2n6c0s0vrwvjykc4vd5s4m2bkn0vdg2dbyyx9fncj"; - name = "eventviews-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/eventviews-18.08.1.tar.xz"; + sha256 = "0h5aqjncsmhgjqsj65j12bx4rb5rf4604fs6h04lda8jrk2qla3y"; + name = "eventviews-18.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ffmpegthumbs-18.08.0.tar.xz"; - sha256 = "1rbfbwnyync4j15qzdhn47gksr6jm97pgkld2x3p564gi98w0vrn"; - name = "ffmpegthumbs-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ffmpegthumbs-18.08.1.tar.xz"; + sha256 = "11gwrw3fm6di4z5a04jqxfvm176mh20h8pfpv0c0zq9qipr1khkc"; + name = "ffmpegthumbs-18.08.1.tar.xz"; }; }; filelight = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/filelight-18.08.0.tar.xz"; - sha256 = "1wx6q0gq4zlg95a93sg7zqkbaka1pcn99jsjkdncq1z4lfphppk9"; - name = "filelight-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/filelight-18.08.1.tar.xz"; + sha256 = "03sz1bnz7w3b4227hvfidi225ci5i83z022fgkb632b0dp2l9m8p"; + name = "filelight-18.08.1.tar.xz"; }; }; granatier = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/granatier-18.08.0.tar.xz"; - sha256 = "06nzgpwvgvbh6hf5yxmcxigh3n72qa0mbiv7k56157yyvxigk62q"; - name = "granatier-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/granatier-18.08.1.tar.xz"; + sha256 = "062qh639n1k919n67k2xn5h829gr0ncczif9mffw8ggvqqrzh560"; + name = "granatier-18.08.1.tar.xz"; }; }; grantlee-editor = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/grantlee-editor-18.08.0.tar.xz"; - sha256 = "06m2n5rcgp63xgnr5jdzly7fda8zx5r3ki07ldxz1xivd985zmfp"; - name = "grantlee-editor-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/grantlee-editor-18.08.1.tar.xz"; + sha256 = "0wl8ii23wh1xakf6vcsv7n259kw0b3lpz7qnfmhz8nwj3k890g9q"; + name = "grantlee-editor-18.08.1.tar.xz"; }; }; grantleetheme = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/grantleetheme-18.08.0.tar.xz"; - sha256 = "1mk80hfra4nmrcb0ff3n7l33pbw6j5lypb3ip7g4c1p8qik6imfv"; - name = "grantleetheme-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/grantleetheme-18.08.1.tar.xz"; + sha256 = "1ydi89smsim4lvgwclm9xsnldimsy45b69qsipz9vhhck4pccd7n"; + name = "grantleetheme-18.08.1.tar.xz"; }; }; gwenview = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/gwenview-18.08.0.tar.xz"; - sha256 = "1nv9a7pj0h2m3wxzy03jw3pi5ps3xqvq9sx7mblq8p4klga2pcnl"; - name = "gwenview-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/gwenview-18.08.1.tar.xz"; + sha256 = "0p32v9y2gz5q4j1vz0yqw90qg8l7nbyzxqn7pqwrzbhlycsx7mp9"; + name = "gwenview-18.08.1.tar.xz"; }; }; incidenceeditor = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/incidenceeditor-18.08.0.tar.xz"; - sha256 = "1s88i1l30b30an8lwc8sdlzfm1cvmb9n5786bs9y0jfgw01wdl7j"; - name = "incidenceeditor-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/incidenceeditor-18.08.1.tar.xz"; + sha256 = "0da1jba66pvjar5wxcx2q9dhfwj2mlwk17h0j9xc9kgxj2y0bzx9"; + name = "incidenceeditor-18.08.1.tar.xz"; }; }; juk = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/juk-18.08.0.tar.xz"; - sha256 = "1lzw9ih4771vdxqngc0ja57v9y6wlgf8dbmnjax74ryi232py1d9"; - name = "juk-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/juk-18.08.1.tar.xz"; + sha256 = "17mylgsw11nc64y0if3imrs2hsxwfdflnn1a4f5p64awrzid04mc"; + name = "juk-18.08.1.tar.xz"; }; }; k3b = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/k3b-18.08.0.tar.xz"; - sha256 = "1lm9140xc5mq1szyc4vkms6b3qhl4b3yn74kqp942b8k9djn17md"; - name = "k3b-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/k3b-18.08.1.tar.xz"; + sha256 = "1vv7pr1i3vj778m763mv1bzrq29kaqm02hnllhgq4dcci3hafn6a"; + name = "k3b-18.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kaccounts-integration-18.08.0.tar.xz"; - sha256 = "0wvqhf9br8nqqacyn6j4k2323w6nixkfzlajkmx872d31d7aqf11"; - name = "kaccounts-integration-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kaccounts-integration-18.08.1.tar.xz"; + sha256 = "18nbj4vyakhxvzy35j4b7iap06lp7zwhfpylfpnshjbcrb724qzs"; + name = "kaccounts-integration-18.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kaccounts-providers-18.08.0.tar.xz"; - sha256 = "1zxyqwdrf9pp5b1vnd8p4wz21ciavffjxd68vcjjyj8bba30c51l"; - name = "kaccounts-providers-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kaccounts-providers-18.08.1.tar.xz"; + sha256 = "0ygiyv5fxf6b62sfibm621cz5cxin6qa1mnjpdxfj72xj8p7dbd7"; + name = "kaccounts-providers-18.08.1.tar.xz"; }; }; kaddressbook = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kaddressbook-18.08.0.tar.xz"; - sha256 = "1wgqqnikv9qyrb4nvkm7h91r1iqfkmbpdp67lcw4jkglqghnn2qc"; - name = "kaddressbook-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kaddressbook-18.08.1.tar.xz"; + sha256 = "0917d7m2nvgadkns8im7fzzqp2m5i21m4nrw75hv6bil7v0cshnn"; + name = "kaddressbook-18.08.1.tar.xz"; }; }; kajongg = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kajongg-18.08.0.tar.xz"; - sha256 = "0dfrwzq1p9ikff52qi50ckb769pfij7gzn61r6pdkkfjgy86364y"; - name = "kajongg-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kajongg-18.08.1.tar.xz"; + sha256 = "0apjydg0q9yvvnlirhhvri2bqwzrkrq85fzphi49pr5ki3ah03dz"; + name = "kajongg-18.08.1.tar.xz"; }; }; kalarm = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kalarm-18.08.0.tar.xz"; - sha256 = "0415yq61q700slmm6vskd92pc2sp1027flghgans80i29617zgaq"; - name = "kalarm-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kalarm-18.08.1.tar.xz"; + sha256 = "1558nls14a22pwjnk59fpgmb4ddrdvzf3rdhl0nf6kkgr0ma0p1w"; + name = "kalarm-18.08.1.tar.xz"; }; }; kalarmcal = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kalarmcal-18.08.0.tar.xz"; - sha256 = "0ss56dy451lbbq872sarqcyapf4g6kgw78s88hgs7z5mlyj8xnll"; - name = "kalarmcal-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kalarmcal-18.08.1.tar.xz"; + sha256 = "02shp4m85frjs4kp5n2kv3nz5frjfrckm7zkjlnwn6lrg6jz7q0f"; + name = "kalarmcal-18.08.1.tar.xz"; }; }; kalgebra = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kalgebra-18.08.0.tar.xz"; - sha256 = "0fv4v7xnspqjbc7x6n2gcyjssm15apszbvj4gs1w2lwlbbr3i224"; - name = "kalgebra-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kalgebra-18.08.1.tar.xz"; + sha256 = "1996vbcvbpkvmya291w2kxfjwkm3baqflx04drrglildsrn6q07w"; + name = "kalgebra-18.08.1.tar.xz"; }; }; kalzium = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kalzium-18.08.0.tar.xz"; - sha256 = "0bjpiir1xxwvhs4xgnvbhphw24iif9g4kj9zg61bqcvq5zxf821x"; - name = "kalzium-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kalzium-18.08.1.tar.xz"; + sha256 = "0sp89xi94xpix1gpz1s7qya1ki7lbbx93yr17bmhlp4dhyfqbzw5"; + name = "kalzium-18.08.1.tar.xz"; }; }; kamera = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kamera-18.08.0.tar.xz"; - sha256 = "169vsxnpcgxws27hcap2l5wjbfyxxi30321c8r3p8fm2klvbc8nw"; - name = "kamera-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kamera-18.08.1.tar.xz"; + sha256 = "03p94azchdgr19mbgpgkvb3rlddik3bjl6iy3j0yd99frlns15ck"; + name = "kamera-18.08.1.tar.xz"; }; }; kamoso = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kamoso-18.08.0.tar.xz"; - sha256 = "1a8azx7rdbzznh9qwzg0x6w50vb5bc6cmd442j2hhdwkl15dqpwd"; - name = "kamoso-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kamoso-18.08.1.tar.xz"; + sha256 = "11hm8q2v3x1rhm2smiqm9gmscbpdkyfb6x4sl0xrnm36m7ps54qb"; + name = "kamoso-18.08.1.tar.xz"; }; }; kanagram = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kanagram-18.08.0.tar.xz"; - sha256 = "02v3xlkfphkk86y8yrw10lq7f4wc7gmh02ms2w00aqrllkpja4vn"; - name = "kanagram-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kanagram-18.08.1.tar.xz"; + sha256 = "0mq8qrvvn30axhizzlzhzp5vl9q1ys7s7p5v525flyyz9fs011dz"; + name = "kanagram-18.08.1.tar.xz"; }; }; kapman = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kapman-18.08.0.tar.xz"; - sha256 = "03fhxn8zckidkab56fzgwai0d1ac5k3il32w881gq5z012ms013h"; - name = "kapman-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kapman-18.08.1.tar.xz"; + sha256 = "0grq9yllpaa267lx654n39mj7ll0g2pj6s42fq7b7236naqyna3d"; + name = "kapman-18.08.1.tar.xz"; }; }; kapptemplate = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kapptemplate-18.08.0.tar.xz"; - sha256 = "10fyvwxf6xmn8jdc4p3m3jpb8ykaga1jmwx2hzhf8c6a3rrcxvvb"; - name = "kapptemplate-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kapptemplate-18.08.1.tar.xz"; + sha256 = "1dp9831hzmh9gd3qwvfyb2ihindl5c42jvmmrhnmfbz1j199z98w"; + name = "kapptemplate-18.08.1.tar.xz"; }; }; kate = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kate-18.08.0.tar.xz"; - sha256 = "1licprflzcsrfap7klr1ia2kl2z2cp16zgznphrqkkn9n6x7xz67"; - name = "kate-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kate-18.08.1.tar.xz"; + sha256 = "1jsdk6jfff36fcb1x0vxl0iqa1xrl0400bm7fhp1gv9m553pkysa"; + name = "kate-18.08.1.tar.xz"; }; }; katomic = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/katomic-18.08.0.tar.xz"; - sha256 = "07d9irgqrawll18fi3b2mrjj416gpkn43bsriifkraqf8yrn3m4s"; - name = "katomic-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/katomic-18.08.1.tar.xz"; + sha256 = "0cd8l7hn89xr5spq107nqxz7dx12drvv70siqx896d8lfpkmh96d"; + name = "katomic-18.08.1.tar.xz"; }; }; kbackup = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kbackup-18.08.0.tar.xz"; - sha256 = "14nmk7dwrmkfv7kz4r64vzy46n48g3l1iqj0937qnpbqk12yvak9"; - name = "kbackup-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kbackup-18.08.1.tar.xz"; + sha256 = "15x75biiwixiw0j329pcxhh5sfyqm82x2rdfb0nqp0zz01cwicv6"; + name = "kbackup-18.08.1.tar.xz"; }; }; kblackbox = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kblackbox-18.08.0.tar.xz"; - sha256 = "0nd4nsx7yyiy1g1g4v0gaw0m6r3kb07gnn8236bch6xxy9xcdzhb"; - name = "kblackbox-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kblackbox-18.08.1.tar.xz"; + sha256 = "00xd6k9ndm1jbr1j2mhi8xfcxqdiwzwnb1cvr35a22r414lbc3cw"; + name = "kblackbox-18.08.1.tar.xz"; }; }; kblocks = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kblocks-18.08.0.tar.xz"; - sha256 = "1pnxzfp3bd089bjbdsi0iwjpw60p36lb110yb61cv0vb54g1sia1"; - name = "kblocks-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kblocks-18.08.1.tar.xz"; + sha256 = "0y9hfxb9rpijpkm1r697v1w5q3gny8pa3ax5y0qq6695j2h7c52p"; + name = "kblocks-18.08.1.tar.xz"; }; }; kblog = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kblog-18.08.0.tar.xz"; - sha256 = "00q7266lx29bfgzhfmb192l8h3qwgpj3yyfc0lykkbhjf6d9w783"; - name = "kblog-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kblog-18.08.1.tar.xz"; + sha256 = "0ickxhz7y098zx88308774kkz8wf6v51ydlnbmnayb8lyaw8ms8i"; + name = "kblog-18.08.1.tar.xz"; }; }; kbounce = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kbounce-18.08.0.tar.xz"; - sha256 = "0x07lxqip9l2k9mdpan03yh17ammkd1f242l2p3qq3j1s71bpznm"; - name = "kbounce-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kbounce-18.08.1.tar.xz"; + sha256 = "1k2qmdhm3sllxhsz6hhs94fndm1lrifhh7md2lmws2l2977ymkpi"; + name = "kbounce-18.08.1.tar.xz"; }; }; kbreakout = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kbreakout-18.08.0.tar.xz"; - sha256 = "1jrix92p48zcpgwvfxn484bw1k8ynfacm4iww14splx2d9skj489"; - name = "kbreakout-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kbreakout-18.08.1.tar.xz"; + sha256 = "06mxh67pyg7fv8x152kd79xzrfnlw22x4x3iklhbngsk1cqsg62r"; + name = "kbreakout-18.08.1.tar.xz"; }; }; kbruch = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kbruch-18.08.0.tar.xz"; - sha256 = "1gkij27hl847bc2jdnjqvigncdmb11spj2rsy825rsnpiqxbqv8f"; - name = "kbruch-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kbruch-18.08.1.tar.xz"; + sha256 = "0m4m1xqp2aqkqs7cgj8z5c6b3s64d330bfgsq7mnm2wakmc69x9g"; + name = "kbruch-18.08.1.tar.xz"; }; }; kcachegrind = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcachegrind-18.08.0.tar.xz"; - sha256 = "13nqcxh21apxpzg51alsgn34hps21nr7aqyh60kd4fbmmsxrqll0"; - name = "kcachegrind-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcachegrind-18.08.1.tar.xz"; + sha256 = "0llqmziq0h6wx3inxc2rmph1qs68fb34q09fvhfasg43l8y8a6cm"; + name = "kcachegrind-18.08.1.tar.xz"; }; }; kcalc = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcalc-18.08.0.tar.xz"; - sha256 = "04bdbdyc9lky6i0dkm6w9f2k3gvr9zq5b9yc6qhl4smdiivlqjb6"; - name = "kcalc-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcalc-18.08.1.tar.xz"; + sha256 = "139pjh31k9cy608h7yl9kxq48x6dsm5c0gcbndqc6nsjwd88ck04"; + name = "kcalc-18.08.1.tar.xz"; }; }; kcalcore = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcalcore-18.08.0.tar.xz"; - sha256 = "0sdzx0ygq89np2cj22v06m9j00nwbqn97rm43nffgixwvrlf1wy5"; - name = "kcalcore-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcalcore-18.08.1.tar.xz"; + sha256 = "0kf92imqm9lqisfy3i25qn0g588p35w23xl0vmx75i67pzr3jcjn"; + name = "kcalcore-18.08.1.tar.xz"; }; }; kcalutils = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcalutils-18.08.0.tar.xz"; - sha256 = "12s2anmwi3q95kjl197jis90vi5gzpxs0b4xj4m6n4lzmnyjvfxl"; - name = "kcalutils-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcalutils-18.08.1.tar.xz"; + sha256 = "1z346k9aniv3bq9c1dak3x5hzymi71ygns773r4agzm4kdn8ghwh"; + name = "kcalutils-18.08.1.tar.xz"; }; }; kcharselect = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcharselect-18.08.0.tar.xz"; - sha256 = "1gfzzzk5admdclw75qhnsf3271p2lr0fgqzxvclcxppwmv5j56aq"; - name = "kcharselect-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcharselect-18.08.1.tar.xz"; + sha256 = "06r9q03rs00zqs0dpb0wxa9663pc2i51hsf83c0z9jnkpq6sjijb"; + name = "kcharselect-18.08.1.tar.xz"; }; }; kcolorchooser = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcolorchooser-18.08.0.tar.xz"; - sha256 = "1sxlx6cnpm0yfbrbk1pqaf0lsf1mgzdnkszr30hwz6z5lvvzj73l"; - name = "kcolorchooser-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcolorchooser-18.08.1.tar.xz"; + sha256 = "027afkj0mllvnwdrrfjnpp4769dp5ixrdmd17r59q2hja0wz6cpf"; + name = "kcolorchooser-18.08.1.tar.xz"; }; }; kcontacts = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcontacts-18.08.0.tar.xz"; - sha256 = "0cil96cd383gvqa2dw1lhaw3vi3m04y4rpjqmiapzwnn4ck0v1ii"; - name = "kcontacts-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcontacts-18.08.1.tar.xz"; + sha256 = "1y0drw7n9mhyq84brqxz4rr666pqj5ww94f2i8k34chdzkcqsr52"; + name = "kcontacts-18.08.1.tar.xz"; }; }; kcron = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcron-18.08.0.tar.xz"; - sha256 = "14lkaz1b6hnpwvxnnx3mgv3fg86vm1g45fggfx25x6x72kiihhzq"; - name = "kcron-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcron-18.08.1.tar.xz"; + sha256 = "1blalii8b6i8b1cknwcarbj84m6rrffsjamgnzyz6l81l43b0j9m"; + name = "kcron-18.08.1.tar.xz"; }; }; kdav = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdav-18.08.0.tar.xz"; - sha256 = "13jwc4623f9mx64i7fb3ha5gwbqgfd54dirbvcyyglrzipxmgja1"; - name = "kdav-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdav-18.08.1.tar.xz"; + sha256 = "046h72gvcc9wxq0rn5ribf3lr03q6zq6acz2c3kxsbdw6kbypb2x"; + name = "kdav-18.08.1.tar.xz"; }; }; kdebugsettings = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdebugsettings-18.08.0.tar.xz"; - sha256 = "1ddqcfq2icsk2xmfr02jawdgxyydhx4yyhrfd7pk8cfw66rm23br"; - name = "kdebugsettings-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdebugsettings-18.08.1.tar.xz"; + sha256 = "0n6lvccm803g9ilwwdka0srvak14i8lk5g149c6qmd73wywqdk84"; + name = "kdebugsettings-18.08.1.tar.xz"; }; }; kde-dev-scripts = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kde-dev-scripts-18.08.0.tar.xz"; - sha256 = "1glnm91wn3xdd6zqqy2p178f05z5wn3gr1i6jyqb0zkl8ansy3yi"; - name = "kde-dev-scripts-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kde-dev-scripts-18.08.1.tar.xz"; + sha256 = "1y162wn5mpi0c3wa8vjb2al2mizz292jzj22wvdzp19vliy32j95"; + name = "kde-dev-scripts-18.08.1.tar.xz"; }; }; kde-dev-utils = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kde-dev-utils-18.08.0.tar.xz"; - sha256 = "1dk510kgjgvycdyzr5mwq9z1b3xr8hlpm4ahfwlfn299gl563fwf"; - name = "kde-dev-utils-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kde-dev-utils-18.08.1.tar.xz"; + sha256 = "1w5r7w7s5iaaxaxicd42nh2dhmc7anfqpv9n92rrk1hwpmjbphg5"; + name = "kde-dev-utils-18.08.1.tar.xz"; }; }; kdeedu-data = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdeedu-data-18.08.0.tar.xz"; - sha256 = "1ph3bw4xgmgh28j9vnj9v1amgisy3f44whpwwhzin9zgzz0cw3gw"; - name = "kdeedu-data-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdeedu-data-18.08.1.tar.xz"; + sha256 = "0gpg1haawwi1d1p1pwzx2127kkdpg4i833312cl637v5qgvg7xhc"; + name = "kdeedu-data-18.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-mobipocket-18.08.0.tar.xz"; - sha256 = "0p3bci612qbqnbps4g4yb2kd1rs6kx2ppcls6vpfb035c28ygf7a"; - name = "kdegraphics-mobipocket-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdegraphics-mobipocket-18.08.1.tar.xz"; + sha256 = "13jw2gn3wc946zdgr2hi1nsd6m518idn4q5wq0ym715mfbfs17zn"; + name = "kdegraphics-mobipocket-18.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-thumbnailers-18.08.0.tar.xz"; - sha256 = "0dwfphz70y0g43a9nxfda78qwsv7y4llx1f51x6n8jl64kpxnijw"; - name = "kdegraphics-thumbnailers-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdegraphics-thumbnailers-18.08.1.tar.xz"; + sha256 = "0h9h5d81bjmjcgbxh3sy776rddpxxcwyj0jjix67q37kndbap4k0"; + name = "kdegraphics-thumbnailers-18.08.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdenetwork-filesharing-18.08.0.tar.xz"; - sha256 = "0l5f9ffwsk0s9r87kid9k1a7j2v4lcdzbn2w4qb2pg22k92k8p67"; - name = "kdenetwork-filesharing-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdenetwork-filesharing-18.08.1.tar.xz"; + sha256 = "1bfqk57d1xfqbig1r8cymlp0pgsfmrix5nr4m1a015rmpqnvb92d"; + name = "kdenetwork-filesharing-18.08.1.tar.xz"; }; }; kdenlive = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdenlive-18.08.0.tar.xz"; - sha256 = "06d0viqma7kivzv3hbsiirkfhbj28mdr2nr3f5ic56381q3ps923"; - name = "kdenlive-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdenlive-18.08.1.tar.xz"; + sha256 = "1ampvjlxn3q8l3mi4nap4lq3hgxzmp6ic88hzmkdj41vpm01flpf"; + name = "kdenlive-18.08.1.tar.xz"; }; }; kdepim-addons = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdepim-addons-18.08.0.tar.xz"; - sha256 = "05141013jdaascsb7ihbmd4f1lh1r6ah5w39wp5vky6ma35zv2l1"; - name = "kdepim-addons-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdepim-addons-18.08.1.tar.xz"; + sha256 = "0fgggq0dl4qy0wha4jjarxgjly54s9fpqkm2macfq2bgvdbsjrgj"; + name = "kdepim-addons-18.08.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdepim-apps-libs-18.08.0.tar.xz"; - sha256 = "0zpx3nilrsvgmgx5visppyx3kn2g5k8fnhfy649k6wa35p846495"; - name = "kdepim-apps-libs-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdepim-apps-libs-18.08.1.tar.xz"; + sha256 = "0v4vvrjh1amlrvmf61cjfb2yr1j4j0qypf5349spnnlwjjrxn2hw"; + name = "kdepim-apps-libs-18.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdepim-runtime-18.08.0.tar.xz"; - sha256 = "0b1jbksxks32s8gjzrjhh4nja089j5dq75yaiil99w11f7nfpkar"; - name = "kdepim-runtime-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdepim-runtime-18.08.1.tar.xz"; + sha256 = "0133d86z1fggzg15jk2p8pg42zcv3khikpgdlyvz4si3canmvkwj"; + name = "kdepim-runtime-18.08.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdesdk-kioslaves-18.08.0.tar.xz"; - sha256 = "1fpg4sdbgzvlc9z7wwxxbp466fhybphvmcdpplbr7ws3588792cb"; - name = "kdesdk-kioslaves-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdesdk-kioslaves-18.08.1.tar.xz"; + sha256 = "1nn4bzywd42ijbzlcnkdlr84n1p6argrd1gz91yyyrhqark7ma76"; + name = "kdesdk-kioslaves-18.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdesdk-thumbnailers-18.08.0.tar.xz"; - sha256 = "047rnzn2lsbhfll0fp4vdf4jsyixg7vmpl2xyvi1y85df5nvv2pc"; - name = "kdesdk-thumbnailers-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdesdk-thumbnailers-18.08.1.tar.xz"; + sha256 = "1c133n4qf9jkgzhccipspwk3r8mbja0k8556ng0wxnhayzmv2sx9"; + name = "kdesdk-thumbnailers-18.08.1.tar.xz"; }; }; kdf = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdf-18.08.0.tar.xz"; - sha256 = "1flv6qjb936fcj5crshy26qy9y2p7j9i3hlidr9lsk81wsyjkqqg"; - name = "kdf-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdf-18.08.1.tar.xz"; + sha256 = "1m5hwfhzvikh7isakbvzyc3y98zdky4iz8vdsi7nnyb6d8n2hbrr"; + name = "kdf-18.08.1.tar.xz"; }; }; kdialog = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdialog-18.08.0.tar.xz"; - sha256 = "04xhp4pdn7gv69gwydz9afml27qj9mrqz2hnrhcsf29pw3vq0hli"; - name = "kdialog-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdialog-18.08.1.tar.xz"; + sha256 = "0s8a3y8sjhyq8lf3i8r6ligg1s9nbhxsd34vncw3lkbq60xkyhrr"; + name = "kdialog-18.08.1.tar.xz"; }; }; kdiamond = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdiamond-18.08.0.tar.xz"; - sha256 = "14c5i2fj9scvkqffz95lrqj49vfg7yh7gfc4s3zzg2sl91j7hwzq"; - name = "kdiamond-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdiamond-18.08.1.tar.xz"; + sha256 = "0vcqdadb9kbmxnycaba6g9hiiyxqybqiw1i4zldlw5x4gnj7dcv2"; + name = "kdiamond-18.08.1.tar.xz"; }; }; keditbookmarks = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/keditbookmarks-18.08.0.tar.xz"; - sha256 = "1zsfmcyb9s782k6knlv56mrssazdid6i70g74is46s59sgfdd9fl"; - name = "keditbookmarks-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/keditbookmarks-18.08.1.tar.xz"; + sha256 = "10nzhsyia1q0m26icqb20qh8s8n6r5vlb5q498gw8dv3rzsmh6sf"; + name = "keditbookmarks-18.08.1.tar.xz"; }; }; kfind = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kfind-18.08.0.tar.xz"; - sha256 = "1bvln7iq2ikcrzaa53wskpqwzmndjvc84a2jdjqzirmh6pqzlf3h"; - name = "kfind-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kfind-18.08.1.tar.xz"; + sha256 = "15w4cdvz35yyfyfaxb4mnxynlbryixydkwmx7lkmhlwnk3zjmskr"; + name = "kfind-18.08.1.tar.xz"; }; }; kfloppy = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kfloppy-18.08.0.tar.xz"; - sha256 = "1clz5651d11pm77mi57nzr274zwshx2qhglfn6jxiif9yz6s9dfp"; - name = "kfloppy-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kfloppy-18.08.1.tar.xz"; + sha256 = "07v3q4jiw728s9akwhy27hczp4hxhp7f8c6g59gdqm0ply0vgxk6"; + name = "kfloppy-18.08.1.tar.xz"; }; }; kfourinline = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kfourinline-18.08.0.tar.xz"; - sha256 = "1agmzlwy4izrmi58cf08cg34h155inmws3ghp524jz1li6rqvzfr"; - name = "kfourinline-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kfourinline-18.08.1.tar.xz"; + sha256 = "03g8g0s2214fqkqp4lyh9m8f382s8xwzi0yqz0yigyq1w5igcl9p"; + name = "kfourinline-18.08.1.tar.xz"; }; }; kgeography = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kgeography-18.08.0.tar.xz"; - sha256 = "0nj3lg8q84wvh1pypix619bdr9xm6s9s5vywciq8ggskqa2qrdc5"; - name = "kgeography-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kgeography-18.08.1.tar.xz"; + sha256 = "1pqs2sk88idzc8xr85qy689palkf5y5l4pfqkd9xfkb87041rl93"; + name = "kgeography-18.08.1.tar.xz"; }; }; kget = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kget-18.08.0.tar.xz"; - sha256 = "0vpphsfgqa4h1bsj0k6lz591ymd5zy3ng86fl4l1qv36kh5b3sr4"; - name = "kget-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kget-18.08.1.tar.xz"; + sha256 = "1ax6sdkpvzg37sp05fx083h0nn78a2zpfpr2l74j3qwq2yssy298"; + name = "kget-18.08.1.tar.xz"; }; }; kgoldrunner = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kgoldrunner-18.08.0.tar.xz"; - sha256 = "13i3b8z2pbvh90ykv365s30az9r33is8wp8ys33kz88z26260rsv"; - name = "kgoldrunner-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kgoldrunner-18.08.1.tar.xz"; + sha256 = "1wbdranw0fq8qynn13d0wkb7fckfzqbz2g920gyx2igw0bblcj0y"; + name = "kgoldrunner-18.08.1.tar.xz"; }; }; kgpg = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kgpg-18.08.0.tar.xz"; - sha256 = "12d6vqfcrgmqajk383p9gx9l49digm51km00slwkb15yjzgsjckx"; - name = "kgpg-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kgpg-18.08.1.tar.xz"; + sha256 = "1i3g7x18khnyvwnvgpnv6xdfbv29w65x8d8ml60zb8siipbnlwb5"; + name = "kgpg-18.08.1.tar.xz"; }; }; khangman = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/khangman-18.08.0.tar.xz"; - sha256 = "0vcyak1pqq894d10jn4s8948fz8py6kjhgrbvjk2ksp28fzsb1q2"; - name = "khangman-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/khangman-18.08.1.tar.xz"; + sha256 = "1nc9lbjxlwr4aqsl6idjyhqxd5wampcz7a6zgq6py03n8mr811qy"; + name = "khangman-18.08.1.tar.xz"; }; }; khelpcenter = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/khelpcenter-18.08.0.tar.xz"; - sha256 = "1ykw91s1w5953646ylxm49bq0bjgxd8yp29r09644q12qmi1w9ay"; - name = "khelpcenter-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/khelpcenter-18.08.1.tar.xz"; + sha256 = "1k60yqnpkplj0k0b8h27zyhviqs6ddwhygmv7cpmnwa1d7kvhdwi"; + name = "khelpcenter-18.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kidentitymanagement-18.08.0.tar.xz"; - sha256 = "1rrdxbil0z0vmv0h0d6jdlwa3sfs3nncq39wmydhwx09phk7db85"; - name = "kidentitymanagement-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kidentitymanagement-18.08.1.tar.xz"; + sha256 = "0w1lmfcjq2fb65l3vd9qzq037j7r3dd49aqh8bnrwkjslshy7iwz"; + name = "kidentitymanagement-18.08.1.tar.xz"; }; }; kig = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kig-18.08.0.tar.xz"; - sha256 = "0kgsar7sp3a7x72gnagi2hwajbl1yaaj493qjnwzlwidjjrlzmhb"; - name = "kig-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kig-18.08.1.tar.xz"; + sha256 = "1haf21widyfi0afixyfczk944l048w8dvlmgkwvfqhmgiiz52g72"; + name = "kig-18.08.1.tar.xz"; }; }; kigo = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kigo-18.08.0.tar.xz"; - sha256 = "1ws0diq3kb8f15v30cj0hc0ii4d14dca7fb3p8vvm8r4ly7gqbdr"; - name = "kigo-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kigo-18.08.1.tar.xz"; + sha256 = "1dmb3cmbi473wpkbnv895nyxxhqmp09ihghvxir77khjpmask04a"; + name = "kigo-18.08.1.tar.xz"; }; }; killbots = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/killbots-18.08.0.tar.xz"; - sha256 = "165g1zll7wq6gyz1lzaf1x17j2nagd66lj015qxifjpn9fd475mm"; - name = "killbots-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/killbots-18.08.1.tar.xz"; + sha256 = "184glirpf8jzy91769d13rck3vnh96s171h6sfqab755857wj960"; + name = "killbots-18.08.1.tar.xz"; }; }; kimagemapeditor = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kimagemapeditor-18.08.0.tar.xz"; - sha256 = "1r3hngzvidv1yz7kd7l8l78gqdhjvw9smciv1vkzf7dk9qarlyfq"; - name = "kimagemapeditor-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kimagemapeditor-18.08.1.tar.xz"; + sha256 = "1w0yinp58f7x4ss2m069736faagwil7ay8gd5w79a5frqizsj36d"; + name = "kimagemapeditor-18.08.1.tar.xz"; }; }; kimap = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kimap-18.08.0.tar.xz"; - sha256 = "12lslmprwmibijlpwng4acmmhdfhm1dgvqsazbyvsr8jagkryxmq"; - name = "kimap-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kimap-18.08.1.tar.xz"; + sha256 = "0na135np2li231kzxfjy4wb5bbgkkyll66x8jd4y0lxvc4cwipfd"; + name = "kimap-18.08.1.tar.xz"; }; }; kio-extras = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kio-extras-18.08.0.tar.xz"; - sha256 = "1k5azz26zwsflnsgv4r0i8z8jph060wpksyqfpkz0vfsf3lv0k3n"; - name = "kio-extras-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kio-extras-18.08.1.tar.xz"; + sha256 = "03q68bc53q656pw733g2j2wkbag6hbqpwszkap2h4pn011cihgyw"; + name = "kio-extras-18.08.1.tar.xz"; }; }; kiriki = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kiriki-18.08.0.tar.xz"; - sha256 = "1fciiq490iwcz86g9pqp8g0s40zf7a3zan132iqmscpl71hsv01b"; - name = "kiriki-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kiriki-18.08.1.tar.xz"; + sha256 = "1kc2flpfqvfijrazvnk7mk03myy7f7lqia1r9lxg1g3xx095jqhz"; + name = "kiriki-18.08.1.tar.xz"; }; }; kiten = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kiten-18.08.0.tar.xz"; - sha256 = "1gzgfj0p0s5yjhwx6hldc8s0cs6p2bn5gd8sy29sicg13wjvhkmj"; - name = "kiten-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kiten-18.08.1.tar.xz"; + sha256 = "1i1pgfxvcqh5jbbk39b6rlc0s67z2naw5glxhkg3nrvxy9yxw9n2"; + name = "kiten-18.08.1.tar.xz"; }; }; kitinerary = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kitinerary-18.08.0.tar.xz"; - sha256 = "14jwlkfy9z6q2pnjmlcy5gihc75n6qnsck05zycs4qsxa4srpn0l"; - name = "kitinerary-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kitinerary-18.08.1.tar.xz"; + sha256 = "0bv1nwwi2mc0l3vfvx29d46l7b876qf4bch9g84zmdcas37w786l"; + name = "kitinerary-18.08.1.tar.xz"; }; }; kjumpingcube = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kjumpingcube-18.08.0.tar.xz"; - sha256 = "001a2ayl74hi89j8i3553qx0cs8w7f4myskq3qa01rg3w4pb3wl2"; - name = "kjumpingcube-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kjumpingcube-18.08.1.tar.xz"; + sha256 = "1qfzydbpd86zsb0yfy5xdaqlbh1awm70lg1nzbqn99rl47vsm85b"; + name = "kjumpingcube-18.08.1.tar.xz"; }; }; kldap = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kldap-18.08.0.tar.xz"; - sha256 = "1825146vi1lq1383qmn8ix70d2rc2cfwp95vpn4divf9aqwmc4x0"; - name = "kldap-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kldap-18.08.1.tar.xz"; + sha256 = "1knf61whi1raj66z55a8535rj911na15zkq0vcb8djz6cg3xw29r"; + name = "kldap-18.08.1.tar.xz"; }; }; kleopatra = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kleopatra-18.08.0.tar.xz"; - sha256 = "1wwjn2p2vblr6fdfcy1s5gf3h5cnclc4lj5vsi5cxyp7d86ij49c"; - name = "kleopatra-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kleopatra-18.08.1.tar.xz"; + sha256 = "0g65qxz6v1glh86fvgpb89ay1221qbnz97mnzw8fb26aar838s8y"; + name = "kleopatra-18.08.1.tar.xz"; }; }; klettres = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/klettres-18.08.0.tar.xz"; - sha256 = "1g84swzlynyl7r2ln52n7w9q0yf6540dd9hj3j0zsp1y2hb9fns8"; - name = "klettres-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/klettres-18.08.1.tar.xz"; + sha256 = "0k5c9j9w0d95fzs7103nx13cxz9q5ivn34wq8px0ma9jaig1w1j9"; + name = "klettres-18.08.1.tar.xz"; }; }; klickety = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/klickety-18.08.0.tar.xz"; - sha256 = "1jrxabmnv0s38i255x7xycn12fgpkmr4p1y0ydk5x98zrv4vn8y0"; - name = "klickety-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/klickety-18.08.1.tar.xz"; + sha256 = "1zx7f4hpcgfrfbgmmhfj9p9l604bzhg06zznfgq40774m4d5m992"; + name = "klickety-18.08.1.tar.xz"; }; }; klines = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/klines-18.08.0.tar.xz"; - sha256 = "14ks53xh6hhlrmiqa7a1f7z42i035qw3v72dpbc8bw20vg53bzpy"; - name = "klines-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/klines-18.08.1.tar.xz"; + sha256 = "1wwvzvwshxj03s3ywpg65lfj32xcd3yj4y7fhdms8xjn0b341grc"; + name = "klines-18.08.1.tar.xz"; }; }; kmag = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmag-18.08.0.tar.xz"; - sha256 = "00ni6clpgwcr6b2yanmgplsb5jqmqxjiymd3572fkj7q8m17ak7f"; - name = "kmag-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmag-18.08.1.tar.xz"; + sha256 = "1a1xml73yhfrqzw37apgmf1f88x58ws09vfdrp8zchawskcm3yi2"; + name = "kmag-18.08.1.tar.xz"; }; }; kmahjongg = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmahjongg-18.08.0.tar.xz"; - sha256 = "0lflx8jxk2yv7bsywwmbk5l54gyhbyv65996fg82z6lw9hrr5wrb"; - name = "kmahjongg-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmahjongg-18.08.1.tar.xz"; + sha256 = "1rdimx9kdm9n3g4856672z0spwsj5ihd40yx17vbzc3lhyqnk0w1"; + name = "kmahjongg-18.08.1.tar.xz"; }; }; kmail = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmail-18.08.0.tar.xz"; - sha256 = "1xj2z4ix9zba6k3cdnakr7f0nfij1z925j3vp0gimkgyvbcb28vr"; - name = "kmail-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmail-18.08.1.tar.xz"; + sha256 = "12097jncdx5zdsr99lmsvhiymarymgbd004vmxm6rni0hq1aqzkl"; + name = "kmail-18.08.1.tar.xz"; }; }; kmail-account-wizard = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmail-account-wizard-18.08.0.tar.xz"; - sha256 = "1hc6zqys2qncljvsl9j48ns77kkq5zabj5a2kzg953dgcdv5x25r"; - name = "kmail-account-wizard-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmail-account-wizard-18.08.1.tar.xz"; + sha256 = "0jzqqn07q0jsggss2r5pjgp0fhfgngvv0rjzyh12lzsn4l8iyd6z"; + name = "kmail-account-wizard-18.08.1.tar.xz"; }; }; kmailtransport = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmailtransport-18.08.0.tar.xz"; - sha256 = "0dfws0pzq3jf1h6j5qzjm96fz1ci4v57j4s9fbry10vyn4racpq8"; - name = "kmailtransport-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmailtransport-18.08.1.tar.xz"; + sha256 = "196cjbnzqcp1ayqpn4vy8ah55nskhv07xrfrm8h0baxj90jd01xn"; + name = "kmailtransport-18.08.1.tar.xz"; }; }; kmbox = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmbox-18.08.0.tar.xz"; - sha256 = "11dh1lgjhiy4bvpvrk1rw23fgjil45ch3lazqc4jp21d1skrr1v4"; - name = "kmbox-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmbox-18.08.1.tar.xz"; + sha256 = "0sjl64cjr2dxvjklpdl2p25vjbvzi0w42m5s3fzlqam9avmckfia"; + name = "kmbox-18.08.1.tar.xz"; }; }; kmime = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmime-18.08.0.tar.xz"; - sha256 = "0kci9b2c67hzbl4hjwkkzk9j7g1l5wy1d8qrm1jwk8s7ccndindw"; - name = "kmime-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmime-18.08.1.tar.xz"; + sha256 = "00jxsnwkx4c9x1cm7w6r5z39d4962d0w6b8irdczix4r660xf56x"; + name = "kmime-18.08.1.tar.xz"; }; }; kmines = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmines-18.08.0.tar.xz"; - sha256 = "0z0fidlcp0kf9vmdgfyzrwi9yk5mfwhkzlqlbfy1631xisz158yn"; - name = "kmines-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmines-18.08.1.tar.xz"; + sha256 = "0csjr16s6jjj6z0963kc5jqwywjf9mvsa8c7x751h76kci1x53b0"; + name = "kmines-18.08.1.tar.xz"; }; }; kmix = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmix-18.08.0.tar.xz"; - sha256 = "084l5dpms26jwd894xnqr054hxjzlxcp2wm2rq37y3cbriia2xgh"; - name = "kmix-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmix-18.08.1.tar.xz"; + sha256 = "1i5wgdmr8sml9cqjlgmi2i4v8lgksa7pnp91cgj75bmcy68sv0gj"; + name = "kmix-18.08.1.tar.xz"; }; }; kmousetool = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmousetool-18.08.0.tar.xz"; - sha256 = "0lcr8hpflaw5lrfydwi5sf069hfb19qifb7wh7qxh7j1b2z8w4gf"; - name = "kmousetool-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmousetool-18.08.1.tar.xz"; + sha256 = "0drpzdsry3xj4wm50850wf9rg3banbfaspbrmj1vwinbyz6f7pwz"; + name = "kmousetool-18.08.1.tar.xz"; }; }; kmouth = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmouth-18.08.0.tar.xz"; - sha256 = "0naqn9pl7jldfna9l3i3kdv8rkw0nky4ppsvqghlrb9jf4dy8lfm"; - name = "kmouth-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmouth-18.08.1.tar.xz"; + sha256 = "0ywadz614w308vsss7b25xx4ddqyabr15miz9x7izffh67dhvm97"; + name = "kmouth-18.08.1.tar.xz"; }; }; kmplot = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmplot-18.08.0.tar.xz"; - sha256 = "0lvw351iz2gdzkphrf8hxgqbjqi4pqvxqk2zjbly4fzwbgk261bd"; - name = "kmplot-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmplot-18.08.1.tar.xz"; + sha256 = "1287pk524lfqvadq2rc8226v9qiwqh80fj1gjhsw6y3vhj88dpvg"; + name = "kmplot-18.08.1.tar.xz"; }; }; knavalbattle = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/knavalbattle-18.08.0.tar.xz"; - sha256 = "0b21z3qqhsyafsa6rx9mc560hrw0046npqjmi5jpmczl6y9mr78q"; - name = "knavalbattle-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/knavalbattle-18.08.1.tar.xz"; + sha256 = "0jxzgv06mysjalm0gfig3h6a9b84nkrq1qchi47h9x8cfaspba9r"; + name = "knavalbattle-18.08.1.tar.xz"; }; }; knetwalk = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/knetwalk-18.08.0.tar.xz"; - sha256 = "04yfxxihfdqhrs126796k498v8valhd73q2bagcx59lj7iymxszj"; - name = "knetwalk-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/knetwalk-18.08.1.tar.xz"; + sha256 = "1bg4jaijvhb312cpwrfr4chmxj3fcj3k9caw5xwzrgdgw7prrbax"; + name = "knetwalk-18.08.1.tar.xz"; }; }; knotes = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/knotes-18.08.0.tar.xz"; - sha256 = "0dvjafmf57z10lx8fb4y4na73qq3dfmqfa2w01b3sdzns0nzaqig"; - name = "knotes-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/knotes-18.08.1.tar.xz"; + sha256 = "1cihancavh5z5781gy6h8cikwbsw2p5hb2wbwakzjs3ld31nsjcv"; + name = "knotes-18.08.1.tar.xz"; }; }; kolf = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kolf-18.08.0.tar.xz"; - sha256 = "0bcd4k7v5sid98h95xbqm5l0dcjkv367mdgzhr6yizlqpyg6c132"; - name = "kolf-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kolf-18.08.1.tar.xz"; + sha256 = "1ngzjmlhx471rfy486fpglpihydskrvwiqnl6xrp6fw1wg9pbd6b"; + name = "kolf-18.08.1.tar.xz"; }; }; kollision = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kollision-18.08.0.tar.xz"; - sha256 = "029pwgwmsm9m284m1sbi2zzhhwbz6rlq68jd783ir6cq2z3llvjp"; - name = "kollision-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kollision-18.08.1.tar.xz"; + sha256 = "0is63m9zw8s53pf73c2a7f2wkvrsg70wk49x6rpzb28jmsgm1xi2"; + name = "kollision-18.08.1.tar.xz"; }; }; kolourpaint = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kolourpaint-18.08.0.tar.xz"; - sha256 = "0p08xc8ai1cllbdwmv46xzcpv70mn6zwd4f62xsh71hhpg8fbqpi"; - name = "kolourpaint-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kolourpaint-18.08.1.tar.xz"; + sha256 = "101vz981kl006q8kirs9d9bsp1bpjzcl22bbswgjny6niqlzd5lm"; + name = "kolourpaint-18.08.1.tar.xz"; }; }; kompare = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kompare-18.08.0.tar.xz"; - sha256 = "0md4qw29q5mnsz0k4a3dl6fdgff33w4kg59qy02kp3pvqav9r1zx"; - name = "kompare-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kompare-18.08.1.tar.xz"; + sha256 = "0ksdf5c6a3rhq0r8g8hiai53pzk37jiicislfik6y8f71rq0crqv"; + name = "kompare-18.08.1.tar.xz"; }; }; konqueror = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/konqueror-18.08.0.tar.xz"; - sha256 = "12zw4bgmmc35vghi8phm93x9lmhfgpxxfvz0grxa4gxcxqjyzzcq"; - name = "konqueror-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/konqueror-18.08.1.tar.xz"; + sha256 = "0bz9vyagcrm7yihrx464hkf30y5rx6p9cvx8hq0sblvb7m4308y7"; + name = "konqueror-18.08.1.tar.xz"; }; }; konquest = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/konquest-18.08.0.tar.xz"; - sha256 = "0pvx4ss8dpxd6q4jnxim3pwyxjvhcy1xihn7s3513hy0h4wabv6s"; - name = "konquest-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/konquest-18.08.1.tar.xz"; + sha256 = "1y3afkna2xg47qk9iwh3gsxbp1plf5y7k87svk8nzbh6aa8pillx"; + name = "konquest-18.08.1.tar.xz"; }; }; konsole = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/konsole-18.08.0.tar.xz"; - sha256 = "1p119ky78zxi8l08xnfklrg21c6124q1fbjvbybf6l0qq3mzwy77"; - name = "konsole-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/konsole-18.08.1.tar.xz"; + sha256 = "05i9mkw4ygpy6ilqkkm5s7m9kva9ds0gr5gszci7z52m7y67s27d"; + name = "konsole-18.08.1.tar.xz"; }; }; kontact = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kontact-18.08.0.tar.xz"; - sha256 = "0027zinl9s92vxhlzv9mak9fgzygqw5ml6i6x659pl3mc889fr7j"; - name = "kontact-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kontact-18.08.1.tar.xz"; + sha256 = "136sfr6gwf2cdlc54hc5p1wzcrjpnan0rzmzs21cwpp9gsvmsjvq"; + name = "kontact-18.08.1.tar.xz"; }; }; kontactinterface = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kontactinterface-18.08.0.tar.xz"; - sha256 = "0mcvpmvczqpsqj83vqfv9zwz7jj3az65nq45xg1l476j8sva278n"; - name = "kontactinterface-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kontactinterface-18.08.1.tar.xz"; + sha256 = "1w96wyr5kinaghnaima1pcq5hz8qyzvvyjpsk3dg8h3is86npvkb"; + name = "kontactinterface-18.08.1.tar.xz"; }; }; kopete = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kopete-18.08.0.tar.xz"; - sha256 = "0g79zv187pj7c2p33qsnkpmvrxpcx1iiy9lcrdz3acgzgvpfh5dk"; - name = "kopete-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kopete-18.08.1.tar.xz"; + sha256 = "0i38hvnp1qiwva6gd3p7zs962bhi5fviysr8wzm7296f1hv1rz4k"; + name = "kopete-18.08.1.tar.xz"; }; }; korganizer = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/korganizer-18.08.0.tar.xz"; - sha256 = "0qifd6l93jjj7sxf3kllm3dq13p738zlvbpxg24wzc3gllyq4ip1"; - name = "korganizer-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/korganizer-18.08.1.tar.xz"; + sha256 = "0wdpcjar64f8bii3xbbj08dfnd0290xwdvlr09p1pfmlllp09l0v"; + name = "korganizer-18.08.1.tar.xz"; }; }; kpat = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kpat-18.08.0.tar.xz"; - sha256 = "0dm9alimp2ibf5fpgbafiaz3lh9irvq2539jp6l61jqcv7801fml"; - name = "kpat-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kpat-18.08.1.tar.xz"; + sha256 = "0cmdfmd8pcwwwq4hjcfjscdl36p9gmw9shmqimjnqm60i5ivlz65"; + name = "kpat-18.08.1.tar.xz"; }; }; kpimtextedit = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kpimtextedit-18.08.0.tar.xz"; - sha256 = "0ciivvpfcsjzpc620zalx7k5ybh6bf53y19lvr1dgad29j6j871q"; - name = "kpimtextedit-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kpimtextedit-18.08.1.tar.xz"; + sha256 = "0v47hb9nvx3bq3ybsqng6546qxk5yi66kd0mm2g7bdx9iq060x0j"; + name = "kpimtextedit-18.08.1.tar.xz"; }; }; kpkpass = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kpkpass-18.08.0.tar.xz"; - sha256 = "1wgycyx8nn9kaqbxvlps44g1nzr2qpr6mb7m22q5qcykly0i5wzl"; - name = "kpkpass-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kpkpass-18.08.1.tar.xz"; + sha256 = "11d125rd35p44phksxrbzaixasgrsa4z9ym98h69ylyk2mm8h9lk"; + name = "kpkpass-18.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kqtquickcharts-18.08.0.tar.xz"; - sha256 = "0ykf5xfzjsanj5rmn5qrhhqfb93i19mrwzsqq8pngaimcqb70cdk"; - name = "kqtquickcharts-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kqtquickcharts-18.08.1.tar.xz"; + sha256 = "1qki34i42hzr0zg0hydg4axsakfl7fydl23sn2xlvxyixw8yvcwi"; + name = "kqtquickcharts-18.08.1.tar.xz"; }; }; krdc = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/krdc-18.08.0.tar.xz"; - sha256 = "03j3cn088mr8cd6vjkv19k5ayrhgh9mbyr0lkj9rr16z6861avmr"; - name = "krdc-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/krdc-18.08.1.tar.xz"; + sha256 = "05fkpwcl1ivprvqy8x1h8akc2fxqnfh80vbis1k1gy8wanizigg9"; + name = "krdc-18.08.1.tar.xz"; }; }; kreversi = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kreversi-18.08.0.tar.xz"; - sha256 = "18qqfaxb34b0z6cdz9h2z0hkmr1vv85j7ra8gzhy35k40dgvhgqm"; - name = "kreversi-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kreversi-18.08.1.tar.xz"; + sha256 = "1srn6czbhmlglnmnkg9pl9qs1b98ckfralydivk14y40m24s4j0b"; + name = "kreversi-18.08.1.tar.xz"; }; }; krfb = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/krfb-18.08.0.tar.xz"; - sha256 = "1zaran8lbhrnlr2nz12xis4b7q0krynzqyix14diiiysrfsmnwqm"; - name = "krfb-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/krfb-18.08.1.tar.xz"; + sha256 = "0p4jyl8dya1xvhisv30h86hnjyjc9sqaqj0d2zx447nqm479k9kw"; + name = "krfb-18.08.1.tar.xz"; }; }; kross-interpreters = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kross-interpreters-18.08.0.tar.xz"; - sha256 = "1g3fgva8h0s1ld38m38iawjr04bsh572lazizr9a460nwk60nmsi"; - name = "kross-interpreters-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kross-interpreters-18.08.1.tar.xz"; + sha256 = "1vkai4v553anbbdb38rccfg65zww93gw2v05kmr0hk62n13lqbh2"; + name = "kross-interpreters-18.08.1.tar.xz"; }; }; kruler = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kruler-18.08.0.tar.xz"; - sha256 = "0fv3186xhyvfi9zz48r4facy9x8m8y53qfl7x1rs0y1hq2d2k3nh"; - name = "kruler-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kruler-18.08.1.tar.xz"; + sha256 = "13gksm8mpnlvsi5v4a4fpbqb4mxq3l6giycwryi0qrh6bw33xak9"; + name = "kruler-18.08.1.tar.xz"; }; }; kshisen = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kshisen-18.08.0.tar.xz"; - sha256 = "11q717m7m37902bchbgpdgsward4w2c9bwjns3xs4c3pyx1w7mg4"; - name = "kshisen-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kshisen-18.08.1.tar.xz"; + sha256 = "07w7rps4wh8ibhjnk1s80x9p1mvnl5yw37fnjz3byknk2a10lcm4"; + name = "kshisen-18.08.1.tar.xz"; }; }; ksirk = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksirk-18.08.0.tar.xz"; - sha256 = "1wxf1g5vfcnvz9n28ja17iawc1997vhz6p75bq84jmls51pxjkzn"; - name = "ksirk-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksirk-18.08.1.tar.xz"; + sha256 = "0rqjxfrnbbmcx07l0rlyfv8mlka5hm4a59q8zsk6x2vii18yhi49"; + name = "ksirk-18.08.1.tar.xz"; }; }; ksmtp = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksmtp-18.08.0.tar.xz"; - sha256 = "13jkxrlycgk9qqw5v16i1rax8lwany7fd1n6m2875saxmjm9qi0s"; - name = "ksmtp-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksmtp-18.08.1.tar.xz"; + sha256 = "0kznmx1qbv3kf0cqxwqgfwy1k79awrf6v46ni97h2fwrw90af9w9"; + name = "ksmtp-18.08.1.tar.xz"; }; }; ksnakeduel = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksnakeduel-18.08.0.tar.xz"; - sha256 = "0ixbv4b9ngb82f4s58hzjvmmifkjy5v59g76kpb5dv9nqb9x8833"; - name = "ksnakeduel-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksnakeduel-18.08.1.tar.xz"; + sha256 = "0l0b94mx948zas3q27qn2dpvwfiqyd08zv2izl947prwg4mvmb0q"; + name = "ksnakeduel-18.08.1.tar.xz"; }; }; kspaceduel = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kspaceduel-18.08.0.tar.xz"; - sha256 = "0qw3lkiwwrzicyqqr6fs78ljhn5z4vsvcvcn9l5j18qkmi2fd2dk"; - name = "kspaceduel-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kspaceduel-18.08.1.tar.xz"; + sha256 = "1fjk0i2f72kzzg321w96989nqw0zfvv9iyv28ywg2pjb62nj9z2x"; + name = "kspaceduel-18.08.1.tar.xz"; }; }; ksquares = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksquares-18.08.0.tar.xz"; - sha256 = "01g9jkd5cq1ga9k9brr8yiny3idmj88c4n1cm2qi10d9n1vd4fja"; - name = "ksquares-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksquares-18.08.1.tar.xz"; + sha256 = "0m30yw3hwh9jmwfwabnmjg2l19q4c4b8qcxp2ywp2xzxggvs3ssd"; + name = "ksquares-18.08.1.tar.xz"; }; }; ksudoku = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksudoku-18.08.0.tar.xz"; - sha256 = "0fc7d6bs0ba51nypx4bn5hylfx9h6xlam7wjw1i7fr2yr8fdv9id"; - name = "ksudoku-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksudoku-18.08.1.tar.xz"; + sha256 = "1ma0009prjmi59jym0qbfqan7iyp3h4pa7q5sdqykk77mlqm1z81"; + name = "ksudoku-18.08.1.tar.xz"; }; }; ksystemlog = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksystemlog-18.08.0.tar.xz"; - sha256 = "1m5y8rawhi03vnpdw75npdd7hc830a5b2kkrz1112g959psv00ah"; - name = "ksystemlog-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksystemlog-18.08.1.tar.xz"; + sha256 = "0c05gzqn51mg7ag6nyir1z3jdy5wd4bfka8lx2gigf6kjqyq4yny"; + name = "ksystemlog-18.08.1.tar.xz"; }; }; kteatime = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kteatime-18.08.0.tar.xz"; - sha256 = "18pm15s7q4xwzi61m2l8k6qplf948lq36iv9nh5sf4p6vp6syay2"; - name = "kteatime-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kteatime-18.08.1.tar.xz"; + sha256 = "0przpgn2kwvnmfsqxncb1wx4xxr696j6zpgwwx3bhqfd89dc0bgm"; + name = "kteatime-18.08.1.tar.xz"; }; }; ktimer = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktimer-18.08.0.tar.xz"; - sha256 = "0g81daqdmfsmbnzjq74zxrbnjxjbi6nd6kl0acmjg7832l30m4js"; - name = "ktimer-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktimer-18.08.1.tar.xz"; + sha256 = "0bwkxl619d4gar2piyk63lds85sz43gghg02cifsjvdvjfqfqbhp"; + name = "ktimer-18.08.1.tar.xz"; }; }; ktnef = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktnef-18.08.0.tar.xz"; - sha256 = "007gjmjyi5r8110w4fv7n5gl67ddn1dg0pb119qr3r82iba8qiqi"; - name = "ktnef-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktnef-18.08.1.tar.xz"; + sha256 = "184isgr9c5amwrlzlkji9q0dhl06936r2axdn5kjy2shbn7j7hz2"; + name = "ktnef-18.08.1.tar.xz"; }; }; ktouch = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktouch-18.08.0.tar.xz"; - sha256 = "0pgckza5cn52aapa39d12dighx698jzb877iiml2n9870whifkms"; - name = "ktouch-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktouch-18.08.1.tar.xz"; + sha256 = "1z23i7h6s31b3az6fk22whp1zs7np20wji5bcwvck1cv5a0nlpvc"; + name = "ktouch-18.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-accounts-kcm-18.08.0.tar.xz"; - sha256 = "16k7dprj75g2lgsmnnmn9n6zgwnp64zsjci5y2vk0cp8ndlr1j54"; - name = "ktp-accounts-kcm-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-accounts-kcm-18.08.1.tar.xz"; + sha256 = "1pnq61vjvzs3lnxf52ski36arxyy5930gdh3858d7nq66dqcvw19"; + name = "ktp-accounts-kcm-18.08.1.tar.xz"; }; }; ktp-approver = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-approver-18.08.0.tar.xz"; - sha256 = "1nh75yzprhbn0af33qsrs81vxk1brlxjf1jal7p8fpr47qdwhzvd"; - name = "ktp-approver-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-approver-18.08.1.tar.xz"; + sha256 = "0sxp79rscfph5iscbpcqyp08szfipnsb0a3k4idlxfxp8bxv1kr2"; + name = "ktp-approver-18.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-auth-handler-18.08.0.tar.xz"; - sha256 = "0akmbrn9z0ind3jmz2azixyvr9glai66j6dynszn59svvjxp0fiz"; - name = "ktp-auth-handler-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-auth-handler-18.08.1.tar.xz"; + sha256 = "18lnffiq0wh02j140ya3474sbq6nbb5yj6yavhm1dl0y0pap4mxl"; + name = "ktp-auth-handler-18.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-call-ui-18.08.0.tar.xz"; - sha256 = "0z23vcvz6nyc6klqqys4ivh33j21kww4fgcm5dvvlf940cc9gr3h"; - name = "ktp-call-ui-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-call-ui-18.08.1.tar.xz"; + sha256 = "1mqgwblz86qbdfhlzncc5wzvqwhki4kx5afbihgynjr13d4jjldp"; + name = "ktp-call-ui-18.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-common-internals-18.08.0.tar.xz"; - sha256 = "1sj1k8x8d2lk8xsqckjzg6zz01gqh3yj52yar56lngn1cjnnf6ak"; - name = "ktp-common-internals-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-common-internals-18.08.1.tar.xz"; + sha256 = "1r4ac7q8hpsldwagz4hsslsx962vxq8hmlhjs5r5h5c89r2qhpil"; + name = "ktp-common-internals-18.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-list-18.08.0.tar.xz"; - sha256 = "0yx64rz6k5dv6s4wsadjqc0fcx6j7blhy15cbnh8r2pbwf0ilk2w"; - name = "ktp-contact-list-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-contact-list-18.08.1.tar.xz"; + sha256 = "09zfmqhpm907x1fcd3v7cvbgxx8sy1krjyidand77adl8ayiq59c"; + name = "ktp-contact-list-18.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-runner-18.08.0.tar.xz"; - sha256 = "0i4zc6bksnb4iajz91wbw140dh7p0rg3hzhi563pn3siy9id442s"; - name = "ktp-contact-runner-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-contact-runner-18.08.1.tar.xz"; + sha256 = "0cv65v2kkfqg6kny3zl3k0kg5af3wbi42jjni0r37rsgaknmg45x"; + name = "ktp-contact-runner-18.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-desktop-applets-18.08.0.tar.xz"; - sha256 = "0i5sniidcgkvq2scf76pkshrj89gvkzjjslgqaxvqrgvyagsaski"; - name = "ktp-desktop-applets-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-desktop-applets-18.08.1.tar.xz"; + sha256 = "04pkknx46zkn5v7946s23n4m1gr28w1cwpsyz8mkww8xfxk52x2y"; + name = "ktp-desktop-applets-18.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-filetransfer-handler-18.08.0.tar.xz"; - sha256 = "15mifrbxxr8lvq7nflxwsz46ywnqmjv1d3irzq1xfcpl47907qhg"; - name = "ktp-filetransfer-handler-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-filetransfer-handler-18.08.1.tar.xz"; + sha256 = "07m25ydhpa92d6pqgrhj6mvhirsf6c1i1xnxjmybrmf8v4cy1z8v"; + name = "ktp-filetransfer-handler-18.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-kded-module-18.08.0.tar.xz"; - sha256 = "12rnnf2nm2kn2904b475qh9ql50yx583jga31389l012whm4gqqf"; - name = "ktp-kded-module-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-kded-module-18.08.1.tar.xz"; + sha256 = "0f8m3avph7w8yrlgpwsf6ykgbzzj7mrh973v2w6gw2iwz2ps0bbm"; + name = "ktp-kded-module-18.08.1.tar.xz"; }; }; ktp-send-file = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-send-file-18.08.0.tar.xz"; - sha256 = "0m8p8w4hqanccf7g0za5yh30z2nxv8dxi09mg1fniypqaw4cp2n7"; - name = "ktp-send-file-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-send-file-18.08.1.tar.xz"; + sha256 = "1d9k2xmyrxk4s6dr1a0dgi4j4j5y5f73r57aldr5k821w425ssmg"; + name = "ktp-send-file-18.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-text-ui-18.08.0.tar.xz"; - sha256 = "04ygny9m823h30hi5qgjz1nk7dj44hdqa9ga0ai9cazxnavvsx57"; - name = "ktp-text-ui-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-text-ui-18.08.1.tar.xz"; + sha256 = "07ydrwsg2xv6vxsp6n2li6d5dfc92bdikdjqq266dqb35mb6wbx4"; + name = "ktp-text-ui-18.08.1.tar.xz"; }; }; ktuberling = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktuberling-18.08.0.tar.xz"; - sha256 = "1m9mdv7hdsrnzjcdnmqrl82mafa9psbr5k7b6m3llh95f61b4jpn"; - name = "ktuberling-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktuberling-18.08.1.tar.xz"; + sha256 = "176fdw99ni02nz3kv62dbiw7887a5kvmxsm8bg3viwyymcs8aay8"; + name = "ktuberling-18.08.1.tar.xz"; }; }; kturtle = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kturtle-18.08.0.tar.xz"; - sha256 = "0mwhnsbwj92zrgyjdfi18pxsfyaxa8pzdmh5k20m0jrh76gkhjr0"; - name = "kturtle-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kturtle-18.08.1.tar.xz"; + sha256 = "1r3w5hbzw2f4794j690wgm7x3dfxfyqnaylhjcrxqmqydkc54w2c"; + name = "kturtle-18.08.1.tar.xz"; }; }; kubrick = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kubrick-18.08.0.tar.xz"; - sha256 = "1affzpwq45r1cqb9ra8w24rrszvvzxiik4ng6jf54dik8sk7wrnn"; - name = "kubrick-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kubrick-18.08.1.tar.xz"; + sha256 = "0nwd0n8rx7dzbwjvkhnmvb2g4g7lasng7745klcdwk40ww223b60"; + name = "kubrick-18.08.1.tar.xz"; }; }; kwalletmanager = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kwalletmanager-18.08.0.tar.xz"; - sha256 = "10yri44d68n6hc4dn78wgqzw394krwjqr6azwd6qgxjp6asc8n69"; - name = "kwalletmanager-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kwalletmanager-18.08.1.tar.xz"; + sha256 = "08hr7ii6dybbmipppay2gxiwak8rqbrxrwbjz0206cyav16bbp7q"; + name = "kwalletmanager-18.08.1.tar.xz"; }; }; kwave = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kwave-18.08.0.tar.xz"; - sha256 = "0aimhn8hgjnwhv0j2hiyiqgh5bslm7rs13yc8sk0kh1vix6909mp"; - name = "kwave-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kwave-18.08.1.tar.xz"; + sha256 = "1gsxzpf8ij7bw6s4dbdl8kvyz21wy76dxi4wqwdggi29gvxzpi76"; + name = "kwave-18.08.1.tar.xz"; }; }; kwordquiz = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kwordquiz-18.08.0.tar.xz"; - sha256 = "1aghybg72anwj6vz3s3zr5i5wflackvfwl9n39mvxddm4ajnw1km"; - name = "kwordquiz-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kwordquiz-18.08.1.tar.xz"; + sha256 = "0bkxvw2g64r2k87m05mdxwh25lbixcga406x9i64z5dmgpsb7d9m"; + name = "kwordquiz-18.08.1.tar.xz"; }; }; libgravatar = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libgravatar-18.08.0.tar.xz"; - sha256 = "0yqd99lax1w5r1fy4rmbv9lk988zvq2yydkrdgh8vymxjljg5xa4"; - name = "libgravatar-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libgravatar-18.08.1.tar.xz"; + sha256 = "0axmf5ph5ahs4124fi016hjj559472k2apgfsbnf9q80d6y25lgf"; + name = "libgravatar-18.08.1.tar.xz"; }; }; libkcddb = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkcddb-18.08.0.tar.xz"; - sha256 = "1ns90vcbp21mwsbvndmk97fpd8n7152iw783q7bqfy1n3ggzkz5x"; - name = "libkcddb-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkcddb-18.08.1.tar.xz"; + sha256 = "1qy3zid9n7irkiz6vizmhwljrg3wcxxgcch58nmacg7fdxwcnnn1"; + name = "libkcddb-18.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkcompactdisc-18.08.0.tar.xz"; - sha256 = "0pgn65knay7fgk2zdgqd29wfhqk9x4zlpp4ywjwb2zsvzz51j9f8"; - name = "libkcompactdisc-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkcompactdisc-18.08.1.tar.xz"; + sha256 = "075i81gpb4c1wgzbv6nnvhgkz2sww0y5zqh8sxw67r46rz4rjwak"; + name = "libkcompactdisc-18.08.1.tar.xz"; }; }; libkdcraw = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkdcraw-18.08.0.tar.xz"; - sha256 = "0xpkkgxsmvrldnprzqrxaz67jb5cv6vndg8flbkagvp0s7mnw56x"; - name = "libkdcraw-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkdcraw-18.08.1.tar.xz"; + sha256 = "0fp01s9fw3m9li5v8cd2zmvy6xrysdqddzcal1xm5df2qj6xnk1d"; + name = "libkdcraw-18.08.1.tar.xz"; }; }; libkdegames = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkdegames-18.08.0.tar.xz"; - sha256 = "1jl3snqyg3p3l4hddg7ag2mkgi49qvzml8p82zdn3sf5fhka1g70"; - name = "libkdegames-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkdegames-18.08.1.tar.xz"; + sha256 = "05xqmg0g08gd45d1q1wblyj5002fvcs72iazif6j7lj9zy60x3qw"; + name = "libkdegames-18.08.1.tar.xz"; }; }; libkdepim = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkdepim-18.08.0.tar.xz"; - sha256 = "1gfwfmr5iqkwb490d3mm32892q47pc73b6c8zygm7mn5cjb5376l"; - name = "libkdepim-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkdepim-18.08.1.tar.xz"; + sha256 = "0rq7y5r15d1r8s9v1mip780xyh11011j1w2id0cbll9a3fhjfgy9"; + name = "libkdepim-18.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkeduvocdocument-18.08.0.tar.xz"; - sha256 = "1i5vmjfczd71654cpxd11djwk852aqg5lkn98pa8qvjy7v85jynn"; - name = "libkeduvocdocument-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkeduvocdocument-18.08.1.tar.xz"; + sha256 = "1nchaip5rcgvazbn3bsiycsa5wcvqj3c0xz48isaz1rmirw4dkan"; + name = "libkeduvocdocument-18.08.1.tar.xz"; }; }; libkexiv2 = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkexiv2-18.08.0.tar.xz"; - sha256 = "0cdh5wd2lvm9m4nyz2yv5ksszk1pc8ajzwq9c467m74lvb1p2had"; - name = "libkexiv2-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkexiv2-18.08.1.tar.xz"; + sha256 = "0v0g626hjpksb8kxgp0kzx84a6hf3qq66if2hxh82kis5xdzbj4l"; + name = "libkexiv2-18.08.1.tar.xz"; }; }; libkgapi = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkgapi-18.08.0.tar.xz"; - sha256 = "1aax7djyp1104b8sbrpfhf5c8j30g3hac973lpblfqg0yhkd9lw0"; - name = "libkgapi-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkgapi-18.08.1.tar.xz"; + sha256 = "0rsfk8n4z67m371vnglin16l33ankv0i60l07c8znr7jllkyzf7r"; + name = "libkgapi-18.08.1.tar.xz"; }; }; libkgeomap = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkgeomap-18.08.0.tar.xz"; - sha256 = "00hjz7amg2rf5s74465s44ac6kd33q4mvsa9ynpljisll5avlhan"; - name = "libkgeomap-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkgeomap-18.08.1.tar.xz"; + sha256 = "1mnf43bpklyxh1schphndc7izknnzn3ymwppq4anysb9k603s7n4"; + name = "libkgeomap-18.08.1.tar.xz"; }; }; libkipi = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkipi-18.08.0.tar.xz"; - sha256 = "1g34ryzr4vx5657c4j4w3b57n5ir6miwp1k60qk7av73qsik7a7d"; - name = "libkipi-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkipi-18.08.1.tar.xz"; + sha256 = "166njf2w6qy30xiccagnpsb7ggcvqmdkp1djahfwmvjwqqxqq9ic"; + name = "libkipi-18.08.1.tar.xz"; }; }; libkleo = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkleo-18.08.0.tar.xz"; - sha256 = "0vscfz794yp9hnrn4r4phbip2mqi3jvi41m5mpjd5pw11644d66c"; - name = "libkleo-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkleo-18.08.1.tar.xz"; + sha256 = "1q1s335rmh2k2hmx4k67ik9wy2wa4n271fv21k6sg0l3h58z3fc6"; + name = "libkleo-18.08.1.tar.xz"; }; }; libkmahjongg = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkmahjongg-18.08.0.tar.xz"; - sha256 = "0xzv7vawwq0gm10h9mfrsy5m5zpk1n3s338al0h9vskvhznphy83"; - name = "libkmahjongg-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkmahjongg-18.08.1.tar.xz"; + sha256 = "0vvmm0mp2s5bl28vn7nq49b3izfy1myxx7c55qq6h3pmml70alp9"; + name = "libkmahjongg-18.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkomparediff2-18.08.0.tar.xz"; - sha256 = "0nx66198vn6zrv012i4p2ghc2slxqccfb3fhd9zszzpnyd08zs27"; - name = "libkomparediff2-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkomparediff2-18.08.1.tar.xz"; + sha256 = "114w3xcd31i0y5fk4cr9d075mmvx746hsnm6grc8mkhi6diplxs1"; + name = "libkomparediff2-18.08.1.tar.xz"; }; }; libksane = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libksane-18.08.0.tar.xz"; - sha256 = "09wx6haaw0rjcjdh2c05b2zrpz57zlhx9x9jy9hw28byrf71i0k0"; - name = "libksane-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libksane-18.08.1.tar.xz"; + sha256 = "0vi0kph8klnm3br9f9ifs5zgnncw83wrvk3kmxc412i28216qgf1"; + name = "libksane-18.08.1.tar.xz"; }; }; libksieve = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libksieve-18.08.0.tar.xz"; - sha256 = "0xnjw2q1hlmrlzdi776459v5w3l88bxpzzpqc93xmq39xh7xqq7b"; - name = "libksieve-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libksieve-18.08.1.tar.xz"; + sha256 = "06agi9wkj455sx0inn6hiahmqlfjaa3ffr8i7zfs2rfzw78qvg20"; + name = "libksieve-18.08.1.tar.xz"; }; }; lokalize = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/lokalize-18.08.0.tar.xz"; - sha256 = "17h634abxzg3kx182qxdx6gyz0knl61yn32nlf76l0cv0bqc2xz5"; - name = "lokalize-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/lokalize-18.08.1.tar.xz"; + sha256 = "1k5vn3jnvqvdc4bn1hdfjjp3snfcpc5i3925kns760vpvdm4a9in"; + name = "lokalize-18.08.1.tar.xz"; }; }; lskat = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/lskat-18.08.0.tar.xz"; - sha256 = "05ckhh8270hjj94ks9zg6pypa2dm1d2r4l219gq456rrhyj9zv13"; - name = "lskat-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/lskat-18.08.1.tar.xz"; + sha256 = "11snjlsmcsh4nkcfdzjdl0jia8g350xj2hgilqk5b9jir0j8rsyp"; + name = "lskat-18.08.1.tar.xz"; }; }; mailcommon = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/mailcommon-18.08.0.tar.xz"; - sha256 = "06j66326wbvgnmacmbhvszbhdcw6h3pzxwcnbbz66n0zz2y4m5gd"; - name = "mailcommon-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/mailcommon-18.08.1.tar.xz"; + sha256 = "1791ph0r5b9a0k2qgjrbxsz8drg23v5bdn832d695yy9q9rgxvwx"; + name = "mailcommon-18.08.1.tar.xz"; }; }; mailimporter = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/mailimporter-18.08.0.tar.xz"; - sha256 = "0gywzd882mkjf9q07wg2hi4js4gqvyjxf3y0lgq22k5bd5gpfxbs"; - name = "mailimporter-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/mailimporter-18.08.1.tar.xz"; + sha256 = "1rnmhfi54a9vlmvqjv2hsj967q886dkbv6nqn5imz11s8a97anb9"; + name = "mailimporter-18.08.1.tar.xz"; }; }; marble = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/marble-18.08.0.tar.xz"; - sha256 = "1ylcdnf0rw0a51jcy183p9xcir4j7jlm6dmhk4k13zvzv16pcwvf"; - name = "marble-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/marble-18.08.1.tar.xz"; + sha256 = "1vc6l68fvqdncvpmd8995v4hawi4w4zn3yjfpnghgvmvs30bak4p"; + name = "marble-18.08.1.tar.xz"; }; }; mbox-importer = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/mbox-importer-18.08.0.tar.xz"; - sha256 = "08n46q2xxvjbbcr4754x7qw4p3yffmrpvzxi7k2i48ifxhs2awqj"; - name = "mbox-importer-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/mbox-importer-18.08.1.tar.xz"; + sha256 = "1sqn11404xc9k76kz9zmm526dkzlk1ywnf15128plvyj6576wwaq"; + name = "mbox-importer-18.08.1.tar.xz"; }; }; messagelib = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/messagelib-18.08.0.tar.xz"; - sha256 = "0d1bb0n9izwlk9fbwyf1hvwkrng1b6im574fxpkgk73ivb72ppfx"; - name = "messagelib-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/messagelib-18.08.1.tar.xz"; + sha256 = "17z8c60dnhwzgpls3b6hsvyjgjpjybw7cfkc05xn1yihi5gr2rxs"; + name = "messagelib-18.08.1.tar.xz"; }; }; minuet = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/minuet-18.08.0.tar.xz"; - sha256 = "0gvla9ig912wrg6vvdmqv2hyybr08a45crx69l31hcd13h9pmyg6"; - name = "minuet-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/minuet-18.08.1.tar.xz"; + sha256 = "06jwrra25v2al0jw7dvp7h41jmw48d784ky74xi9lx4ma4h4vsvg"; + name = "minuet-18.08.1.tar.xz"; }; }; okular = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/okular-18.08.0.tar.xz"; - sha256 = "11wwh0vb1l2dw2zhcg6f92y7vb5i5kaqwi8kszz8sd874ydpp8pn"; - name = "okular-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/okular-18.08.1.tar.xz"; + sha256 = "1in053a3ir4qw2fabrv69g6kxr2hmdwq360kikmwdgsb6a7a8sjk"; + name = "okular-18.08.1.tar.xz"; }; }; palapeli = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/palapeli-18.08.0.tar.xz"; - sha256 = "1a1k44q62raw1kxkyg8cspvwxzr1islbwzcb7sj63cmzsmwfhkg1"; - name = "palapeli-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/palapeli-18.08.1.tar.xz"; + sha256 = "17c6xlmjz8nnnvp4xa27yzrx2vrsjlznjm2awj70z923js5kzfhl"; + name = "palapeli-18.08.1.tar.xz"; }; }; parley = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/parley-18.08.0.tar.xz"; - sha256 = "1cy58fs1jaz1zga4dwfr80m0p6cgzc5ip26ds2x2lpygx7pbjcc6"; - name = "parley-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/parley-18.08.1.tar.xz"; + sha256 = "1bwj806qm2g3n57f1svaz6x5y238xl0b3pmp4cg29a9c090gcj0r"; + name = "parley-18.08.1.tar.xz"; }; }; picmi = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/picmi-18.08.0.tar.xz"; - sha256 = "1x2ya0vwxwc56rfskl3l83nw0vpdh1lzshh0sdal3rfw0s8w895x"; - name = "picmi-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/picmi-18.08.1.tar.xz"; + sha256 = "0bc3zs5ql1yfriq3pbxc0cb010n8rygqglpz8c2qinnsgf9wb305"; + name = "picmi-18.08.1.tar.xz"; }; }; pimcommon = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/pimcommon-18.08.0.tar.xz"; - sha256 = "1j6pj7f52ya0jgzq97g65zl3mpv7hn002flv35qlg5srzdllm3pd"; - name = "pimcommon-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/pimcommon-18.08.1.tar.xz"; + sha256 = "0h8g374bdnf9nm43flz9wg1ddcdppqxng1vq58vqlviiy32qf86p"; + name = "pimcommon-18.08.1.tar.xz"; }; }; pim-data-exporter = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/pim-data-exporter-18.08.0.tar.xz"; - sha256 = "1spbkwv9kqzky958nymr5plz8rgzxbn6xzgy7k9pkpvynd1a54hz"; - name = "pim-data-exporter-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/pim-data-exporter-18.08.1.tar.xz"; + sha256 = "01spb3lfs3rsl1h6d6lrszssj1rnbv1p21np75x4rm7qxzdn7wy7"; + name = "pim-data-exporter-18.08.1.tar.xz"; }; }; pim-sieve-editor = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/pim-sieve-editor-18.08.0.tar.xz"; - sha256 = "0nqv530rlamlngxwy3cpbyjj75akx3k9lcifgymlbm4ipp9k125c"; - name = "pim-sieve-editor-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/pim-sieve-editor-18.08.1.tar.xz"; + sha256 = "09npw10dgzk7z3022d1np4qvmbwb07lxjj2nd4k1hxnkcjaz242d"; + name = "pim-sieve-editor-18.08.1.tar.xz"; }; }; poxml = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/poxml-18.08.0.tar.xz"; - sha256 = "04sy8v3n12asz8hfh107y5irhxzlpkzgc3zjw8qfygflzg9a48cz"; - name = "poxml-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/poxml-18.08.1.tar.xz"; + sha256 = "1zazxxh4j8ihlb5v33b5wgj4ddqqhd809lzhxq28dq0mg7wvqcm8"; + name = "poxml-18.08.1.tar.xz"; }; }; print-manager = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/print-manager-18.08.0.tar.xz"; - sha256 = "1mi2aqsh5irlnlgkajkkxhazyafhpndrxckcc2kmrh00d4cxhivn"; - name = "print-manager-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/print-manager-18.08.1.tar.xz"; + sha256 = "0ixamp14m3p13j1c6nc9x6043600k2anfw12mn1yg4f8q5fb6dnf"; + name = "print-manager-18.08.1.tar.xz"; }; }; rocs = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/rocs-18.08.0.tar.xz"; - sha256 = "1c3i11mg6xs64wjyph51hqr6j428hh71ljdq4ajhysql7l5kbhhx"; - name = "rocs-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/rocs-18.08.1.tar.xz"; + sha256 = "1kchipj3q29zfp60l81q52m6gb4fcmawcl42rvzr4mxf4h7dw72n"; + name = "rocs-18.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/signon-kwallet-extension-18.08.0.tar.xz"; - sha256 = "024ay0z9inbf7k54iq5v78cxh4q8x1ypvd8r3w80dyygjw2dw743"; - name = "signon-kwallet-extension-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/signon-kwallet-extension-18.08.1.tar.xz"; + sha256 = "1wf9xffjxyqn5vwwnp4wbn22lby5vc396snc3imdp1bx4z5ffck4"; + name = "signon-kwallet-extension-18.08.1.tar.xz"; }; }; spectacle = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/spectacle-18.08.0.tar.xz"; - sha256 = "1gc2qza529jld1zngzs98zmd3734h13phviswqpg93qnbr9hxskr"; - name = "spectacle-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/spectacle-18.08.1.tar.xz"; + sha256 = "0xvw6l0712gmb3dvq9hnyp7r160rvmvmm3mvgapj4z5c00m8a1d7"; + name = "spectacle-18.08.1.tar.xz"; }; }; step = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/step-18.08.0.tar.xz"; - sha256 = "15hjbisv3adsn0vavlcl3iy3vz6mf1fv0qj4ykmxckblcyhm1mgg"; - name = "step-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/step-18.08.1.tar.xz"; + sha256 = "1b7cvrhdbfkqg72phbgbl15v8c4nr6b1b9fw8i1vam028a97bq8z"; + name = "step-18.08.1.tar.xz"; }; }; svgpart = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/svgpart-18.08.0.tar.xz"; - sha256 = "0q71nn1xsdh7ag60szl836lif9ywnv3dlv8w0sn3zfa7yv0cbraa"; - name = "svgpart-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/svgpart-18.08.1.tar.xz"; + sha256 = "07mm5vzd5lslr5x7r71ac3hp3s779i89nz4d84550pk0qdn3qpmb"; + name = "svgpart-18.08.1.tar.xz"; }; }; sweeper = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/sweeper-18.08.0.tar.xz"; - sha256 = "1j87cb9bbfn42f2xn9k6j8ailgn18b5ribjf4sgglx2h1l3vpq51"; - name = "sweeper-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/sweeper-18.08.1.tar.xz"; + sha256 = "1vmdk38j03qj0l5gc27dc242j0cj7k2c5zfq2xrvjb44rxfirdy4"; + name = "sweeper-18.08.1.tar.xz"; }; }; syndication = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/syndication-18.08.0.tar.xz"; - sha256 = "17j3ks7bmr3p71lvrm8bzbfai5sw3frwrwl0ckbg1rwhkbsi3d71"; - name = "syndication-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/syndication-18.08.1.tar.xz"; + sha256 = "0lirbr8zb1j5kalki6v98wmcg5z25xj1wamszd81h9wlkgk5aqd0"; + name = "syndication-18.08.1.tar.xz"; }; }; umbrello = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/umbrello-18.08.0.tar.xz"; - sha256 = "0rs92l6disjha8w5nx05qjbidib4a9yyab7f4cd4sjnjfcw3i1px"; - name = "umbrello-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/umbrello-18.08.1.tar.xz"; + sha256 = "16p283jz5v5j40i1i7c9fk36bhs2k30rk17l3nikmf0qd7j5n6ir"; + name = "umbrello-18.08.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/zeroconf-ioslave-18.08.0.tar.xz"; - sha256 = "05j8k8la4gcydazzhhxq8700w1l4q57yylcar1wzs108icp03rkm"; - name = "zeroconf-ioslave-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/zeroconf-ioslave-18.08.1.tar.xz"; + sha256 = "0m1yhm17chz49xs6nh1n8dqdkbnr8kkig9p2f9nmvypnfagygpsi"; + name = "zeroconf-ioslave-18.08.1.tar.xz"; }; }; } From c098f143b4a1325734f636d3e12abb2275ba9532 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Fri, 7 Sep 2018 23:34:47 +0400 Subject: [PATCH 232/600] chromium: 68.0.3440.106 -> 69.0.3497.81 Also update to build with external gn. --- .../networking/browsers/chromium/common.nix | 13 ++----------- .../patches/remove-webp-include-68.patch | 12 ------------ .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 3 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ebc700a7f37c..6b9f7225c84f 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, fetchpatch, gnutar +{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -139,11 +139,6 @@ let # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") ./patches/fix-freetype.patch ./patches/nix_plugin_paths_68.patch - ] ++ optionals (versionRange "68" "69") [ - ./patches/remove-webp-include-68.patch - (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") - (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs") - ] ++ optionals (versionAtLeast version "69") [ ./patches/remove-webp-include-69.patch ] ++ optional enableWideVine ./patches/widevine.patch; @@ -243,15 +238,11 @@ let configurePhase = '' runHook preConfigure - # Build gn - python tools/gn/bootstrap/bootstrap.py -v -s --no-clean - PATH="$PWD/out/Release:$PATH" - # This is to ensure expansion of $out. libExecPath="${libExecPath}" python build/linux/unbundle/replace_gn_files.py \ --system-libraries ${toString gnSystemLibraries} - gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + ${gn}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch deleted file mode 100644 index 1995bf1fa8f5..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h -+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h -@@ -8,7 +8,7 @@ - #include "third_party/blink/renderer/platform/platform_export.h" - #include "third_party/blink/renderer/platform/wtf/vector.h" - #include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION --#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION -+#define WEBP_MAX_DIMENSION 16383 - #include "third_party/skia/include/core/SkStream.h" - #include "third_party/skia/include/encode/SkJpegEncoder.h" - #include "third_party/skia/include/encode/SkPngEncoder.h" - diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 89b6a7ce3121..ebf730129079 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 = "0w5k1446j45796vj8p6kv5cdrkrxyr7rh8d8vavplfldbvg36bdw"; - sha256bin64 = "0a7gmbcps3b85rhwgrvg41m9db2n3igwr4hncm7kcqnq5hr60v8s"; - version = "69.0.3497.32"; + sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn"; + sha256bin64 = "03k5y1nyzx26mxwxmdijkl2kj49vm5vhbxhakfxxjg3r1v0rsqrs"; + version = "69.0.3497.81"; }; dev = { - sha256 = "15gk2jbjv3iy4hg4xm1f66x5jqfqh9f98wfzrcsd5ix3ki3f9g3c"; - sha256bin64 = "1lir6q31dnjsbrz99bfx74r5j6f0c1a443ky1k0idbx6ysvr8nnm"; - version = "70.0.3521.2"; + sha256 = "1lx6dfd6w675b4kyrci8ikc8rfmjc1aqmm7bimxp3h4p97j5wml1"; + sha256bin64 = "0fsxj9h25glp3akw0x2rc488w5zr5v5yvl6ry7fy8w70fqgynffj"; + version = "70.0.3538.9"; }; stable = { - sha256 = "1676y2axl5ihvv8jid2i9wp4i4awxzij5nwvd5zx98506l3088bh"; - sha256bin64 = "0d352maw1630g0hns3c0g0n95bp5iqh7nzs8bnv48kxz87snmpdj"; - version = "68.0.3440.106"; + sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn"; + sha256bin64 = "1f3shb85jynxq37vjxxkkxrjayqgvpss1zws5i28x6i9nygfzay7"; + version = "69.0.3497.81"; }; } From c6a51bf12b8c31e826339be719e23751166dd2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 7 Sep 2018 21:38:17 +0200 Subject: [PATCH 233/600] plasma5: 5.13.4 -> 5.13.5 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 360 ++++++++++++++++---------------- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index acf769f02e33..fc1850b3c2a4 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 752493b1a70d..a6c3cb66f6a2 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/bluedevil-5.13.4.tar.xz"; - sha256 = "1f7bjj3p5n8pvmqqgqz5xgjjhq1mjwknd36hrr5jn3klhbyahqkk"; - name = "bluedevil-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/bluedevil-5.13.5.tar.xz"; + sha256 = "0am708cb6jfccx1jfbriwc2jgwd4ajqllirc9i0bg4jz5ydxbjxg"; + name = "bluedevil-5.13.5.tar.xz"; }; }; breeze = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/breeze-5.13.4.tar.xz"; - sha256 = "1kxcd8zkk79mjh1j0lzw2nf0v0w2qc4zzb68nw61k1ca8v9mgq84"; - name = "breeze-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/breeze-5.13.5.tar.xz"; + sha256 = "09jkkfdmngvbp8i2y6irlv6yvrzpc86mw6apmqvphiaqsilyxaw0"; + name = "breeze-5.13.5.tar.xz"; }; }; breeze-grub = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/breeze-grub-5.13.4.tar.xz"; - sha256 = "1vxy24b2ndjkljw5ipwl8nl8nqckxr64sq6v4p690wib9j1nly09"; - name = "breeze-grub-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/breeze-grub-5.13.5.tar.xz"; + sha256 = "03hsq77gi75chgyq9pzh3ry6k6bi78pfm33zn8gx784k9fx7gvqr"; + name = "breeze-grub-5.13.5.tar.xz"; }; }; breeze-gtk = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/breeze-gtk-5.13.4.tar.xz"; - sha256 = "0sa0v9irimqhh17c1nykzkbhr6n3agam8y0idfr26xg7jblch3s0"; - name = "breeze-gtk-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/breeze-gtk-5.13.5.tar.xz"; + sha256 = "1knh0b27b81rnd87s31s2mawqcl1yzwjcakk5npzfm3nj23xakv3"; + name = "breeze-gtk-5.13.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/breeze-plymouth-5.13.4.tar.xz"; - sha256 = "1v02bh3xwcx5vixcp21a4wq04nn3wsgip5ycrgsb2bn013mspv20"; - name = "breeze-plymouth-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/breeze-plymouth-5.13.5.tar.xz"; + sha256 = "0xsjl602wsb5ak1xg19w8y0fv9404cwbj1rcrm0hgjv735m32c57"; + name = "breeze-plymouth-5.13.5.tar.xz"; }; }; discover = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/discover-5.13.4.tar.xz"; - sha256 = "1n7wd9w1r9a5ncgqc2s0aywivzqc3115wr93hrf1lqxpk0qskkyc"; - name = "discover-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/discover-5.13.5.tar.xz"; + sha256 = "1q3nc5lih95vs5masd8z897hvfvpwidiisj8bg62iq0cblsgwz6d"; + name = "discover-5.13.5.tar.xz"; }; }; drkonqi = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/drkonqi-5.13.4.tar.xz"; - sha256 = "1ddqisah98qd0hqg6pz5jk1pmisji2c6mj3i5w7df57zi7kpj4wz"; - name = "drkonqi-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/drkonqi-5.13.5.tar.xz"; + sha256 = "02kbmymzzhsf9slaf64xlp8sfv59gl7qf1g2ahcq58sqry5bqjnk"; + name = "drkonqi-5.13.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kactivitymanagerd-5.13.4.tar.xz"; - sha256 = "0iq5bxnszdndbvrqi8xm80d7i67xw0z45yq3qdsdlx80zzgb9g9d"; - name = "kactivitymanagerd-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kactivitymanagerd-5.13.5.tar.xz"; + sha256 = "0zfvypxh748vsl270l8wn6inmp8shi2m051yy699qdqbyb039wjq"; + name = "kactivitymanagerd-5.13.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kde-cli-tools-5.13.4.tar.xz"; - sha256 = "1dznj0jni4bm5z0hy644pcf7iavfd9yp8hfx87af3xhxxrifws37"; - name = "kde-cli-tools-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kde-cli-tools-5.13.5.tar.xz"; + sha256 = "0p1az420p4ldinmxnkdwl69542ddm0r4f3wmdysfird7d68yw2hp"; + name = "kde-cli-tools-5.13.5.tar.xz"; }; }; kdecoration = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kdecoration-5.13.4.tar.xz"; - sha256 = "1clf939g7qpnxxxw8iv3i4l9330dayzhg0cfrx6mffm2ywny67wd"; - name = "kdecoration-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kdecoration-5.13.5.tar.xz"; + sha256 = "04p77fs5c9b4mbpcl4a2c1wc0i09g51b7c1v7n9fd4nfkm7z8sqs"; + name = "kdecoration-5.13.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kde-gtk-config-5.13.4.tar.xz"; - sha256 = "03x5yvgk6kjy12qh3xblv90rsf8g5nsrc9573zd3rzz74pjql605"; - name = "kde-gtk-config-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kde-gtk-config-5.13.5.tar.xz"; + sha256 = "06j64y7p5kxnrc3407hma0drh3sb8jvjp3mx6na6b86z4xxf1kj6"; + name = "kde-gtk-config-5.13.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kdeplasma-addons-5.13.4.tar.xz"; - sha256 = "1kgnmkykma14vinabal747hpvnrahccksgb68pxb4lxgylbcvy04"; - name = "kdeplasma-addons-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kdeplasma-addons-5.13.5.tar.xz"; + sha256 = "1a4f61bbwhc2y0lnrglbq3sas16bxff0ga3im9d15nq5a5q637i1"; + name = "kdeplasma-addons-5.13.5.tar.xz"; }; }; kgamma5 = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kgamma5-5.13.4.tar.xz"; - sha256 = "0hcnflk7zzpx00w6ifidrwxjmr99xrisfz2206fggal5j7y5w6yw"; - name = "kgamma5-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kgamma5-5.13.5.tar.xz"; + sha256 = "08brmdi5y69iwhj7506q2l0bfm92c9l9ds9w4d1ipcgnbydrhfyn"; + name = "kgamma5-5.13.5.tar.xz"; }; }; khotkeys = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/khotkeys-5.13.4.tar.xz"; - sha256 = "1nq2afb06y3383gh3n5b1b4sbry5nicy3znid6p7b0jch1a0v73x"; - name = "khotkeys-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/khotkeys-5.13.5.tar.xz"; + sha256 = "16kp5ck6zfpnmnvspdnqklix54np3sxvj5ixs9saqf3gd5rk49mp"; + name = "khotkeys-5.13.5.tar.xz"; }; }; kinfocenter = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kinfocenter-5.13.4.tar.xz"; - sha256 = "1vnch4ic1ppsrnp1w6rjcmn3c9ni91b3dgk0z91aw2x8c77cvji9"; - name = "kinfocenter-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kinfocenter-5.13.5.tar.xz"; + sha256 = "15r9j33z3l31gip9q3fw015s4mxakgy5wqfs04w5p0aq8x9xkpzl"; + name = "kinfocenter-5.13.5.tar.xz"; }; }; kmenuedit = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kmenuedit-5.13.4.tar.xz"; - sha256 = "0jyb4dc42dnpb6v4hkfb9m97yim767z0dc0i0hxqvznd87n5nk98"; - name = "kmenuedit-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kmenuedit-5.13.5.tar.xz"; + sha256 = "0zha39cd3p5nmrbkhkbcavxns2n2wnb6chc5kcsk5km9wn4laxz0"; + name = "kmenuedit-5.13.5.tar.xz"; }; }; kscreen = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kscreen-5.13.4.tar.xz"; - sha256 = "0labhlwdar6iibixal48bkk777hpyaibszv9mshlmhd7riaqrxs3"; - name = "kscreen-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kscreen-5.13.5.tar.xz"; + sha256 = "0kf1cf88n46b4js7x9r504605v68wp5hwpwid6phvfqdyqrvbb77"; + name = "kscreen-5.13.5.tar.xz"; }; }; kscreenlocker = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kscreenlocker-5.13.4.tar.xz"; - sha256 = "01b6y0wwclhni6ansg3avkml4qsq93rrg254ihy18bd1h05jxg4r"; - name = "kscreenlocker-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kscreenlocker-5.13.5.tar.xz"; + sha256 = "171zjk9r333kbkb9pashw0rdmiwq11nzfin4wnmqzwp7rrclxs18"; + name = "kscreenlocker-5.13.5.tar.xz"; }; }; ksshaskpass = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/ksshaskpass-5.13.4.tar.xz"; - sha256 = "1f1567ac8qlgjgbqbksxqm969shydw3nizhn3ixvzr0n81lvab36"; - name = "ksshaskpass-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/ksshaskpass-5.13.5.tar.xz"; + sha256 = "1znhj8x8kag1jrw0j1kfvqgprdayrcfbmawz2jap1ik2bjq7dp81"; + name = "ksshaskpass-5.13.5.tar.xz"; }; }; ksysguard = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/ksysguard-5.13.4.tar.xz"; - sha256 = "1pg5687mlf5h4wb65my0v6scrj1zkxm5755wlq1jdasqr6zffdw0"; - name = "ksysguard-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/ksysguard-5.13.5.tar.xz"; + sha256 = "1qjqhqc23rbimz3qj8gr3dhp0griwgbiajhvjngh1jl55fb3q29j"; + name = "ksysguard-5.13.5.tar.xz"; }; }; kwallet-pam = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kwallet-pam-5.13.4.tar.xz"; - sha256 = "0f9pg73710adr8p7m9qmync2lc86yl6hxmvr854lqzrp9mm2an0p"; - name = "kwallet-pam-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kwallet-pam-5.13.5.tar.xz"; + sha256 = "145daahh8qjpbfcvjk2zyd6k3sr22npgnv3n23j9aim75qiwz1ac"; + name = "kwallet-pam-5.13.5.tar.xz"; }; }; kwayland-integration = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kwayland-integration-5.13.4.tar.xz"; - sha256 = "0mhsidzpv5wg59d3v5z3a4n27fgfpdcr6y33zvib9k67isgx39h1"; - name = "kwayland-integration-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kwayland-integration-5.13.5.tar.xz"; + sha256 = "1qhkrs8md36z5gndkm88pyv6mspqsdsdavjz8klfwfv1hii6qyds"; + name = "kwayland-integration-5.13.5.tar.xz"; }; }; kwin = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kwin-5.13.4.tar.xz"; - sha256 = "1inh20xh80nv1vn0154jqsn6cn1xqfgjvvdvng6k2v330sd15dc6"; - name = "kwin-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kwin-5.13.5.tar.xz"; + sha256 = "0ld1pclni1axrh7jww3gxlfwkbjsfbqb9z7gygj2ff3nmc6khgfm"; + name = "kwin-5.13.5.tar.xz"; }; }; kwrited = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kwrited-5.13.4.tar.xz"; - sha256 = "1j9gl6d3j5mzydb4r9xmzxs313f2pj5phnh2n74nia672fn5kpqb"; - name = "kwrited-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kwrited-5.13.5.tar.xz"; + sha256 = "150nhjk4vcigs2r2bxqk309g81lxpnkkv8l44hiyivcbmwvc3aya"; + name = "kwrited-5.13.5.tar.xz"; }; }; libkscreen = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/libkscreen-5.13.4.tar.xz"; - sha256 = "1azcpc3jm006s8zswv1w22gcajyvs800xc77l6das5jrl4ddk309"; - name = "libkscreen-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/libkscreen-5.13.5.tar.xz"; + sha256 = "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k"; + name = "libkscreen-5.13.5.tar.xz"; }; }; libksysguard = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/libksysguard-5.13.4.tar.xz"; - sha256 = "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh"; - name = "libksysguard-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/libksysguard-5.13.5.tar.xz"; + sha256 = "0pccjjjzk8dxgmkj5vrq20nwb3qpf9isjd1zmg5nc127jld924x6"; + name = "libksysguard-5.13.5.tar.xz"; }; }; milou = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/milou-5.13.4.tar.xz"; - sha256 = "0rqwjb91a5x7piwdfh4xy8f2nhkfzdaja0ifpm7hrkysq6d9yzad"; - name = "milou-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/milou-5.13.5.tar.xz"; + sha256 = "0rhgj10l2iik1mgnv2bixxqjyc3pl731bs1bqz9gsa3wiazspwrv"; + name = "milou-5.13.5.tar.xz"; }; }; oxygen = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/oxygen-5.13.4.tar.xz"; - sha256 = "0035z94v4fbdl5jcaggv1vqjxk9z1marf4vs8zm7fkz6hhcn4vj2"; - name = "oxygen-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/oxygen-5.13.5.tar.xz"; + sha256 = "0wm2mngh0gb0lqvx8g82ml2sdv0kbkx14mpb8c6aw3hslcwma7yd"; + name = "oxygen-5.13.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-browser-integration-5.13.4.tar.xz"; - sha256 = "19vqn3wbkfzsbf5rl61zaqgp10q83zxjmvvbn9325rp3dsv3i0jb"; - name = "plasma-browser-integration-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-browser-integration-5.13.5.tar.xz"; + sha256 = "0bhpbq4n29x8m0nmxlli5ljmgpw9da7sfbmf3j5c3wnxqja16sgy"; + name = "plasma-browser-integration-5.13.5.tar.xz"; }; }; plasma-desktop = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-desktop-5.13.4.tar.xz"; - sha256 = "1wmyms3bjka9kgjc6zp17j8w707lnmr2kxqzqznm78c16h34lfdx"; - name = "plasma-desktop-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-desktop-5.13.5.tar.xz"; + sha256 = "14isrq3n9lm1nzmyv8zdgq6pwnv2zmg4dwxyp7fvqjxfls8851vp"; + name = "plasma-desktop-5.13.5.tar.xz"; }; }; plasma-integration = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-integration-5.13.4.tar.xz"; - sha256 = "0p5wqj0jdvwq7blj7j1va00jlkqkwcxfkcj7gpnjmnsggp25mpsq"; - name = "plasma-integration-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-integration-5.13.5.tar.xz"; + sha256 = "0j57ra79p5lkj81d05hhb87mrxgyj6qikkpzcb0p2dr2x8cmkng2"; + name = "plasma-integration-5.13.5.tar.xz"; }; }; plasma-nm = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-nm-5.13.4.tar.xz"; - sha256 = "0qadmxzmw8a4r43ri2xxj4i884vraxlyxmwqkkn540x0aysyj4rq"; - name = "plasma-nm-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-nm-5.13.5.tar.xz"; + sha256 = "1z8f5iybgra72vhpiayiwpysvv2z8x2r5xal8rhgf7y24xcjwxmi"; + name = "plasma-nm-5.13.5.tar.xz"; }; }; plasma-pa = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-pa-5.13.4.tar.xz"; - sha256 = "1xqmp19dkggfzapns94jr0jz03aphdlz31iw888w2qj730zdx97k"; - name = "plasma-pa-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-pa-5.13.5.tar.xz"; + sha256 = "0p54x4zr3w009nn7g00qmxh7xil35x7b48d0l0flz5d7hvkk6nd8"; + name = "plasma-pa-5.13.5.tar.xz"; }; }; plasma-sdk = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-sdk-5.13.4.tar.xz"; - sha256 = "13ddin88ila3imkhn9bgaf1i0bbbmcb4xigk2cps74s8vl98jpfa"; - name = "plasma-sdk-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-sdk-5.13.5.tar.xz"; + sha256 = "1x8hq343xzwlcsdvf0jy0qgn64xw8l11lawhknbjrf90qq58axga"; + name = "plasma-sdk-5.13.5.tar.xz"; }; }; plasma-tests = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-tests-5.13.4.tar.xz"; - sha256 = "0fzqw3ix9sa3m492xjz46wsaqs7cgfpcprdx3z05ww4217k5d4sf"; - name = "plasma-tests-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-tests-5.13.5.tar.xz"; + sha256 = "00nm0d0c4zccbwnhy8sc1qb4sf7bs5vfky3n7lihwyng3syqwz3d"; + name = "plasma-tests-5.13.5.tar.xz"; }; }; plasma-vault = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-vault-5.13.4.tar.xz"; - sha256 = "1acpn49vb645a30xnxxf0rylihb7n838l0ky5169n6dq96swam4j"; - name = "plasma-vault-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-vault-5.13.5.tar.xz"; + sha256 = "1045zb58pmcyn0cznb81bmcpd4hkhxm6509rznrjykkhcfcrbf8z"; + name = "plasma-vault-5.13.5.tar.xz"; }; }; plasma-workspace = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-5.13.4.tar.xz"; - sha256 = "1kvl6pbhqw7llv8llq020qvbk7glynix8c4dsh3dfp170xpg3qnh"; - name = "plasma-workspace-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-5.13.5.tar.xz"; + sha256 = "1qcmw60lyp966rhvw9raaqrvxdv09pr8zc7x3fx1vpm9kphh3lv3"; + name = "plasma-workspace-5.13.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-wallpapers-5.13.4.tar.xz"; - sha256 = "11z8isy01vbgzb5jkbslin30himy5072wwrb010jw9ls9j5dz1cm"; - name = "plasma-workspace-wallpapers-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-wallpapers-5.13.5.tar.xz"; + sha256 = "1wbnm6bzvgx2ssig4dk3plhrsjiw3lq1yhr2dfga6vvlyi6wg9mg"; + name = "plasma-workspace-wallpapers-5.13.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plymouth-kcm-5.13.4.tar.xz"; - sha256 = "1f18ys2b80smd975a18qkhxb3ipr31wx8g0pmbfscqclc6kma506"; - name = "plymouth-kcm-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plymouth-kcm-5.13.5.tar.xz"; + sha256 = "0flgr68rms40acgl2f4539mvp53m36ifignxix27raqmibaf38s1"; + name = "plymouth-kcm-5.13.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.13.4"; + version = "1-5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/polkit-kde-agent-1-5.13.4.tar.xz"; - sha256 = "0wgj9pawwcgznqg7shp3zh65ag9cscnmamgr29x2lq9wwxqw2836"; - name = "polkit-kde-agent-1-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/polkit-kde-agent-1-5.13.5.tar.xz"; + sha256 = "00f05ii3www8knn2ycgkc6izc8ydb3vjy4f657k38hkzl2sjnhl6"; + name = "polkit-kde-agent-1-5.13.5.tar.xz"; }; }; powerdevil = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/powerdevil-5.13.4.tar.xz"; - sha256 = "10zhm5z0hwh75fmcp7cz5c35zcywm7an73x2dh4fyl42cczfb0zl"; - name = "powerdevil-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/powerdevil-5.13.5.tar.xz"; + sha256 = "1k7ilcvm5nvx6sd43j0djar9ay6ag84g4m8f420yf7q4yryp76yn"; + name = "powerdevil-5.13.5.tar.xz"; }; }; sddm-kcm = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/sddm-kcm-5.13.4.tar.xz"; - sha256 = "0g6alnlg8waxgf3cbzx838062qsdcfisxsw67zxykyp77spq00f0"; - name = "sddm-kcm-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/sddm-kcm-5.13.5.tar.xz"; + sha256 = "122g83ajh0xqylvmicrhgw0fm8bmzpw26v7fjckfk9if5zqzk8ch"; + name = "sddm-kcm-5.13.5.tar.xz"; }; }; systemsettings = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/systemsettings-5.13.4.tar.xz"; - sha256 = "1z6c6kaz0ib76qsiq5cj6ya4mrdgmv3xa71hnwd2fbmv45agk8q4"; - name = "systemsettings-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/systemsettings-5.13.5.tar.xz"; + sha256 = "14029a3mf2d6cw87lyffnwy88yvj0n3jmi0glr69zwi8lmz0cbsv"; + name = "systemsettings-5.13.5.tar.xz"; }; }; user-manager = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/user-manager-5.13.4.tar.xz"; - sha256 = "1s968hf7p9rrv3b0bq47s1387cbl6iq5313m34xfv5h7rqr2cw3m"; - name = "user-manager-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/user-manager-5.13.5.tar.xz"; + sha256 = "12550xvl084rab0y331r8dm3qwpcvm83k3j02gxrwrigv1vckas8"; + name = "user-manager-5.13.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/xdg-desktop-portal-kde-5.13.4.tar.xz"; - sha256 = "02fv1v778rh512wcm2zqgn6q61459bjbcjj2xz63lp3iycl7avqi"; - name = "xdg-desktop-portal-kde-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/xdg-desktop-portal-kde-5.13.5.tar.xz"; + sha256 = "0i9pcbdxfh2cbv9ybk9i11l7vcm2ifx0zm3gkj3ry3bjxxbphn4f"; + name = "xdg-desktop-portal-kde-5.13.5.tar.xz"; }; }; } From 48bdf31f58b40dfb7f781033c100c87e2dd729f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 29 Aug 2018 14:55:21 +0200 Subject: [PATCH 234/600] androidndk: Fix `make_standalone_toolchain.py` Python path needs to be absolute and the generated scripts will use also an absolute path to `bash`. --- pkgs/development/mobile/androidenv/androidndk.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index b79741fca23d..eb7e78152801 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which -, platformTools, python3, libcxx, version, sha256 +, platformTools, python3, libcxx, version, sha256, bash , fullNDK ? false # set to true if you want other parts of the NDK # that is not used by Nixpkgs like sources, # examples, docs, or LLVM toolchains @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { cd $out/libexec unzip -qq $src - patchShebangs ${pkg_path} - # so that it doesn't fail because of read-only permissions set cd - ${if (version == "10e") then @@ -50,9 +48,15 @@ stdenv.mkDerivation rec { patch -p1 \ --no-backup-if-mismatch \ -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_${version}.patch" } + + sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py + sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" '' } + + patchShebangs ${pkg_path} + cd ${pkg_path} '' + lib.optionalString (!fullNDK) '' From db784d883c4fbc276a1c639c8ff675a5fe805cac Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 7 Sep 2018 21:55:41 +0200 Subject: [PATCH 235/600] sage: re-add pkg-config aliases Those were removed because they were added to openblas itself. There was an error with that however and it will take some time until the fix makes its way through staging. For the time being, reverting this part of 26d5d030fe498b64a307af35ff96ff215ccd967a will fix the sage build. This commit should be reverted once 408eacbc896ecc6d0e25238963ecbd412d78ce3c is in master. --- pkgs/applications/science/math/sage/default.nix | 10 +++++++--- .../science/math/sage/openblas-pc.nix | 17 +++++++++++++++++ .../applications/science/math/sage/sage-env.nix | 6 +++--- .../science/math/sage/sage-with-env.nix | 6 ++++++ pkgs/applications/science/math/sage/sagelib.nix | 7 ++++++- 5 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/science/math/sage/openblas-pc.nix diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 08e3a752b8b6..7e62f0cf75ee 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -21,7 +21,7 @@ let sagelib = self.callPackage ./sagelib.nix { inherit flint ecl arb; - inherit sage-src pynac singular; + inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; linbox = nixpkgs.linbox.override { withSage = true; }; }; @@ -41,13 +41,13 @@ let }; sage-env = self.callPackage ./sage-env.nix { - inherit sage-src python rWrapper ecl singular palp flint pynac pythonEnv; + inherit sage-src python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; sage-with-env = self.callPackage ./sage-with-env.nix { inherit pythonEnv; - inherit sage-src pynac singular; + inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig three = nodePackages_8_x.three; }; @@ -60,6 +60,10 @@ let }; }; + openblas-blas-pc = callPackage ./openblas-pc.nix { name = "blas"; }; + openblas-cblas-pc = callPackage ./openblas-pc.nix { name = "cblas"; }; + openblas-lapack-pc = callPackage ./openblas-pc.nix { name = "lapack"; }; + sage-src = callPackage ./sage-src.nix {}; pythonRuntimeDeps = with python.pkgs; [ diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix new file mode 100644 index 000000000000..f4669a6557e9 --- /dev/null +++ b/pkgs/applications/science/math/sage/openblas-pc.nix @@ -0,0 +1,17 @@ +{ openblasCompat +, writeTextFile +, name +}: + +writeTextFile { + name = "openblas-${name}-pc-${openblasCompat.version}"; + destination = "/lib/pkgconfig/${name}.pc"; + text = '' + Name: ${name} + Version: ${openblasCompat.version} + + Description: ${name} for SageMath, provided by the OpenBLAS package. + Cflags: -I${openblasCompat}/include + Libs: -L${openblasCompat}/lib -lopenblas + ''; +} diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 74c2e0aa0360..317eb6e16c49 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -37,7 +37,7 @@ , lcalc , rubiks , flintqs -, openblasCompat +, openblas-cblas-pc , flint , gmp , mpfr @@ -98,9 +98,9 @@ writeTextFile rec { export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [ # This is only needed in the src/sage/misc/cython.py test and I'm not sure if there's really a use-case # for it outside of the tests. However since singular and openblas are runtime dependencies anyways - # it doesn't really hurt to include. + # and openblas-cblas-pc is tiny, it doesn't really hurt to include. singular - openblasCompat + openblas-cblas-pc ]) }' export SAGE_ROOT='${sage-src}' diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 8ccf8b5a4938..63b9772b8231 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -4,6 +4,9 @@ , sage-env , sage-src , openblasCompat +, openblas-blas-pc +, openblas-cblas-pc +, openblas-lapack-pc , pkg-config , three , singular @@ -29,6 +32,9 @@ let makeWrapper pkg-config openblasCompat # lots of segfaults with regular (64 bit) openblas + openblas-blas-pc + openblas-cblas-pc + openblas-lapack-pc singular three pynac diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index c1dbcf38304e..abcefba5e260 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -3,6 +3,9 @@ , buildPythonPackage , arb , openblasCompat +, openblas-blas-pc +, openblas-cblas-pc +, openblas-lapack-pc , brial , cliquer , cypari2 @@ -56,7 +59,9 @@ buildPythonPackage rec { nativeBuildInputs = [ iml perl - openblasCompat + openblas-blas-pc + openblas-cblas-pc + openblas-lapack-pc jupyter_core ]; From 0b6da47fe322f9760b393b0c0f073b9b5d6d38a3 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Fri, 7 Sep 2018 22:01:15 +0200 Subject: [PATCH 236/600] kubernetes-helm: fix darwin hash --- pkgs/applications/networking/cluster/helm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index a84852f197dd..bd00404b536b 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -6,7 +6,7 @@ let else "darwin-amd64"; checksum = if isLinux then "1zig6ihmxcaw2wsbdd85yf1zswqcifw0hvbp1zws7r5ihd4yv8hg" - else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv"; + else "1l8y9i8vhibhwbn5kn5qp722q4dcx464kymlzy2bkmhiqbxnnkkw"; pname = "helm"; version = "2.10.0"; in From dd0b3dafc9c3b77fe6ab972d0f39394a2bb8b53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 29 Aug 2018 18:31:38 +0200 Subject: [PATCH 237/600] androidndk: Add `makeStandaloneToolchain` support Example: ``` let toolchain = (androidenv.androidndk.makeStandaloneToolchain 24 "arm64"); in ... ``` --- .../mobile/androidenv/androidndk.nix | 164 ++++++++++-------- 1 file changed, 87 insertions(+), 77 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index eb7e78152801..dc693accbf4b 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,100 +1,110 @@ { stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which -, platformTools, python3, libcxx, version, sha256, bash +, platformTools, python3, libcxx, version, sha256, bash, runCommand , fullNDK ? false # set to true if you want other parts of the NDK # that is not used by Nixpkgs like sources, # examples, docs, or LLVM toolchains }: -stdenv.mkDerivation rec { - name = "android-ndk-r${version}"; - inherit version; +let + makeStandaloneToolchain = api: arch: let + full_ndk = (ndk true); + in runCommand "makeStandaloneToolchain-${version}" {} '' + ${full_ndk}/libexec/${full_ndk.name}/build/tools/make_standalone_toolchain.py --api ${toString api} --arch ${arch} --install-dir $out + ''; + ndk = fullNDK: stdenv.mkDerivation rec { + name = "android-ndk-r${version}"; + inherit version; - src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { + src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip"; inherit sha256; } else throw "platform ${stdenv.hostPlatform.system} not supported!"; - phases = "buildPhase"; + phases = "buildPhase"; - nativeBuildInputs = [ unzip makeWrapper file ]; + nativeBuildInputs = [ unzip makeWrapper file ]; - buildCommand = let - bin_path = "$out/bin"; - pkg_path = "$out/libexec/${name}"; - sed_script_1 = - "'s|^PROGDIR=`dirname $0`" + - "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeBinPath [ - coreutils file findutils - gawk gnugrep gnused - jdk python3 which - ]) + ":${platformTools}/platform-tools"; - in '' - mkdir -pv $out/libexec - cd $out/libexec - unzip -qq $src + buildCommand = let + bin_path = "$out/bin"; + pkg_path = "$out/libexec/${name}"; + sed_script_1 = + "'s|^PROGDIR=`dirname $0`" + + "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; + runtime_paths = (lib.makeBinPath [ + coreutils file findutils + gawk gnugrep gnused + jdk python3 which + ]) + ":${platformTools}/platform-tools"; + in '' + mkdir -pv $out/libexec + cd $out/libexec + unzip -qq $src - # so that it doesn't fail because of read-only permissions set - cd - - ${if (version == "10e") then - '' - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch } - '' - else - '' - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_${version}.patch" } + # so that it doesn't fail because of read-only permissions set + cd - + ${if (version == "10e") then + '' + patch -p1 \ + --no-backup-if-mismatch \ + -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch } + '' + else + '' + patch -p1 \ + --no-backup-if-mismatch \ + -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_" + "${version}" + ".patch" } - sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py - sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py - wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" - '' - } + sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py + sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py + wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + '' + } - patchShebangs ${pkg_path} + patchShebangs ${pkg_path} - cd ${pkg_path} + cd ${pkg_path} - '' + lib.optionalString (!fullNDK) '' - # Steps to reduce output size - rm -rf docs sources tests - # We only support cross compiling with gcc for now - rm -rf toolchains/*-clang* toolchains/llvm* - '' + + '' + lib.optionalString (!fullNDK) '' + # Steps to reduce output size + rm -rf docs sources tests + # We only support cross compiling with gcc for now + rm -rf toolchains/*-clang* toolchains/llvm* + '' + - '' - find ${pkg_path}/toolchains \( \ - \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm -0100 \) \ - \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \; - # fix ineffective PROGDIR / MYNDKDIR determination - for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"} - do - sed -i -e ${sed_script_1} $i - done + '' + find ${pkg_path}/toolchains \( \ + \( -type f -a -name "*.so*" \) -o \ + \( -type f -a -perm -0100 \) \ + \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \; + # fix ineffective PROGDIR / MYNDKDIR determination + for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"} + do + sed -i -e ${sed_script_1} $i + done - # wrap - for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"} - do - wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" - done - # make some executables available in PATH - mkdir -pv ${bin_path} - for i in \ - ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"} - do - ln -sf ${pkg_path}/$i ${bin_path}/$i - done - ''; + # wrap + for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"} + do + wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" + done + # make some executables available in PATH + mkdir -pv ${bin_path} + for i in \ + ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"} + do + ln -sf ${pkg_path}/$i ${bin_path}/$i + done + ''; - meta = { - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - license = stdenv.lib.licenses.asl20; + meta = { + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; + license = stdenv.lib.licenses.asl20; + }; }; -} + passthru = { + inherit makeStandaloneToolchain; + }; +in lib.extendDerivation true passthru (ndk fullNDK) From fd59d5642e4c140820410dc13fd0dd646fc785de Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:11:27 +0200 Subject: [PATCH 238/600] pigz: add license --- pkgs/tools/compression/pigz/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index a2668f73ceb2..7d4cdc2df86d 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation { install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.zlib.net/pigz/; description = "A parallel implementation of gzip for multi-core machines"; - platforms = stdenv.lib.platforms.unix; + license = licenses.zlib; + platforms = platforms.unix; }; } From 1e98674c792f3c6e82c44f0b1410e5b317b25e4a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:13:59 +0200 Subject: [PATCH 239/600] zdelta: add license --- pkgs/tools/compression/zdelta/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index 01050c5ee821..20748c31ab81 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3"; }; - meta = { + meta = with stdenv.lib; { homepage = http://cis.poly.edu/zdelta; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.zlib; }; } From 735a7de05164ce5238261f5fbb625fb5a109debc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:15:14 +0200 Subject: [PATCH 240/600] bashmount: add license --- pkgs/tools/filesystems/bashmount/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 579258f63f98..cd0f3ea23229 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jamielinux/bashmount; description = "A menu-driven bash script for the management of removable media with udisks"; maintainers = [ maintainers.koral ]; + license = licenses.gpl2; platforms = platforms.all; }; } From 9f9723b179961e7235d8e808c4ee8eaf52e05086 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 17 May 2018 18:53:13 -0400 Subject: [PATCH 241/600] nixpkgs module: Fix defaulting of `localSystem` and `system` Take two of #40708 (4fe289860888668956b7e79e24efeb101c2f51d1). That PR attempted to bidirectionally default `config.nixpkgs.system` and `config.nixpkgs.localSystem.system` to each be updated by the other. But this is not possible with the way the module system works. Divergence in certain cases in inevitable. This PR is more conservative and just has `system` default `localSystem` and `localSystem` make the final call as-is. This solves a number of issues. - `localSystem` completely overrides `system`, just like with nixpkgs proper. There is no need to specify `localSystem.system` to clobber the old system. - `config.nixpkgs.localSystem` is exactly what is passed to nixpkgs. No spooky steps. - `config.nixpkgs.localSystem` is elaborated just as nixpkgs would so that all attributes are available, not just the ones the user specified. The remaining issue is just that `config.nixpkgs.system` doesn't update based on `config.nixpkgs.localSystem.system`. It should never be referred to lest it is a bogus stale value because `config.nixpkgs.localSystem` overwrites it. Fixes #46320 --- nixos/lib/eval-config.nix | 6 +++++- nixos/modules/misc/nixpkgs.nix | 12 ++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 97c79487df4c..ef685949ae1f 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -36,7 +36,11 @@ let _file = ./eval-config.nix; key = _file; config = { - nixpkgs.localSystem = lib.mkDefault { inherit system; }; + # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override + # this. Since the latter defaults to the former, the former should + # default to the argument. That way this new default could propagate all + # they way through, but has the last priority behind everything else. + nixpkgs.system = lib.mkDefault system; _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); }; }; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 8fbe218b232a..7f9833e184ab 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -62,12 +62,11 @@ in pkgs = mkOption { defaultText = literalExample ''import "''${nixos}/.." { - inherit (config.nixpkgs) config overlays localSystem crossSystem; + inherit (cfg) config overlays localSystem crossSystem; } ''; default = import ../../.. { - localSystem = { inherit (cfg) system; } // cfg.localSystem; - inherit (cfg) config overlays crossSystem; + inherit (cfg) config overlays localSystem crossSystem; }; type = pkgsType; example = literalExample ''import {}''; @@ -140,8 +139,11 @@ in localSystem = mkOption { type = types.attrs; # TODO utilize lib.systems.parsedPlatform - default = { system = builtins.currentSystem; }; + default = { inherit (cfg) system; }; example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + # Make sure that the final value has all fields for sake of other modules + # referring to this. TODO make `lib.systems` itself use the module system. + apply = lib.systems.elaborate; defaultText = literalExample ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' @@ -180,6 +182,7 @@ in system = mkOption { type = types.str; example = "i686-linux"; + default = { system = builtins.currentSystem; }; description = '' Specifies the Nix platform type on which NixOS should be built. It is better to specify nixpkgs.localSystem instead. @@ -196,6 +199,7 @@ in See nixpkgs.localSystem for more information. + Ignored when nixpkgs.localSystem is set. Ignored when nixpkgs.pkgs is set. ''; }; From 58213481f660b451aa914f4be00847ea44c7823f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 7 Sep 2018 23:37:31 +0200 Subject: [PATCH 242/600] pecita: download from official source The file upstream has not been changed for a long time so should be safe to avoid the archive URL. --- pkgs/data/fonts/pecita/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index b57cf22569d2..a90ff42a8e2a 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -1,18 +1,24 @@ -{stdenv, fetchzip}: +{ stdenv, fetchurl }: let + version = "5.4"; -in fetchzip rec { + +in + +fetchurl rec { name = "pecita-${version}"; - url = "http://archive.rycee.net/pecita/${name}.tar.xz"; + url = "http://pecita.eu/b/Pecita.otf"; + + downloadToTemp = true; postFetch = '' - tar xJvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/opentype - cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf + cp -v $downloadedFile $out/share/fonts/opentype/Pecita.otf ''; + recursiveHash = true; sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; meta = with stdenv.lib; { From 8060dadf69b99305d9f723894303d825a604a722 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:17:34 +0200 Subject: [PATCH 243/600] curlftpfs: update meta data --- pkgs/tools/filesystems/curlftpfs/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 4af7c9fb8c26..5636909093e6 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { doCheck = false; # fails, doesn't work well too, btw - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; + homepage = http://curlftpfs.sourceforge.net; + license = licenses.gpl2; + platforms = platforms.linux; + }; } From 5f2d66ccc6e39cb0fee97b94b915d4e8e59b35ca Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:19:35 +0200 Subject: [PATCH 244/600] fatresize: add license --- pkgs/tools/filesystems/fatresize/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index 9af14b051261..7bb5dd415a6a 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, parted, utillinux }: stdenv.mkDerivation rec { - + version = "1.0.2"; name = "fatresize-${version}"; @@ -9,31 +9,32 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2"; sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm"; }; - + buildInputs = [ parted utillinux ]; - + # This patch helps this unmantained piece of software to be built against recent parted # It basically modifies the detection scheme for parted version (the current one has no micro version defined) # The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted # The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params patches = [ ./fatresize_parted_nix.patch ]; - + preConfigure = '' echo "Replacing calls to ped_free with free ..." substituteInPlace ./fatresize.c --replace ped_free free ''; - + # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG makeFlags = '' LDFLAGS=-lparted-fs-resize ''; - + propagatedBuildInputs = [ parted utillinux ]; - - meta = { + + meta = with stdenv.lib; { description = "The FAT16/FAT32 non-destructive resizer"; homepage = https://sourceforge.net/projects/fatresize; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From 4516ca5480dc19bd41ea88b34a8dfa24034ea59d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:22:13 +0200 Subject: [PATCH 245/600] jfsutils: add license + homepage --- pkgs/tools/filesystems/jfsutils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 244f3e294a86..acc7a91d93f5 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ]; - meta = { + meta = with stdenv.lib; { description = "IBM JFS utilities"; - platforms = stdenv.lib.platforms.linux; + homepage = http://jfs.sourceforge.net; + license = licenses.gpl3; + platforms = platforms.linux; }; } From 4f83467ba42b00714f317fd56987fbc6a38b96a1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:23:41 +0200 Subject: [PATCH 246/600] mtools: add license --- pkgs/tools/filesystems/mtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index e7a9963f6501..f153e59019e3 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/mtools/; description = "Utilities to access MS-DOS disks"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = platforms.unix; + license = licenses.gpl3; }; } From d3485885b208c6992d3c318a723716196ac26145 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:25:24 +0200 Subject: [PATCH 247/600] mtpfs: add licenses --- pkgs/tools/filesystems/mtpfs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index afe51caa8772..bf048113714f 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/cjd/mtpfs; description = "FUSE Filesystem providing access to MTP devices"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.qknight ]; + platforms = platforms.all; + license = licenses.gpl3; + maintainers = [ maintainers.qknight ]; }; } From aae4e1ddc20bc30a395198cad44859bc367d8284 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:29:04 +0200 Subject: [PATCH 248/600] nilfs-utils: add licenses --- pkgs/tools/filesystems/nilfs-utils/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 6b56a8aadfa0..eccd72ceb238 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -46,14 +46,11 @@ stdenv.mkDerivation rec { find . -name .libs | xargs rm -rf ''; - meta = { + meta = with stdenv.lib; { description = "NILFS utilities"; - maintainers = with stdenv.lib.maintainers; - [ - raskin - ]; - platforms = with stdenv.lib.platforms; - linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl21 ]; downloadPage = "http://nilfs.sourceforge.net/en/download.html"; updateWalker = true; }; From fa6bfc59746533c559382218c99e264a97c98120 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:32:12 +0200 Subject: [PATCH 249/600] reiser4progs: add license, update homepage --- pkgs/tools/filesystems/reiser4progs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 59d8e8aa4389..967a8ee43bef 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace ./run-ldconfig true ''; - meta = { + meta = with stdenv.lib; { inherit version; - homepage = http://www.namesys.com/; + homepage = https://sourceforge.net/projects/reiser4/; description = "Reiser4 utilities"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 9a46c0f384fc2025d69cea4ab2ea4a3625738710 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:34:31 +0200 Subject: [PATCH 250/600] relfs: add license --- pkgs/tools/filesystems/relfs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 9a8c3ecb0fc8..04a15dfa22be 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -40,10 +40,12 @@ stdenv.mkDerivation rec { chmod a+x \$out/bin/relfs_grant; ''; - meta = { + meta = with stdenv.lib; { description = "A relational filesystem on top of FUSE"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + homepage = http://relfs.sourceforge.net; + license = licenses.gpl2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; broken = true; }; } From 0f61edc465a643d48471a0b96b362694419f3ecb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:38:03 +0200 Subject: [PATCH 251/600] wfds: add license --- pkgs/tools/filesystems/wdfs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index dc725b5078f0..135373e09f42 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [fuse glib neon]; - meta = { + + meta = with stdenv.lib; { homepage = http://noedler.de/projekte/wdfs/; + license = licenses.gpl2; description = "User-space filesystem that allows to mount a webdav share"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } From f92f9a2b6f2883f446f8582403819c5ccde1f1a0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:39:15 +0200 Subject: [PATCH 252/600] bchunk: add license --- pkgs/tools/cd-dvd/bchunk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index 6828ef7d61d3..aa47edcb96c4 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://he.fi/bchunk/; description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; platforms = platforms.unix; + license = licenses.gpl2; }; } From e016d1eabb34e83bf5dbd845bbb516e02aaf074e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:40:38 +0200 Subject: [PATCH 253/600] cdrdao: add license --- pkgs/tools/cd-dvd/cdrdao/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 25d94593f5ef..a17b03025032 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation { # Needed on gcc >= 6. NIX_CFLAGS_COMPILE = "-Wno-narrowing"; - meta = { + meta = with stdenv.lib; { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = http://cdrdao.sourceforge.net/; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From 0bdf24f9a50df8c5328b22f454df8bdab2c80b72 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:43:36 +0200 Subject: [PATCH 254/600] lsdvd: add license --- pkgs/tools/cd-dvd/lsdvd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 6a3f92a57c2d..56ec8e19f54e 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation { buildInputs = [ libdvdread ]; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/lsdvd/; description = "Display information about audio, video, and subtitle tracks on a DVD"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 7de251551a12def35ca27e2131a5bf0fe3817c5c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 4 Sep 2018 21:50:55 +0200 Subject: [PATCH 255/600] xvkbd: update homepage --- pkgs/tools/X11/xvkbd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 7221555ed33f..06824f882a44 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { facility to enter characters onto other clients (softwares) by clicking on a keyboard displayed on the screen. ''; - homepage = http://homepage3.nifty.com/tsato/xvkbd/; + homepage = http://t-sato.in.coocan.jp/xvkbd; license = licenses.gpl2Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; From 72ce407703d48f4f7c580b872f3b8aad6cc4ae73 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 4 Sep 2018 21:55:11 +0200 Subject: [PATCH 256/600] x2x: update license + homepage --- pkgs/tools/X11/x2x/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index dd529011557a..24cf4f6b2e16 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation { cp x2x.1 $out/man/man1/ ''; - meta = { + meta = with stdenv.lib; { description = "Allows the keyboard, mouse on one X display to be used to control another X display"; - homepage = http://x2x.dottedmag.net; - license = "BSD"; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/dottedmag/x2x; + license = licenses.bsd3; + platforms = platforms.linux; }; } From 4f0010dbec1f8668d2441eb9fcf3cc648c19cf8a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 4 Sep 2018 22:00:16 +0200 Subject: [PATCH 257/600] euca2ools: update homepage --- pkgs/tools/virtualization/euca2ools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index ce628ff84b5e..5b310992afb6 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -15,7 +15,7 @@ in buildPythonApplication rec { propagatedBuildInputs = [ boto m2crypto ]; meta = { - homepage = http://open.eucalyptus.com/downloads; + homepage = https://github.com/eucalyptus/euca2ools; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; From e4620658d0dcb9a8bd7a698fc315365ce82a01c7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 4 Sep 2018 22:00:43 +0200 Subject: [PATCH 258/600] nitrogen: update homepage --- pkgs/tools/X11/nitrogen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index f53ab38672bd..eda5703d6a86 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { multi-head with Xinerama. Wallpapers are browsable with a convenient GUI, and settings are stored in a human-readable config file. ''; - homepage = http://projects.l3ib.org/nitrogen/; + homepage = https://github.com/l3ib/nitrogen; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.auntie ]; From fb89213cf650a4a847ee7481ae767a2f2ebdabf2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 4 Sep 2018 22:16:31 +0200 Subject: [PATCH 259/600] x11-ssh-askpass: update src + homepage, add license --- pkgs/tools/networking/x11-ssh-askpass/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 4061d5284aa6..896a2ff4daaa 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; src = fetchurl { - url = http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz; - sha1 = "78c992951685d4dbffb77536f37b83ae2a6eafc7"; + url = http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz; + sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88"; }; nativeBuildInputs = [ imake ]; @@ -24,11 +24,10 @@ stdenv.mkDerivation { installTargets = [ "install" "install.man" ]; - meta = { - homepage = http://www.jmknoble.net/software/x11-ssh-askpass/; + meta = with stdenv.lib; { + homepage = https://github.com/sigmavirus24/x11-ssh-askpass; description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH"; - - platforms = stdenv.lib.platforms.unix; - maintainers = []; + license = licenses.mit; + platforms = platforms.unix; }; } From 218ac50fd47cb6155dd05885bb3676804036910d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 Sep 2018 01:02:55 +0200 Subject: [PATCH 260/600] pythonPackages.trio: fix build (#46342) Fixes the build for `python3Packages.trio' for the next ZHF iteration. Please refer to the Hydra build for further reference: https://hydra.nixos.org/build/80617356 `python3Packages.sniffio` is needed for the build, otherwise the build aborts with an error like this: ``` Could not find a version that satisfies the requirement sniffio (from trio==0.6.0) (from versions: ) No matching distribution found for sniffio (from trio==0.6.0) ``` See #45960 --- .../python-modules/sniffio/default.nix | 30 +++++++++++++++++++ .../python-modules/trio/default.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/sniffio/default.nix diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix new file mode 100644 index 000000000000..9893bc5828a0 --- /dev/null +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage, lib, fetchPypi, glibcLocales, isPy3k, contextvars +, pythonOlder +}: + +buildPythonPackage rec { + pname = "sniffio"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dzb0nx3m1hpjgsv6s6w5ac2jcmywcz6gqnfkw8rwz1vkr1836rf"; + }; + + # breaks with the following error: + # > TypeError: 'encoding' is an invalid keyword argument for this function + disabled = !isPy3k; + + buildInputs = [ glibcLocales ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ]; + + # no tests distributed with PyPI + doCheck = false; + + meta = with lib; { + homepage = https://github.com/python-trio/sniffio; + license = licenses.asl20; + description = "Sniff out which async library your code is running under"; + }; +} diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 4924fa527c62..89addb377dc4 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -8,6 +8,7 @@ , pytest , pyopenssl , trustme +, sniffio }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { async_generator idna outcome + sniffio ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 091694633930..2eae6212cd4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -574,6 +574,8 @@ in { trio = callPackage ../development/python-modules/trio {}; + sniffio = callPackage ../development/python-modules/sniffio { }; + tokenserver = callPackage ../development/python-modules/tokenserver {}; toml = callPackage ../development/python-modules/toml { }; From f60fea5742e3e379f5060991daae94dafa67ea1f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 4 Sep 2018 22:28:32 +0200 Subject: [PATCH 261/600] netselect: update homepage + license --- pkgs/tools/networking/netselect/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix index 6015ff9fbc7c..ef00d8602feb 100644 --- a/pkgs/tools/networking/netselect/default.nix +++ b/pkgs/tools/networking/netselect/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "netselect-0.3"; - + src = fetchurl { url = http://alumnit.ca/~apenwarr/netselect/netselect-0.3.tar.gz; sha256 = "0y69z59vylj9x9nk5jqn6ihx7dkzg09gpv2w1q1rs8fmi4jr90gy"; @@ -15,11 +15,11 @@ stdenv.mkDerivation { --replace "-g root" "" \ --replace "4755" "0755" ''; - - meta = { - homepage = http://alumnit.ca/~apenwarr/netselect/; + + meta = with stdenv.lib; { + homepage = https://github.com/apenwarr/netselect; description = "An ultrafast intelligent parallelizing binary-search implementation of \"ping\""; - license = "BSD"; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + platforms = platforms.linux; }; } From 17eda398322401c4fccd335a3221aaf3e75b16b9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 00:32:30 +0200 Subject: [PATCH 262/600] numix-*: update homepage --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 2 +- pkgs/data/icons/numix-icon-theme-square/default.nix | 2 +- pkgs/data/icons/numix-icon-theme/default.nix | 2 +- pkgs/misc/themes/numix/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 5ac0998fb291..68b967e715d4 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme (circle version)"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 875e10259276..ec6972c4cac7 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme (square version)"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 35f624a00f5b..9aaed97dc273 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index f7b5f3d91af4..4fb412481095 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.romildo ]; From 0f8c58afd223c366482602804bf5b5231c0820c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sat, 8 Sep 2018 01:38:56 +0200 Subject: [PATCH 263/600] kdecoration-viewer: Fixes build (#46339) --- pkgs/tools/misc/kdecoration-viewer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index 62783bb30dff..5c2e410cd930 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -2,13 +2,13 @@ , cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: stdenv.mkDerivation rec { - name = "kdecoration-viewer-2015-08-20"; + name = "kdecoration-viewer-2018-07-24"; src = fetchFromGitHub { owner = "KDE"; repo = "kdecoration-viewer"; - rev = "d7174acee01475fbdb71cfd48ca49d487a141701"; - sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6"; + rev = "6e50b39c651bbf92fd7e7116d43bf57288254288"; + sha256 = "01v6i081vx0mydqvnj05xli86m52v6bxxc3z1zlyyap9cfhag7lj"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 320a587b7e862bda6b10eff4d90f25753703185d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 7 Sep 2018 19:00:54 -0500 Subject: [PATCH 264/600] kconfig-frontends: 3.12.0.0 -> 4.11.0.1 --- pkgs/development/tools/misc/kconfig-frontends/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index d1415569ca33..869ab3a39c50 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { basename = "kconfig-frontends"; - version = "3.12.0.0"; + version = "4.11.0.1"; name = "${basename}-${version}"; src = fetchurl { - sha256 = "01zlph9bq2xzznlpmfpn0zrmhf2iqw02yh1q7g7adgkl5jk1a9pa"; + sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3"; url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; }; From 3c42848ec75e5911904888ad518c87bdda625ed2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 7 Sep 2018 19:31:33 -0500 Subject: [PATCH 265/600] kconfig-frontends: patch+wrap python shebang to fix kconfig-diff --- pkgs/development/tools/misc/kconfig-frontends/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index 869ab3a39c50..8a49465a8c2f 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses }: +{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }: stdenv.mkDerivation rec { basename = "kconfig-frontends"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bison flex gperf ncurses ]; + buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ]; hardeningDisable = [ "format" ]; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { "--enable-frontends=conf,mconf,nconf" ]; + postInstall = '' + wrapPythonPrograms + ''; + meta = with stdenv.lib; { description = "Out of Linux tree packaging of the kconfig infrastructure"; longDescription = '' From 4fcf281e536f2690f4c69f4019d3ee3b30a3e7b5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 7 Sep 2018 19:36:51 -0500 Subject: [PATCH 266/600] kconfig-frontends: don't disable format hardening, doesn't seem needed --- pkgs/development/tools/misc/kconfig-frontends/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index 8a49465a8c2f..bceb15f11659 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ]; - hardeningDisable = [ "format" ]; - configureFlags = [ "--enable-frontends=conf,mconf,nconf" ]; From f0f8229ee398a5c4fbc1bef2d5074710ac7f4a71 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 15 Aug 2018 00:37:30 +0200 Subject: [PATCH 267/600] gssdp: enable docs, tests, gir and split outputs --- pkgs/development/libraries/gssdp/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index d48ba9082af2..0d77018eee5f 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, libsoup, glib }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }: stdenv.mkDerivation rec { name = "gssdp-${version}"; version = "1.0.2"; + outputs = [ "out" "bin" "dev" "devdoc" ]; + src = fetchurl { - url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz"; + url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsoup ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + buildInputs = [ libsoup gtk3 ]; propagatedBuildInputs = [ glib ]; + configureFlags = [ + "--enable-gtk-doc" + ]; + + doCheck = true; + meta = with stdenv.lib; { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.all; }; } From bd55a78f6d15416a075a7efc79f179b13c0d9482 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 7 Sep 2018 20:58:00 -0400 Subject: [PATCH 268/600] nanorc: Init at 2018-09-05 --- .../editors/nano/nanorc/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/editors/nano/nanorc/default.nix diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix new file mode 100644 index 000000000000..fb30036e146f --- /dev/null +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "nanorc-${version}"; + version = "2018-09-05"; + + src = fetchFromGitHub { + owner = "scopatz"; + repo = "nanorc"; + rev = "1e589cb729d24fba470228d429e6dde07973d597"; + sha256 = "136yxr38lzrfv8bar0c6c56rh54q9s94zpwa19f425crh44drppl"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share + + install *.nanorc $out/share/ + ''; + + meta = { + description = "Improved Nano Syntax Highlighting Files"; + homepage = https://github.com/scopatz/nanorc; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ nequissimus ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06a7aaa9a68a..2fbddb94b1b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17843,6 +17843,8 @@ with pkgs; nanoblogger = callPackage ../applications/misc/nanoblogger { }; + nanorc = callPackage ../applications/editors/nano/nanorc { }; + navipowm = callPackage ../applications/misc/navipowm { }; navit = libsForQt5.callPackage ../applications/misc/navit { }; From 1aaea3839b1ff01718d6a02407672a08406a5df5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 15 Aug 2018 00:45:35 +0200 Subject: [PATCH 269/600] gupnp: enable docs, gir and split outputs --- pkgs/development/libraries/gupnp/default.nix | 39 ++++++++++++------- .../libraries/gupnp/fix-requires.patch | 9 +++++ 2 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/libraries/gupnp/fix-requires.patch diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 963b93ef6917..7ec6199dc076 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,28 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }: - +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, glib, gssdp, libsoup, libxml2, libuuid }: + stdenv.mkDerivation rec { name = "gupnp-${version}"; - majorVersion = "1.0"; - version = "${majorVersion}.2"; + version = "1.0.2"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz"; + url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/gupnp-${version}.tar.xz"; sha256 = "043nqxlj030a3wvd6x4c9z8fjarjjjsl2pjarl0nn70ig6kzswsi"; }; - nativeBuildInputs = [ pkgconfig ]; + patches = [ + # Nix’s pkg-config ignores Requires.private + # https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d + # We are essentialy reverting the following patch for now + # https://bugzilla.gnome.org/show_bug.cgi?id=685477 + # at least until Requires.internal or something is implemented + # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7 + ./fix-requires.patch + ]; + + nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ]; propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ]; - postInstall = '' - ln -sv ${libsoup.dev}/include/libsoup-2*/libsoup $out/include - ln -sv ${libxml2.dev}/include/*/libxml $out/include - ln -sv ${gssdp}/include/*/libgssdp $out/include - ''; + configureFlags = [ + "--enable-gtk-doc" + ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { homepage = http://www.gupnp.org/; description = "An implementation of the UPnP specification"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gupnp/fix-requires.patch b/pkgs/development/libraries/gupnp/fix-requires.patch new file mode 100644 index 000000000000..4538fc55460f --- /dev/null +++ b/pkgs/development/libraries/gupnp/fix-requires.patch @@ -0,0 +1,9 @@ +--- a/gupnp-1.0.pc.in ++++ b/gupnp-1.0.pc.in +@@ -8,4 +8,5 @@ + Version: @VERSION@ + Libs: -L${libdir} -lgupnp-1.0 + Cflags: -I${includedir}/gupnp-1.0 +-Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@ ++Requires: glib-2.0 gobject-2.0 gssdp-1.0 libxml-2.0 libsoup-2.4 ++Requires.private: @UUID_LIBS@ From 5bee539f1cacf5b8708c41edaaf2146fe347ae36 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 15 Aug 2018 00:58:52 +0200 Subject: [PATCH 270/600] gupnp-dlna: enable docs, tests and split outputs --- .../libraries/gupnp-dlna/default.nix | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 75818f756921..aba95889b698 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,22 +1,34 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, gst_all_1 }: stdenv.mkDerivation rec { name = "gupnp-dlna-${version}"; - majorVersion = "0.10"; - version = "${majorVersion}.5"; + version = "0.10.5"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-dlna/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/gupnp-dlna/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj"; }; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - buildInputs = [ gupnp gst-plugins-base ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + buildInputs = [ gupnp gst_all_1.gst-plugins-base ]; - meta = { + configureFlags = [ + "--enable-gtk-doc" + ]; + + doCheck = true; + + postPatch = '' + chmod +x tests/test-discoverer.sh.in + patchShebangs tests/test-discoverer.sh.in + ''; + + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GUPnP/; description = "Library to ease DLNA-related bits for applications using GUPnP"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } From 0f063f97a6db56c751e5e56dde3b3dac31a942bd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 15 Aug 2018 01:13:16 +0200 Subject: [PATCH 271/600] =?UTF-8?q?gupnp:=201.0.2=20=E2=86=92=201.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gupnp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 7ec6199dc076..45adf46ff36f 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gupnp-${version}"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/gupnp-${version}.tar.xz"; - sha256 = "043nqxlj030a3wvd6x4c9z8fjarjjjsl2pjarl0nn70ig6kzswsi"; + sha256 = "1fyb6yn75vf2y1b8nbc1df572swzr74yiwy3v3g5xn36wlp1cjvr"; }; patches = [ From 05506a27850c777cefc4b58bceeb12fcd1845872 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 15 Aug 2018 01:25:51 +0200 Subject: [PATCH 272/600] gupnp-av: enable docs, gir, tests and split outputs --- .../libraries/gupnp-av/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 9b61f4b648e1..7491da7c3e2f 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, gupnp, glib, libxml2 }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, glib, libxml2 }: stdenv.mkDerivation rec { name = "gupnp-av-${version}"; - majorVersion = "0.12"; - version = "${majorVersion}.10"; + version = "0.12.10"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-av/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40"; }; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ gupnp glib libxml2 ]; - meta = { + configureFlags = [ + "--enable-gtk-doc" + ]; + + doCheck = true; + + meta = with stdenv.lib; { homepage = http://gupnp.org/; description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } From b18461b085a319b1bc8b09144c6af0cb6058a7bf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Sep 2018 03:07:59 +0200 Subject: [PATCH 273/600] =?UTF-8?q?gupnp-igd:=200.2.4=20=E2=86=92=200.2.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/gupnp-igd/default.nix | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 182905e9546a..50107959786d 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp }: - +{ stdenv, fetchurl, pkgconfig, gettext, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp }: + stdenv.mkDerivation rec { name = "gupnp-igd-${version}"; - majorVersion = "0.2"; - version = "${majorVersion}.4"; + version = "0.2.5"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-igd/${majorVersion}/${name}.tar.xz"; - sha256 = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44"; + url = "mirror://gnome/sources/gupnp-igd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; propagatedBuildInputs = [ glib gupnp ]; - meta = { + configureFlags = [ + "--enable-gtk-doc" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Library to handle UPnP IGD port mapping"; homepage = http://www.gupnp.org/; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21; + platforms = platforms.linux; }; } - From feb18af0609de04f8e19e4b7edf76b014ce82729 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 15 Aug 2018 00:11:34 +0200 Subject: [PATCH 274/600] gnome3.rygel: init at 0.36.2 --- pkgs/desktops/gnome-3/core/rygel/default.nix | 54 ++++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/rygel/default.nix diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix new file mode 100644 index 000000000000..ef0886328974 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, pkgconfig, vala, gettext, libxml2, gobjectIntrospection, gtk-doc, wrapGAppsHook, glib, gssdp, gupnp, gupnp-av, gupnp-dlna, gst_all_1, libgee, libsoup, gtk3, libmediaart, sqlite, systemd, tracker, shared-mime-info, gnome3 }: + +let + pname = "rygel"; + version = "0.36.2"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + # TODO: split out lib + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0i12z6bzfzgcjidhxa2jsvpm4hqpab0s032z13jy2vbifrncfcnk"; + }; + + nativeBuildInputs = [ + pkgconfig vala gettext libxml2 gobjectIntrospection gtk-doc wrapGAppsHook + ]; + buildInputs = [ + glib gssdp gupnp gupnp-av gupnp-dlna libgee libsoup gtk3 libmediaart sqlite systemd tracker shared-mime-info + ] ++ (with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly + ]); + + configureFlags = [ + "--with-systemduserunitdir=$(out)/lib/systemd/user" + "--enable-apidocs" + "--sysconfdir=/etc" + ]; + + installFlags = [ + "sysconfdir=$(out)/etc" + ]; + + doCheck = true; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; + homepage = https://wiki.gnome.org/Projects/Rygel; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d90440d5f557..5112f8b496f5 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -216,6 +216,8 @@ lib.makeScope pkgs.newScope (self: with self; { rest = callPackage ./core/rest { }; + rygel = callPackage ./core/rygel { }; + simple-scan = callPackage ./core/simple-scan { }; sushi = callPackage ./core/sushi { }; From 60ae12f5de19c784de869f81f1074236a8db1c6b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 15 Aug 2018 11:16:39 +0200 Subject: [PATCH 275/600] nixos/rygel: init --- nixos/modules/module-list.nix | 1 + .../services/desktops/gnome3/rygel.nix | 30 +++++++++++++++++++ .../services/x11/desktop-managers/gnome3.nix | 1 + 3 files changed, 32 insertions(+) create mode 100644 nixos/modules/services/desktops/gnome3/rygel.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4795922abcfb..b1ae2f356cd6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -245,6 +245,7 @@ ./services/desktops/gnome3/gnome-user-share.nix ./services/desktops/gnome3/gpaste.nix ./services/desktops/gnome3/gvfs.nix + ./services/desktops/gnome3/rygel.nix ./services/desktops/gnome3/seahorse.nix ./services/desktops/gnome3/sushi.nix ./services/desktops/gnome3/tracker.nix diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix new file mode 100644 index 000000000000..55d5e703aa19 --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/rygel.nix @@ -0,0 +1,30 @@ +# rygel service. +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + options = { + services.gnome3.rygel = { + enable = mkOption { + default = false; + description = '' + Whether to enable Rygel UPnP Mediaserver. + + You will need to also allow UPnP connections in firewall, see the following comment. + ''; + type = types.bool; + }; + }; + }; + + ###### implementation + config = mkIf config.services.gnome3.rygel.enable { + environment.systemPackages = [ pkgs.gnome3.rygel ]; + + services.dbus.packages = [ pkgs.gnome3.rygel ]; + + systemd.packages = [ pkgs.gnome3.rygel ]; + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index faf5214130db..eb86f7b53bb6 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -110,6 +110,7 @@ in { services.gnome3.gnome-terminal-server.enable = mkDefault true; services.gnome3.gnome-user-share.enable = mkDefault true; services.gnome3.gvfs.enable = true; + services.gnome3.rygel.enable = mkDefault true; services.gnome3.seahorse.enable = mkDefault true; services.gnome3.sushi.enable = mkDefault true; services.gnome3.tracker.enable = mkDefault true; From f223f417fa57719e79aaa59ef2d1cef3b6171129 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 7 Sep 2018 02:18:36 -0400 Subject: [PATCH 276/600] swift-corelibs.corefoundation: update and modernize This actually makes it useful to the Darwin stdenv, which I'll soon be adjusting to use this library --- .../darwin/swift-corelibs/corefoundation.nix | 76 +++++++++++++++---- .../darwin/swift-corelibs/default.nix | 4 +- 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 969168fa54ba..1dea55cccc9e 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -1,32 +1,78 @@ -{ stdenv, fetchFromGitHub, python, ninja, libxml2 }: +{ stdenv, fetchFromGitHub, fetchurl, python, ninja, libxml2, objc4, ICU, curl }: -stdenv.mkDerivation { +let + # 10.12 adds a new sysdir.h that our version of CF in the main derivation depends on, but + # isn't available publicly, so instead we grab an older version of the same file that did + # not use sysdir.h, but provided the same functionality. Luckily it's simple :) hack hack + sysdir-free-system-directories = fetchurl { + url = "https://raw.githubusercontent.com/apple/swift-corelibs-foundation/9a5d8420f7793e63a8d5ec1ede516c4ebec939f0/CoreFoundation/Base.subproj/CFSystemDirectories.c"; + sha256 = "0krfyghj4f096arvvpf884ra5czqlmbrgf8yyc0b3avqmb613pcc"; + }; +in stdenv.mkDerivation { name = "swift-corefoundation"; src = fetchFromGitHub { owner = "apple"; repo = "swift-corelibs-foundation"; - rev = "dce4233f583ec15190b240d6116396bf9641cd57"; - sha256 = "0i2ldvy14x05k2vgl5z0g5l2i5llifdfbij5zwfdwb8jmmq215qr"; + rev = "85c640e7ce50e6ca61a134c72270e214bc63fdba"; # https://github.com/apple/swift-corelibs-foundation/pull/1686 + sha256 = "0z2v278wy7jh0c92g1dszd8hj8naxari660sqx6yab5dwapd46qc"; }; - buildInputs = [ ninja python libxml2 ]; + buildInputs = [ ninja python libxml2 objc4 ICU curl ]; + + sourceRoot = "source/CoreFoundation"; patchPhase = '' - substituteInPlace CoreFoundation/build.py \ - --replace '-I''${SYSROOT}/usr/include/libxml2' '-I${libxml2.dev}/include/libxml2' \ + cp ${sysdir-free-system-directories} Base.subproj/CFSystemDirectories.c + + # In order, since I can't comment individual lines: + # 1. Disable dispatch support for now + # 2. For the linker too + # 3. Use the legit CoreFoundation.h, not the one telling you not to use it because of Swift + substituteInPlace build.py \ + --replace "cf.CFLAGS += '-DDEPLOYMENT" '#' \ + --replace "cf.LDFLAGS += '-ldispatch" '#' \ + --replace "Base.subproj/SwiftRuntime/CoreFoundation.h" 'Base.subproj/CoreFoundation.h' + + # Includes xpc for some initialization routine that they don't define anyway, so no harm here + substituteInPlace PlugIn.subproj/CFBundlePriv.h \ + --replace '#if (TARGET_OS_MAC' '#if (0' + + # Why do we define __GNU__? Is that normal? + substituteInPlace Base.subproj/CFAsmMacros.h \ + --replace '#if defined(__GNU__) ||' '#if 0 &&' + + # The MIN macro doesn't seem to be defined sensibly for us. Not sure if our stdenv or their bug + substituteInPlace Base.subproj/CoreFoundation_Prefix.h \ + --replace '#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX' '#if 1' + + # Somehow our ICU doesn't have this, probably because it's too old (we'll update it soon when we update the rest of the SDK) + substituteInPlace Locale.subproj/CFLocale.c \ + --replace '#if U_ICU_VERSION_MAJOR_NUM' '#if 0 //' ''; - configurePhase = ":"; + BUILD_DIR = "./Build"; + CFLAGS = "-DINCLUDE_OBJC -I${libxml2.dev}/include/libxml2"; # They seem to assume we include objc in some places and not in others, make a PR; also not sure why but libxml2 include path isn't getting picked up from buildInputs + LDFLAGS = "-install_name ${placeholder "out"}/Frameworks/CoreFoundation.framework/CoreFoundation -current_version 1234.56.7 -compatibility_version 150.0.0 -init ___CFInitialize"; + configurePhase = "../configure --sysroot unused"; - buildPhase = '' - cd CoreFoundation - ../configure --sysroot unused - ninja - ''; + enableParallelBuilding = true; + buildPhase = "ninja -j $NIX_BUILD_CORES"; + # TODO: their build system sorta kinda can do this, but it doesn't seem to work right now + # Also, this includes a bunch of private headers in the framework, which is not what we want installPhase = '' - mkdir -p $out/lib - cp ../Build/CoreFoundation/libCoreFoundation.a $out/lib + base="$out/Library/Frameworks/CoreFoundation.framework" + mkdir -p $base/Versions/A/{Headers,PrivateHeaders,Modules} + + cp ./Build/CoreFoundation/libCoreFoundation.dylib $base/Versions/A/CoreFoundation + cp ./Build/CoreFoundation/usr/include/CoreFoundation/*.h $base/Versions/A/Headers + cp ./Build/CoreFoundation/usr/include/CoreFoundation/module.modulemap $base/Versions/A/Modules + + ln -s A $base/Versions/Current + + for i in CoreFoundation Headers Modules; do + ln -s Versions/Current/$i $base/$i + done ''; } diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix index dd652dc56273..0d96b8fd008e 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/default.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix @@ -1,7 +1,7 @@ -{callPackage, darwin}: +{ callPackage, darwin }: rec { - corefoundation = callPackage ./corefoundation.nix {}; + corefoundation = callPackage ./corefoundation.nix { inherit (darwin) objc4 ICU; }; libdispatch = callPackage ./libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; }; From 2031c0ebfeba4cd2bf24058030da95a56c9b6e91 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 8 Sep 2018 04:06:58 -0400 Subject: [PATCH 277/600] mono-addins: fix build (#46354) --- pkgs/development/libraries/mono-addins/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index e68661b44ec3..780f68e7d485 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }: stdenv.mkDerivation rec { name = "mono-addins-${version}"; @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ mono gtk-sharp-2_0 ]; + + # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged + buildInputs = [ mono48 gtk-sharp-2_0 ]; dontStrip = true; From 5a166ffd4733ff7049c2c57d42beb3ed4c15cbbf Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 8 Sep 2018 10:16:48 +0200 Subject: [PATCH 278/600] boo: remove, broken since Jun 2016 marked broken in June 2016, no visible attempt to fix it, so let's get rid of it --- pkgs/development/compilers/boo/config.patch | 45 -------------------- pkgs/development/compilers/boo/default.nix | 46 --------------------- pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 95 deletions(-) delete mode 100644 pkgs/development/compilers/boo/config.patch delete mode 100644 pkgs/development/compilers/boo/default.nix diff --git a/pkgs/development/compilers/boo/config.patch b/pkgs/development/compilers/boo/config.patch deleted file mode 100644 index f6e0eee29b1b..000000000000 --- a/pkgs/development/compilers/boo/config.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/default.build b/default.build -index e48fd9e..b0dee4f 100644 ---- a/default.build -+++ b/default.build -@@ -23,14 +23,14 @@ - - - -- -+ - - - - - - -- -+ - - - -@@ -575,9 +575,9 @@ - key files for mime detection, etc - --> - -- -+ - -- -+ - - - -@@ -707,9 +707,9 @@ - key files for mime detection, etc - --> - -- -+ - -- -+ - - - diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix deleted file mode 100644 index ec5e08ffda40..000000000000 --- a/pkgs/development/compilers/boo/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper, nant -, shared-mime-info, gtksourceview, gtk2 }: - -let - release = "alpha"; -in stdenv.mkDerivation rec { - name = "boo-${version}"; - version = "2013-10-21"; - - src = fetchFromGitHub { - owner = "boo-lang"; - repo = "boo"; - - rev = "${release}"; - sha256 = "174abdwfpq8i3ijx6bwqll16lx7xwici374rgsbymyk8g8mla094"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - mono makeWrapper nant shared-mime-info gtksourceview - gtk2 - ]; - - patches = [ ./config.patch ]; - - postPatch = '' - sed -e 's|\$out|'$out'|' -i default.build - ''; - - buildPhase = '' - nant -t:mono-4.5 - ''; - - installPhase = '' - nant install - cp $out/lib/mono/boo/*.dll $out/lib/boo/ - ''; - - dontStrip = true; - - meta = with stdenv.lib; { - description = "The Boo Programming Language"; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fbddb94b1b7..8c36b24bcf28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6310,10 +6310,6 @@ with pkgs; binaryen = callPackage ../development/compilers/binaryen { }; - boo = callPackage ../development/compilers/boo { - inherit (gnome2) gtksourceview; - }; - colm = callPackage ../development/compilers/colm { }; fetchegg = callPackage ../build-support/fetchegg { }; From dc84de59d13953d3e906a6e2d27b232b4d3ef5ce Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 8 Sep 2018 10:11:51 +0200 Subject: [PATCH 279/600] nant: remove - our version is from 2015 - it doesn't build - upstream project is dead, last release 2012, last commit Oct 2016. - used by only 1 nixpkgs package: `boo`, marked broken since 2016. --- .../tools/build-managers/nant/default.nix | 71 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 73 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/nant/default.nix diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix deleted file mode 100644 index c394d87e09ec..000000000000 --- a/pkgs/development/tools/build-managers/nant/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper -, targetVersion ? "4.5" }: - -let - version = "2015-11-15"; - - src = fetchFromGitHub { - owner = "nant"; - repo = "nant"; - rev = "19bec6eca205af145e3c176669bbd57e1712be2a"; - sha256 = "11l5y76csn686p8i3kww9s0sxy659ny9l64krlqg3y2nxaz0fk6l"; - }; - - nant-bootstrapped = stdenv.mkDerivation { - name = "nant-bootstrapped-${version}"; - inherit src; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mono makeWrapper ]; - - buildFlags = "bootstrap"; - - dontStrip = true; - - installPhase = '' - mkdir -p $out/lib/nant-bootstrap - cp -r bootstrap/* $out/lib/nant-bootstrap - - mkdir -p $out/bin - makeWrapper "${mono}/bin/mono" $out/bin/nant \ - --add-flags "$out/lib/nant-bootstrap/NAnt.exe" - ''; - }; - -in stdenv.mkDerivation { - name = "nant-${version}"; - inherit src; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mono makeWrapper nant-bootstrapped ]; - - dontStrip = true; - - buildPhase = '' - nant -t:mono-${targetVersion} - ''; - - installPhase = '' - mkdir -p $out/lib/nant - cp -r build/mono-${targetVersion}.unix/nant-debug/bin/* $out/lib/nant/ - - mkdir -p $out/bin - makeWrapper "${mono}/bin/mono" $out/bin/nant \ - --add-flags "$out/lib/nant/NAnt.exe" - ''; - - meta = with stdenv.lib; { - homepage = http://nant.sourceforge.net; - description = "NAnt is a free .NET build tool"; - - longDescription = '' - NAnt is a free .NET build tool. In theory it is kind of like make without - make's wrinkles. In practice it's a lot like Ant. - ''; - - license = licenses.gpl2Plus; - maintainers = with maintainers; [ zohl ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c36b24bcf28..f5ca0d6a1f3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8492,8 +8492,6 @@ with pkgs; nailgun = callPackage ../development/tools/nailgun { }; - nant = callPackage ../development/tools/build-managers/nant { }; - ninja = callPackage ../development/tools/build-managers/ninja { }; gn = callPackage ../development/tools/build-managers/gn { }; From 2953d4c9947fbc152ccda2e8941c2a4f9c908f12 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 8 Sep 2018 10:24:22 +0200 Subject: [PATCH 280/600] banshee: remove - was broken since June 2016 because it depends on `boo` - no visible attempts to fix in over 2 years --- pkgs/applications/audio/banshee/default.nix | 57 --------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 62 deletions(-) delete mode 100644 pkgs/applications/audio/banshee/default.nix diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix deleted file mode 100644 index 8a4e8893c8d3..000000000000 --- a/pkgs/applications/audio/banshee/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base -, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib -, mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0 -, boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp -, libmtp, libgpod, mono-zeroconf }: - -stdenv.mkDerivation rec { - name = "banshee-${version}"; - version = "2.6.2"; - - src = fetchurl { - url = "https://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz"; - sha256 = "1y30p8wxx5li39i5gpq2wib0ympy8llz0gyi6ri9bp730ndhhz7p"; - }; - - dontStrip = true; - - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ - gtk-sharp-2_0.gtk gstreamer gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly gst-ffmpeg - mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp - gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans - gio-sharp libmtp libgpod mono-zeroconf - ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - postPatch = '' - patchShebangs data/desktop-files/update-desktop-file.sh - patchShebangs build/private-icon-theme-installer - sed -i "s,DOCDIR=.*,DOCDIR=$out/lib/monodoc," configure - ''; - - postInstall = let - ldLibraryPath = lib.makeLibraryPath [ gtk-sharp-2_0.gtk gtk-sharp-2_0 sqlite gconf glib gstreamer ]; - - monoGACPrefix = lib.concatStringsSep ":" [ - mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp gtk-sharp-2_0 - boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans - gio-sharp libmtp libgpod mono-zeroconf - ]; - in '' - sed -e '2a export MONO_GAC_PREFIX=${monoGACPrefix}' \ - -e 's|LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${ldLibraryPath}:|' \ - -e "s|GST_PLUGIN_PATH=|GST_PLUGIN_PATH=$GST_PLUGIN_SYSTEM_PATH:|" \ - -e 's| mono | ${mono}/bin/mono |' \ - -i $out/bin/banshee - ''; - meta = with lib; { - homepage = "http://banshee.fm/"; - description = "A music player written in C# using GNOME technologies"; - platforms = platforms.linux; - maintainers = [ maintainers.zohl ]; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5ca0d6a1f3d..b61f74415944 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15527,11 +15527,6 @@ with pkgs; barrier = callPackage ../applications/misc/barrier {}; - banshee = callPackage ../applications/audio/banshee { - gconf = pkgs.gnome2.GConf; - libgpod = pkgs.libgpod.override { monoSupport = true; }; - }; - bashSnippets = callPackage ../applications/misc/bashSnippets { }; batik = callPackage ../applications/graphics/batik { }; From 182f1fc2c8f046f97e0c9f5626e9647b66f24ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 8 Sep 2018 09:29:28 +0100 Subject: [PATCH 281/600] vim-plugins: remove .git extension from spec --- pkgs/misc/vim-plugins/vim-plugin-names | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f2a46ee8a806..a49542c88e03 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -6,7 +6,7 @@ "github:alvan/vim-closetag" "github:amiorin/ctrlp-z" "github:andreshazard/vim-logreview" -"github:andsild/peskcolor.vim.git" +"github:andsild/peskcolor.vim" "github:andviro/flake8-vim" "github:ap/vim-css-color" "github:bazelbuild/vim-bazel" @@ -40,7 +40,7 @@ "github:eagletmt/ghcmod-vim" "github:eagletmt/neco-ghc" "github:editorconfig/editorconfig-vim" -"github:ehamberg/vim-cute-python.git" +"github:ehamberg/vim-cute-python" "github:eikenb/acp" "github:elixir-lang/vim-elixir" "github:elmcast/elm-vim" @@ -79,7 +79,7 @@ "github:itchyny/vim-gitbranch" "github:ivanov/vim-ipython" "github:jacoborus/tender.vim" -"github:janko-m/vim-test.git" +"github:janko-m/vim-test" "github:JazzCore/ctrlp-cmatcher" "github:jceb/vim-hier" "github:jceb/vim-orgmode" @@ -150,7 +150,7 @@ "github:megaannum/forms" "github:megaannum/self" "github:mfukar/robotframework-vim" -"github:mhinz/vim-grepper.git" +"github:mhinz/vim-grepper" "github:mhinz/vim-signify" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" @@ -178,7 +178,7 @@ "github:raichoo/purescript-vim" "github:reedes/vim-pencil" "github:reedes/vim-wordy" -"github:rhysd/committia.vim.git" +"github:rhysd/committia.vim" "github:rhysd/vim-grammarous" "github:rhysd/vim-operator-surround" "github:Rip-Rip/clang_complete" @@ -206,7 +206,7 @@ "github:shougo/neomru.vim" "github:shougo/neosnippet-snippets" "github:shougo/neosnippet.vim" -"github:shougo/neoyank.vim.git" +"github:shougo/neoyank.vim" "github:shougo/tabpagebuffer.vim" "github:shougo/unite.vim" "github:shougo/vimproc.vim" @@ -269,7 +269,7 @@ "github:vim-scripts/Colour-Sampler-Pack" "github:vim-scripts/Improved-AnsiEsc" "github:vim-scripts/matchit.zip" -"github:vim-scripts/mayansmoke.git" +"github:vim-scripts/mayansmoke" "github:vim-scripts/random.vim" "github:vim-scripts/Rename" "github:vim-scripts/ReplaceWithRegister" From a02002debacc30a151494c0c7b069e0ef2800a60 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 Sep 2018 11:20:47 +0200 Subject: [PATCH 282/600] pythonPackages.pycaption: fix build (#46356) The `beaitufulsoup4` package distributed by `nixpkgs` is now at `4.6.3`. Additionally it fixes `gnomecaption` which depends on the broken `pycaption` package. See https://hydra.nixos.org/build/81000247 See https://hydra.nixos.org/build/80723223 Addresses #45960 --- pkgs/development/python-modules/pycaption/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index d4ed6088409b..468011e2a807 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.py \ --replace 'beautifulsoup4>=4.2.1,<4.5.0' \ - 'beautifulsoup4>=4.2.1,<=4.6.0' + 'beautifulsoup4>=4.2.1,<=4.6.3' ''; # don't require enum34 on python >= 3.4 From 1b4f19ca73c6bc1bf1298a8dc252e6c5e337e8e5 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sat, 8 Sep 2018 13:29:16 +0200 Subject: [PATCH 283/600] Remove outdated external package emacs-find-file-in-project --- pkgs/top-level/emacs-packages.nix | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ba82bd217fdc..6cd80613526b 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -178,7 +178,7 @@ let for file in elpy.el elpy-pkg.el; do substituteInPlace $file \ --replace "company \"0.8.2\"" "company \"${company.version}\"" \ - --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${find-file-in-project.version}\"" \ + --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${melpaPackages.find-file-in-project.version}\"" \ --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \ --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \ --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\"" @@ -226,31 +226,6 @@ let ess-R-object-popup = callPackage ../applications/editors/emacs-modes/ess-R-object-popup { }; - find-file-in-project = melpaBuild rec { - pname = "find-file-in-project"; - version = "3.5"; - src = fetchFromGitHub { - owner = "technomancy"; - repo = pname; - rev = "53a8d8174f915d9dcf5ac6954b1c0cae61266177"; - sha256 = "0wky8vqg08iw34prbz04bqmhfhj82y93swb8zkz6la2vf9da0gmd"; - }; - recipe = writeText "recipe" '' - (find-file-in-project - :repo "technomancy/find-file-in-project" - :fetcher github) - ''; - meta = { - description = "Quick access to project files in Emacs"; - longDescription = '' - Find files in a project quickly. - This program provides a couple methods for quickly finding any file in a - given project. It depends on GNU find. - ''; - license = gpl3Plus; - }; - }; - filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { }; font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { }; From cd20437f8113f2d1ad6ad240405b3f016acad935 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 19:00:34 -0700 Subject: [PATCH 284/600] josm: 14066 -> 14178 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from josm --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index e753c5ded95c..fc10bc852e5c 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 = "14066"; + version = "14178"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia"; + sha256 = "08an4s8vbcd8vyinnvd7cxmgnrsy47j78a94nk6vq244gp7v5n0r"; }; buildInputs = [ jre10 makeWrapper ]; From a0d7b889110893c2a27178dd5d7ef327dd834d74 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Sep 2018 13:04:19 +0200 Subject: [PATCH 285/600] nixos/sks: Add a dataDir option --- nixos/modules/services/security/sks.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix index 62308428f326..acc2a128b151 100644 --- a/nixos/modules/services/security/sks.nix +++ b/nixos/modules/services/security/sks.nix @@ -27,6 +27,20 @@ in "; }; + dataDir = mkOption { + type = types.path; + default = "/var/db/sks"; + example = "/var/lib/sks"; + # TODO: The default might change to "/var/lib/sks" as this is more + # common. There's also https://github.com/NixOS/nixpkgs/issues/26256 + # and "/var/db" is not FHS compliant (seems to come from BSD). + description = '' + Data directory (-basedir) for SKS, where the database and all + configuration files are located (e.g. KDB, PTree, membership and + sksconf). + ''; + }; + hkpAddress = mkOption { default = [ "127.0.0.1" "::1" ]; type = types.listOf types.str; @@ -51,7 +65,7 @@ in users.users.sks = { createHome = true; - home = "/var/db/sks"; + home = cfg.dataDir; isSystemUser = true; shell = "${pkgs.coreutils}/bin/true"; }; From 6764d41ecc7ef10745abc02d09e4211e12345fd9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Sep 2018 13:32:53 +0200 Subject: [PATCH 286/600] nixos/sks: Update the descriptions and add meta.maintainers TODO: Merge this module with https://github.com/NixOS/nixpkgs/pull/24516 --- nixos/modules/services/security/sks.nix | 41 ++++++++++++------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix index acc2a128b151..5e4b1a71fdd9 100644 --- a/nixos/modules/services/security/sks.nix +++ b/nixos/modules/services/security/sks.nix @@ -3,28 +3,26 @@ with lib; let - cfg = config.services.sks; - sksPkg = cfg.package; -in - -{ +in { + meta.maintainers = with maintainers; [ primeos calbrecht jcumming ]; options = { services.sks = { - enable = mkEnableOption "sks"; + enable = mkEnableOption '' + SKS (synchronizing key server for OpenPGP) and start the database + server. You need to create "''${dataDir}/dump/*.gpg" for the initial + import''; package = mkOption { default = pkgs.sks; defaultText = "pkgs.sks"; type = types.package; - description = " - Which sks derivation to use. - "; + description = "Which SKS derivation to use."; }; dataDir = mkOption { @@ -44,17 +42,16 @@ in hkpAddress = mkOption { default = [ "127.0.0.1" "::1" ]; type = types.listOf types.str; - description = " - Wich ip addresses the sks-keyserver is listening on. - "; + description = '' + Domain names, IPv4 and/or IPv6 addresses to listen on for HKP + requests. + ''; }; hkpPort = mkOption { default = 11371; - type = types.int; - description = " - Which port the sks-keyserver is listening on. - "; + type = types.ints.u16; + description = "HKP port to listen on."; }; }; }; @@ -76,19 +73,21 @@ in home = config.users.users.sks.home; user = config.users.users.sks.name; in { - sks-keyserver = { + "sks-db" = { + description = "SKS database server"; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' mkdir -p ${home}/dump - ${pkgs.sks}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/ - ${pkgs.sks}/bin/sks cleandb || true - ${pkgs.sks}/bin/sks pbuild -cache 20 -ptree_cache 70 || true + ${sksPkg}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/ + ${sksPkg}/bin/sks cleandb || true + ${sksPkg}/bin/sks pbuild -cache 20 -ptree_cache 70 || true ''; serviceConfig = { WorkingDirectory = home; User = user; Restart = "always"; - ExecStart = "${pkgs.sks}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}"; + ExecStart = "${sksPkg}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}"; }; }; }; From 2c751dcdc9d38a8fd58ff6b241b048839de49511 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 8 Sep 2018 07:58:50 -0400 Subject: [PATCH 287/600] yabause: 0.9.14 -> 0.9.15 (#46353) + fixes for Qt 5.11 build. --- .../0001-Fixes-for-Qt-5.11-upgrade.patch | 67 +++++++++++++++++++ pkgs/misc/emulators/yabause/default.nix | 17 +++-- .../yabause/emu-compatibility.com.patch | 10 --- 3 files changed, 77 insertions(+), 17 deletions(-) create mode 100644 pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch delete mode 100644 pkgs/misc/emulators/yabause/emu-compatibility.com.patch diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch new file mode 100644 index 000000000000..43539ef4ca58 --- /dev/null +++ b/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch @@ -0,0 +1,67 @@ +From 3140afd6fb7dad7a25296526a71b005fb9eae048 Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel +Date: Sat, 8 Sep 2018 00:44:08 -0400 +Subject: [PATCH] Fixes for Qt 5.11 upgrade + +--- + src/qt/ui/UICheatRaw.cpp | 2 -- + src/qt/ui/UICheatRaw.h | 2 +- + src/qt/ui/UICheats.cpp | 2 ++ + src/qt/ui/UIHexInput.h | 2 ++ + 4 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/qt/ui/UICheatRaw.cpp b/src/qt/ui/UICheatRaw.cpp +index 4ad82d77..3f78486b 100755 +--- a/src/qt/ui/UICheatRaw.cpp ++++ b/src/qt/ui/UICheatRaw.cpp +@@ -20,8 +20,6 @@ + #include "UIHexInput.h" + #include "../QtYabause.h" + +-#include +- + UICheatRaw::UICheatRaw( QWidget* p ) + : QDialog( p ) + { +diff --git a/src/qt/ui/UICheatRaw.h b/src/qt/ui/UICheatRaw.h +index d97b429d..20318c67 100755 +--- a/src/qt/ui/UICheatRaw.h ++++ b/src/qt/ui/UICheatRaw.h +@@ -21,7 +21,7 @@ + + #include "ui_UICheatRaw.h" + +-class QButtonGroup; ++#include + + class UICheatRaw : public QDialog, public Ui::UICheatRaw + { +diff --git a/src/qt/ui/UICheats.cpp b/src/qt/ui/UICheats.cpp +index c6027972..44d341c3 100755 +--- a/src/qt/ui/UICheats.cpp ++++ b/src/qt/ui/UICheats.cpp +@@ -21,6 +21,8 @@ + #include "UICheatRaw.h" + #include "../CommonDialogs.h" + ++#include ++ + UICheats::UICheats( QWidget* p ) + : QDialog( p ) + { +diff --git a/src/qt/ui/UIHexInput.h b/src/qt/ui/UIHexInput.h +index f333b016..4bd8aed4 100644 +--- a/src/qt/ui/UIHexInput.h ++++ b/src/qt/ui/UIHexInput.h +@@ -22,6 +22,8 @@ + #include "ui_UIHexInput.h" + #include "../QtYabause.h" + ++#include ++ + class HexValidator : public QValidator + { + Q_OBJECT +-- +2.16.4 + diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index e7237fd4454c..a2d462fd990e 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qtbase, libGLU_combined +{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU_combined , freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { name = "yabause-${version}"; - # 0.9.15 only works with OpenGL 3.2 or later: - # https://github.com/Yabause/yabause/issues/349 - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz"; - sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm"; + sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qtbase libGLU_combined freeglut openal SDL2 ]; + buildInputs = [ qtbase qt5.qtmultimedia libGLU_combined freeglut openal SDL2 ]; - patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ]; + patches = [ + ./linkage-rwx-linux-elf.patch + # Fixes derived from + # https://github.com/Yabause/yabause/commit/06a816c032c6f7fd79ced6e594dd4b33571a0e73 + ./0001-Fixes-for-Qt-5.11-upgrade.patch + ]; cmakeFlags = [ "-DYAB_NETWORK=ON" diff --git a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch deleted file mode 100644 index 5f13d2ee1837..000000000000 --- a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/qt/ui/UIYabause.ui 2017-09-28 13:23:04.636014753 +0000 -+++ b/src/qt/ui/UIYabause.ui 2017-09-28 13:23:21.945763537 +0000 -@@ -230,7 +230,6 @@ - - &Help - -- - - - From 56b3c5b2dde6d05dee8fde4f21cdf78a1578b89a Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Sat, 8 Sep 2018 05:10:51 -0700 Subject: [PATCH 288/600] nixos/networkmanager: fix VPN plugin service definition targets (#46201) --- .../modules/services/networking/networkmanager.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index d5af4648e8f9..2d76e0676b24 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -406,25 +406,25 @@ in { { source = configFile; target = "NetworkManager/NetworkManager.conf"; } - { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name"; + { source = "${networkmanager-openvpn}/lib/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}/lib/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}/lib/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}/lib/NetworkManager/VPN/nm-fortisslvpn-service.name"; target = "NetworkManager/VPN/nm-fortisslvpn-service.name"; } - { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; + { source = "${networkmanager-l2tp}/lib/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } - { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name"; + { source = "${networkmanager_strongswan}/lib/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}/lib/NetworkManager/VPN/nm-iodine-service.name"; target = "NetworkManager/VPN/nm-iodine-service.name"; } ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) From 37032db5835aec5b04a0c1201e504a878a5aabb7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 Sep 2018 14:19:24 +0200 Subject: [PATCH 289/600] chessx: fix build (#46359) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://hydra.nixos.org/build/80998335. Upstream doesn't support QT 5.11 ATM which broke compilation: ``` src/dialogs/savedialog.cpp: In constructor ‘SaveDialog::SaveDialog(QWidget*, Qt::WindowFlags)’: src/dialogs/savedialog.cpp:37:34: error: invalid use of incomplete type ‘class QButtonGroup’ group = new QButtonGroup(this); ``` The Arch community recommends to use an older QT version to fix this (https://aur.archlinux.org/packages/chessx/). Furthermore the `QT_PLUGIN_PATH` wasn't set properly which broke the runtime since QT coudln't find the `xcb` plugin: ``` qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in "" This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem. ``` Finally, some minor style fixes were made for consistent indentation. Addresses #45960 --- pkgs/games/chessx/default.nix | 38 ++++++++++++++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index c8d23fcc9de6..e4ec4dffa1db 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,30 +1,41 @@ -{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }: +{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl, makeWrapper +, lib +}: + stdenv.mkDerivation rec { name = "chessx-${version}"; version = "1.4.6"; + src = fetchurl { url = "mirror://sourceforge/chessx/chessx-${version}.tgz"; sha256 = "1vb838byzmnyglm9mq3khh3kddb9g4g111cybxjzalxxlc81k5dd"; }; + buildInputs = [ - qtbase - qtsvg - qttools - qtmultimedia - zlib + qtbase + qtsvg + qttools + qtmultimedia + zlib ]; - nativeBuildInputs = [ pkgconfig qmake ]; + + nativeBuildInputs = [ pkgconfig qmake makeWrapper ]; # RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm' enableParallelBuilding = false; installPhase = '' - runHook preInstall - mkdir -p "$out/bin" - mkdir -p "$out/share/applications" - cp -pr release/chessx "$out/bin" - cp -pr unix/chessx.desktop "$out/share/applications" - runHook postInstall + runHook preInstall + + mkdir -p "$out/bin" + mkdir -p "$out/share/applications" + cp -pr release/chessx "$out/bin" + cp -pr unix/chessx.desktop "$out/share/applications" + + wrapProgram $out/bin/chessx \ + --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins + + runHook postInstall ''; meta = with stdenv.lib; { @@ -32,5 +43,6 @@ stdenv.mkDerivation rec { description = "ChessX allows you to browse and analyse chess games"; license = licenses.gpl2; maintainers = [maintainers.luispedro]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fbddb94b1b7..bd80143651bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19730,7 +19730,7 @@ with pkgs; chessdb = callPackage ../games/chessdb { }; - chessx = libsForQt5.callPackage ../games/chessx { }; + chessx = libsForQt59.callPackage ../games/chessx { }; chocolateDoom = callPackage ../games/chocolate-doom { }; From 3b4ab85f01673e7573f5e740fa50bbaf0174c03b Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sat, 8 Sep 2018 15:21:25 +0300 Subject: [PATCH 290/600] ripgrep: 0.9.0 -> 0.10.0 (#46331) --- pkgs/tools/text/ripgrep/default.nix | 15 +++++++++++---- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index f70f0f3d75b2..81c88ecad9e5 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt }: +{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt +, Security +, withPCRE2 ? false, pcre2 ? null +}: rustPlatform.buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = version; - sha256 = "089xffrqi4wm0w1lhy5iqxrcb82ca44bxl8qps4ilv0ih91vxwfj"; + sha256 = "017fz5kv1kv9jz7mb7vcxrklf5vybvfz2x61g6myzshqz4z1v1yb"; }; - cargoSha256 = "1wsw7s1bc1gnpq4kjzkas5zf2snhpx9f6cyrrf6g5jr8l0hcbyih"; + cargoSha256 = "0k2b2vbklfdjk2zdc8ip480drc12gy1whlwj94p44hr3402azcgr"; + + cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; nativeBuildInputs = [ asciidoc docbook_xsl libxslt ]; + buildInputs = (stdenv.lib.optional withPCRE2 pcre2) + ++ (stdenv.lib.optional stdenv.isDarwin Security); preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd80143651bd..7e0425b26b9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2911,7 +2911,10 @@ with pkgs; }) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];}); grin = callPackage ../tools/text/grin { }; - ripgrep = callPackage ../tools/text/ripgrep { }; + + ripgrep = callPackage ../tools/text/ripgrep { + inherit (darwin.apple_sdk.frameworks) Security; + }; grive2 = callPackage ../tools/filesystems/grive2 { }; From f2c5b98649f20619a61dd43171023bd2b191ed7e Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 4 Aug 2018 14:09:56 +0200 Subject: [PATCH 291/600] maintainers: add 'yarny' (= myself) --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ecec7bbaf7e3..e15337497f09 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4518,6 +4518,11 @@ github = "y0no"; name = "Yoann Ono"; }; + yarny = { + email = "41838844+Yarny0@users.noreply.github.com"; + github = "Yarny0"; + name = "Yarny"; + }; yarr = { email = "savraz@gmail.com"; github = "Eternity-Yarr"; From a08b633fe7b636556ece29cc75448254b6ac3d28 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 4 Aug 2018 14:10:28 +0200 Subject: [PATCH 292/600] HylaFAX+: init at 5.6.0 Create the top-level packages attribute 'hylafaxplus' that builds HylaFAX+ . Note: The nobody uid and the nogroup gid are hardcoded in the package. The package build recipe file contains options to modify these ids. --- pkgs/servers/hylafaxplus/config.site | 20 ++++ pkgs/servers/hylafaxplus/default.nix | 95 +++++++++++++++++++ .../servers/hylafaxplus/post-install-check.sh | 7 ++ pkgs/servers/hylafaxplus/post-install.sh | 24 +++++ pkgs/servers/hylafaxplus/post-patch.sh | 25 +++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 173 insertions(+) create mode 100644 pkgs/servers/hylafaxplus/config.site create mode 100644 pkgs/servers/hylafaxplus/default.nix create mode 100644 pkgs/servers/hylafaxplus/post-install-check.sh create mode 100644 pkgs/servers/hylafaxplus/post-install.sh create mode 100644 pkgs/servers/hylafaxplus/post-patch.sh diff --git a/pkgs/servers/hylafaxplus/config.site b/pkgs/servers/hylafaxplus/config.site new file mode 100644 index 000000000000..7c8014449216 --- /dev/null +++ b/pkgs/servers/hylafaxplus/config.site @@ -0,0 +1,20 @@ +@config_maxgid@ +DIR_BIN="@out_@/bin" +DIR_FONTMAP="@out_@/share/ghostscript/@ghostscript_version@" +DIR_LIB="@out_@/lib" +DIR_LIBDATA="@out_@/spool/etc" +DIR_LIBEXEC="@out_@/spool/bin" +DIR_LOCKS=/var/lock +DIR_MAN="@out_@/share/man" +DIR_SBIN="@out_@/spool/bin" +DIR_SPOOL="@out_@/spool" +FONTMAP="@ghostscript@/share/ghostscript/@ghostscript_version@" +PATH_AFM="@ghostscript@/share/ghostscript/fonts" +PATH_DPSRIP="@out_@/spool/bin/ps2fax" +PATH_EGETTY="@coreutils@/bin/false" +PATH_GSRIP="@ghostscript@/bin/gs" +PATH_IMPRIP="@coreutils@/bin/false" +PATH_SENDMAIL="@coreutils@/bin/false" +PATH_VGETTY="@coreutils@/bin/false" +SYSVINIT=no +TIFFBIN="@libtiff@/bin" diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix new file mode 100644 index 000000000000..410d24974268 --- /dev/null +++ b/pkgs/servers/hylafaxplus/default.nix @@ -0,0 +1,95 @@ +{ stdenv +, lib +, fakeroot +, fetchurl +, libfaketime +, substituteAll +## runtime dependencies +, coreutils +, file +, findutils +, gawk +, ghostscript +, gnugrep +, gnused +, libtiff +, psmisc +, sharutils +, utillinux +, zlib +## optional packages (using `null` disables some functionality) +, jbigkit ? null +, lcms2 ? null # for colored faxes +, openldap ? null +, pam ? null +## system-dependent settings that have to be hardcoded +, maxgid ? 65534 # null -> try to auto-detect (bad on linux) +, maxuid ? 65534 # null -> hardcoded value 60002 +}: + +let + + name = "hylafaxplus-${version}"; + version = "5.6.0"; + sha256 = "128514kw9kb5cvznm87z7gis1mpyx4bcqrxx4xa7cbfj1v3v81fr"; + + configSite = substituteAll { + name = "hylafaxplus-config.site"; + src = ./config.site; + config_maxgid = lib.optionalString (maxgid!=null) ''CONFIG_MAXGID=${builtins.toString maxgid}''; + ghostscript_version = ghostscript.version; + out_ = "@out@"; # "out" will be resolved in post-install.sh + inherit coreutils ghostscript libtiff; + }; + + postPatch = substituteAll { + name = "hylafaxplus-post-patch.sh"; + src = ./post-patch.sh; + inherit configSite; + maxuid = lib.optionalString (maxuid!=null) (builtins.toString maxuid); + faxcover_binpath = lib.makeBinPath + [stdenv.shellPackage coreutils]; + faxsetup_binpath = lib.makeBinPath + [stdenv.shellPackage coreutils findutils gnused gnugrep gawk]; + }; + + postInstall = substituteAll { + name = "hylafaxplus-post-install.sh"; + src = ./post-install.sh; + inherit fakeroot libfaketime; + }; + +in + +stdenv.mkDerivation { + inherit name version; + src = fetchurl { + url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz"; + inherit sha256; + }; + # Note that `configure` (and maybe `faxsetup`) are looking + # for a couple of standard binaries in the `PATH` and + # hardcode their absolute paths in the new package. + buildInputs = [ + file # for `file` command + ghostscript + libtiff + psmisc # for `fuser` command + sharutils # for `uuencode` command + utillinux # for `agetty` command + zlib + jbigkit # optional + lcms2 # optional + openldap # optional + pam # optional + ]; + postPatch = ''. ${postPatch}''; + dontAddPrefix = true; + postInstall = ''. ${postInstall}''; + postInstallCheck = ''. ${./post-install-check.sh}''; + meta.description = "enterprise-class system for sending and receiving facsimiles"; + meta.homepage = http://hylafax.sourceforge.net; + meta.license = lib.licenses.bsd3; + meta.maintainers = [ lib.maintainers.yarny ]; + meta.platforms = lib.platforms.linux; +} diff --git a/pkgs/servers/hylafaxplus/post-install-check.sh b/pkgs/servers/hylafaxplus/post-install-check.sh new file mode 100644 index 000000000000..2850738edccc --- /dev/null +++ b/pkgs/servers/hylafaxplus/post-install-check.sh @@ -0,0 +1,7 @@ +# check if the package contains all the files needed +for x in faxq faxquit hfaxd faxcron faxqclean faxgetty +do + test -x "$out/spool/bin/$x" +done +test -d "$out/spool/config" +test -f "$out/spool/etc/setup.cache" diff --git a/pkgs/servers/hylafaxplus/post-install.sh b/pkgs/servers/hylafaxplus/post-install.sh new file mode 100644 index 000000000000..ddc7c3f85eda --- /dev/null +++ b/pkgs/servers/hylafaxplus/post-install.sh @@ -0,0 +1,24 @@ +# Parts of the `install` make target don't +# dare to set file modes (or owners), but put the +# needed commands in a new file called `root.sh`. +# We execute the `chmod` commands of +# this script to set execute bits. +sed '/chown/d;/chgrp/d' --in-place root.sh +. root.sh + +# We run `faxsetup` to prepare some config files +# that the admin would have to create otherwise. +# Since `faxsetup` is quite picky about its environment, +# we have to prepare some dummy files. +# `faxsetup` stores today's date in the output files, +# so we employ faketime to simulate a deterministic date. +echo "uucp:x:0" >> "$TMPDIR/passwd.dummy" # dummy uucp user +touch "$out/spool/etc/config.dummy" # dummy modem config +mkdir "$TMPDIR/lock.dummy" # dummy lock dir +"@libfaketime@/bin/faketime" -f "$(date --utc --date=@$SOURCE_DATE_EPOCH '+%F %T')" \ + "@fakeroot@/bin/fakeroot" -- \ + "$out/spool/bin/faxsetup" -with-DIR_LOCKS="$TMPDIR/lock.dummy" -with-PASSWD="$TMPDIR/passwd.dummy" +rm "$out/spool/etc/config.dummy" + +# Ensure all binaries are reachable within the spooling area. +ln --symbolic --target-directory="$out/spool/bin/" "$out/bin/"* diff --git a/pkgs/servers/hylafaxplus/post-patch.sh b/pkgs/servers/hylafaxplus/post-patch.sh new file mode 100644 index 000000000000..6ec5937147e2 --- /dev/null +++ b/pkgs/servers/hylafaxplus/post-patch.sh @@ -0,0 +1,25 @@ +# `configure` (maybe others) set `POSIXLY_CORRECT`, which +# breaks the gcc wrapper script of nixpkgs (maybe others). +# We simply un-export `POSIXLY_CORRECT` after each export so +# its effects don't apply within nixpkgs wrapper scripts. +grep -rlF POSIXLY_CORRECT | xargs \ + sed '/export *POSIXLY_CORRECT/a export -n POSIXLY_CORRECT' -i + +# Replace strange default value for the nobody account. +if test -n "@maxuid@" +then + for f in util/faxadduser.c hfaxd/manifest.h + do + substituteInPlace "$f" --replace 60002 "@maxuid@" + done +fi + +# Replace hardcoded `PATH` variables with proper paths. +# Note: `findutils` is needed for `faxcron`. +substituteInPlace faxcover/edit-faxcover.sh.in \ + --replace 'PATH=/bin' 'PATH="@faxcover_binpath@"' +substituteInPlace etc/faxsetup.sh.in \ + --replace 'PATH=/bin' 'PATH="@faxsetup_binpath@"' + +# Create `config.site` +substitute "@configSite@" config.site --subst-var out diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fbddb94b1b7..e6d055848dce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3196,6 +3196,8 @@ with pkgs; hwinfo = callPackage ../tools/system/hwinfo { }; + hylafaxplus = callPackage ../servers/hylafaxplus { }; + i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; i2p = callPackage ../tools/networking/i2p {}; From 12fa95f2d696b6babb365a27efef140e7113cc34 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 4 Aug 2018 17:08:54 +0200 Subject: [PATCH 293/600] modules: HylaFAX server configuration This commit adds the following * the uucp user * options for HylaFAX server to control startup and modems * systemd services for HylaFAX server processes including faxgettys for modems * systemd services to maintain the HylaFAX spool area, including cleanup with faxcron and faxqclean * default configuration for all server processes for a minimal working configuration Some notes: * HylaFAX configuration cannot be initialized with faxsetup (as it would be common on other Linux distributions). The hylafaxplus package contains a template spool area. * Modems are controlled by faxgetty. Send-only configuration (modems controlled by faxq) is not supported by this configuration setup. * To enable the service, one or more modems must be defined with config.services.hylafax.modems . * Sending mail *should* work: HylaFAX will use whatever is in config.services.mail.sendmailSetuidWrapper.program unless overridden with the sendmailPath option. * The admin has to create a hosts.hfaxd file somewhere (e.g. in /etc) before enabling HylaFAX. This file controls access to the server (see hosts.hfaxd(5) ). Sadly, HylaFAX does not permit account-based access control as is accepts connections via TCP only. * Active fax polling should work; I can't test it. * Passive fax polling is not supported by HylaFAX. * Pager transmissions (with sendpage) are disabled by default. I have never tested or used these. * Incoming data/voice/"extern"al calls won't be handled by default. I have never tested or used these. --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/module-list.nix | 1 + .../services/networking/hylafax/default.nix | 29 ++ .../networking/hylafax/faxq-default.nix | 12 + .../services/networking/hylafax/faxq-wait.sh | 29 ++ .../networking/hylafax/hfaxd-default.nix | 10 + .../networking/hylafax/modem-default.nix | 22 + .../services/networking/hylafax/options.nix | 375 ++++++++++++++++++ .../services/networking/hylafax/spool.sh | 111 ++++++ .../services/networking/hylafax/systemd.nix | 249 ++++++++++++ 10 files changed, 839 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/networking/hylafax/default.nix create mode 100644 nixos/modules/services/networking/hylafax/faxq-default.nix create mode 100755 nixos/modules/services/networking/hylafax/faxq-wait.sh create mode 100644 nixos/modules/services/networking/hylafax/hfaxd-default.nix create mode 100644 nixos/modules/services/networking/hylafax/modem-default.nix create mode 100644 nixos/modules/services/networking/hylafax/options.nix create mode 100755 nixos/modules/services/networking/hylafax/spool.sh create mode 100644 nixos/modules/services/networking/hylafax/systemd.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 8292cdc995e0..aafeb997c326 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -53,7 +53,7 @@ tomcat = 16; #audio = 17; # unused #floppy = 18; # unused - #uucp = 19; # unused + uucp = 19; #lp = 20; # unused #proc = 21; # unused pulseaudio = 22; # must match `pulseaudio' GID diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3f3123798f59..f51a30aec2e9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -517,6 +517,7 @@ ./services/networking/heyefi.nix ./services/networking/hostapd.nix ./services/networking/htpdate.nix + ./services/networking/hylafax/default.nix ./services/networking/i2pd.nix ./services/networking/i2p.nix ./services/networking/iodine.nix diff --git a/nixos/modules/services/networking/hylafax/default.nix b/nixos/modules/services/networking/hylafax/default.nix new file mode 100644 index 000000000000..6e28e8c5d8bc --- /dev/null +++ b/nixos/modules/services/networking/hylafax/default.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: + +{ + + imports = [ + ./options.nix + ./systemd.nix + ]; + + config = lib.modules.mkIf config.services.hylafax.enable { + environment.systemPackages = [ pkgs.hylafaxplus ]; + users.users.uucp = { + uid = config.ids.uids.uucp; + group = "uucp"; + description = "Unix-to-Unix CoPy system"; + isSystemUser = true; + inherit (config.users.users.nobody) home; + }; + assertions = [{ + assertion = config.services.hylafax.modems != {}; + message = '' + HylaFAX cannot be used without modems. + Please define at least one modem with + . + ''; + }]; + }; + +} diff --git a/nixos/modules/services/networking/hylafax/faxq-default.nix b/nixos/modules/services/networking/hylafax/faxq-default.nix new file mode 100644 index 000000000000..a2630ce66b71 --- /dev/null +++ b/nixos/modules/services/networking/hylafax/faxq-default.nix @@ -0,0 +1,12 @@ +{ ... }: + +# see man:hylafax-config(5) + +{ + + ModemGroup = [ ''"any:.*"'' ]; + ServerTracing = "0x78701"; + SessionTracing = "0x78701"; + UUCPLockDir = "/var/lock"; + +} diff --git a/nixos/modules/services/networking/hylafax/faxq-wait.sh b/nixos/modules/services/networking/hylafax/faxq-wait.sh new file mode 100755 index 000000000000..8c39e9d20c18 --- /dev/null +++ b/nixos/modules/services/networking/hylafax/faxq-wait.sh @@ -0,0 +1,29 @@ +#! @shell@ -e + +# skip this if there are no modems at all +if ! stat -t "@spoolAreaPath@"/etc/config.* >/dev/null 2>&1 +then + exit 0 +fi + +echo "faxq started, waiting for modem(s) to initialize..." + +for i in `seq @timeoutSec@0 -1 0` # gracefully timeout +do + sleep 0.1 + # done if status files exist, but don't mention initialization + if \ + stat -t "@spoolAreaPath@"/status/* >/dev/null 2>&1 \ + && \ + ! grep --silent --ignore-case 'initializing server' \ + "@spoolAreaPath@"/status/* + then + echo "modem(s) apparently ready" + exit 0 + fi + # if i reached 0, modems probably failed to initialize + if test $i -eq 0 + then + echo "warning: modem initialization timed out" + fi +done diff --git a/nixos/modules/services/networking/hylafax/hfaxd-default.nix b/nixos/modules/services/networking/hylafax/hfaxd-default.nix new file mode 100644 index 000000000000..8999dae57f41 --- /dev/null +++ b/nixos/modules/services/networking/hylafax/hfaxd-default.nix @@ -0,0 +1,10 @@ +{ ... }: + +# see man:hfaxd(8) + +{ + + ServerTracing = "0x91"; + XferLogFile = "/clientlog"; + +} diff --git a/nixos/modules/services/networking/hylafax/modem-default.nix b/nixos/modules/services/networking/hylafax/modem-default.nix new file mode 100644 index 000000000000..7529b5b0aafd --- /dev/null +++ b/nixos/modules/services/networking/hylafax/modem-default.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: + +# see man:hylafax-config(5) + +{ + + TagLineFont = "etc/LiberationSans-25.pcf"; + TagLineLocale = ''en_US.UTF-8''; + + AdminGroup = "root"; # groups that can change server config + AnswerRotary = "fax"; # don't accept anything else but faxes + LogFileMode = "0640"; + PriorityScheduling = true; + RecvFileMode = "0640"; + ServerTracing = "0x78701"; + SessionTracing = "0x78701"; + UUCPLockDir = "/var/lock"; + + SendPageCmd = ''${pkgs.coreutils}/bin/false''; # prevent pager transmit + SendUUCPCmd = ''${pkgs.coreutils}/bin/false''; # prevent UUCP transmit + +} diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix new file mode 100644 index 000000000000..4ac6d3fa8432 --- /dev/null +++ b/nixos/modules/services/networking/hylafax/options.nix @@ -0,0 +1,375 @@ +{ config, lib, pkgs, ... }: + +let + + inherit (lib.options) literalExample mkEnableOption mkOption; + inherit (lib.types) bool enum int lines loaOf nullOr path str submodule; + inherit (lib.modules) mkDefault mkIf mkMerge; + + commonDescr = '' + Values can be either strings or integers + (which will be added to the config file verbatimly) + or lists thereof + (which will be translated to multiple + lines with the same configuration key). + Boolean values are translated to "Yes" or "No". + The default contains some reasonable + configuration to yield an operational system. + ''; + + str1 = lib.types.addCheck str (s: s!=""); # non-empty string + int1 = lib.types.addCheck int (i: i>0); # positive integer + + configAttrType = + # Options in HylaFAX configuration files can be + # booleans, strings, integers, or list thereof + # representing multiple config directives with the same key. + # This type definition resolves all + # those types into a list of strings. + let + inherit (lib.types) attrsOf coercedTo listOf; + innerType = coercedTo bool (x: if x then "Yes" else "No") + (coercedTo int (toString) str); + in + attrsOf (coercedTo innerType lib.singleton (listOf innerType)); + + cfg = config.services.hylafax; + + modemConfigOptions = { name, config, ... }: { + options = { + name = mkOption { + type = str1; + example = "ttyS1"; + description = '' + Name of modem device, + will be searched for in /dev. + ''; + }; + type = mkOption { + type = str1; + example = "cirrus"; + description = '' + Name of modem configuration file, + will be searched for in config + in the spooling area directory. + ''; + }; + config = mkOption { + type = configAttrType; + example = { + AreaCode = "49"; + LocalCode = "30"; + FAXNumber = "123456"; + LocalIdentifier = "LostInBerlin"; + }; + description = '' + Attribute set of values for the given modem. + ${commonDescr} + Options defined here override options in + for this modem. + ''; + }; + }; + config.name = mkDefault name; + config.config.Include = [ "config/${config.type}" ]; + }; + + defaultConfig = + let + inherit (config.security) wrapperDir; + inherit (config.services.mail.sendmailSetuidWrapper) program; + mkIfDefault = cond: value: mkIf cond (mkDefault value); + noWrapper = config.services.mail.sendmailSetuidWrapper==null; + # If a sendmail setuid wrapper exists, + # we add the path to the default configuration file. + # Otherwise, we use `false` to provoke + # an error if hylafax tries to use it. + c.sendmailPath = mkMerge [ + (mkIfDefault noWrapper ''${pkgs.coreutils}/bin/false'') + (mkIfDefault (!noWrapper) ''${wrapperDir}/${program}'') + ]; + importDefaultConfig = file: + lib.attrsets.mapAttrs + (lib.trivial.const mkDefault) + (import file { inherit pkgs; }); + c.commonModemConfig = importDefaultConfig ./modem-default.nix; + c.faxqConfig = importDefaultConfig ./faxq-default.nix; + c.hfaxdConfig = importDefaultConfig ./hfaxd-default.nix; + in + c; + + localConfig = + let + c.hfaxdConfig.UserAccessFile = cfg.userAccessFile; + c.faxqConfig = lib.attrsets.mapAttrs + (lib.trivial.const (v: mkIf (v!=null) v)) + { + AreaCode = cfg.areaCode; + CountryCode = cfg.countryCode; + LongDistancePrefix = cfg.longDistancePrefix; + InternationalPrefix = cfg.internationalPrefix; + }; + c.commonModemConfig = c.faxqConfig; + in + c; + +in + + +{ + + + options.services.hylafax = { + + enable = mkEnableOption ''HylaFAX server''; + + autostart = mkOption { + type = bool; + default = true; + example = false; + description = '' + Autostart the HylaFAX queue manager at system start. + If this is false, the queue manager + will still be started if there are pending + jobs or if a user tries to connect to it. + ''; + }; + + countryCode = mkOption { + type = nullOr str1; + default = null; + example = "49"; + description = ''Country code for server and all modems.''; + }; + + areaCode = mkOption { + type = nullOr str1; + default = null; + example = "30"; + description = ''Area code for server and all modems.''; + }; + + longDistancePrefix = mkOption { + type = nullOr str; + default = null; + example = "0"; + description = ''Long distance prefix for server and all modems.''; + }; + + internationalPrefix = mkOption { + type = nullOr str; + default = null; + example = "00"; + description = ''International prefix for server and all modems.''; + }; + + spoolAreaPath = mkOption { + type = path; + default = "/var/spool/fax"; + description = '' + The spooling area will be created/maintained + at the location given here. + ''; + }; + + userAccessFile = mkOption { + type = path; + default = "/etc/hosts.hfaxd"; + description = '' + The hosts.hfaxd + file entry in the spooling area + will be symlinked to the location given here. + This file must exist and be + readable only by the uucp user. + See hosts.hfaxd(5) for details. + This configuration permits access for all users: + + environment.etc."hosts.hfaxd" = { + mode = "0600"; + user = "uucp"; + text = ".*"; + }; + + Note that host-based access can be controlled with + ; + by default, only 127.0.0.1 is permitted to connect. + ''; + }; + + sendmailPath = mkOption { + type = path; + example = literalExample "''${pkgs.postfix}/bin/sendmail"; + # '' ; # fix vim + description = '' + Path to sendmail program. + The default uses the local sendmail wrapper + (see ), + otherwise the false + binary to cause an error if used. + ''; + }; + + hfaxdConfig = mkOption { + type = configAttrType; + example.RecvqProtection = "0400"; + description = '' + Attribute set of lines for the global + hfaxd config file etc/hfaxd.conf. + ${commonDescr} + ''; + }; + + faxqConfig = mkOption { + type = configAttrType; + example = { + InternationalPrefix = "00"; + LongDistancePrefix = "0"; + }; + description = '' + Attribute set of lines for the global + faxq config file etc/config. + ${commonDescr} + ''; + }; + + commonModemConfig = mkOption { + type = configAttrType; + example = { + InternationalPrefix = "00"; + LongDistancePrefix = "0"; + }; + description = '' + Attribute set of default values for + modem config files etc/config.*. + ${commonDescr} + Think twice before changing + paths of fax-processing scripts. + ''; + }; + + modems = mkOption { + type = loaOf (submodule [ modemConfigOptions ]); + default = {}; + example.ttyS1 = { + type = "cirrus"; + config = { + FAXNumber = "123456"; + LocalIdentifier = "Smith"; + }; + }; + description = '' + Description of installed modems. + At least on modem must be defined + to enable the HylaFAX server. + ''; + }; + + spoolExtraInit = mkOption { + type = lines; + default = ""; + example = ''chmod 0755 . # everyone may read my faxes''; + description = '' + Additional shell code that is executed within the + spooling area directory right after its setup. + ''; + }; + + faxcron.enable.spoolInit = mkEnableOption '' + Purge old files from the spooling area with + faxcron + each time the spooling area is initialized. + ''; + faxcron.enable.frequency = mkOption { + type = nullOr str1; + default = null; + example = "daily"; + description = '' + Purge old files from the spooling area with + faxcron with the given frequency + (see systemd.time(7)). + ''; + }; + faxcron.infoDays = mkOption { + type = int1; + default = 30; + description = '' + Set the expiration time for data in the + remote machine information directory in days. + ''; + }; + faxcron.logDays = mkOption { + type = int1; + default = 30; + description = '' + Set the expiration time for + session trace log files in days. + ''; + }; + faxcron.rcvDays = mkOption { + type = int1; + default = 7; + description = '' + Set the expiration time for files in + the received facsimile queue in days. + ''; + }; + + faxqclean.enable.spoolInit = mkEnableOption '' + Purge old files from the spooling area with + faxqclean + each time the spooling area is initialized. + ''; + faxqclean.enable.frequency = mkOption { + type = nullOr str1; + default = null; + example = "daily"; + description = '' + Purge old files from the spooling area with + faxcron with the given frequency + (see systemd.time(7)). + ''; + }; + faxqclean.archiving = mkOption { + type = enum [ "never" "as-flagged" "always" ]; + default = "as-flagged"; + example = "always"; + description = '' + Enable or suppress job archiving: + never disables job archiving, + as-flagged archives jobs that + have been flagged for archiving by sendfax, + always forces archiving of all jobs. + See also sendfax(1) and faxqclean(8). + ''; + }; + faxqclean.doneqMinutes = mkOption { + type = int1; + default = 15; + example = literalExample ''24*60''; + description = '' + Set the job + age threshold (in minutes) that controls how long + jobs may reside in the doneq directory. + ''; + }; + faxqclean.docqMinutes = mkOption { + type = int1; + default = 60; + example = literalExample ''24*60''; + description = '' + Set the document + age threshold (in minutes) that controls how long + unreferenced files may reside in the docq directory. + ''; + }; + + }; + + + config.services.hylafax = + mkIf + (config.services.hylafax.enable) + (mkMerge [ defaultConfig localConfig ]) + ; + +} diff --git a/nixos/modules/services/networking/hylafax/spool.sh b/nixos/modules/services/networking/hylafax/spool.sh new file mode 100755 index 000000000000..31e930e8c597 --- /dev/null +++ b/nixos/modules/services/networking/hylafax/spool.sh @@ -0,0 +1,111 @@ +#! @shell@ -e + +# The following lines create/update the HylaFAX spool directory: +# Subdirectories/files with persistent data are kept, +# other directories/files are removed/recreated, +# mostly from the template spool +# directory in the HylaFAX package. + +# This block explains how the spool area is +# derived from the spool template in the HylaFAX package: +# +# + capital letter: directory; file otherwise +# + P/p: persistent directory +# + F/f: directory with symlinks per entry +# + T/t: temporary data +# + S/s: single symlink into package +# | +# | + u: change ownership to uucp:uucp +# | + U: ..also change access mode to user-only +# | | +# archive P U +# bin S +# client T u (client connection info) +# config S +# COPYRIGHT s +# dev T u (maybe some FIFOs) +# docq P U +# doneq P U +# etc F contains customized config files! +# etc/hosts.hfaxd f +# etc/xferfaxlog f +# info P u (database of called devices) +# log P u (communication logs) +# pollq P U +# recvq P u +# sendq P U +# status T u (modem status info files) +# tmp T U + + +shopt -s dotglob # if bash sees "*", it also includes dot files +lnsym () { ln --symbol "$@" ; } +lnsymfrc () { ln --symbolic --force "$@" ; } +cprd () { cp --remove-destination "$@" ; } +update () { install --owner=@faxuser@ --group=@faxgroup@ "$@" ; } + + +## create/update spooling area + +update --mode=0750 -d "@spoolAreaPath@" +cd "@spoolAreaPath@" + +persist=(archive docq doneq info log pollq recvq sendq) + +# remove entries that don't belong here +touch dummy # ensure "*" resolves to something +for k in * +do + keep=0 + for j in "${persist[@]}" xferfaxlog clientlog faxcron.lastrun + do + if test "$k" == "$j" + then + keep=1 + break + fi + done + if test "$keep" == "0" + then + rm --recursive "$k" + fi +done + +# create persistent data directories (unless they exist already) +update --mode=0700 -d "${persist[@]}" +chmod 0755 info log recvq + +# create ``xferfaxlog``, ``faxcron.lastrun``, ``clientlog`` +touch clientlog faxcron.lastrun xferfaxlog +chown @faxuser@:@faxgroup@ clientlog faxcron.lastrun xferfaxlog + +# create symlinks for frozen directories/files +lnsym --target-directory=. "@hylafax@"/spool/{COPYRIGHT,bin,config} + +# create empty temporary directories +update --mode=0700 -d client dev status +update -d tmp + + +## create and fill etc + +install -d "@spoolAreaPath@/etc" +cd "@spoolAreaPath@/etc" + +# create symlinks to all files in template's etc +lnsym --target-directory=. "@hylafax@/spool/etc"/* + +# set LOCKDIR in setup.cache +sed --regexp-extended 's|^(UUCP_LOCKDIR=).*$|\1'"'@lockPath@'|g" --in-place setup.cache + +# etc/{xferfaxlog,lastrun} are stored in the spool root +lnsymfrc --target-directory=. ../xferfaxlog +lnsymfrc --no-target-directory ../faxcron.lastrun lastrun + +# etc/hosts.hfaxd is provided by the NixOS configuration +lnsymfrc --no-target-directory "@userAccessFile@" hosts.hfaxd + +# etc/config and etc/config.${DEVID} must be copied: +# hfaxd reads these file after locking itself up in a chroot +cprd --no-target-directory "@globalConfigPath@" config +cprd --target-directory=. "@modemConfigPath@"/* diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix new file mode 100644 index 000000000000..91d9c1a37da6 --- /dev/null +++ b/nixos/modules/services/networking/hylafax/systemd.nix @@ -0,0 +1,249 @@ +{ config, lib, pkgs, ... }: + + +let + + inherit (lib) mkIf mkMerge; + inherit (lib) concatStringsSep optionalString; + + cfg = config.services.hylafax; + mapModems = lib.flip map (lib.attrValues cfg.modems); + + mkConfigFile = name: conf: + # creates hylafax config file, + # makes sure "Include" is listed *first* + let + mkLines = conf: + (lib.concatLists + (lib.flip lib.mapAttrsToList conf + (k: map (v: ''${k}: ${v}'') + ))); + include = mkLines { Include = conf.Include or []; }; + other = mkLines ( conf // { Include = []; } ); + in + pkgs.writeText ''hylafax-config${name}'' + (concatStringsSep "\n" (include ++ other)); + + globalConfigPath = mkConfigFile "" cfg.faxqConfig; + + modemConfigPath = + let + mkModemConfigFile = { config, name, ... }: + mkConfigFile ''.${name}'' + (cfg.commonModemConfig // config); + mkLine = { name, type, ... }@modem: '' + # check if modem config file exists: + test -f "${pkgs.hylafaxplus}/spool/config/${type}" + ln \ + --symbolic \ + --no-target-directory \ + "${mkModemConfigFile modem}" \ + "$out/config.${name}" + ''; + in + pkgs.runCommand "hylafax-config-modems" {} + ''mkdir --parents "$out/" ${concatStringsSep "\n" (mapModems mkLine)}''; + + setupSpoolScript = pkgs.substituteAll { + name = "hylafax-setup-spool.sh"; + src = ./spool.sh; + isExecutable = true; + inherit (pkgs.stdenv) shell; + hylafax = pkgs.hylafaxplus; + faxuser = "uucp"; + faxgroup = "uucp"; + lockPath = "/var/lock"; + inherit globalConfigPath modemConfigPath; + inherit (cfg) sendmailPath spoolAreaPath userAccessFile; + }; + + waitFaxqScript = pkgs.substituteAll { + # This script checks the modems status files + # and waits until all modems report readiness. + name = "hylafax-faxq-wait-start.sh"; + src = ./faxq-wait.sh; + isExecutable = true; + timeoutSec = toString 10; + inherit (pkgs.stdenv) shell; + inherit (cfg) spoolAreaPath; + }; + + sockets."hylafax-hfaxd" = { + description = "HylaFAX server socket"; + documentation = [ "man:hfaxd(8)" ]; + wantedBy = [ "multi-user.target" ]; + listenStreams = [ "127.0.0.1:4559" ]; + socketConfig.FreeBind = true; + socketConfig.Accept = true; + }; + + paths."hylafax-faxq" = { + description = "HylaFAX queue manager sendq watch"; + documentation = [ "man:faxq(8)" "man:sendq(5)" ]; + wantedBy = [ "multi-user.target" ]; + pathConfig.PathExistsGlob = [ ''${cfg.spoolAreaPath}/sendq/q*'' ]; + }; + + timers = mkMerge [ + ( + mkIf (cfg.faxcron.enable.frequency!=null) + { "hylafax-faxcron".timerConfig.Persistent = true; } + ) + ( + mkIf (cfg.faxqclean.enable.frequency!=null) + { "hylafax-faxqclean".timerConfig.Persistent = true; } + ) + ]; + + hardenService = + # Add some common systemd service hardening settings, + # but allow each service (here) to override + # settings by explicitely setting those to `null`. + # More hardening would be nice but makes + # customizing hylafax setups very difficult. + # If at all, it should only be added along + # with some options to customize it. + let + hardening = { + PrivateDevices = true; # breaks /dev/tty... + PrivateNetwork = true; + PrivateTmp = true; + ProtectControlGroups = true; + #ProtectHome = true; # breaks custom spool dirs + ProtectKernelModules = true; + ProtectKernelTunables = true; + #ProtectSystem = "strict"; # breaks custom spool dirs + RestrictNamespaces = true; + RestrictRealtime = true; + }; + filter = key: value: (value != null) || ! (lib.hasAttr key hardening); + apply = service: lib.filterAttrs filter (hardening // (service.serviceConfig or {})); + in + service: service // { serviceConfig = apply service; }; + + services."hylafax-spool" = { + description = "HylaFAX spool area preparation"; + documentation = [ "man:hylafax-server(4)" ]; + script = '' + ${setupSpoolScript} + cd "${cfg.spoolAreaPath}" + ${cfg.spoolExtraInit} + if ! test -f "${cfg.spoolAreaPath}/etc/hosts.hfaxd" + then + echo hosts.hfaxd is missing + exit 1 + fi + ''; + serviceConfig.ExecStop = ''${setupSpoolScript}''; + serviceConfig.RemainAfterExit = true; + serviceConfig.Type = "oneshot"; + unitConfig.RequiresMountsFor = [ cfg.spoolAreaPath ]; + }; + + services."hylafax-faxq" = { + description = "HylaFAX queue manager"; + documentation = [ "man:faxq(8)" ]; + requires = [ "hylafax-spool.service" ]; + after = [ "hylafax-spool.service" ]; + wants = mapModems ( { name, ... }: ''hylafax-faxgetty@${name}.service'' ); + wantedBy = mkIf cfg.autostart [ "multi-user.target" ]; + serviceConfig.Type = "forking"; + serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/faxq -q "${cfg.spoolAreaPath}"''; + # This delays the "readiness" of this service until + # all modems are initialized (or a timeout is reached). + # Otherwise, sending a fax with the fax service + # stopped will always yield a failed send attempt: + # The fax service is started when the job is created with + # `sendfax`, but modems need some time to initialize. + serviceConfig.ExecStartPost = [ ''${waitFaxqScript}'' ]; + # faxquit fails if the pipe is already gone + # (e.g. the service is already stopping) + serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}"''; + # disable some systemd hardening settings + serviceConfig.PrivateDevices = null; + serviceConfig.RestrictRealtime = null; + }; + + services."hylafax-hfaxd@" = { + description = "HylaFAX server"; + documentation = [ "man:hfaxd(8)" ]; + after = [ "hylafax-faxq.service" ]; + requires = [ "hylafax-faxq.service" ]; + serviceConfig.StandardInput = "socket"; + serviceConfig.StandardOutput = "socket"; + serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/hfaxd -q "${cfg.spoolAreaPath}" -d -I''; + unitConfig.RequiresMountsFor = [ cfg.userAccessFile ]; + # disable some systemd hardening settings + serviceConfig.PrivateDevices = null; + serviceConfig.PrivateNetwork = null; + }; + + services."hylafax-faxcron" = rec { + description = "HylaFAX spool area maintenance"; + documentation = [ "man:faxcron(8)" ]; + after = [ "hylafax-spool.service" ]; + requires = [ "hylafax-spool.service" ]; + wantedBy = mkIf cfg.faxcron.enable.spoolInit requires; + startAt = mkIf (cfg.faxcron.enable.frequency!=null) cfg.faxcron.enable.frequency; + serviceConfig.ExecStart = concatStringsSep " " [ + ''${pkgs.hylafaxplus}/spool/bin/faxcron'' + ''-q "${cfg.spoolAreaPath}"'' + ''-info ${toString cfg.faxcron.infoDays}'' + ''-log ${toString cfg.faxcron.logDays}'' + ''-rcv ${toString cfg.faxcron.rcvDays}'' + ]; + }; + + services."hylafax-faxqclean" = rec { + description = "HylaFAX spool area queue cleaner"; + documentation = [ "man:faxqclean(8)" ]; + after = [ "hylafax-spool.service" ]; + requires = [ "hylafax-spool.service" ]; + wantedBy = mkIf cfg.faxqclean.enable.spoolInit requires; + startAt = mkIf (cfg.faxqclean.enable.frequency!=null) cfg.faxqclean.enable.frequency; + serviceConfig.ExecStart = concatStringsSep " " [ + ''${pkgs.hylafaxplus}/spool/bin/faxqclean'' + ''-q "${cfg.spoolAreaPath}"'' + ''-v'' + (optionalString (cfg.faxqclean.archiving!="never") ''-a'') + (optionalString (cfg.faxqclean.archiving=="always") ''-A'') + ''-j ${toString (cfg.faxqclean.doneqMinutes*60)}'' + ''-d ${toString (cfg.faxqclean.docqMinutes*60)}'' + ]; + }; + + mkFaxgettyService = { name, ... }: + lib.nameValuePair ''hylafax-faxgetty@${name}'' rec { + description = "HylaFAX faxgetty for %I"; + documentation = [ "man:faxgetty(8)" ]; + bindsTo = [ "dev-%i.device" ]; + requires = [ "hylafax-spool.service" ]; + after = bindsTo ++ requires; + before = [ "hylafax-faxq.service" "getty.target" ]; + unitConfig.StopWhenUnneeded = true; + unitConfig.AssertFileNotEmpty = ''${cfg.spoolAreaPath}/etc/config.%I''; + serviceConfig.UtmpIdentifier = "%I"; + serviceConfig.TTYPath = "/dev/%I"; + serviceConfig.Restart = "always"; + serviceConfig.KillMode = "process"; + serviceConfig.IgnoreSIGPIPE = false; + serviceConfig.ExecStart = ''-${pkgs.hylafaxplus}/spool/bin/faxgetty -q "${cfg.spoolAreaPath}" /dev/%I''; + # faxquit fails if the pipe is already gone + # (e.g. the service is already stopping) + serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}" %I''; + # disable some systemd hardening settings + serviceConfig.PrivateDevices = null; + serviceConfig.RestrictRealtime = null; + }; + + modemServices = + lib.listToAttrs (mapModems mkFaxgettyService); + +in + +{ + config.systemd = mkIf cfg.enable { + inherit sockets timers paths; + services = lib.mapAttrs (lib.const hardenService) (services // modemServices); + }; +} From 2ed07fdb2bf30a202a44976d0263d8c44e20b5b3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 14:42:12 +0200 Subject: [PATCH 294/600] drgeo: add license + homepage --- pkgs/applications/science/geometry/drgeo/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 8db1beedebbb..e233b91bbc91 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { cp drgeo.desktop.in drgeo.desktop ''; - meta = { + meta = with stdenv.lib; { description = "Interactive geometry program"; - platforms = stdenv.lib.platforms.linux; + homepage = https://sourceforge.net/projects/ofset; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 258c202565cae23ad4e6b17670d9ab4313c31090 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 14:44:43 +0200 Subject: [PATCH 295/600] prooftree: add license --- pkgs/applications/science/logic/prooftree/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 01dfc35f6e0d..2d5fcfd2d261 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "A program for proof-tree visualization"; longDescription = '' Prooftree is a program for proof-tree visualization during interactive @@ -35,7 +35,8 @@ stdenv.mkDerivation (rec { shift-click). ''; homepage = http://askra.de/software/prooftree; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.jwiegley ]; + platforms = platforms.unix; + maintainers = [ maintainers.jwiegley ]; + license = licenses.gpl3; }; }) From 1cff2dd135ef9d267017cf414dff9e0baf48452d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 14:48:19 +0200 Subject: [PATCH 296/600] pynac: add license --- pkgs/applications/science/math/pynac/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 1a059aeb1670..9bbb695a331b 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { of the full GiNaC, and it is *only* meant to be used as a Python library. ''; homepage = http://pynac.org; + license = licenses.gpl3; maintainers = with maintainers; [ timokau ]; platforms = platforms.linux; }; From 70e254d6bd2100b09bf869137d87640ae27b89fe Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 14:51:28 +0200 Subject: [PATCH 297/600] root: add license --- pkgs/applications/science/misc/root/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index e966e798ae6d..2ec1ded68a26 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -67,10 +67,11 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { homepage = https://root.cern.ch/; description = "A data analysis framework"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = platforms.unix; + maintainers = [ maintainers.veprbl ]; + license = licenses.lgpl21; }; } From c2ff374951cbd743b6189750bbfc616b58b9f1fb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 14:55:41 +0200 Subject: [PATCH 298/600] bazaar: add license --- pkgs/applications/version-management/bazaar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index fea6fb358303..097c1e86a897 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -27,9 +27,10 @@ python2Packages.buildPythonApplication rec { --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt ''; - meta = { + meta = with stdenv.lib; { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } From 499b7e892713ec104de26cece63bcfac055adc4c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:01:25 +0200 Subject: [PATCH 299/600] bzr-tools: add license --- pkgs/applications/version-management/bazaar/tools.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index 0ad3c6079acd..82c87f30b711 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -3,7 +3,7 @@ python2Packages.buildPythonApplication rec { name = "bzr-tools-${version}"; version = "2.6.0"; - + src = fetchurl { url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb"; @@ -11,9 +11,10 @@ python2Packages.buildPythonApplication rec { doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Bazaar plugins"; homepage = http://wiki.bazaar.canonical.com/BzrTools; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } From 9f29e4c9c7c42085e9e3ed8b9833a02eb1b5380d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:04:33 +0200 Subject: [PATCH 300/600] cvs2svn: add license --- pkgs/applications/version-management/cvs2svn/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 90a9f26045f3..5dc0c48b0f78 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { /* !!! maybe we should absolutise the program names in $out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */ - meta = { + meta = with stdenv.lib; { description = "A tool to convert CVS repositories to Subversion repositories"; homepage = http://cvs2svn.tigris.org/; - maintainers = [ lib.maintainers.makefu ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.makefu ]; + platforms = platforms.unix; + license = licenses.asl20; }; } From edb1bfcd320e6c0184d4a80951f7c2b5fc702d5f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:07:58 +0200 Subject: [PATCH 301/600] guitone: add license --- pkgs/applications/version-management/guitone/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 88074a0862c1..33d2eb89ad08 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 based GUI for monotone"; - homepage = http://guitone.thomaskeller.biz; + homepage = https://guitone.thomaskeller.biz; downloadPage = https://code.monotone.ca/p/guitone/; + license = stdenv.lib.licenses.gpl3; inherit (qt4.meta) platforms; }; } From ae795a6acd5923b179f1a30a9f40fb6edd5e1d69 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:12:27 +0200 Subject: [PATCH 302/600] monotone: add license --- .../applications/version-management/monotone/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 4282f48654e6..0606c58c09d5 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost zlib botan libidn lua pcre sqlite expect + buildInputs = [ boost zlib botan libidn lua pcre sqlite expect openssl gmp bzip2 ]; postInstall = '' @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { #doCheck = true; # some tests fail (and they take VERY long) - meta = { + meta = with stdenv.lib; { description = "A free distributed version control system"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; + license = licenses.gpl2; }; } From bcedf59d84201679939836b5997c024497e10b1d Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 8 Sep 2018 15:15:41 +0200 Subject: [PATCH 303/600] perl-packages: remove rycee from maintainers I no longer use or develop Perl regularly so cannot vouch for these packages anymore. --- pkgs/top-level/perl-packages.nix | 72 -------------------------------- 1 file changed, 72 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8903436d5955..4d3bd223d412 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1250,7 +1250,6 @@ let meta = { description = "Serves PODs right from your Catalyst application"; license = stdenv.lib.licenses.bsd3; - maintainers = [ maintainers.rycee ]; }; }; @@ -1478,7 +1477,6 @@ let propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -1506,7 +1504,6 @@ let meta = { description = "Catalyst Plugin for Log::Handler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1534,7 +1531,6 @@ let meta = { description = "Per-session custom expiry times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1572,7 +1568,6 @@ let meta = { description = "File storage backend for session data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1614,7 +1609,6 @@ let meta = { description = "Handle passing of status messages between screens of a web application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1629,7 +1623,6 @@ let meta = { description = "CSV view class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -1752,7 +1745,6 @@ let meta = { description = "Handle Common Gateway Interface requests and responses"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -1895,7 +1887,6 @@ let meta = { description = "Unified cache handling interface"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -2509,7 +2500,6 @@ let homepage = https://github.com/rjbs/Config-INI; description = "Simple .ini-file format"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -2568,7 +2558,6 @@ let homepage = https://github.com/rjbs/Config-MVP; description = "Multivalue-property package-oriented configuration"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -2801,7 +2790,6 @@ let meta = { description = "Read and write Changes files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -3074,7 +3062,6 @@ let meta = with stdenv.lib; { description = "Perl wrapper around OpenSSL's AES library"; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; platforms = platforms.unix; }; }; @@ -3561,7 +3548,6 @@ let meta = { description = "Domain and host name validation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -3576,7 +3562,6 @@ let meta = { description = "IPv4 and IPv6 validation methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -3590,7 +3575,6 @@ let meta = { description = "Common URL validation methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -3823,7 +3807,6 @@ let meta = { description = "Parse and format MySQL dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -4333,7 +4316,6 @@ let meta = { description = "Adding keywords to perl, in perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -4495,7 +4477,6 @@ let meta = { description = "Perl extension for 32 bit Jenkins Hashing Algorithm"; license = stdenv.lib.licenses.artistic2; - maintainers = [ maintainers.rycee ]; }; }; @@ -4915,7 +4896,6 @@ let homepage = https://github.com/rjbs/Email-Abstract; description = "Unified interface to mail representations"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -4967,7 +4947,6 @@ let homepage = https://github.com/rjbs/Email-Date-Format; description = "Produce RFC 2822 date strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5009,7 +4988,6 @@ let homepage = https://github.com/rjbs/Email-MIME; description = "Easy MIME message handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -5038,7 +5016,6 @@ let homepage = https://github.com/rjbs/Email-MIME-ContentType; description = "Parse a MIME Content-Type Header"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; propagatedBuildInputs = [ Encode ]; }; @@ -5054,7 +5031,6 @@ let homepage = https://github.com/rjbs/Email-MIME-Encodings; description = "A unified interface to MIME encoding and decoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -5069,7 +5045,6 @@ let homepage = https://github.com/rjbs/Email-Send; description = "Simply Sending Email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; buildInputs = [ MIMETools MailTools ]; }; @@ -5102,7 +5077,6 @@ let homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5117,7 +5091,6 @@ let homepage = https://github.com/rjbs/Email-Simple; description = "Simple parsing of RFC2822 message format and headers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5140,7 +5113,6 @@ let propagatedBuildInputs = [ EmailValid ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5220,7 +5192,6 @@ let meta = { description = "Determine the locale encoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5936,7 +5907,6 @@ let meta = { description = "Determine MIME types of data or files using libmagic"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -6053,7 +6023,6 @@ let meta = { description = "Read a file backwards by lines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -6239,7 +6208,6 @@ let homepage = https://github.com/tommybutler/file-util/wiki; description = "Easy, versatile, portable file handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -6352,7 +6320,6 @@ let meta = { description = "Validation with simple chains of constraints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; buildInputs = [ CGI ]; }; @@ -6868,7 +6835,6 @@ let meta = { description = "Provide the stuff missing in Hash::Util"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -7591,7 +7557,6 @@ let meta = { description = "Alternative but compatible interface to modules that export symbols"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -7694,7 +7659,6 @@ let meta = { description = "Open an HTML file with automatic charset detection"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -7825,7 +7789,6 @@ let meta = { description = "IO::Socket with read/write timeout"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -8785,7 +8748,6 @@ let homepage = https://github.com/preaction/Log-Any; description = "Bringing loggers and listeners together"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -8830,7 +8792,6 @@ let meta = { description = "Log messages to several outputs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -8890,7 +8851,6 @@ let homepage = https://mschilli.github.io/log4perl/; description = "Log4j implementation for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9221,7 +9181,6 @@ let meta = { description = "Various e-mail related modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9510,7 +9469,6 @@ let meta = { description = "Low-calorie MIME generator (DEPRECATED)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9551,7 +9509,6 @@ let homepage = https://github.com/rjbs/mixin-linewise; description = "Write your linewise code for handles; this does the rest"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10095,7 +10052,6 @@ let meta = { description = "Minimalist Object Orientation (with Moose compatibility)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10403,7 +10359,6 @@ let homepage = https://github.com/gfx/mousex-getopt; description = "A Mouse role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10504,7 +10459,6 @@ let homepage = https://github.com/moose/MooseX-Getopt; description = "A Moose role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10763,7 +10717,6 @@ let homepage = https://github.com/moose/MooseX-Types; description = "Organise your Moose types in libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -11060,7 +11013,6 @@ let meta = { description = "Manages IPv4 and IPv6 addresses and subnets"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -11253,7 +11205,6 @@ let meta = { description = "Work with TLD names"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -11794,7 +11745,6 @@ let homepage = https://github.com/dluxhu/perl-parallel-forkmanager; description = "A simple parallel processing fork manager"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12189,7 +12139,6 @@ let meta = { description = "A PerlIO layer that adds read & write timeout to a handle"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12811,7 +12760,6 @@ let homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger; description = "A thing that takes a string of Perl and rewrites its documentation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12852,7 +12800,6 @@ let homepage = https://github.com/neilb/Pod-POM; description = "POD Object Model"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12866,7 +12813,6 @@ let meta = { description = "Generate the TOC of a POD with Pod::POM"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13041,7 +12987,6 @@ let homepage = https://github.com/rjbs/Pod-Weaver; description = "Weave together a Pod document from an outline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13105,7 +13050,6 @@ let homepage = https://github.com/sanko/readonly; description = "Facility for creating read-only scalars, arrays, hashes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13130,7 +13074,6 @@ let homepage = https://github.com/PerlRedis/perl-redis; description = "Perl binding for Redis database"; license = stdenv.lib.licenses.artistic2; - maintainers = [ maintainers.rycee ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -13318,7 +13261,6 @@ let meta = { description = "Roles. Like a nouvelle cuisine portion size slice of Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13593,7 +13535,6 @@ let homepage = https://github.com/rjbs/Software-License; description = "Packages that provide templated software licenses"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14147,7 +14088,6 @@ let homepage = https://github.com/rjbs/Sub-Exporter-ForMethods; description = "Helper routines for using Sub::Exporter to build methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14201,7 +14141,6 @@ let meta = { description = "Tool for inspecting subroutines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14228,7 +14167,6 @@ let homepage = https://github.com/p5sagit/Sub-Name; description = "(Re)name a sub"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14408,7 +14346,6 @@ let meta = { description = "Perl interface to the UNIX syslog(3) calls"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14797,7 +14734,6 @@ let meta = { description = "Format a header and rows into a table"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14873,7 +14809,6 @@ let meta = { description = "Distribution with a rich set of tools built upon the Test2 framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14964,7 +14899,6 @@ let meta = { description = "Easily create test classes in an xUnit/JUnit style"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -15173,7 +15107,6 @@ let homepage = https://github.com/rjbs/Test-Fatal; description = "Incredibly simple helpers for testing code with exceptions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -15860,7 +15793,6 @@ let meta = { description = "Basic utilities for writing tests"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16015,7 +15947,6 @@ let homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16212,7 +16143,6 @@ let meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16226,7 +16156,6 @@ let meta = { description = "Encoding aware Text::CSV"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16734,7 +16663,6 @@ let homepage = https://github.com/rjbs/Throwable; description = "A role for classes that can be thrown"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; From ffb5eca618071552eb9e88286b3cce222c454a44 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:15:58 +0200 Subject: [PATCH 304/600] vcprompt: add license --- pkgs/applications/version-management/vcprompt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index 4afb1b20e32c..c2bf0a4183c1 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = http://hg.gerg.ca/vcprompt; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; + license = licenses.gpl2Plus; }; } From 6960a96a0c7fa7dcfb3282ef352942a68515a3ad Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 Sep 2018 15:20:39 +0200 Subject: [PATCH 305/600] jbake: fix sandbox build (#46363) See https://hydra.nixos.org/build/80999410 Without a sandbox the `checkPhase` breaks with the following error: ``` /nix/store/i6vl5lwlz5jbkg4r6p340dwmj6fha3xq-stdenv-linux/setup: bin/jbake: /usr/bin/env: bad interpreter: No such file or directory jbake did not return correct version ``` Running `patchShebangs` before fixes the issue. Addresses #45960 --- pkgs/development/tools/jbake/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 152cddc101d6..9c3094fb4fec 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper jre ]; + postPatch = "patchShebangs ."; + installPhase = '' mkdir -p $out cp -vr * $out From 2be3ed40622e5b8baeb6f6998389be781d43763f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:27:50 +0200 Subject: [PATCH 306/600] tivodecode: add license --- pkgs/applications/video/tivodecode/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index b158bc924605..83ca41e201c9 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation { sha256 = "1pww5r2iygscqn20a1cz9xbfh18p84a6a5ifg4h5nvyn9b63k23q"; }; - meta = { + meta = with stdenv.lib; { description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file"; homepage = http://tivodecode.sourceforge.net; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } From 6e6e41b56e2fe1b02a2a5c1576ebbfb54b3aed27 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:28:10 +0200 Subject: [PATCH 307/600] xine-ui: add license --- pkgs/applications/video/xine-ui/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 69fc68a69deb..4dfc3fd052a2 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "xine-ui-0.99.10"; - + src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a"; }; - + nativeBuildInputs = [ pkgconfig shared-mime-info ]; buildInputs = @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; configureFlags = [ "--with-readline=${readline.dev}" ]; - + LIRC_CFLAGS="-I${lirc}/include"; LIRC_LIBS="-L ${lirc}/lib -llirc_client"; #NIX_LDFLAGS = "-lXext -lgcc_s"; - meta = { + meta = with stdenv.lib; { homepage = http://www.xine-project.org/; description = "Xlib-based interface to Xine, a video player"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From d18bf127350bc6de4b2370d295e09e3ced8bc1bd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:28:25 +0200 Subject: [PATCH 308/600] fbpanel: add license --- pkgs/applications/window-managers/fbpanel/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index b521240b48f5..0c13691a36ac 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { description = "A stand-alone panel"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.mit; }; passthru = { From de6544b50e53e0e843f95d876f4cca743fed00e0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 Sep 2018 16:16:26 +0200 Subject: [PATCH 309/600] pdf2htmlEX: mark as broken See https://hydra.nixos.org/build/81003667 The build is currently broken on Hydra due to the following error: ``` CairoFontEngine.cc:681:17: error: 'void Object::free()' is private within this context ``` This issue is was also reported in AUR (https://aur.archlinux.org/packages/pdf2htmlex/) and in the upstream issue tracker (https://github.com/coolwanglu/pdf2htmlEX/issues/753) with no answer until now. The current README.md states that the project is no longer under active development and it seems as there are currently no active maintainers who could fix this: * https://github.com/coolwanglu/pdf2htmlEX/commit/5d0a2239fcf6ef60a1140edb917fad69d751d6e3 * https://github.com/coolwanglu/pdf2htmlEX/issues/772 --- pkgs/tools/typesetting/pdf2htmlEX/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix index e0f3681f43d8..ad9684910c0b 100644 --- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix +++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.taktoa ]; platforms = with platforms; linux; + broken = true; # 2018-09-08 }; } From d02c6a56cc8af61825625943ff38e469154a91d6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Sep 2018 14:14:01 +0200 Subject: [PATCH 310/600] sks: Copy the web examples to $webSamples for the module --- pkgs/servers/sks/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index fe4029db1c14..e4f5ea1f57c9 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; }; + outputs = [ "out" "webSamples" ]; + buildInputs = [ ocaml zlib db perl camlp4 ]; makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; @@ -26,6 +28,9 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "./sks unit_test"; + # Copy the web examples for the NixOS module + postInstall = "cp -R sampleWeb $webSamples"; + meta = with stdenv.lib; { description = "An easily deployable & decentralized OpenPGP keyserver"; longDescription = '' From a0d3d098ffd027a4a6a0b3d7db7edd59dcfb78af Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Sep 2018 15:19:40 +0200 Subject: [PATCH 311/600] nixos/sks: Add a webroot option The module will now, by default, serve a simple webpage via the built-in web server (instead of displaying an error message). --- nixos/modules/services/security/sks.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix index 5e4b1a71fdd9..009b5980813f 100644 --- a/nixos/modules/services/security/sks.nix +++ b/nixos/modules/services/security/sks.nix @@ -53,6 +53,21 @@ in { type = types.ints.u16; description = "HKP port to listen on."; }; + + webroot = mkOption { + type = types.path; + default = "${sksPkg.webSamples}/OpenPKG"; + defaultText = "\${pkgs.sks.webSamples}/OpenPKG"; + description = '' + Source directory (will be symlinked) for the files the built-in + webserver should serve. SKS (''${pkgs.sks.webSamples}) provides the + following examples: "HTML5", "OpenPKG", and "XHTML+ES". The index + file can be named index.html, index.htm, index.xhtm, or index.xhtml. + Files with the extensions .css, .es, .js, .jpg, .jpeg, .png, or .gif + are supported. Subdirectories and filenames with anything other than + alphanumeric characters and the '.' character will be ignored. + ''; + }; }; }; @@ -78,6 +93,7 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' + ln -sfT "${cfg.webroot}" web mkdir -p ${home}/dump ${sksPkg}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/ ${sksPkg}/bin/sks cleandb || true From a6934b2389f9e2bb55675fc93498d949adb3bb40 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Sep 2018 16:08:37 +0200 Subject: [PATCH 312/600] sks: Adapt the package to NixOS (pkgs.db provides only "db_stat") --- pkgs/servers/sks/adapt-to-nixos.patch | 27 +++++++++++++++++++++++++++ pkgs/servers/sks/default.nix | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/servers/sks/adapt-to-nixos.patch diff --git a/pkgs/servers/sks/adapt-to-nixos.patch b/pkgs/servers/sks/adapt-to-nixos.patch new file mode 100644 index 000000000000..b4403e8c7bc7 --- /dev/null +++ b/pkgs/servers/sks/adapt-to-nixos.patch @@ -0,0 +1,27 @@ +--- a/version.ml 2018-09-08 15:56:18.919154257 +0200 ++++ b/version.ml 2018-09-08 15:56:07.544028575 +0200 +@@ -24,16 +24,6 @@ + + let run () = + let bdb_version = Bdb.version () in +- let dbstats_dir = +- let split = Str.regexp_string "." in +- let major_minor_string major minor = +- sprintf "Further details about the BDB environment can be seen by \ +- executing\ndb%s.%s_stat -x in the KDB and Ptree directories\n" major minor +- in +- match Str.split split bdb_version with +- | major :: minor :: _ -> major_minor_string major minor +- | [] | _ :: [] -> major_minor_string "X" "Y" +- in + printf "SKS version %s%s\n" + Common.version Common.version_suffix; + +@@ -44,5 +34,6 @@ + requirement for recon of SKS %s\n" + Common.compatible_version_string; + +- printf "%s" dbstats_dir ++ printf "Further details about the BDB environment can be seen by executing\n\ ++ db_stat -x in the KDB and PTree directories\n" + diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index e4f5ea1f57c9..deeeabda7451 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; }; + # pkgs.db provides db_stat, not db$major.$minor_stat + patches = [ ./adapt-to-nixos.patch ]; + outputs = [ "out" "webSamples" ]; buildInputs = [ ocaml zlib db perl camlp4 ]; From eb0050ca458870deb17e0bedfdf1eeda3c67bf9e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Sep 2018 16:10:29 +0200 Subject: [PATCH 313/600] nixos/sks: Use a group and don't add sks to systemPackages Without a group the gid will default to 65534 (2^16 - 2) which maps to "nogroup". IMO it makes more sense to explicitly set a valid group. Adding pkgs.sks to environment.systemPackages is not required (IIRC we want to avoid bloating environment.systemPackages). Instead it seems like a better idea to make the relevant binaries available to the user sks and enable useDefaultShell so that "su -l sks" can be used for manual interaction (that way the files will always have the correct owner). --- nixos/modules/services/security/sks.nix | 29 ++++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix index 009b5980813f..e285b94b170a 100644 --- a/nixos/modules/services/security/sks.nix +++ b/nixos/modules/services/security/sks.nix @@ -73,20 +73,22 @@ in { config = mkIf cfg.enable { - environment.systemPackages = [ sksPkg ]; - - users.users.sks = { - createHome = true; - home = cfg.dataDir; - isSystemUser = true; - shell = "${pkgs.coreutils}/bin/true"; + users = { + users.sks = { + isSystemUser = true; + description = "SKS user"; + home = cfg.dataDir; + createHome = true; + group = "sks"; + useDefaultShell = true; + packages = [ sksPkg pkgs.db ]; + }; + groups.sks = { }; }; systemd.services = let hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ; hkpPort = builtins.toString cfg.hkpPort; - home = config.users.users.sks.home; - user = config.users.users.sks.name; in { "sks-db" = { description = "SKS database server"; @@ -94,14 +96,15 @@ in { wantedBy = [ "multi-user.target" ]; preStart = '' ln -sfT "${cfg.webroot}" web - mkdir -p ${home}/dump - ${sksPkg}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/ + mkdir -p dump + ${sksPkg}/bin/sks build dump/*.gpg -n 10 -cache 100 || true #*/ ${sksPkg}/bin/sks cleandb || true ${sksPkg}/bin/sks pbuild -cache 20 -ptree_cache 70 || true ''; serviceConfig = { - WorkingDirectory = home; - User = user; + WorkingDirectory = "~"; + User = "sks"; + Group = "sks"; Restart = "always"; ExecStart = "${sksPkg}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}"; }; From 53ef5441bb261bcb52b5ffe7cab77ba46114e7e9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Sep 2018 16:45:58 +0200 Subject: [PATCH 314/600] nixos/sks: Make the webroot option optional That way the built-in web server is usable by default but users can use $HOME/web directly (instead of having to use a symlink), if they want to customize the webpage. --- nixos/modules/services/security/sks.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix index e285b94b170a..9f0261038d5b 100644 --- a/nixos/modules/services/security/sks.nix +++ b/nixos/modules/services/security/sks.nix @@ -55,17 +55,18 @@ in { }; webroot = mkOption { - type = types.path; + type = types.nullOr types.path; default = "${sksPkg.webSamples}/OpenPKG"; defaultText = "\${pkgs.sks.webSamples}/OpenPKG"; description = '' - Source directory (will be symlinked) for the files the built-in - webserver should serve. SKS (''${pkgs.sks.webSamples}) provides the - following examples: "HTML5", "OpenPKG", and "XHTML+ES". The index - file can be named index.html, index.htm, index.xhtm, or index.xhtml. - Files with the extensions .css, .es, .js, .jpg, .jpeg, .png, or .gif - are supported. Subdirectories and filenames with anything other than - alphanumeric characters and the '.' character will be ignored. + Source directory (will be symlinked, if not null) for the files the + built-in webserver should serve. SKS (''${pkgs.sks.webSamples}) + provides the following examples: "HTML5", "OpenPKG", and "XHTML+ES". + The index file can be named index.html, index.htm, index.xhtm, or + index.xhtml. Files with the extensions .css, .es, .js, .jpg, .jpeg, + .png, or .gif are supported. Subdirectories and filenames with + anything other than alphanumeric characters and the '.' character + will be ignored. ''; }; }; @@ -95,7 +96,8 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - ln -sfT "${cfg.webroot}" web + ${lib.optionalString (cfg.webroot != null) + "ln -sfT \"${cfg.webroot}\" web"} mkdir -p dump ${sksPkg}/bin/sks build dump/*.gpg -n 10 -cache 100 || true #*/ ${sksPkg}/bin/sks cleandb || true From 91ddedf4a00031802ebaa6fb2da2fced9e2e1b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 8 Sep 2018 12:26:43 -0300 Subject: [PATCH 315/600] deepin-sound-theme: init at 15.10.3 --- .../deepin/deepin-sound-theme/default.nix | 23 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-sound-theme/default.nix diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix new file mode 100644 index 000000000000..f12419a615b3 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "deepin-sound-theme-${version}"; + version = "15.10.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-sound-theme"; + rev = version; + sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Deepin sound theme"; + homepage = https://github.com/linuxdeepin/deepin-sound-theme; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index c1438012ef51..50d777492839 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -10,6 +10,7 @@ let deepin-menu = callPackage ./deepin-menu { }; deepin-mutter = callPackage ./deepin-mutter { }; deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; + deepin-sound-theme = callPackage ./deepin-sound-theme { }; deepin-terminal = callPackage ./deepin-terminal { inherit (pkgs.gnome3) libgee vte; wnck = pkgs.libwnck3; From 2c7c248a534bab9f9f6adbfb1e4c31934574d2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 8 Sep 2018 12:30:30 -0300 Subject: [PATCH 316/600] go-gir-generator: init at 1.0.4 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/go-gir-generator/default.nix | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/desktops/deepin/go-gir-generator/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 50d777492839..dff959bd9b08 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -17,6 +17,7 @@ let }; dtkcore = callPackage ./dtkcore { }; dtkwidget = callPackage ./dtkwidget { }; + go-gir-generator = callPackage ./go-gir-generator { }; qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; qt5integration = callPackage ./qt5integration { }; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix new file mode 100644 index 000000000000..cc05f6f055b0 --- /dev/null +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, libgudev }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "go-gir-generator"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0yi3lsgkxi8ghz2c7msf2df20jxkvzj8s47slvpzz4m57i82vgzl"; + }; + + nativeBuildInputs = [ + pkgconfig + go + ]; + + buildInputs = [ + gobjectIntrospection + libgudev + ]; + + makeFlags = [ + "PREFIX=$(out)" + "HOME=$(TMP)" + ]; + + meta = with stdenv.lib; { + description = "Generate static golang bindings for GObject"; + homepage = https://github.com/linuxdeepin/go-gir-generator; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} From a36e9a415c5e575c044175c0d7f0f6f7d41efa16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 8 Sep 2018 12:32:00 -0300 Subject: [PATCH 317/600] go-lib: init at 1.2.16.1 --- pkgs/desktops/deepin/default.nix | 1 + pkgs/desktops/deepin/go-lib/default.nix | 34 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/desktops/deepin/go-lib/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index dff959bd9b08..4aa5e6c3bbb8 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -18,6 +18,7 @@ let dtkcore = callPackage ./dtkcore { }; dtkwidget = callPackage ./dtkwidget { }; go-gir-generator = callPackage ./go-gir-generator { }; + go-lib = callPackage ./go-lib { }; qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; qt5integration = callPackage ./qt5integration { }; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix new file mode 100644 index 000000000000..44de8889df28 --- /dev/null +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio, + mobile-broadband-provider-info +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "go-lib"; + version = "1.2.16.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0nl35dm0bdca38qhnzdpsv6b0vds9ccvm4c86rs42a7c6v655b1q"; + }; + + buildInputs = [ + glib + xorg.libX11 + gdk_pixbuf + pulseaudio + mobile-broadband-provider-info + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Go bindings for Deepin Desktop Environment development"; + homepage = https://github.com/linuxdeepin/go-lib; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} From 3f28e941e490c605d427342f0d85e0f7e3a0f2a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 8 Sep 2018 12:33:13 -0300 Subject: [PATCH 318/600] go-dbus-generator: init at 0.6.6 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/go-dbus-generator/default.nix | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/desktops/deepin/go-dbus-generator/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4aa5e6c3bbb8..3a9a2e24b062 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -17,6 +17,7 @@ let }; dtkcore = callPackage ./dtkcore { }; dtkwidget = callPackage ./dtkwidget { }; + go-dbus-generator = callPackage ./go-dbus-generator { }; go-gir-generator = callPackage ./go-gir-generator { }; go-lib = callPackage ./go-lib { }; qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix new file mode 100644 index 000000000000..2933c58f8d95 --- /dev/null +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, go, go-lib }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "go-dbus-generator"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "17rzicqizyyrhjjf4rild7py1cyd07b2zdcd9nabvwn4gvj6lhfb"; + }; + + nativeBuildInputs = [ + go + go-lib + ]; + + makeFlags = [ + "PREFIX=$(out)" + "GOPATH=$(GGOPATH):${go-lib}/share/gocode" + "HOME=$(TMP)" + ]; + + meta = with stdenv.lib; { + description = "Convert dbus interfaces to go-lang or qml wrapper code"; + homepage = https://github.com/linuxdeepin/go-dbus-generator; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} From c1d1207463d5894e17cc32c584eacea56faeaa97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 8 Sep 2018 12:35:45 -0300 Subject: [PATCH 319/600] go-dbus-factory: init at 0.0.7.1 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/go-dbus-factory/default.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/desktops/deepin/go-dbus-factory/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 3a9a2e24b062..1d52038cdd92 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -17,6 +17,7 @@ let }; dtkcore = callPackage ./dtkcore { }; dtkwidget = callPackage ./dtkwidget { }; + go-dbus-factory = callPackage ./go-dbus-factory { }; go-dbus-generator = callPackage ./go-dbus-generator { }; go-gir-generator = callPackage ./go-gir-generator { }; go-lib = callPackage ./go-lib { }; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix new file mode 100644 index 000000000000..a488bd7202cb --- /dev/null +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "go-dbus-factory"; + version = "0.0.7.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx"; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with stdenv.lib; { + description = "GoLang DBus factory for the Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/go-dbus-factory; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} From 2c57a6a70450009489ce2efd97e3fc764a9e081f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 8 Sep 2018 12:36:43 -0300 Subject: [PATCH 320/600] dbus-factory: init at 3.1.17 --- pkgs/desktops/deepin/dbus-factory/default.nix | 30 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/desktops/deepin/dbus-factory/default.nix diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix new file mode 100644 index 000000000000..66d28cbcaf3e --- /dev/null +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dbus-factory"; + version = "3.1.17"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1llq8wzgikgpzj7z36fyzk8kjych2h9nzi3x6zv53z0xc1xn4256"; + }; + + nativeBuildInputs = [ + jq + libxml2 + go-dbus-generator + ]; + + makeFlags = [ "GOPATH=$(out)/share/gocode" ]; + + meta = with stdenv.lib; { + description = "Generates static DBus bindings for Golang and QML at build-time"; + homepage = https://github.com/linuxdeepin/dbus-factory; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 1d52038cdd92..49da151eefee 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -3,6 +3,7 @@ let packages = self: with self; { + dbus-factory = callPackage ./dbus-factory { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; From bda4992564e03f7645506700e178af09dcc2c40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 8 Sep 2018 18:14:53 +0200 Subject: [PATCH 321/600] treewide: Fix variables in homepages --- pkgs/data/fonts/medio/default.nix | 2 +- pkgs/data/fonts/penna/default.nix | 2 +- pkgs/data/fonts/route159/default.nix | 2 +- pkgs/data/fonts/seshat/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix index 8b484b3b5efd..aa805b6f0825 100644 --- a/pkgs/data/fonts/medio/default.nix +++ b/pkgs/data/fonts/medio/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "Serif font designed by Sora Sagano"; longDescription = '' Medio is a serif font designed by Sora Sagano, based roughly diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix index 893553a62ce2..b1244c47bf1b 100644 --- a/pkgs/data/fonts/penna/default.nix +++ b/pkgs/data/fonts/penna/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "Geometric sans serif designed by Sora Sagano"; longDescription = '' Penna is a geometric sans serif designed by Sora Sagano, diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix index 7e2480a77dc5..892078a1151b 100644 --- a/pkgs/data/fonts/route159/default.nix +++ b/pkgs/data/fonts/route159/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "A weighted sans serif font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix index 36e4f2fa10ff..6b22716f1ebb 100644 --- a/pkgs/data/fonts/seshat/default.nix +++ b/pkgs/data/fonts/seshat/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "Roman body font designed for main text by Sora Sagano"; longDescription = '' Seshat is a Roman body font designed for the main text. By From 9ef77854f7f304aa941444e929e70e1e4465bbc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 8 Sep 2018 18:30:00 +0200 Subject: [PATCH 322/600] treewide: Use http/https for homepages --- pkgs/development/coq-modules/QuickChick/default.nix | 2 +- pkgs/development/coq-modules/category-theory/default.nix | 2 +- pkgs/development/coq-modules/coq-haskell/default.nix | 2 +- pkgs/development/python-modules/urlgrabber/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 35cf63af8627..fc88a1c33eed 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = git://github.com/QuickChick/QuickChick.git; + homepage = https://github.com/QuickChick/QuickChick; description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 795c177bc80d..c707fcdbd6be 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = git://github.com/jwiegley/category-theory.git; + homepage = https://github.com/jwiegley/category-theory; description = "A formalization of category theory in Coq for personal study and practical work"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index a66e941a8c9c..9d9a4cb5f1a1 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = git://github.com/jwiegley/coq-haskell.git; + homepage = https://github.com/jwiegley/coq-haskell; description = "A library for formalizing Haskell types and functions in Coq"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index f399f4d426ee..528846d72381 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycurl ]; meta = with stdenv.lib; { - homepage = "urlgrabber.baseurl.org"; + homepage = http://urlgrabber.baseurl.org; license = licenses.lgpl2Plus; description = "Python module for downloading files"; maintainers = with maintainers; [ qknight ]; From 9c97f37761a5eaa7387aabcd2c3cc631a2b712a3 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Sat, 8 Sep 2018 12:12:11 -0500 Subject: [PATCH 323/600] nixos/zeronet: Fix TOR permissions, add torAlways option --- nixos/modules/services/networking/zeronet.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index 2377cb2c8f11..8b60799891ca 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -12,6 +12,8 @@ let log_dir = ${cfg.logDir} '' + lib.optionalString (cfg.port != null) '' ui_port = ${toString cfg.port} + '' + lib.optionalString (cfg.torAlways) '' + tor = always '' + cfg.extraConfig; }; in with lib; { @@ -35,11 +37,17 @@ in with lib; { port = mkOption { type = types.nullOr types.int; default = null; - example = 15441; - description = "Optional zeronet port."; + example = 43110; + description = "Optional zeronet web UI port."; }; tor = mkOption { + type = types.bool; + default = false; + description = "Use TOR for zeronet traffic where possible."; + }; + + torAlways = mkOption { type = types.bool; default = false; description = "Use TOR for all zeronet traffic."; @@ -60,9 +68,13 @@ in with lib; { services.tor = mkIf cfg.tor { enable = true; controlPort = 9051; - extraConfig = "CookieAuthentication 1"; + extraConfig = '' + CacheDirectoryGroupReadable 1 + CookieAuthentication 1 + CookieAuthFileGroupReadable 1 + ''; }; - + systemd.services.zeronet = { description = "zeronet"; after = [ "network.target" (optionalString cfg.tor "tor.service") ]; From 4f6c4030dc36c25f3c51e9bdd43fa4bc76724d14 Mon Sep 17 00:00:00 2001 From: countingsort Date: Sat, 8 Sep 2018 19:44:25 +0200 Subject: [PATCH 324/600] bunny: 1.1 -> 1.2 --- pkgs/tools/package-management/bunny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix index c73f3fb524cd..623c7a5b2f6b 100644 --- a/pkgs/tools/package-management/bunny/default.nix +++ b/pkgs/tools/package-management/bunny/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bunny-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitLab { owner = "tim241"; repo = "bunny"; rev = version; - sha256 = "0mxhj23fscbyqb9hfpmimgjn6nbx1lx3dl2msgwdy281zs25w8ki"; + sha256 = "13qsgv4n4c96pgm2l5kvwxpk97x2jpk3wp2m56vdj07hcgywgj3h"; }; dontBuild = true; From cb380983ed941e5e40fa7423c26f363636a42233 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 8 Sep 2018 13:29:54 -0400 Subject: [PATCH 325/600] qt5.qtwebkit: Fixes modules src being subtly broken. b785d4813e5d0f428b9563b3cea7cc6953fc24db introduced breakage in Qt modules for 5.6 and 5.9, especially visible is Qt Webkit. This was manifested by having a non-sensical build log where it is using the top-level `src` attribute as source instead of Qt Webkit's own source. Were it not for the `src` top-level attribute (which is a legit package), the error would have been made obvious by passing `null` to `src`. This partily reverts newly introduced way `src` can be passed to a qtModule, instead relying on extending the `srcs` attrset. For ZHF #45960 --- .../libraries/qt-5/5.11/default.nix | 23 +++++++++++-------- .../libraries/qt-5/modules/qtwebkit.nix | 5 ---- pkgs/development/libraries/qt-5/qtModule.nix | 2 +- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 2a706fc7b6e8..d65fe9d219c0 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -34,7 +34,18 @@ let qtCompatVersion = "5.11"; mirror = "http://download.qt.io"; - srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; + srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { + # Community port of the now unmaintained upstream qtwebkit. + qtwebkit = { + src = fetchFromGitHub { + owner = "annulen"; + repo = "webkit"; + rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8"; + sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf"; + }; + version = "5.212-alpha-01-26-2018"; + }; + }; patches = { qtbase = [ @@ -102,15 +113,7 @@ let qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix {}; - qtwebkit = callPackage ../modules/qtwebkit.nix { - src = fetchFromGitHub { - owner = "annulen"; - repo = "webkit"; - rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8"; - sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf"; - }; - version = "5.212-alpha-01-26-2018"; - }; + qtwebkit = callPackage ../modules/qtwebkit.nix {}; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 833433fabeca..970ee2e5c807 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -5,8 +5,6 @@ , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby , darwin , flashplayerFix ? false -, src ? null -, version ? null }: let @@ -35,9 +33,6 @@ qtModule { cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ]; - inherit src; - inherit version; - __impureHostDeps = optionals (stdenv.isDarwin) [ "/usr/lib/libicucore.dylib" ]; diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index e18564aaabe2..84a9d30918b1 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -8,7 +8,7 @@ args: let inherit (args) name; - version = if (args.version or null) == null then srcs."${name}".version else args.version; + version = args.version or srcs."${name}".version; src = args.src or srcs."${name}".src; in From 39ed38f017b285af1b74f6ba58d218a476ea490f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 8 Sep 2018 20:24:31 +0200 Subject: [PATCH 326/600] sequeler: 0.6.0 -> 0.6.1 Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.1 --- pkgs/applications/misc/sequeler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index cc676bb28e2e..ba4984a0f155 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -4,7 +4,7 @@ let - version = "0.6.0"; + version = "0.6.1"; sqlGda = libgda.override { mysqlSupport = true; postgresSupport = true; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "Alecaddd"; repo = "sequeler"; rev = "v${version}"; - sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai"; + sha256 = "1gafd8bmwpby7gjzfr7q25rrdmyh1f175fxc1yrcr5nplfyzwfnb"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ]; From 8c6cf3de3d1d448ba17b5d0433068862d7f6efc9 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Sat, 8 Sep 2018 21:24:15 +0200 Subject: [PATCH 327/600] cryptsetup: enable and fix tests (#46346) Some tests use O_DIRECT which is filesystem dependent and fails in a sandbox as well as on some filesystems without sandboxing. Patch out O_DIRECT and disable the 4 test cases that still fail in a sandbox. See discussion in #46151. --- pkgs/os-specific/linux/cryptsetup/default.nix | 10 ++++++++++ .../cryptsetup/disable-failing-tests.patch | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 178fc7d91408..2b5c3817ddf7 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -14,8 +14,16 @@ stdenv.mkDerivation rec { sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx"; }; + # Disable 4 test cases that fail in a sandbox + patches = [ ./disable-failing-tests.patch ]; + postPatch = '' patchShebangs tests + + # O_DIRECT is filesystem dependent and fails in a sandbox (on tmpfs) + # and on several filesystem types (btrfs, zfs) without sandboxing. + # Remove it, see discussion in #46151 + substituteInPlace tests/unit-utils-io.c --replace "| O_DIRECT" "" ''; NIX_LDFLAGS = "-lgcc_s"; @@ -30,6 +38,8 @@ stdenv.mkDerivation rec { buildInputs = [ lvm2 json_c openssl libuuid popt ] ++ stdenv.lib.optional enablePython python2; + doCheck = true; + meta = { homepage = https://gitlab.com/cryptsetup/cryptsetup/; description = "LUKS for dm-crypt"; diff --git a/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch b/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch new file mode 100644 index 000000000000..1504bf3e1511 --- /dev/null +++ b/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch @@ -0,0 +1,19 @@ +diff -ur a/tests/blockwise-compat b/tests/blockwise-compat +--- a/tests/blockwise-compat 2018-09-08 12:23:11.706555098 +0200 ++++ b/tests/blockwise-compat 2018-09-08 12:24:24.444393460 +0200 +@@ -148,15 +148,11 @@ + # device/file fn_name length + RUN "P" $1 read_buffer $BSIZE + RUN "P" $1 read_buffer $((2*BSIZE)) +- RUN "F" $1 read_buffer $((BSIZE-1)) +- RUN "F" $1 read_buffer $((BSIZE+1)) + RUN "P" $1 read_buffer 0 + + RUN "P" $1 write_buffer $BSIZE + RUN "P" $1 write_buffer $((2*BSIZE)) + +- RUN "F" $1 write_buffer $((BSIZE-1)) +- RUN "F" $1 write_buffer $((BSIZE+1)) + RUN "F" $1 write_buffer 0 + + # basic blockwise functions From 73e75a7d165abd693d6c6c900abd919827939b24 Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Sat, 8 Sep 2018 21:32:04 +0200 Subject: [PATCH 328/600] pythonPackages.confluent-kafka: fix build (#46380) cc #45960 --- pkgs/development/python-modules/confluent-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 0638ea3a36d2..a0183e4595c4 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures}: buildPythonPackage rec { version = "0.11.5"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "bfb5807bfb5effd74f2cfe65e4e3e8564a9e72b25e099f655d8ad0d362a63b9f"; }; - buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ; + buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro futures ]) ; # Tests fail for python3 under this pypi release doCheck = if isPy3k then false else true; From 113f4d7b445e90b17a636584bbda40155baa3409 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Sat, 8 Sep 2018 21:35:33 +0200 Subject: [PATCH 329/600] pythonPackages.persistent: fix build (#46364) Documentation-related tests failed, the docs didn't build correctly because of missing dependencies sphinx and manuel. Add them. --- pkgs/development/python-modules/persistent/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 542a68728af1..721385f3ed6a 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,12 +1,14 @@ { buildPythonPackage , fetchPypi , zope_interface +, sphinx, manuel }: buildPythonPackage rec { pname = "persistent"; version = "4.4.2"; + nativeBuildInputs = [ sphinx manuel ]; propagatedBuildInputs = [ zope_interface ]; src = fetchPypi { From b19cdc31c12ee262b9892f2f60903483bf5a7f31 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Sat, 8 Sep 2018 13:13:23 -0700 Subject: [PATCH 330/600] vkquake: fix build --- pkgs/games/quakespasm/vulkan.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 2cf09e2ec938..6f69c6469503 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,4 +1,5 @@ -{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-loader }: +{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: + stdenv.mkDerivation rec { name = "vkquake-${version}"; majorVersion = "1.00"; @@ -13,8 +14,12 @@ stdenv.mkDerivation rec { sourceRoot = "source/Quake"; + nativeBuildInputs = [ + makeWrapper vulkan-headers + ]; + buildInputs = [ - makeWrapper gzip SDL2 libvorbis libmad vulkan-loader.dev + gzip SDL2 libvorbis libmad vulkan-loader ]; buildFlags = [ "DO_USERDIRS=1" ]; From 0b2b7b2d537ddc988cae617e33918e1c73a23c13 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Thu, 12 Apr 2018 15:32:14 -0700 Subject: [PATCH 331/600] steamcmd: init at 20180104 --- pkgs/games/steam/default.nix | 1 + pkgs/games/steam/steamcmd.nix | 46 +++++++++++++++++++++++++++++++++ pkgs/games/steam/steamcmd.sh | 24 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 73 insertions(+) create mode 100644 pkgs/games/steam/steamcmd.nix create mode 100644 pkgs/games/steam/steamcmd.sh diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index e8a911bebd5e..5aab54b83221 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -19,6 +19,7 @@ let then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped else null; }; + steamcmd = callPackage ./steamcmd.nix { }; }; in self diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix new file mode 100644 index 000000000000..6a2c7fe01b4f --- /dev/null +++ b/pkgs/games/steam/steamcmd.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, steam-run, bash +, steamRoot ? "~/.local/share/Steam" +}: + +stdenv.mkDerivation rec { + name = "steamcmd-${version}"; + version = "20180104"; # According to steamcmd_linux.tar.gz mtime + + src = fetchurl { + url = https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz; + sha256 = "0z0y0zqvhydmfc9y9vg5am0vz7m3gbj4l2dwlrfz936hpx301gyf"; + }; + + # The source tarball does not have a single top-level directory. + preUnpack = '' + mkdir $name + cd $name + sourceRoot=. + ''; + + buildInputs = [ bash steam-run ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/steamcmd/linux32 + install -Dm755 steamcmd.sh $out/share/steamcmd/steamcmd.sh + install -Dm755 linux32/* $out/share/steamcmd/linux32 + + mkdir -p $out/bin + substitute ${./steamcmd.sh} $out/bin/steamcmd \ + --subst-var shell \ + --subst-var out \ + --subst-var-by steamRoot "${steamRoot}" \ + --subst-var-by steamRun ${steam-run} + chmod 0755 $out/bin/steamcmd + ''; + + meta = with stdenv.lib; { + description = "Steam command-line tools"; + homepage = "https://developer.valvesoftware.com/wiki/SteamCMD"; + platforms = platforms.linux; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ tadfisher ]; + }; +} diff --git a/pkgs/games/steam/steamcmd.sh b/pkgs/games/steam/steamcmd.sh new file mode 100644 index 000000000000..e092a4fedbe9 --- /dev/null +++ b/pkgs/games/steam/steamcmd.sh @@ -0,0 +1,24 @@ +#!@bash@/bin/bash -e + +# Always run steamcmd in the user's Steam root. +STEAMROOT=@steamRoot@ + +# Create a facsimile Steam root if it doesn't exist. +if [ ! -e "$STEAMROOT" ]; then + mkdir -p "$STEAMROOT"/{appcache,config,logs,Steamapps/common} + mkdir -p ~/.steam + ln -sf "$STEAMROOT" ~/.steam/root + ln -sf "$STEAMROOT" ~/.steam/steam +fi + +# Copy the system steamcmd install to the Steam root. If we don't do +# this, steamcmd assumes the path to `steamcmd` is the Steam root. +# Note that symlinks don't work here. +if [ ! -e "$STEAMROOT/steamcmd.sh" ]; then + mkdir -p "$STEAMROOT/linux32" + # steamcmd.sh will replace these on first use + cp @out@/share/steamcmd/steamcmd.sh "$STEAMROOT/." + cp @out@/share/steamcmd/linux32/* "$STEAMROOT/linux32/." +fi + +@steamRun@/bin/steam-run "$STEAMROOT/steamcmd.sh" "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3cb6069caf8..7aefe4edd667 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20210,6 +20210,8 @@ with pkgs; nativeOnly = true; }).run; + steamcmd = steamPackages.steamcmd; + linux-steam-integration = callPackage ../games/linux-steam-integration { gtk = pkgs.gtk3; }; From 50ea36953e324b1dd4af4baea6e7712afb5c6745 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 8 Sep 2018 23:12:22 +0200 Subject: [PATCH 332/600] testssl: 2.9.5-5 -> 2.9.5-6 Changelog: https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-6 --- pkgs/applications/networking/testssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 5a548d5ff65f..cc0cffb6e3b3 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -2,7 +2,7 @@ , dnsutils, coreutils, openssl, nettools, utillinux, procps }: let - version = "2.9.5-5"; + version = "2.9.5-6"; in stdenv.mkDerivation rec { name = "testssl.sh-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "0zgj9vhd8fv3a1cn8dxqmjd8qmgryc867gq7zbvbr41lkqc06a1r"; + sha256 = "0wn7lxz0ibv59v0acbsk5z3rsmr65zr1q7n4kxva1cw5xzq9ya6k"; }; nativeBuildInputs = [ makeWrapper ]; From 7a5b42161f59d7398d1f88af10c178ce592ff387 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 02:36:31 +0200 Subject: [PATCH 333/600] slurm: 17.11.9-2 -> 18.08.0-1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index a191d7a721d5..ba0e57bb2be8 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.9-2"; + version = "18.08.0-1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "1lq4ac6yjai6wh979dciw8v3d99zbd3w36rfh0vpncqm672fg1qy"; + sha256 = "0mnaynnpz0cyd1lspcln6h6w5d7brcw3yiqsfxqrfhlmygyp21wq"; }; outputs = [ "out" "dev" ]; From 0051772890908ec8323d4fe1c4ffdb8498f3b759 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 02:37:29 +0200 Subject: [PATCH 334/600] nixos/slurm: add option clusterName slurm 18.08 requires ClusterName to be set (set to default). --- nixos/modules/services/computing/slurm/slurm.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 1e1c5bc9f035..09174ed39f5e 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -8,6 +8,7 @@ let # configuration file can be generated by http://slurm.schedmd.com/configurator.html configFile = pkgs.writeTextDir "slurm.conf" '' + ClusterName=${cfg.clusterName} ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''} @@ -105,6 +106,15 @@ in ''; }; + clusterName = mkOption { + type = types.str; + default = "default"; + example = "myCluster"; + description = '' + Necessary to distinguish accounting records in a multi-cluster environment. + ''; + }; + nodeName = mkOption { type = types.nullOr types.str; default = null; From 7dd2f4ec9c5e4c5b53f912554cb899dbacae6f10 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 23:16:37 +0200 Subject: [PATCH 335/600] pyslurm: 20180811 -> 20180908 --- pkgs/development/python-modules/pyslurm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 24704bd8f309..f004ab1054dd 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20180811"; + version = "20180908"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "2d4f0553de971309b7e465d4d64528b8a5fafb05"; - sha256 = "1cy57gyvvmzx0c8fx4h6p8dgan0ay6pdivdf24k1xiancjnw20xr"; + rev = "50dc113e99d82e70e84fc2e812333733708be4ed"; + sha256 = "1j2i4rvhmk2ihhcvsjdlqlxqb5a05jg8k9bqkv3zrvdj71yn4z9k"; }; buildInputs = [ cython slurm ]; From 9110f768cf4069348e8025e1fb45ce43a62ab39a Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sat, 8 Sep 2018 21:12:44 +0100 Subject: [PATCH 336/600] pyre: 0.9.0 -> 0.11.0 --- pkgs/development/tools/pyre/default.nix | 80 ++++++++++++++++--- .../tools/pyre/pyre-bdist-wheel.patch | 43 ++++++++++ 2 files changed, 113 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/tools/pyre/pyre-bdist-wheel.patch diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index 1d7f8025bb0e..a62310878ba2 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -1,24 +1,30 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript }: +{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript +, jbuilder, python3, rsync, fetchpatch }: let # Manually set version - the setup script requires # hg and git + keeping the .git directory around. - version = "0.0.10"; + pyre-version = "0.0.11"; versionFile = writeScript "version.ml" '' cat > "./version.ml" < Makefile + sed "s/%VERSION%/external ${pyre-version}/" Makefile.template > Makefile + sed "s/%VERSION%/external/" dune.in > dune cp ${versionFile} ./scripts/generate-version-number.sh mkdir $(pwd)/build export OCAMLFIND_DESTDIR=$(pwd)/build export OCAMLPATH=$OCAMLPATH:$(pwd)/build + make release ''; @@ -60,7 +70,7 @@ in stdenv.mkDerivation { # Improvement for a future version. installPhase = '' mkdir -p $out/bin - cp _build/all/main.native $out/bin/pyre.bin + cp ./_build/default/main.exe $out/bin/pyre.bin ''; meta = with stdenv.lib; { @@ -70,4 +80,54 @@ in stdenv.mkDerivation { platforms = with platforms; linux; maintainers = with maintainers; [ teh ]; }; +}; +typeshed = stdenv.mkDerivation { + name = "typeshed"; + # typeshed doesn't have versions, it seems to be synchronized with + # mypy relases. I'm assigning a random version here (same as pyre). + version = pyre-version; + src = fetchFromGitHub { + owner = "python"; + repo = "typeshed"; + rev = "a08c6ea"; + sha256 = "0wy8yh43vhyyc4g7iqnmlj66kz5in02y5qc0c4jdckhpa3mchaqk"; + }; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = "cp -r $src $out"; +}; +in python3.pkgs.buildPythonApplication rec { + pname = "pyre-check"; + version = pyre-version; + src = fetchFromGitHub { + owner = "facebook"; + repo = "pyre-check"; + rev = "v${pyre-version}"; + sha256 = "0ig7bx2kfn2kbxw74wysh5365yp5gyby42l9l29iclrzdghgk32l"; + }; + patches = [ + (fetchpatch { + url = "https://github.com/facebook/pyre-check/commit/b473d2ed9fc11e7c1cd0c7b8c42f521e5cdc2003.patch"; + sha256 = "05xvyp7j4n6z92bxf64rxfq5pvaadxgx1c8c5qziy75vdz72lkcy"; + }) + ./pyre-bdist-wheel.patch + ]; + + # The build-pypi-package script does some funky stuff with build + # directories - easier to patch it a bit than to replace it + # completely though: + postPatch = '' + mkdir ./build + substituteInPlace scripts/build-pypi-package.sh \ + --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \ + --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$(pwd)/build" + ''; + + buildInputs = [ pyre-bin rsync ]; + propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ]; + buildPhase = '' + bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed} + cp -r build/dist dist + ''; + + doCheck = false; # can't open file 'nix_run_setup': } diff --git a/pkgs/development/tools/pyre/pyre-bdist-wheel.patch b/pkgs/development/tools/pyre/pyre-bdist-wheel.patch new file mode 100644 index 000000000000..1b6fea024e03 --- /dev/null +++ b/pkgs/development/tools/pyre/pyre-bdist-wheel.patch @@ -0,0 +1,43 @@ +diff --git a/scripts/build-pypi-package.sh b/scripts/build-pypi-package.sh +index 1035591..bb8cbae 100755 +--- a/scripts/build-pypi-package.sh ++++ b/scripts/build-pypi-package.sh +@@ -98,7 +98,7 @@ rsync -avm --filter='- tests/' --filter='+ */' --filter='-! *.py' "${SCRIPTS_DIR + sed -i -e "/__version__/s/= \".*\"/= \"${PACKAGE_VERSION}\"/" "${BUILD_ROOT}/${MODULE_NAME}/version.py" + + # Copy binary files. +-BINARY_FILE="${SCRIPTS_DIRECTORY}/../_build/default/main.exe" ++BINARY_FILE="NIX_BINARY_FILE" + if [[ ! -f "${BINARY_FILE}" ]]; then + echo "The binary file ${BINARY_FILE} does not exist." + echo "Have you run 'make' in the toplevel directory?" +@@ -146,7 +146,7 @@ def find_typeshed_files(base): + result.append((target, files)) + return result + +-with open('README.md') as f: ++with open('README.md', encoding='utf8') as f: + long_description = f.read() + + setup( +@@ -205,20 +205,3 @@ fi + + # Build. + python3 setup.py bdist_wheel +- +-# Move artifact outside the build directory. +-mkdir -p "${SCRIPTS_DIRECTORY}/dist" +-files_count="$(find "${BUILD_ROOT}/dist/" -type f | wc -l | tr -d ' ')" +-[[ "${files_count}" == '1' ]] || \ +- die "${files_count} files created in ${BUILD_ROOT}/dist, but only one was expected" +-source_file="$(find "${BUILD_ROOT}/dist/" -type f)" +-destination="$(basename "${source_file}")" +-destination="${destination/%-any.whl/-${WHEEL_DISTRIBUTION_PLATFORM}.whl}" +-mv "${source_file}" "${SCRIPTS_DIRECTORY}/dist/${destination}" +- +-# Cleanup. +-cd "${SCRIPTS_DIRECTORY}" +-rm -rf "${BUILD_ROOT}" +- +-printf '\nAll done. Build artifact available at:\n %s\n' "${SCRIPTS_DIRECTORY}/dist/${destination}" +-exit 0 From fb0e0dcbc65a7b54bcf98b37b16b06412f0b042f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 8 Sep 2018 16:38:51 -0500 Subject: [PATCH 337/600] xdg/mime.nix: ensure $out/share/mime/packages exists For update-mime-database to work, you must have to have some mime packages installed. In some DEs like XFCE this is not guaranteed to happen. In that case just skip the update-mime-database call. Fixes #46162 --- nixos/modules/config/xdg/mime.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index f1b672234a34..eb8ac2a54ace 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -23,7 +23,7 @@ with lib; ]; environment.extraSetup = '' - if [ -w $out/share/mime ]; then + if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null fi From b23f6a37146aaf7f87788658594585a391da86ce Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 8 Sep 2018 21:43:42 +0000 Subject: [PATCH 338/600] nixos: xdg: fix indent and eol spaces --- nixos/modules/config/xdg/mime.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index eb8ac2a54ace..4323a49ea1dd 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -7,7 +7,7 @@ with lib; type = types.bool; default = true; description = '' - Whether to install files to support the + Whether to install files to support the XDG Shared MIME-info specification and the XDG MIME Applications specification. ''; @@ -17,18 +17,18 @@ with lib; config = mkIf config.xdg.mime.enable { environment.pathsToLink = [ "/share/mime" ]; - environment.systemPackages = [ - # this package also installs some useful data, as well as its utilities - pkgs.shared-mime-info + environment.systemPackages = [ + # this package also installs some useful data, as well as its utilities + pkgs.shared-mime-info ]; environment.extraSetup = '' if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then - XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null + XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null fi if [ -w $out/share/applications ]; then - ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications + ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications fi ''; }; From 5e94e2bc7c2f349d44a74bf935b4bc4ff950b89f Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sat, 8 Sep 2018 13:32:24 -0700 Subject: [PATCH 339/600] wkhtmltopdf: 0.12.4 -> 0.12.5, use Qt5 --- pkgs/tools/graphics/wkhtmltopdf/default.nix | 112 +----------------- pkgs/tools/graphics/wkhtmltopdf/makefix.patch | 24 ---- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 7 insertions(+), 133 deletions(-) delete mode 100644 pkgs/tools/graphics/wkhtmltopdf/makefix.patch diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 3ecd91aaca14..14ba0f8c2a9a 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,113 +1,21 @@ -{ stdenv, fetchFromGitHub, fetchpatch, qt4, fontconfig, freetype, libpng, zlib, libjpeg -, openssl, libX11, libXext, libXrender, overrideDerivation }: +{ stdenv, fetchFromGitHub, qt5, fontconfig, freetype, libpng, zlib, libjpeg +, openssl, libX11, libXext, libXrender }: stdenv.mkDerivation rec { - version = "0.12.4"; + version = "0.12.5"; name = "wkhtmltopdf-${version}"; src = fetchFromGitHub { owner = "wkhtmltopdf"; repo = "wkhtmltopdf"; rev = version; - sha256 = "09yzj9ylc6ci4a1qlhz60cgxi1nm9afwjrjxfikf8wwjd3i24vp2"; + sha256 = "0i6b6z3f4szspbbi23qr3hv22j9bhmcj7c1jizr7y0ra43mrgws1"; }; - wkQt = overrideDerivation qt4 (deriv: { - name = "qt-mod-4.8.7"; - enableParallelBuilding = true; - src = fetchFromGitHub { - owner = "wkhtmltopdf"; - repo = "qt"; - rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo. - sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23"; - }; - configureFlags = - '' - -dbus-linked - -glib - -no-separate-debug-info - -openssl-linked - -qdbus - -v - '' - + # This is taken from the wkhtml build script that we don't run - '' - -confirm-license - -exceptions - -fast - -graphicssystem raster - -iconv - -largefile - -no-3dnow - -no-accessibility - -no-audio-backend - -no-avx - -no-cups - -no-dbus - -no-declarative - -no-glib - -no-gstreamer - -no-gtkstyle - -no-icu - -no-javascript-jit - -no-libmng - -no-libtiff - -nomake demos - -nomake docs - -nomake examples - -nomake tests - -nomake tools - -nomake translations - -no-mitshm - -no-mmx - -no-multimedia - -no-nas-sound - -no-neon - -no-nis - -no-opengl - -no-openvg - -no-pch - -no-phonon - -no-phonon-backend - -no-qt3support - -no-rpath - -no-scripttools - -no-sm - -no-sql-ibase - -no-sql-mysql - -no-sql-odbc - -no-sql-psql - -no-sql-sqlite - -no-sql-sqlite2 - -no-sse - -no-sse2 - -no-sse3 - -no-sse4.1 - -no-sse4.2 - -no-ssse3 - -no-stl - -no-xcursor - -no-xfixes - -no-xinerama - -no-xinput - -no-xkb - -no-xrandr - -no-xshape - -no-xsync - -opensource - -release - -static - -system-libjpeg - -system-libpng - -system-zlib - -webkit - -xmlpatterns - ''; - }); - buildInputs = [ - wkQt fontconfig freetype libpng zlib libjpeg openssl + fontconfig freetype libpng zlib libjpeg openssl libX11 libXext libXrender + qt5.qtwebkit qt5.qtsvg ]; prePatch = '' @@ -116,14 +24,6 @@ stdenv.mkDerivation rec { done ''; - patches = [ - (fetchpatch { - name = "make-0.12.4-compile.patch"; - url = "https://github.com/efx/aports/raw/eb9f8e6bb9a488460929db747b15b8fceddd7abd/testing/wkhtmltopdf/10-patch1.patch"; - sha256 = "1c136jz0klr2rmhmy13gdbgsgkpjfdp2sif8bnw8d23mr9pym3s1"; - }) - ]; - configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; enableParallelBuilding = true; diff --git a/pkgs/tools/graphics/wkhtmltopdf/makefix.patch b/pkgs/tools/graphics/wkhtmltopdf/makefix.patch deleted file mode 100644 index 0642a23afa9e..000000000000 --- a/pkgs/tools/graphics/wkhtmltopdf/makefix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur a/src/image/image.pro b/src/image/image.pro ---- a/src/image/image.pro 2014-08-28 14:07:51.024561967 +0200 -+++ b/src/image/image.pro 2014-08-28 14:08:22.383623390 +0200 -@@ -25,7 +25,7 @@ - - unix { - man.path=$$INSTALLBASE/share/man/man1 -- man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltoimage.1.gz -+ man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltoimage.1.gz - - QMAKE_EXTRA_TARGETS += man - INSTALLS += man -diff -Naur a/src/pdf/pdf.pro b/src/pdf/pdf.pro ---- a/src/pdf/pdf.pro 2014-08-28 14:10:02.305818775 +0200 -+++ b/src/pdf/pdf.pro 2014-08-28 14:09:47.360789555 +0200 -@@ -25,7 +25,7 @@ - - unix { - man.path=$$INSTALLBASE/share/man/man1 -- man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltopdf.1.gz -+ man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltopdf.1.gz - - QMAKE_EXTRA_TARGETS += man - INSTALLS += man diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e0425b26b9d..9e9dd3afa251 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6045,9 +6045,7 @@ with pkgs; wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { - overrideDerivation = lib.overrideDerivation; - }; + wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; From c69933f71b8e6c1336d8320a75ff4b8eac5dddf7 Mon Sep 17 00:00:00 2001 From: "Scott W. Dunlop" Date: Sat, 8 Sep 2018 23:09:06 +0000 Subject: [PATCH 340/600] nats-streaming-server: init at 0.11.0 --- .../servers/nats-streaming-server/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/servers/nats-streaming-server/default.nix diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix new file mode 100644 index 000000000000..8270fa398214 --- /dev/null +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -0,0 +1,26 @@ +{ buildGoPackage, fetchFromGitHub, lib }: + +with lib; + +buildGoPackage rec { + name = "nats-streaming-server-${version}"; + version = "0.11.0"; + rev = "v${version}"; + + goPackagePath = "github.com/nats-io/nats-streaming-server"; + + src = fetchFromGitHub { + inherit rev; + owner = "nats-io"; + repo = "nats-streaming-server"; + sha256 = "0skkx3f7dpbf6nqpsbsk8ssn8hl55s9k76a5y5ksyqar5bdxvds5"; + }; + + meta = { + description = "NATS Streaming System Server"; + license = licenses.asl20; + maintainers = [ maintainers.swdunlop ]; + homepage = https://nats.io/; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b107fa5929a9..9d4bbd42c661 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13126,6 +13126,8 @@ with pkgs; nas = callPackage ../servers/nas { }; + nats-streaming-server = callPackage ../servers/nats-streaming-server { }; + neard = callPackage ../servers/neard { }; nginx = nginxStable; From 10a412f251d2139d9e094669c0d0478b7ea7e1bd Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 9 Sep 2018 02:04:34 +0200 Subject: [PATCH 341/600] almonds: update license --- pkgs/applications/science/math/almonds/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index 96613f4e38a6..b5d9632c551d 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -20,8 +20,7 @@ with python3.pkgs; buildPythonApplication rec { meta = with stdenv.lib; { description = "Terminal Mandelbrot fractal viewer"; homepage = https://github.com/Tenchi2xh/Almonds; - # No license has been specified - license = licenses.unfree; + license = licenses.mit; maintainers = with maintainers; [ infinisil ]; }; } From 4ada74e293212434114ac87a679c1432650f4b40 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 12 Jul 2018 08:42:52 +0000 Subject: [PATCH 342/600] dwarf-fortress: Support multiple unfuck/dfhack/TWBT versions --- pkgs/games/dwarf-fortress/default.nix | 52 +++++++++++++------ pkgs/games/dwarf-fortress/dfhack/default.nix | 21 ++++++-- pkgs/games/dwarf-fortress/dfhack/dfhack.json | 38 ++++++++++++++ .../dwarf-therapist/dwarf-therapist.in | 26 ++++++++++ .../dwarf-therapist/wrapper.nix | 19 ++++--- pkgs/games/dwarf-fortress/game.nix | 3 -- pkgs/games/dwarf-fortress/lazy-pack.nix | 2 +- pkgs/games/dwarf-fortress/twbt/default.nix | 25 ++++++--- pkgs/games/dwarf-fortress/twbt/twbt.json | 32 ++++++++++++ pkgs/games/dwarf-fortress/unfuck.json | 26 ++++++++++ pkgs/games/dwarf-fortress/unfuck.nix | 32 ++++++------ pkgs/games/dwarf-fortress/wrapper/default.nix | 46 ++++++++-------- 12 files changed, 244 insertions(+), 78 deletions(-) create mode 100644 pkgs/games/dwarf-fortress/dfhack/dfhack.json create mode 100644 pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in create mode 100644 pkgs/games/dwarf-fortress/twbt/twbt.json create mode 100644 pkgs/games/dwarf-fortress/unfuck.json diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index aa4ff210812b..87bcc44b8156 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -5,7 +5,8 @@ # This directory menaces with spikes of Nix code. It is terrifying. # # If this is your first time here, you should probably install the dwarf-fortress-full package, -# for instance with `environment.systempackages = [ pkgs.dwarf-fortress.dwarf-fortress-full ];`. +# for instance with: +# `environment.systemPackages = [ pkgs.dwarf-fortress-packages.dwarf-fortress-full ];` # # You can adjust its settings by using override, or compile your own package by # using the other packages here. Take a look at lazy-pack.nix to get an idea of @@ -24,11 +25,36 @@ let callPackage = pkgs.newScope self; df-games = lib.listToAttrs (map (dfVersion: { - name = "dwarf-fortress_${lib.replaceStrings ["."] ["_"] dfVersion}"; - value = callPackage ./wrapper { - inherit (self) themes; - dwarf-fortress = callPackage ./game.nix { inherit dfVersion; }; - }; + name = "dwarf-fortress_${lib.replaceStrings ["."] ["_"] dfVersion}"; + value = + let + # I can't believe this syntax works. Spikes of Nix code indeed... + dwarf-fortress = callPackage ./game.nix { + inherit dfVersion; + inherit dwarf-fortress-unfuck; + }; + + # unfuck is linux-only right now, we will only use it there. + dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { inherit dfVersion; } + else null; + + twbt = callPackage ./twbt { inherit dfVersion; }; + + dfhack = callPackage ./dfhack { + inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; + inherit dfVersion; + inherit twbt; + stdenv = gccStdenv; + }; + in + callPackage ./wrapper { + inherit (self) themes; + + dwarf-fortress = dwarf-fortress; + dwarf-fortress-unfuck = dwarf-fortress-unfuck; + twbt = twbt; + dfhack = dfhack; + }; }) (lib.attrNames self.df-hashes)); self = rec { @@ -37,17 +63,8 @@ let dwarf-fortress-full = callPackage ./lazy-pack.nix { }; - dfhack = callPackage ./dfhack { - inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; - stdenv = gccStdenv; - }; - soundSense = callPackage ./soundsense.nix { }; - # unfuck is linux-only right now, we will only use it there. - dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { } - else null; - dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { inherit (dwarf-fortress) dwarf-fortress; dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist { @@ -59,8 +76,9 @@ let legends-browser = callPackage ./legends-browser {}; - twbt = callPackage ./twbt {}; - themes = recurseIntoAttrs (callPackage ./themes { }); + themes = recurseIntoAttrs (callPackage ./themes { + stdenv = stdenvNoCC; + }); # aliases phoebus-theme = themes.phoebus; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 4a8c84cf92dc..1c88cab02193 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -3,14 +3,25 @@ , enableStoneSense ? false, allegro5, libGLU_combined , enableTWBT ? true, twbt , SDL +, dfVersion }: +with lib; + let - dfVersion = "0.44.12"; - version = "${dfVersion}-r1"; + dfhack-releases = builtins.fromJSON (builtins.readFile ./dfhack.json); + + release = if hasAttr dfVersion dfhack-releases + then getAttr dfVersion dfhack-releases + else throw "[DFHack] Unsupported Dwarf Fortress version: ${dfVersion}"; + + version = release.dfHackRelease; + + warning = if release.prerelease then builtins.trace "[DFHack] Version ${version} is a prerelease. Careful!" + else null; # revision of library/xml submodule - xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094"; + xmlRev = release.xmlRev; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "64" @@ -41,8 +52,8 @@ let src = fetchFromGitHub { owner = "DFHack"; repo = "dfhack"; - sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy"; - rev = version; + rev = release.dfHackRelease; + sha256 = release.sha256; fetchSubmodules = true; }; diff --git a/pkgs/games/dwarf-fortress/dfhack/dfhack.json b/pkgs/games/dwarf-fortress/dfhack/dfhack.json new file mode 100644 index 000000000000..d1907fb38afb --- /dev/null +++ b/pkgs/games/dwarf-fortress/dfhack/dfhack.json @@ -0,0 +1,38 @@ +{ + "0.43.05": { + "dfHackRelease": "0.43.05-r3.1", + "sha256": "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl", + "xmlRev": "860a9041a75305609643d465123a4b598140dd7f", + "prerelease": false + }, + "0.44.05": { + "dfHackRelease": "0.44.05-r2", + "sha256": "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9", + "xmlRev": "2794f8a6d7405d4858bac486a0bb17b94740c142", + "prerelease": false + }, + "0.44.09": { + "dfHackRelease": "0.44.09-r1", + "sha256": "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk", + "xmlRev": "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5", + "prerelease": false + }, + "0.44.10": { + "dfHackRelease": "0.44.10-r2", + "sha256": "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i", + "xmlRev": "321bd48b10c4c3f694cc801a7dee6be392c09b7b", + "prerelease": false + }, + "0.44.11": { + "dfHackRelease": "0.44.11-beta2.1", + "sha256": "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2", + "xmlRev": "f27ebae6aa8fb12c46217adec5a812cd49a905c8", + "prerelease": true + }, + "0.44.12": { + "dfHackRelease": "0.44.12-r1", + "sha256": "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy", + "xmlRev": "23500e4e9bd1885365d0a2ef1746c321c1dd5094", + "prerelease": false + } +} diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in b/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in new file mode 100644 index 000000000000..77936c430e2b --- /dev/null +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in @@ -0,0 +1,26 @@ +#!@stdenv_shell@ -e + +[ -z "$DT_DIR" ] && DT_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/dwarftherapist" + +install_dir="@install@" +therapist_dir="@therapist@" + +cat <&2 +Using $DT_DIR as Dwarf Therapist overlay directory. +EOF + +update_path() { + local path="$1" + + mkdir -p "$DT_DIR/$(dirname "$path")" + if [ ! -e "$DT_DIR/$path" ] || [ -L "$DT_DIR/$path" ]; then + rm -f "$DT_DIR/$path" + ln -s "$install_dir/share/dwarftherapist/$path" "$DT_DIR/$path" + fi +} + +cd "$install_dir/share/dwarftherapist" +update_path memory_layouts + +QT_QPA_PLATFORM_PLUGIN_PATH="@qt_plugin_path@" \ + exec "$therapist_dir/bin/dwarftherapist" "$@" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 322a21ec3ad9..f86ef4bea7ab 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, dwarf-therapist, dwarf-fortress, makeWrapper }: +{ pkgs, stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }: let platformSlug = if stdenv.targetPlatform.is32bit then @@ -7,6 +7,8 @@ let in symlinkJoin { name = "dwarf-therapist-${dwarf-therapist.version}"; + + wrapper = ./dwarf-therapist.in; paths = [ dwarf-therapist ]; @@ -14,13 +16,18 @@ in symlinkJoin { passthru = { inherit dwarf-fortress dwarf-therapist; }; - postBuild = '' - # DwarfTherapist assumes it's run in $out/share/dwarftherapist and - # therefore uses many relative paths. - wrapProgram $out/bin/dwarftherapist \ - --run "cd $out/share/dwarftherapist" + buildCommand = '' + mkdir -p $out/bin ln -s $out/bin/dwarftherapist $out/bin/DwarfTherapist + substitute $wrapper $out/bin/dwarftherapist \ + --subst-var-by stdenv_shell ${stdenv.shell} \ + --subst-var-by install $out \ + --subst-var-by therapist ${dwarf-therapist} \ + --subst-var-by qt_plugin_path "${pkgs.qt5.qtbase}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms" + chmod 755 $out/bin/dwarftherapist + + # Fix up memory layouts rm -rf $out/share/dwarftherapist/memory_layouts/linux mkdir -p $out/share/dwarftherapist/memory_layouts/linux origmd5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 2547bb83f3f5..b5c80a0a56dc 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -42,9 +42,6 @@ let in -assert dwarf-fortress-unfuck != null -> - dwarf-fortress-unfuck.dfVersion == dfVersion; - stdenv.mkDerivation { name = "dwarf-fortress-${dfVersion}"; diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 3e0d3dcc6d73..ca7ae4024289 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -6,7 +6,7 @@ , enableDFHack ? stdenvNoCC.isLinux , enableTWBT ? enableDFHack , enableSoundSense ? true -, enableStoneSense ? false # StoneSense is currently broken. +, enableStoneSense ? true , enableDwarfTherapist ? true, dwarf-therapist , enableLegendsBrowser ? true, legends-browser , theme ? themes.phoebus diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index d90812f5d05e..1bdbddb56de4 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -1,14 +1,28 @@ -{ stdenvNoCC, fetchurl, unzip }: +{ stdenvNoCC, lib, fetchurl, unzip +, dfVersion +}: +with lib; + +let + twbt-releases = builtins.fromJSON (builtins.readFile ./twbt.json); + + release = if hasAttr dfVersion twbt-releases + then getAttr dfVersion twbt-releases + else throw "[TWBT] Unsupported Dwarf Fortress version: ${dfVersion}"; + + warning = if release.prerelease then builtins.trace "[TWBT] Version ${version} is a prerelease. Careful!" + else null; + +in stdenvNoCC.mkDerivation rec { name = "twbt-${version}"; - version = "6.54"; - dfVersion = "0.44.12"; + version = release.twbtRelease; src = fetchurl { url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip"; - sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh"; + sha256 = release.sha256; }; sourceRoot = "."; @@ -24,10 +38,9 @@ stdenvNoCC.mkDerivation rec { cp -a *.png $art/data/art/ ''; - meta = with stdenvNoCC.lib; { description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface."; - maintainers = with maintainers; [ Baughn ]; + maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; platforms = platforms.linux; homepage = https://github.com/mifki/df-twbt; diff --git a/pkgs/games/dwarf-fortress/twbt/twbt.json b/pkgs/games/dwarf-fortress/twbt/twbt.json new file mode 100644 index 000000000000..b455ff017fcd --- /dev/null +++ b/pkgs/games/dwarf-fortress/twbt/twbt.json @@ -0,0 +1,32 @@ +{ + "0.43.05": { + "twbtRelease": "6.22", + "sha256": "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7", + "prerelease": false + }, + "0.44.05": { + "twbtRelease": "6.35", + "sha256": "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g", + "prerelease": false + }, + "0.44.09": { + "twbtRelease": "6.41", + "sha256": "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44", + "prerelease": false + }, + "0.44.10": { + "twbtRelease": "6.49", + "sha256": "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz", + "prerelease": false + }, + "0.44.11": { + "twbtRelease": "6.51", + "sha256": "1yclqmarjd97ch054h425a12r8a5ailmflsd7b39cg4qhdr1nii5", + "prerelease": true + }, + "0.44.12": { + "twbtRelease": "6.53", + "sha256": "05qc9x4zm0pamwg7j12j0084dq2sj7825fhd3l0wxfinphzk3was", + "prerelease": false + } +} diff --git a/pkgs/games/dwarf-fortress/unfuck.json b/pkgs/games/dwarf-fortress/unfuck.json new file mode 100644 index 000000000000..f7a4974c575c --- /dev/null +++ b/pkgs/games/dwarf-fortress/unfuck.json @@ -0,0 +1,26 @@ +{ + "0.43.05": { + "unfuckRelease": "0.43.05", + "sha256": "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2" + }, + "0.44.05": { + "unfuckRelease": "0.44.05", + "sha256": "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b" + }, + "0.44.09": { + "unfuckRelease": "0.44.09", + "sha256": "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm" + }, + "0.44.10": { + "unfuckRelease": "0.44.10", + "sha256": "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj" + }, + "0.44.11": { + "unfuckRelease": "0.44.11.1", + "sha256": "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz" + }, + "0.44.12": { + "unfuckRelease": "0.44.12", + "sha256": "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz" + } +} diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 0c5a81a52f0f..732003118713 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -1,18 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake +{ stdenv, lib, fetchFromGitHub, cmake , libGL, libSM, SDL, SDL_image, SDL_ttf, glew, openalSoft , ncurses, glib, gtk2, libsndfile, zlib +, dfVersion }: -let dfVersion = "0.44.12"; in +with lib; + +let + unfuck-releases = builtins.fromJSON (builtins.readFile ./unfuck.json); + + release = if hasAttr dfVersion unfuck-releases + then getAttr dfVersion unfuck-releases + else throw "[unfuck] Unknown Dwarf Fortress version: ${dfVersion}"; +in stdenv.mkDerivation { - name = "dwarf_fortress_unfuck-${dfVersion}"; + name = "dwarf_fortress_unfuck-${release.unfuckRelease}"; src = fetchFromGitHub { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; - rev = dfVersion; - sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"; + rev = release.unfuckRelease; + sha256 = release.sha256; }; cmakeFlags = [ @@ -20,23 +29,12 @@ stdenv.mkDerivation { "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" ]; - makeFlags = [ - ''CFLAGS="-fkeep-inline-functions"'' - ''CXXFLAGS="-fkeep-inline-functions"'' - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ libSM SDL SDL_image SDL_ttf glew openalSoft ncurses gtk2 libsndfile zlib libGL ]; - postPatch = '' - substituteInPlace CMakeLists.txt --replace \ - 'set(CMAKE_BUILD_TYPE Release)' \ - 'set(CMAKE_BUILD_TYPE Debug)' - ''; - # Don't strip unused symbols; dfhack hooks into some of them. dontStrip = true; @@ -56,6 +54,6 @@ stdenv.mkDerivation { homepage = https://github.com/svenstaro/dwarf_fortress_unfuck; license = licenses.free; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar numinit ]; }; } diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 6efe004fa9e8..105143916d10 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, buildEnv, dwarf-fortress, substituteAll +{ stdenv, lib, buildEnv, substituteAll +, dwarf-fortress, dwarf-fortress-unfuck , enableDFHack ? false, dfhack , enableSoundSense ? false, soundSense, jdk , enableStoneSense ? false @@ -37,34 +38,12 @@ let paths = themePkg ++ pkgs; pathsToLink = [ "/" "/hack" "/hack/scripts" ]; ignoreCollisions = true; - - postBuild = '' - # De-symlink init.txt - cp $out/data/init/init.txt init.txt - rm $out/data/init/init.txt - mv init.txt $out/data/init/init.txt - '' + lib.optionalString enableDFHack '' - rm $out/hack/symbols.xml - substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \ - --replace $(cat ${dwarf-fortress}/hash.md5.orig) \ - $(cat ${dwarf-fortress}/hash.md5) - '' + lib.optionalString enableTWBT '' - substituteInPlace $out/data/init/init.txt \ - --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' - '' + '' - substituteInPlace $out/data/init/init.txt \ - --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ - --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ - --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' - ''; }; in stdenv.mkDerivation rec { name = "dwarf-fortress-${dwarf-fortress.dfVersion}"; - compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress.dfVersion); true) pkgs; - dfInit = substituteAll { name = "dwarf-fortress-init"; src = ./dwarf-fortress-init.in; @@ -99,5 +78,26 @@ stdenv.mkDerivation rec { chmod 755 $out/bin/soundsense ''; + postBuild = '' + # De-symlink init.txt + cp $out/data/init/init.txt init.txt + rm $out/data/init/init.txt + mv init.txt $out/data/init/init.txt + '' + lib.optionalString enableDFHack '' + rm $out/hack/symbols.xml + echo "[$out/hack/symbols.xml] $(cat ${dwarf-fortress}/hash.md5.orig) => $(cat ${dwarf-fortress}/hash.md5)" + substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \ + --replace $(cat ${dwarf-fortress}/hash.md5.orig) \ + $(cat ${dwarf-fortress}/hash.md5) + '' + lib.optionalString enableTWBT '' + substituteInPlace $out/data/init/init.txt \ + --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' + '' + '' + substituteInPlace $out/data/init/init.txt \ + --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ + --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ + --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' + ''; + preferLocalBuild = true; } From f14d3b4795c173f5ff353031b8d32afab7090ab9 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 15 Jul 2018 03:58:37 +0000 Subject: [PATCH 343/600] Fix dfhack's Dwarf Fortress MD5 in the correct environment --- .../dwarf-therapist/wrapper.nix | 18 ++++--- pkgs/games/dwarf-fortress/wrapper/default.nix | 54 +++++++++++-------- 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index f86ef4bea7ab..6e3a13692a72 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -30,11 +30,17 @@ in symlinkJoin { # Fix up memory layouts rm -rf $out/share/dwarftherapist/memory_layouts/linux mkdir -p $out/share/dwarftherapist/memory_layouts/linux - origmd5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8) - patchedmd5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8) - substitute \ - ${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile} \ - $out/share/dwarftherapist/memory_layouts/${inifile} \ - --replace "$origmd5" "$patchedmd5" + orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8) + patched_md5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8) + input_file="${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile}" + output_file="$out/share/dwarftherapist/memory_layouts/${inifile}" + + echo "[Dwarf Therapist Wrapper] Fixing Dwarf Fortress MD5 prefix:" + echo " Input: $input_file" + echo " Search: $orig_md5" + echo " Output: $output_file" + echo " Replace: $patched_md5" + + substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5" ''; } diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 105143916d10..33523270b19d 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -37,6 +37,39 @@ let paths = themePkg ++ pkgs; pathsToLink = [ "/" "/hack" "/hack/scripts" ]; + + postBuild = '' + # De-symlink init.txt + cp $out/data/init/init.txt init.txt + rm -f $out/data/init/init.txt + mv init.txt $out/data/init/init.txt + '' + lib.optionalString enableDFHack '' + # De-symlink symbols.xml + rm $out/hack/symbols.xml + + # Patch the MD5 + orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig") + patched_md5=$(cat "${dwarf-fortress}/hash.md5") + input_file="${dfhack_}/hack/symbols.xml" + output_file="$out/hack/symbols.xml" + + echo "[DFHack Wrapper] Fixing Dwarf Fortress MD5:" + echo " Input: $input_file" + echo " Search: $orig_md5" + echo " Output: $output_file" + echo " Replace: $patched_md5" + + substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5" + '' + lib.optionalString enableTWBT '' + substituteInPlace $out/data/init/init.txt \ + --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' + '' + '' + substituteInPlace $out/data/init/init.txt \ + --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ + --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ + --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' + ''; + ignoreCollisions = true; }; in @@ -78,26 +111,5 @@ stdenv.mkDerivation rec { chmod 755 $out/bin/soundsense ''; - postBuild = '' - # De-symlink init.txt - cp $out/data/init/init.txt init.txt - rm $out/data/init/init.txt - mv init.txt $out/data/init/init.txt - '' + lib.optionalString enableDFHack '' - rm $out/hack/symbols.xml - echo "[$out/hack/symbols.xml] $(cat ${dwarf-fortress}/hash.md5.orig) => $(cat ${dwarf-fortress}/hash.md5)" - substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \ - --replace $(cat ${dwarf-fortress}/hash.md5.orig) \ - $(cat ${dwarf-fortress}/hash.md5) - '' + lib.optionalString enableTWBT '' - substituteInPlace $out/data/init/init.txt \ - --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' - '' + '' - substituteInPlace $out/data/init/init.txt \ - --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ - --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ - --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' - ''; - preferLocalBuild = true; } From 7a5521537a1715ac7f7f5e420cef865304383b82 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 15 Jul 2018 05:38:30 +0000 Subject: [PATCH 344/600] Let the user override dfVersion in dwarf-fortress-full --- pkgs/games/dwarf-fortress/default.nix | 47 +++++++++++++++++++------ pkgs/games/dwarf-fortress/lazy-pack.nix | 17 ++++++--- 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 87bcc44b8156..1ee33fb27f36 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -6,26 +6,48 @@ # # If this is your first time here, you should probably install the dwarf-fortress-full package, # for instance with: -# `environment.systemPackages = [ pkgs.dwarf-fortress-packages.dwarf-fortress-full ];` +# +# environment.systemPackages = [ pkgs.dwarf-fortress-packages.dwarf-fortress-full ]; # # You can adjust its settings by using override, or compile your own package by -# using the other packages here. Take a look at lazy-pack.nix to get an idea of -# how. +# using the other packages here. +# +# For example, you can enable the FPS indicator, disable the intro, pick a +# theme other than phoebus (the default for dwarf-fortress-full), _and_ use +# an older version with something like: +# +# environment.systemPackages = [ +# (pkgs.dwarf-fortress-packages.dwarf-fortress-full.override { +# dfVersion = "0.44.11"; +# theme = "cla"; +# enableIntro = false; +# enableFPS = true; +# }) +# ] +# +# Take a look at lazy-pack.nix to see all the other options. # # You will find the configuration files in ~/.local/share/df_linux/data/init. If # you un-symlink them and edit, then the scripts will avoid overwriting your # changes on later launches, but consider extending the wrapper with your # desired options instead. -# -# Although both dfhack and dwarf therapist are included in the lazy pack, you -# can only use one at a time. DFHack does have therapist-like features, so this -# may or may not be a problem. + +with lib; let callPackage = pkgs.newScope self; + # The latest Dwarf Fortress version. Maintainers: when a new version comes + # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing + # this. + latestVersion = "0.44.12"; + + # Converts a version to a package name. + versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; + + # A map of names to each Dwarf Fortress package we know about. df-games = lib.listToAttrs (map (dfVersion: { - name = "dwarf-fortress_${lib.replaceStrings ["."] ["_"] dfVersion}"; + name = versionToName dfVersion; value = let # I can't believe this syntax works. Spikes of Nix code indeed... @@ -59,9 +81,14 @@ let self = rec { df-hashes = builtins.fromJSON (builtins.readFile ./game.json); - dwarf-fortress = df-games.dwarf-fortress_0_44_12; + + dwarf-fortress = getAttr (versionToName latestVersion) df-games; - dwarf-fortress-full = callPackage ./lazy-pack.nix { }; + dwarf-fortress-full = callPackage ./lazy-pack.nix { + inherit versionToName; + inherit latestVersion; + inherit df-games; + }; soundSense = callPackage ./soundsense.nix { }; diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index ca7ae4024289..a05ea49ce814 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -1,8 +1,9 @@ -{ stdenvNoCC, lib, buildEnv -, dwarf-fortress, themes +{ stdenvNoCC, lib, buildEnv, callPackage +, df-games, themes, latestVersion, versionToName +, dfVersion ? latestVersion # This package should, at any given time, provide an opinionated "optimal" # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and - # should contain every utility available. + # should contain every utility available unless you disable them. , enableDFHack ? stdenvNoCC.isLinux , enableTWBT ? enableDFHack , enableSoundSense ? true @@ -16,6 +17,14 @@ , enableFPS ? false }: +with lib; + +let + dfGame = versionToName dfVersion; + dwarf-fortress = if hasAttr dfGame df-games + then getAttr dfGame df-games + else throw "Unknown Dwarf Fortress version: ${dfVersion}"; +in buildEnv { name = "dwarf-fortress-full"; paths = [ @@ -28,7 +37,7 @@ buildEnv { meta = with stdenvNoCC.lib; { description = "An opinionated wrapper for Dwarf Fortress"; - maintainers = with maintainers; [ Baughn ]; + maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; platforms = platforms.all; homepage = https://github.com/NixOS/nixpkgs/; From fe847fcc929b824596aa049b08f06c8af9519a68 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 15 Jul 2018 06:41:27 +0000 Subject: [PATCH 345/600] Therapist needs to depend on the DF version, since it uses its MD5 --- pkgs/games/dwarf-fortress/default.nix | 36 +++++++++---------- pkgs/games/dwarf-fortress/lazy-pack.nix | 3 +- pkgs/games/dwarf-fortress/wrapper/default.nix | 3 +- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 1ee33fb27f36..88a6d72bc485 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -64,10 +64,18 @@ let dfhack = callPackage ./dfhack { inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; - inherit dfVersion; - inherit twbt; + inherit dfVersion twbt; stdenv = gccStdenv; }; + + dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { + inherit dwarf-fortress; + dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist { + texlive = pkgs.texlive.combine { + inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; + }; + }; + }; in callPackage ./wrapper { inherit (self) themes; @@ -76,41 +84,33 @@ let dwarf-fortress-unfuck = dwarf-fortress-unfuck; twbt = twbt; dfhack = dfhack; + dwarf-therapist = dwarf-therapist; }; }) (lib.attrNames self.df-hashes)); self = rec { df-hashes = builtins.fromJSON (builtins.readFile ./game.json); - + + # Aliases for the latest Dwarf Fortress and the selected Therapist install dwarf-fortress = getAttr (versionToName latestVersion) df-games; + dwarf-therapist = dwarf-fortress.dwarf-therapist; + dwarf-fortress-original = dwarf-fortress.dwarf-fortress; dwarf-fortress-full = callPackage ./lazy-pack.nix { - inherit versionToName; - inherit latestVersion; - inherit df-games; + inherit df-games versionToName latestVersion; }; - + soundSense = callPackage ./soundsense.nix { }; - dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { - inherit (dwarf-fortress) dwarf-fortress; - dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist { - texlive = pkgs.texlive.combine { - inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; - }; - }; - }; - legends-browser = callPackage ./legends-browser {}; themes = recurseIntoAttrs (callPackage ./themes { stdenv = stdenvNoCC; }); - # aliases + # Theme aliases phoebus-theme = themes.phoebus; cla-theme = themes.cla; - dwarf-fortress-original = dwarf-fortress.dwarf-fortress; }; in self // df-games diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index a05ea49ce814..3a81dcc9c931 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -8,7 +8,7 @@ , enableTWBT ? enableDFHack , enableSoundSense ? true , enableStoneSense ? true -, enableDwarfTherapist ? true, dwarf-therapist +, enableDwarfTherapist ? true , enableLegendsBrowser ? true, legends-browser , theme ? themes.phoebus # General config options: @@ -24,6 +24,7 @@ let dwarf-fortress = if hasAttr dfGame df-games then getAttr dfGame df-games else throw "Unknown Dwarf Fortress version: ${dfVersion}"; + dwarf-therapist = dwarf-fortress.dwarf-therapist; in buildEnv { name = "dwarf-fortress-full"; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 33523270b19d..8d9f06ffe143 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildEnv, substituteAll , dwarf-fortress, dwarf-fortress-unfuck +, dwarf-therapist , enableDFHack ? false, dfhack , enableSoundSense ? false, soundSense, jdk , enableStoneSense ? false @@ -89,7 +90,7 @@ stdenv.mkDerivation rec { runDFHack = ./dfhack.in; runSoundSense = ./soundSense.in; - passthru = { inherit dwarf-fortress; }; + passthru = { inherit dwarf-fortress dwarf-therapist; }; buildCommand = '' mkdir -p $out/bin From 870f05c975d95e9f05e0e2de3b039e4eef08d6c5 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 15 Jul 2018 07:02:50 +0000 Subject: [PATCH 346/600] Fix dangling DFHack "Git:" version text --- pkgs/games/dwarf-fortress/dfhack/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 1c88cab02193..5dcdeda7ba28 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -32,6 +32,10 @@ let #! ${stdenv.shell} if [ "$*" = "describe --tags --long" ]; then echo "${version}-unknown" + elif [ "$*" = "describe --tags --abbrev=8 --long" ]; then + echo "${version}-unknown" + elif [ "$*" = "describe --tags --abbrev=8 --exact-match" ]; then + echo "${version}" elif [ "$*" = "rev-parse HEAD" ]; then if [ "$(dirname "$(pwd)")" = "xml" ]; then echo "${xmlRev}" From 5f1013d87576f89d391670e17725a897204a6cb9 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 15 Jul 2018 07:34:26 +0000 Subject: [PATCH 347/600] Use stdenv.mkDerivation for Therapist wrapper --- pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 6e3a13692a72..071ab2af0c5c 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -5,7 +5,9 @@ let "linux32" else "linux64"; inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini"; -in symlinkJoin { +in + +stdenv.mkDerivation rec { name = "dwarf-therapist-${dwarf-therapist.version}"; wrapper = ./dwarf-therapist.in; @@ -43,4 +45,6 @@ in symlinkJoin { substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5" ''; + + preferLocalBuild = true; } From 2cd2571edd0fef223e65d9039059871e3ab61d1c Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 9 Sep 2018 07:03:53 +0000 Subject: [PATCH 348/600] Update twbt to 6.54 --- pkgs/games/dwarf-fortress/twbt/twbt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/twbt/twbt.json b/pkgs/games/dwarf-fortress/twbt/twbt.json index b455ff017fcd..f7de1c14e6b6 100644 --- a/pkgs/games/dwarf-fortress/twbt/twbt.json +++ b/pkgs/games/dwarf-fortress/twbt/twbt.json @@ -25,8 +25,8 @@ "prerelease": true }, "0.44.12": { - "twbtRelease": "6.53", - "sha256": "05qc9x4zm0pamwg7j12j0084dq2sj7825fhd3l0wxfinphzk3was", + "twbtRelease": "6.54", + "sha256": "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh", "prerelease": false } } From 213b5457fc0a343d71c9ee1a84ea3722b3b05388 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 9 Sep 2018 07:12:36 +0000 Subject: [PATCH 349/600] Inline JSON files --- pkgs/games/dwarf-fortress/dfhack/default.nix | 39 +++++++++++++++++++- pkgs/games/dwarf-fortress/dfhack/dfhack.json | 38 ------------------- pkgs/games/dwarf-fortress/themes/default.nix | 2 +- pkgs/games/dwarf-fortress/twbt/default.nix | 33 ++++++++++++++++- pkgs/games/dwarf-fortress/twbt/twbt.json | 32 ---------------- pkgs/games/dwarf-fortress/unfuck.json | 26 ------------- pkgs/games/dwarf-fortress/unfuck.nix | 27 +++++++++++++- 7 files changed, 97 insertions(+), 100 deletions(-) delete mode 100644 pkgs/games/dwarf-fortress/dfhack/dfhack.json delete mode 100644 pkgs/games/dwarf-fortress/twbt/twbt.json delete mode 100644 pkgs/games/dwarf-fortress/unfuck.json diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 5dcdeda7ba28..d65bdab84911 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -9,7 +9,44 @@ with lib; let - dfhack-releases = builtins.fromJSON (builtins.readFile ./dfhack.json); + dfhack-releases = { + "0.43.05" = { + dfHackRelease = "0.43.05-r3.1"; + sha256 = "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl"; + xmlRev = "860a9041a75305609643d465123a4b598140dd7f"; + prerelease = false; + }; + "0.44.05" = { + dfHackRelease = "0.44.05-r2"; + sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9"; + xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142"; + prerelease = false; + }; + "0.44.09" = { + dfHackRelease = "0.44.09-r1"; + sha256 = "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk"; + xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5"; + prerelease = false; + }; + "0.44.10" = { + dfHackRelease = "0.44.10-r2"; + sha256 = "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i"; + xmlRev = "321bd48b10c4c3f694cc801a7dee6be392c09b7b"; + prerelease = false; + }; + "0.44.11" = { + dfHackRelease = "0.44.11-beta2.1"; + sha256 = "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2"; + xmlRev = "f27ebae6aa8fb12c46217adec5a812cd49a905c8"; + prerelease = true; + }; + "0.44.12" = { + dfHackRelease = "0.44.12-r1"; + sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy"; + xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094"; + prerelease = false; + }; + }; release = if hasAttr dfVersion dfhack-releases then getAttr dfVersion dfhack-releases diff --git a/pkgs/games/dwarf-fortress/dfhack/dfhack.json b/pkgs/games/dwarf-fortress/dfhack/dfhack.json deleted file mode 100644 index d1907fb38afb..000000000000 --- a/pkgs/games/dwarf-fortress/dfhack/dfhack.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "0.43.05": { - "dfHackRelease": "0.43.05-r3.1", - "sha256": "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl", - "xmlRev": "860a9041a75305609643d465123a4b598140dd7f", - "prerelease": false - }, - "0.44.05": { - "dfHackRelease": "0.44.05-r2", - "sha256": "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9", - "xmlRev": "2794f8a6d7405d4858bac486a0bb17b94740c142", - "prerelease": false - }, - "0.44.09": { - "dfHackRelease": "0.44.09-r1", - "sha256": "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk", - "xmlRev": "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5", - "prerelease": false - }, - "0.44.10": { - "dfHackRelease": "0.44.10-r2", - "sha256": "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i", - "xmlRev": "321bd48b10c4c3f694cc801a7dee6be392c09b7b", - "prerelease": false - }, - "0.44.11": { - "dfHackRelease": "0.44.11-beta2.1", - "sha256": "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2", - "xmlRev": "f27ebae6aa8fb12c46217adec5a812cd49a905c8", - "prerelease": true - }, - "0.44.12": { - "dfHackRelease": "0.44.12-r1", - "sha256": "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy", - "xmlRev": "23500e4e9bd1885365d0a2ef1746c321c1dd5094", - "prerelease": false - } -} diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index 0b8eb23a7b9d..feb4782d7c32 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -1,4 +1,4 @@ -{lib, fetchFromGitHub}: +{lib, fetchFromGitHub, ...}: with builtins; diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 1bdbddb56de4..7c80c1012462 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -5,7 +5,38 @@ with lib; let - twbt-releases = builtins.fromJSON (builtins.readFile ./twbt.json); + twbt-releases = { + "0.43.05" = { + twbtRelease = "6.22"; + sha256 = "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7"; + prerelease = false; + }; + "0.44.05" = { + twbtRelease = "6.35"; + sha256 = "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g"; + prerelease = false; + }; + "0.44.09" = { + twbtRelease = "6.41"; + sha256 = "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44"; + prerelease = false; + }; + "0.44.10" = { + twbtRelease = "6.49"; + sha256 = "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz"; + prerelease = false; + }; + "0.44.11" = { + twbtRelease = "6.51"; + sha256 = "1yclqmarjd97ch054h425a12r8a5ailmflsd7b39cg4qhdr1nii5"; + prerelease = true; + }; + "0.44.12" = { + twbtRelease = "6.54"; + sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh"; + prerelease = false; + }; + }; release = if hasAttr dfVersion twbt-releases then getAttr dfVersion twbt-releases diff --git a/pkgs/games/dwarf-fortress/twbt/twbt.json b/pkgs/games/dwarf-fortress/twbt/twbt.json deleted file mode 100644 index f7de1c14e6b6..000000000000 --- a/pkgs/games/dwarf-fortress/twbt/twbt.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "0.43.05": { - "twbtRelease": "6.22", - "sha256": "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7", - "prerelease": false - }, - "0.44.05": { - "twbtRelease": "6.35", - "sha256": "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g", - "prerelease": false - }, - "0.44.09": { - "twbtRelease": "6.41", - "sha256": "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44", - "prerelease": false - }, - "0.44.10": { - "twbtRelease": "6.49", - "sha256": "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz", - "prerelease": false - }, - "0.44.11": { - "twbtRelease": "6.51", - "sha256": "1yclqmarjd97ch054h425a12r8a5ailmflsd7b39cg4qhdr1nii5", - "prerelease": true - }, - "0.44.12": { - "twbtRelease": "6.54", - "sha256": "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh", - "prerelease": false - } -} diff --git a/pkgs/games/dwarf-fortress/unfuck.json b/pkgs/games/dwarf-fortress/unfuck.json deleted file mode 100644 index f7a4974c575c..000000000000 --- a/pkgs/games/dwarf-fortress/unfuck.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "0.43.05": { - "unfuckRelease": "0.43.05", - "sha256": "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2" - }, - "0.44.05": { - "unfuckRelease": "0.44.05", - "sha256": "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b" - }, - "0.44.09": { - "unfuckRelease": "0.44.09", - "sha256": "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm" - }, - "0.44.10": { - "unfuckRelease": "0.44.10", - "sha256": "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj" - }, - "0.44.11": { - "unfuckRelease": "0.44.11.1", - "sha256": "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz" - }, - "0.44.12": { - "unfuckRelease": "0.44.12", - "sha256": "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz" - } -} diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 732003118713..c4d01b3ff392 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -7,7 +7,32 @@ with lib; let - unfuck-releases = builtins.fromJSON (builtins.readFile ./unfuck.json); + unfuck-releases = { + "0.43.05" = { + unfuckRelease = "0.43.05"; + sha256 = "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2"; + }; + "0.44.05" = { + unfuckRelease = "0.44.05"; + sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b"; + }; + "0.44.09" = { + unfuckRelease = "0.44.09"; + sha256 = "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm"; + }; + "0.44.10" = { + unfuckRelease = "0.44.10"; + sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"; + }; + "0.44.11" = { + unfuckRelease = "0.44.11.1"; + sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"; + }; + "0.44.12" = { + unfuckRelease = "0.44.12"; + sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"; + }; + }; release = if hasAttr dfVersion unfuck-releases then getAttr dfVersion unfuck-releases From 7bda775331b503f5d5d814309d5ae635c1d36162 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2018 10:30:58 +0200 Subject: [PATCH 350/600] imv: Include i686-linux in platforms attribute The package builds and works fine on i686-linux, so there is no need to fail evaluation on those systems. Signed-off-by: aszlig Issue: #45976 Cc: @rnhmjoj, @xeji --- pkgs/applications/graphics/imv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 9def3f16ad03..cdbf5f446875 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/eXeC64/imv; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } From 97acac9a81cb16992c8f6ff856ffcbeede667eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 9 Sep 2018 09:45:45 +0100 Subject: [PATCH 351/600] doc/vim: improve plugin documentation --- doc/languages-frameworks/vim.section.md | 70 ++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 1d6a4fe8da8d..26aa9c25f06f 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -5,11 +5,16 @@ date: 2016-06-25 --- # User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs -You'll get a vim(-your-suffix) in PATH also loading the plugins you want. +Both Neovim and Vim can be configured to include your favorite plugins +and additional libraries. + Loading can be deferred; see examples. -Vim packages, VAM (=vim-addon-manager) and Pathogen are supported to load -packages. +At the moment we support three different methods for managing plugins: + +- Vim packages (*recommend*) +- VAM (=vim-addon-manager) +- Pathogen ## Custom configuration @@ -25,7 +30,19 @@ vim_configurable.customize { } ``` -## Vim packages +For Neovim the `configure` argument can be overridden to achieve the same: + +``` +neovim.override { + configure = { + customRC = '' + # here your custom configuration goes! + ''; + }; +} +``` + +## Managing plugins with Vim packages To store you plugins in Vim packages the following example can be used: @@ -38,13 +55,50 @@ vim_configurable.customize { opt = [ phpCompletion elm-vim ]; # To automatically load a plugin when opening a filetype, add vimrc lines like: # autocmd FileType php :packadd phpCompletion - } -}; + }; +} ``` -## VAM +For Neovim the syntax is -### dependencies by Vim plugins +``` +neovim.override { + configure = { + customRC = '' + # here your custom configuration goes! + ''; + packages.myVimPackage = with pkgs.vimPlugins; { + # see examples below how to use custom packages + start = [ ]; + opt = [ ]; + }; + }; +} +``` + +The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.nix` to make it installable: + +``` +{ + packageOverrides = pkgs: with pkgs; { + myVim = vim_configurable.customize { + name = "vim-with-plugins"; + # add here code from the example section + }; + myNeovim = neovim.override { + configure = { + # add here code from the example section + }; + }; + }; +} +``` + +After that you can install your special grafted `myVim` or `myNeovim` packages. + +## Managing plugins with VAM + +### Handling dependencies of Vim plugins VAM introduced .json files supporting dependencies without versioning assuming that "using latest version" is ok most of the time. From dfcf07d9d381f1911ac9117d5f477b83f444a03f Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Sun, 9 Sep 2018 11:34:18 +0200 Subject: [PATCH 352/600] pythonPackages.django-raster: fix build (#46413) --- pkgs/development/python-modules/django-raster/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 19ef783fe759..39634b8d293a 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -1,11 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, numpy, django_colorful, pillow, psycopg2, - pyparsing, django, celery + pyparsing, django_2_1, celery, boto3 }: buildPythonPackage rec { version = "0.6"; pname = "django-raster"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "9a0f8e71ebeeeb5380c6ca68e027e9de335f43bc15e89dd22e7a470c4eb7aeb8"; @@ -15,7 +17,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 - pyparsing django celery ]; + pyparsing django_2_1 celery boto3 ]; meta = with stdenv.lib; { description = "Basic raster data integration for Django"; From 5b1b4adb2acdc7b28273356f2f5deb4522f78ae0 Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Sun, 9 Sep 2018 12:10:18 +0200 Subject: [PATCH 353/600] pythonPackages.CDDB: fix darwin build (#46412) --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2eae6212cd4d..e08a394ae433 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1456,6 +1456,8 @@ in { disabled = !isPy27; + buildInputs = optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ]; + src = pkgs.fetchurl { url = "http://cddb-py.sourceforge.net/${name}.tar.gz"; sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w"; From c020a59ccd5ee57706e7461ababebd3366102b2b Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Sun, 9 Sep 2018 12:13:36 +0200 Subject: [PATCH 354/600] pythonPackages.tifffile: fix python 2 build (#46415) --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 159051b9a6a8..3910ddf07256 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pythonOlder -, numpy, nose, enum34, futures }: +, numpy, nose, enum34, futures, pathlib }: buildPythonPackage rec { pname = "tifffile"; @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ numpy ] - ++ lib.optional isPy27 futures + ++ lib.optional isPy27 [ futures pathlib ] ++ lib.optional (pythonOlder "3.0") enum34; meta = with stdenv.lib; { From 953199fd829f0b9d3c3ed95cf2e1b138d2268a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 9 Sep 2018 09:46:35 +0100 Subject: [PATCH 355/600] vim-plugins: rewrite updater A new python script has been added to replace the aged viml-based updater. The new updater has the following advantages: - use rss feeds to check for updates quicker - parallel downloads & better caching - uses proper override mechanism instead of text substitution - update generated files in-place instead of having to insert updated plugins manually Automatically reading `dependencies` from the plugins directory has been not re-implemented. This has been mostly been used by Mark Weber's plugins, which seem to no longer receive regular updates. This could be implemented in future as required. --- doc/languages-frameworks/vim.section.md | 12 + pkgs/misc/vim-plugins/default.nix | 3403 ++--------------------- pkgs/misc/vim-plugins/generated.nix | 2941 ++++++++++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 586 ++-- 4 files changed, 3404 insertions(+), 3538 deletions(-) create mode 100644 pkgs/misc/vim-plugins/generated.nix diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 26aa9c25f06f..f0a6559c3d51 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -179,6 +179,18 @@ Sample output2: ] +## Adding new plugins to nixpkgs + +In `pkgs/misc/vim-plugins/vim-plugin-names` we store the plugin names +for all vim plugins we automatically generate plugins for. +The format of this file `github username/github repository`: +For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. +After adding your plugin to this file run the `./update.py` in the same folder. +This will updated a file called `generated.nix` and make your plugin accessible in the +`vimPlugins` attribute set (`vimPlugins.nerdtree` in our example). +If additional steps to the build process of the plugin are required, add an +override to the `pkgs/misc/vim-plugins/default.nix` in the same directory. + ## Important repositories - [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d251b2da45c6..0b6ad80acbdb 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,5 +1,6 @@ # TODO check that no license information gets lost -{ config, lib, stdenv, python, cmake, vim, vimUtils, ruby +{ callPackage, config, lib, stdenv +, python, cmake, vim, vimUtils, ruby , which, fetchgit, llvmPackages, rustPlatform , xkb_switch, fzf, skim , python3, boost, icu, ncurses @@ -16,43 +17,24 @@ let inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; + generated = callPackage ./generated.nix { + inherit buildVimPluginFrom2Nix; + }; # TL;DR # * Add your plugin to ./vim-plugin-names -# * sort -df ./vim-plugin-names > sorted && mv sorted vim-plugin-names -# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'x! result'"` -# Note: pluginnames2nix will fetch any plugins in the file; to speed up the process, -# update ./vim-plugin-names to contain only plugins which need generation -# Copy the generated expression(s) into this file from the ./result file. -# If plugin is complicated then make changes to ./vim2nix/additional-nix-code - -# This attrs contains two sections: -# The first contains plugins added manually, the second contains plugins -# generated by call nix#ExportPluginsForNix. -# Documentation & usage see vim-utils.nix. -# attribute names should be the same as used by vim-pi to make dependency -# resolution work -self = rec { - # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations - # which recreates this the following derivations based on ./vim-plugin-names - pluginnames2nix = vimUtils.pluginnames2Nix { - name = "vim-plugin-names-to-nix"; - namefiles = [./vim-plugin-names]; - }; - - # Section I - vim-addon-vim2nix = vim2nix; - - vim2nix = buildVimPluginFrom2Nix { # use it to update plugins +# * sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names +# * run ./update.py +# +# If additional modifications to the build process are required, +# use add an override to this file. +self = generated // (with generated; { + vim2nix = buildVimPluginFrom2Nix { name = "vim2nix"; src = ./vim2nix; dependencies = ["vim-addon-manager"]; }; - - # Section II - # Update with vimUtils.vimPlugins.pluginnames2Nix command - fzfWrapper = buildVimPluginFrom2Nix { name = fzf.name; src = fzf.src; @@ -108,328 +90,7 @@ self = rec { dependencies = []; }; - # missing dependency, using additional-nix-code results in an invalid expression - vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2018-06-02"; - src = fetchgit { - url = "https://github.com/shougo/vimshell.vim"; - rev = "03bf7673a5098918a533000d67dca97546695237"; - sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi"; - }; - dependencies = [ "vimproc-vim" ]; - }; - - # --- generated packages bellow this line --- - - vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-auto-save-2017-11-08"; - src = fetchgit { - url = "https://github.com/907th/vim-auto-save"; - rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; - sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; - }; - dependencies = []; - - }; - - vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2018-05-28"; - src = fetchgit { - url = "https://github.com/Chiel92/vim-autoformat"; - rev = "3c50ddb50635f7899b4339a64bc02333cdd24a4b"; - sha256 = "1zw7b3zxgsmj149z238qx2palqysdywqgsxgj2z37kc8is8dpdpy"; - }; - dependencies = []; - - }; - - ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2017-11-01"; - src = fetchgit { - url = "https://github.com/FelikZ/ctrlp-py-matcher"; - rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; - sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; - }; - dependencies = []; - - }; - - ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-cmatcher-2015-10-15"; - src = fetchgit { - url = "https://github.com/JazzCore/ctrlp-cmatcher"; - rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; - sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; - }; - dependencies = []; - buildInputs = [ python ]; - buildPhase = '' - patchShebangs . - ./install.sh - ''; - }; - - julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "julia-vim-2018-07-01"; - src = fetchgit { - url = "https://github.com/JuliaEditorSupport/julia-vim"; - rev = "c49d4d39fa7f54387ec20b8bbf006700b1e01fe2"; - sha256 = "14wib4768vi7681iclihlj94dlqq1apkynma8n7p9nh3jfzd4d06"; - }; - dependencies = []; - - }; - - zeavim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zeavim-vim-2018-03-22"; - src = fetchgit { - url = "https://github.com/KabbAmine/zeavim.vim"; - rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa"; - sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj"; - }; - dependencies = []; - - }; - - vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-08-19"; - src = fetchgit { - url = "https://github.com/LnL7/vim-nix"; - rev = "ab3c4d52d08e9e8d2a0919e38f98ba25a2b8ad18"; - sha256 = "1waan5vgba8qx3107hdrnmbnq5kr1n49q43p7m2g7wmj81v050yb"; - }; - dependencies = []; - - }; - - vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-actions-2018-01-18"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-actions"; - rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; - sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async-2017-03-20"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-async"; - rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; - sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; - }; - dependencies = ["vim-addon-signs"]; - - }; - - vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-background-cmd-2015-12-11"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-background-cmd"; - rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; - sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; - }; - dependencies = ["vim-addon-mw-utils"]; - - }; - - vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-commenting-2013-06-10"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-commenting"; - rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; - sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; - }; - dependencies = []; - - }; - - vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-completion-2015-02-10"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-completion"; - rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; - sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; - }; - dependencies = ["tlib"]; - - }; - - vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-errorformats-2014-11-05"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-errorformats"; - rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; - }; - dependencies = []; - - }; - - vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-goto-thing-at-cursor-2012-01-11"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; - rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; - sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; - }; - dependencies = ["tlib"]; - - }; - - vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-local-vimrc-2015-03-19"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-local-vimrc"; - rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; - sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; - }; - dependencies = []; - - }; - - vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager-2017-05-07"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-manager"; - rev = "2434225ae48e608c2b6ac86c8da1c62209da746f"; - sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb"; - }; - dependencies = []; - buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; - }; - - vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mru-2013-08-08"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-mru"; - rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; - }; - dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; - - }; - - vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mw-utils-2018-03-09"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-mw-utils"; - rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2"; - sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f"; - }; - dependencies = []; - - }; - - vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-nix-2017-09-11"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-nix"; - rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; - sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; - }; - dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-other-2014-07-15"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-other"; - rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; - sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6"; - }; - dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; - - }; - - vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-php-manual-2015-01-01"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-php-manual"; - rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; - sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; - }; - dependencies = []; - - }; - - vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-signs-2013-04-19"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-signs"; - rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; - sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; - }; - dependencies = []; - - }; - - vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql-2017-02-11"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-sql"; - rev = "048a139af36829fce670c8ff80d3aad927557ee6"; - sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; - }; - dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; - - }; - - vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-syntax-checker-2017-06-26"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-syntax-checker"; - rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; - sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-toggle-buffer-2012-01-13"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-toggle-buffer"; - rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-xdebug-2014-08-29"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-xdebug"; - rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; - sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; - }; - dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; - - }; - - tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2018-07-04"; - src = fetchgit { - url = "https://github.com/Quramy/tsuquyomi"; - rev = "9247e0f1ad0e1ae7d350ad5b27ef92269955cc65"; - sha256 = "09mihjiqg407n14gb4kr60fnyp3rpi18fr9nhnpg1ym2ly0nsa1l"; - }; - dependencies = []; - - }; - - clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clang_complete-2018-01-18"; - src = fetchgit { - url = "https://github.com/Rip-Rip/clang_complete"; - rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275"; - sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p"; - }; - dependencies = []; + clang_complete = clang_complete.overrideAttrs(old: { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). @@ -441,1591 +102,24 @@ self = rec { substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" ''; - }; + }); - riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "riv-vim-2018-06-21"; - src = fetchgit { - url = "https://github.com/Rykka/riv.vim"; - rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8"; - sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch"; - }; - dependencies = []; - - }; - - ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ultisnips-2018-04-30"; - src = fetchgit { - url = "https://github.com/SirVer/ultisnips"; - rev = "6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba"; - sha256 = "1zp3xcmxk6cn38zmxxy5s2wnw9djskwkmspq2s9vqliyhprf9sy3"; - }; - dependencies = []; - - }; - - vim-hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hoogle-2018-03-04"; - src = fetchgit { - url = "https://github.com/Twinside/vim-hoogle"; - rev = "871d104c92e33cb238506f2805f1652561978cc8"; - sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; - }; - dependencies = []; - - }; - - vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2018-07-06"; - src = fetchgit { - url = "https://github.com/airblade/vim-gitgutter"; - rev = "6076c9678643a8b2fc9973f16ec9efcd5dbe1aca"; - sha256 = "1dyrll5rm61qdmzkym67hfyw80qnw10s1qrz9ryw3zvh1s2ad43l"; - }; - dependencies = []; - - }; - - Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2018-06-20"; - src = fetchgit { - url = "https://github.com/ajh17/Spacegray.vim"; - rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81"; - sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9"; - }; - dependencies = []; - - }; - - nerdtree-git-plugin = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nerdtree-git-plugin-2017-03-12"; - src = fetchgit { - url = "https://github.com/albfan/nerdtree-git-plugin"; - rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d"; - sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj"; - }; - dependencies = []; - - }; - - vim-colors-solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colors-solarized-2011-05-09"; - src = fetchgit { - url = "https://github.com/altercation/vim-colors-solarized"; - rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; - }; - dependencies = []; - - }; - - vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-closetag-2018-05-15"; - src = fetchgit { - url = "https://github.com/alvan/vim-closetag"; - rev = "17367f433e095a66a8a885ab628033ce2a635aa1"; - sha256 = "11qkk1vsihw2sv1vdn94xjwm2p5hvisjv5h1arpdyxpnz45rs6vh"; - }; - dependencies = []; - - }; - - ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-z-2015-10-17"; - src = fetchgit { - url = "https://github.com/amiorin/ctrlp-z"; - rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; - sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; - }; - dependencies = []; - - }; - - vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-logreview-2017-07-08"; - src = fetchgit { - url = "https://github.com/andreshazard/vim-logreview"; - rev = "b7b66ab338e904127d796af49235b8c29742f18f"; - sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; - }; - dependencies = []; - - }; - - peskcolor-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "peskcolor-vim-git-2016-06-11"; - src = fetchgit { - url = "https://github.com/andsild/peskcolor.vim.git"; - rev = "cba4fc739bbebacd503158f6509d9c226651f363"; - sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq"; - }; - dependencies = []; - - }; - - flake8-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "flake8-vim-2017-02-17"; - src = fetchgit { - url = "https://github.com/andviro/flake8-vim"; - rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795"; - sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g"; - }; - dependencies = []; - - }; - - vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2018-03-06"; - src = fetchgit { - url = "https://github.com/ap/vim-css-color"; - rev = "afaacf50e65b7d30b170e70ee13c1518dce1e032"; - sha256 = "1ck8qv3wfmc7rdddzd7zh2dsnb0rx69grmc0laz7n1358xg0i4vx"; - }; - dependencies = []; - - }; - - vim-bazel = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-bazel-2018-01-10"; - src = fetchgit { - url = "https://github.com/bazelbuild/vim-bazel"; - rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3"; - sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy"; - }; - dependencies = ["maktaba"]; - - }; - - clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2018-07-25"; - src = fetchgit { - url = "https://github.com/bbchung/clighter8"; - rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181"; - sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg"; - }; - dependencies = []; + clighter8 = clighter8.overrideAttrs(old: { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \ -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim ''; - }; + }); - neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-07-23"; - src = fetchgit { - url = "https://github.com/benekastah/neomake"; - rev = "b24cac5f6aa1d8f8e8bcfae52ed255f277f4f163"; - sha256 = "00hmbip0r3l0h6fk0bxs9rqbfj0vn246804s2s7shdjsvn6a3pa0"; - }; - dependencies = []; - - }; - - vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hdevtools-2017-03-11"; - src = fetchgit { - url = "https://github.com/bitc/vim-hdevtools"; - rev = "4ffdace7002915cb10d663a2c56386286c5b8e37"; - sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka"; - }; - dependencies = []; - - }; - - vim-trailing-whitespace = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-trailing-whitespace-2017-09-22"; - src = fetchgit { - url = "https://github.com/bronson/vim-trailing-whitespace"; - rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; - sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; - }; - dependencies = []; - - }; - - vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-toml-2018-06-15"; - src = fetchgit { - url = "https://github.com/cespare/vim-toml"; - rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80"; - sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n"; - }; - dependencies = []; - - }; - - denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-extra-2018-07-19"; - src = fetchgit { - url = "https://github.com/chemzqm/denite-extra"; - rev = "10836562703ebfe6552204e63b9b4293236d6d0f"; - sha256 = "1jq6wv6vhjpkd9xy8i6rjd0l69djvxg8395ylclr2dv21carx5z6"; - }; - dependencies = []; - - }; - - denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-git-2018-07-19"; - src = fetchgit { - url = "https://github.com/chemzqm/denite-git"; - rev = "edd2c202e05c3f84e31b94a841fef236b923d559"; - sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd"; - }; - dependencies = []; - - }; - - concealedyank-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "concealedyank-vim-2013-03-24"; - src = fetchgit { - url = "https://github.com/chikatoike/concealedyank.vim"; - rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd"; - sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb"; - }; - dependencies = []; - - }; - - sourcemap-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sourcemap-vim-2012-09-19"; - src = fetchgit { - url = "https://github.com/chikatoike/sourcemap.vim"; - rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; - sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; - }; - dependencies = []; - - }; - - CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2018-07-18"; - src = fetchgit { - url = "https://github.com/chrisbra/CheckAttach"; - rev = "0f1f2e78071d7f805a0a679955cb4486f692b753"; - sha256 = "11skk275ijq8hwpp0zxsdgr08brq08v1syvyawck8vzrnqrq71sc"; - }; - dependencies = []; - - }; - - csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csv-vim-2018-06-24"; - src = fetchgit { - url = "https://github.com/chrisbra/csv.vim"; - rev = "918be3bd15920fd9bc79fca5e6870b8055742a1a"; - sha256 = "01fhw55s5q23ny3n7ldg53n3raysr2wnnkpfybbba2wv55w5vpdy"; - }; - dependencies = []; - - }; - - sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sparkup-2012-06-10"; - src = fetchgit { - url = "https://github.com/chrisgeo/sparkup"; - rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; - sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; - }; - dependencies = []; - - }; - - base16-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "base16-vim-2018-05-24"; - src = fetchgit { - url = "https://github.com/chriskempson/base16-vim"; - rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d"; - sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk"; - }; - dependencies = []; - - }; - - vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sort-motion-2018-07-15"; - src = fetchgit { - url = "https://github.com/christoomey/vim-sort-motion"; - rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5"; - sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb"; - }; - dependencies = []; - - }; - - vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2018-07-13"; - src = fetchgit { - url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "18b775fbccde5ff02e516c014290650bb40e257d"; - sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj"; - }; - dependencies = []; - - }; - - spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2018-03-29"; - src = fetchgit { - url = "https://github.com/ctjhoa/spacevim"; - rev = "30142a518ba77feb22791b5cb2387d88b70c58f2"; - sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg"; - }; - dependencies = []; - - }; - - ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2018-06-28"; - src = fetchgit { - url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989"; - sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk"; - }; - dependencies = []; - - }; - - vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim2hs-2014-04-16"; - src = fetchgit { - url = "https://github.com/dag/vim2hs"; - rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; - }; - dependencies = []; - - }; - - quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "quickfixstatus-2011-09-02"; - src = fetchgit { - url = "https://github.com/dannyob/quickfixstatus"; - rev = "fd3875b914fc51bbefefa8c4995588c088163053"; - sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; - }; - dependencies = []; - - }; - - agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2018-05-23"; - src = fetchgit { - url = "https://github.com/derekelkins/agda-vim"; - rev = "24169e70c1dbd784349b1551b6a3753680d9bb87"; - sha256 = "1bn2g89dvwccfl4ki07jb8iydb3d0s4rm7z5gv5q1bv3lccndax6"; - }; - dependencies = []; - - }; - - vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scala-2017-11-10"; - src = fetchgit { - url = "https://github.com/derekwyatt/vim-scala"; - rev = "0b909e24f31d94552eafae610da0f31040c08f2b"; - sha256 = "1lqqapimgjr7k4imr26ap0lgx6k4qjl5gmgb1knvh5kz100bsjl5"; - }; - dependencies = []; - - }; - - vim-table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-table-mode-2018-05-16"; - src = fetchgit { - url = "https://github.com/dhruvasagar/vim-table-mode"; - rev = "5483e163bd0a67e729e0e8436315f33f9e126baf"; - sha256 = "0mmpa7zhrj8mqf4931ldf6n9jlpfxc4kg8xdhqlp7srlnq4h8siw"; - }; - dependencies = []; - - }; - - vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2017-04-07"; - src = fetchgit { - url = "https://github.com/digitaltoad/vim-jade"; - rev = "ddc5592f8c36bf4bd915c16b38b8c76292c2b975"; - sha256 = "069pha18g1nlzg44k742vjxm4zwjd1qjzhfllkr35qaiflvjm84y"; - }; - dependencies = []; - - }; - - pony-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pony-vim-syntax-2017-09-26"; - src = fetchgit { - url = "https://github.com/dleonard0/pony-vim-syntax"; - rev = "caa34b3d7a15d9bfbfbb2f5944c85eb1eddcfafc"; - sha256 = "0r2lv99hkm95dv8wy9rkrkcwz5wkmwggfwi5vakgw497l3a9jskr"; - }; - dependencies = []; - - }; - - vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-07-23"; - src = fetchgit { - url = "https://github.com/dracula/vim"; - rev = "d329d61c1752807059aef388c4e9629296760a35"; - sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm"; - }; - dependencies = []; - - }; - - xptemplate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "xptemplate-2017-12-06"; - src = fetchgit { - url = "https://github.com/drmingdrmer/xptemplate"; - rev = "74aac3aebaf9c67c12c21d6b25295b9bec9c93b3"; - sha256 = "01yvas50hg7iwwrdh61407mc477byviccksgi0fkaz89p78bbd1p"; - }; - dependencies = []; - - }; - - ghcmod-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-vim-2016-06-19"; - src = fetchgit { - url = "https://github.com/eagletmt/ghcmod-vim"; - rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; - sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; - }; - dependencies = []; - - }; - - neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2018-05-13"; - src = fetchgit { - url = "https://github.com/eagletmt/neco-ghc"; - rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; - sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; - }; - dependencies = []; - - }; - - editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "editorconfig-vim-2018-07-25"; - src = fetchgit { - url = "https://github.com/editorconfig/editorconfig-vim"; - rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4"; - sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x"; - }; - dependencies = []; - - }; - - vim-cute-python-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-cute-python-git-2016-04-04"; - src = fetchgit { - url = "https://github.com/ehamberg/vim-cute-python.git"; - rev = "d7a6163f794500447242df2bedbe20bd751b92da"; - sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf"; - }; - dependencies = []; - - }; - - acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "acp-2013-02-05"; - src = fetchgit { - url = "https://github.com/eikenb/acp"; - rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e"; - sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg"; - }; - dependencies = []; - - }; - - vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2018-05-25"; - src = fetchgit { - url = "https://github.com/elixir-lang/vim-elixir"; - rev = "b916c00a7cdb6099dbebb6096eab55794751e2b3"; - sha256 = "1scg80j7kjjqfcswddwsig166zmipa9q6rm0kh8779i7qflgg4g0"; - }; - dependencies = []; - - }; - - elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2018-06-18"; - src = fetchgit { - url = "https://github.com/elmcast/elm-vim"; - rev = "e51e2e43ad617c26205a84453481d3ac152c8fec"; - sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b"; - }; - dependencies = []; - - }; - - vim-json = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-json-2018-01-10"; - src = fetchgit { - url = "https://github.com/elzr/vim-json"; - rev = "3727f089410e23ae113be6222e8a08dd2613ecf2"; - sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1"; - }; - dependencies = []; - - }; - - vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2018-07-23"; - src = fetchgit { - url = "https://github.com/embear/vim-localvimrc"; - rev = "a3cb22a68625e022df1da402361801cc817bcec5"; - sha256 = "0n3fl4wh5bhppxwkpd69jmnck2js08dgzfxcpfqrvx22zr22m8kc"; - }; - dependencies = []; - - }; - - vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-haskellConcealPlus-2016-05-13"; - src = fetchgit { - url = "https://github.com/enomsg/vim-haskellConcealPlus"; - rev = "81dfb51ff8e471fb1f30659a10daaf1bdd65fb03"; - sha256 = "0vm76gxw62lkyxccrlnn8sblfl3d51svwfra9wfixq4h51jdggyr"; - }; - dependencies = []; - - }; - - ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ensime-vim-2018-04-21"; - src = fetchgit { - url = "https://github.com/ensime/ensime-vim"; - rev = "634cce6eae10a31cd6eec259890bdcda326ee3c2"; - sha256 = "03sr53680kcwxaa5xbqzdfbsgday3bkzja33wym49w9gjmlaa320"; - }; - dependencies = ["vimproc" "vimshell" "self" "forms"]; - passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; - }; - - supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "supertab-2017-11-14"; - src = fetchgit { - url = "https://github.com/ervandew/supertab"; - rev = "40fe711e088e2ab346738233dd5adbb1be355172"; - sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; - }; - dependencies = []; - - }; - - YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "YUNOcommit-vim-2014-11-26"; - src = fetchgit { - url = "https://github.com/esneider/YUNOcommit.vim"; - rev = "981082055a73ef076d7e27477874d2303153a448"; - sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab"; - }; - dependencies = []; - - }; - - vim-lastplace = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-lastplace-2017-06-13"; - src = fetchgit { - url = "https://github.com/farmergreg/vim-lastplace"; - rev = "102b68348eff0d639ce88c5094dab0fdbe4f7c55"; - sha256 = "1d0mjjyissjvl80wgmn7z1gsjs3fhk0vnmx84l9q7g04ql4l9pja"; - }; - dependencies = []; - - }; - - vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-07-22"; - src = fetchgit { - url = "https://github.com/fatih/vim-go"; - rev = "5e26ce6bfa9400f645aaa5898f802f46275b9585"; - sha256 = "1m380n3sdsqydn5dbjj1cafslbr1426ihz1a7rxr980z5jd43hj1"; - }; - dependencies = []; - - }; - - vim-isort = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-isort-2017-03-12"; - src = fetchgit { - url = "https://github.com/fisadev/vim-isort"; - rev = "65bd9fecd5412c8c127de86f8dcf6cfe4dd70fda"; - sha256 = "0d9r2p557czrqhn3z35jsrzp3iw6n0vjhxcgkk6l0y79ni3dar1m"; - }; - dependencies = []; - postPatch = '' - substituteInPlace ftplugin/python_vimisort.vim \ - --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' - ''; - }; - - vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorschemes-2017-08-22"; - src = fetchgit { - url = "https://github.com/flazz/vim-colorschemes"; - rev = "eab315701f4627967fd62582eefc4e37a3745786"; - sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k"; - }; - dependencies = []; - - }; - - floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "floobits-neovim-2017-08-02"; - src = fetchgit { - url = "https://github.com/floobits/floobits-neovim"; - rev = "9ccd5a8d5d28261b9686717d61a32b756f38f189"; - sha256 = "02njg49qz9bfzggpn7z5c7w1wa1k5hxly66904wizl601fa6c664"; - }; - dependencies = []; - - }; - - psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2018-03-11"; - src = fetchgit { - url = "https://github.com/frigoeu/psc-ide-vim"; - rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f"; - sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g"; - }; - dependencies = []; - - }; - - vim-snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snipmate-2017-04-20"; - src = fetchgit { - url = "https://github.com/garbas/vim-snipmate"; - rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; - sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2018-02-02"; - src = fetchgit { - url = "https://github.com/gmarik/vundle"; - rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; - sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; - }; - dependencies = []; - - }; - - csapprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csapprox-2013-07-26"; - src = fetchgit { - url = "https://github.com/godlygeek/csapprox"; - rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; - sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; - }; - dependencies = []; - - }; - - tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tabular-2016-05-04"; - src = fetchgit { - url = "https://github.com/godlygeek/tabular"; - rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; - sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz"; - }; - dependencies = []; - - }; - - vim-codefmt = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-codefmt-2018-06-06"; - src = fetchgit { - url = "https://github.com/google/vim-codefmt"; - rev = "78f646545c4e1254fc413242e5c204a2dc79665d"; - sha256 = "0ysnjsc7nybm374k039655y1wijkh8p2m0hsfxf9cxf79yjinyql"; - }; - dependencies = ["maktaba"]; - - }; - - vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsonnet-2018-04-10"; - src = fetchgit { - url = "https://github.com/google/vim-jsonnet"; - rev = "1425166887329363381194adc457b02b663b1354"; - sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j"; - }; - dependencies = []; - - }; - - vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-maktaba-2018-05-06"; - src = fetchgit { - url = "https://github.com/google/vim-maktaba"; - rev = "ffdb1a5a9921f7fd722c84d0f60e166f9916b67d"; - sha256 = "1cmhgd9xvx09l6ypks09gxqs1vad1bddinf4cx2jmd516bv8qss3"; - }; - dependencies = []; - - }; - - gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gitv-2018-06-10"; - src = fetchgit { - url = "https://github.com/gregsexton/gitv"; - rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2"; - sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn"; - }; - dependencies = ["fugitive"]; - - }; - - xterm-color-table-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "xterm-color-table-vim-2013-12-31"; - src = fetchgit { - url = "https://github.com/guns/xterm-color-table.vim"; - rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; - sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; - }; - dependencies = []; - - }; - - vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsdoc-2018-05-05"; - src = fetchgit { - url = "https://github.com/heavenshell/vim-jsdoc"; - rev = "5ef086789f5ac431d1d5aab53e771f00f1c25503"; - sha256 = "0f0dbcvbmha2nfadvf27crxkkxc1ps1inss5n66vy1p5bffv0bpm"; - }; - dependencies = []; - - }; - - vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-leader-guide-2017-03-18"; - src = fetchgit { - url = "https://github.com/hecal3/vim-leader-guide"; - rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e"; - sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw"; - }; - dependencies = []; - - }; - - vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2018-07-19"; - src = fetchgit { - url = "https://github.com/honza/vim-snippets"; - rev = "1143432afdb3a97b606b081700eead5b4f499d4d"; - sha256 = "1z0pgpsv8y1zhxlm6w76wgd4wx378wbq44mvgxxfxi0mfvb6vywf"; - }; - dependencies = []; - - }; - - idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2017-12-04"; - src = fetchgit { - url = "https://github.com/idris-hackers/idris-vim"; - rev = "091ed6b267749927777423160eeab520109dd9c1"; - sha256 = "1zibar2vxcmai0k37ricwnimfdv1adxfbbvz871rc4l6h3q85if1"; - }; - dependencies = []; - - }; - - vim-SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-SyntaxRange-2018-03-09"; - src = fetchgit { - url = "https://github.com/inkarkat/vim-SyntaxRange"; - rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; - sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; - }; - dependencies = []; - - }; - - vim-extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-extradite-2015-09-22"; - src = fetchgit { - url = "https://github.com/int3/vim-extradite"; - rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; - sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; - }; - dependencies = []; - - }; - - calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2018-07-04"; - src = fetchgit { - url = "https://github.com/itchyny/calendar.vim"; - rev = "f27fcf52c8a516f55ede5cff468f0a3e4014ae1b"; - sha256 = "07gg83bgj9c43jn66zlvyc1avqjyidb9cjwdv1ln3965zkl47b5r"; - }; - dependencies = []; - - }; - - lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2018-07-05"; - src = fetchgit { - url = "https://github.com/itchyny/lightline.vim"; - rev = "0532dff598abca9975d3f80128eaadadbf1d91d4"; - sha256 = "1wvhl2wc2p4vqi7zzj7wdyq0cnbfq8s7g5ifcchj8f5s8c4h4lfc"; - }; - dependencies = []; - - }; - - thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "thumbnail-vim-2017-04-24"; - src = fetchgit { - url = "https://github.com/itchyny/thumbnail.vim"; - rev = "71cb5d48e59fc77149c1d1036ecd9e39f0b46a00"; - sha256 = "0b25n28ri6n5rrvgfynv8rm5pzzxpnrnj1l3647pf2fjxd2z2rv5"; - }; - dependencies = []; - - }; - - vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-cursorword-2017-10-19"; - src = fetchgit { - url = "https://github.com/itchyny/vim-cursorword"; - rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; - sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; - }; - dependencies = []; - - }; - - vim-gitbranch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitbranch-2017-05-28"; - src = fetchgit { - url = "https://github.com/itchyny/vim-gitbranch"; - rev = "8118dc1cdd387bd609852be4bf350360ce881193"; - sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j"; - }; - dependencies = []; - - }; - - vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ipython-2015-06-23"; - src = fetchgit { - url = "https://github.com/ivanov/vim-ipython"; - rev = "42499f094b805b90b683afa5009cee99abd0bb75"; - sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x"; - }; - dependencies = []; - - }; - - tender-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tender-vim-2017-03-14"; - src = fetchgit { - url = "https://github.com/jacoborus/tender.vim"; - rev = "6b0497a59233b3e67fb528a498069eb1d24743f9"; - sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn"; - }; - dependencies = []; - - }; - - vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-test-git-2018-07-10"; - src = fetchgit { - url = "https://github.com/janko-m/vim-test.git"; - rev = "e24477e81e91fe90c5d914849848027cb09a7c86"; - sha256 = "1kkfzs0bmbg4kjips1jylrsd5rqd39ab2x2z1a64pjkx1fvl703b"; - }; - dependencies = []; - - }; - - vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hier-2011-08-27"; - src = fetchgit { - url = "https://github.com/jceb/vim-hier"; - rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; - sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n"; - }; - dependencies = []; - buildInputs = [ vim ]; - }; - - vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2018-07-25"; - src = fetchgit { - url = "https://github.com/jceb/vim-orgmode"; - rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c"; - sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx"; - }; - dependencies = []; - - }; - - vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2018-05-02"; - src = fetchgit { - url = "https://github.com/jeetsukumaran/vim-buffergator"; - rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916"; - sha256 = "1b6sw5858h3v7p46v1fiy06jnfwiwqsfqwhr46ia12d0rfdm538c"; - }; - dependencies = []; - - }; - - tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tslime-vim-2018-07-23"; - src = fetchgit { - url = "https://github.com/jgdavey/tslime.vim"; - rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; - sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; - }; - dependencies = []; - - }; - - vim-docbk = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-docbk-2015-04-01"; - src = fetchgit { - url = "https://github.com/jhradilek/vim-docbk"; - rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e"; - sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d"; - }; - dependencies = []; - - }; - - auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "auto-pairs-2017-07-03"; - src = fetchgit { - url = "https://github.com/jiangmiao/auto-pairs"; - rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; - sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; - }; - dependencies = []; - - }; - - vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nerdtree-tabs-2018-05-05"; - src = fetchgit { - url = "https://github.com/jistr/vim-nerdtree-tabs"; - rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b"; - sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa"; - }; - dependencies = []; - - }; - - zenburn = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zenburn-2018-04-29"; - src = fetchgit { - url = "https://github.com/jnurmine/zenburn"; - rev = "2cacfcb222d9db34a8d1a13bb8bb814f039b98cd"; - sha256 = "0m5d5sjckirfpdhg9sf1nl5xywvzdx6y04r13m47jlavf79hhimi"; - }; - dependencies = []; - - }; - - vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorstepper-2016-01-28"; - src = fetchgit { - url = "https://github.com/jonbri/vim-colorstepper"; - rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05"; - sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs"; - }; - dependencies = []; - - }; - - vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-xdebug-2012-08-15"; - src = fetchgit { - url = "https://github.com/joonty/vim-xdebug"; - rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; - sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw"; - }; - dependencies = []; - postInstall = false; - }; - - fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-07-22"; - src = fetchgit { - url = "https://github.com/junegunn/fzf.vim"; - rev = "6ce58caad320be3cf9ff5d275191f88524edf326"; - sha256 = "02s6ky1mnb18iy91p6syy3qnp55zwg2d52ybm6cic2gwvj1az1sf"; - }; - dependencies = []; - - }; - - goyo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "goyo-vim-2017-06-01"; - src = fetchgit { - url = "https://github.com/junegunn/goyo.vim"; - rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; - sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj"; - }; - dependencies = []; - - }; - - limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "limelight-vim-2016-06-24"; - src = fetchgit { - url = "https://github.com/junegunn/limelight.vim"; - rev = "106fb5749d227a0de72e36068ed72798c6fd48e6"; - sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh"; - }; - dependencies = []; - - }; - - vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2017-06-03"; - src = fetchgit { - url = "https://github.com/junegunn/vim-easy-align"; - rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; - sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774"; - }; - dependencies = []; - - }; - - vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dashboard-2017-08-08"; - src = fetchgit { - url = "https://github.com/junegunn/vim-github-dashboard"; - rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6"; - sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y"; - }; - dependencies = []; - - }; - - vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-peekaboo-2017-03-20"; - src = fetchgit { - url = "https://github.com/junegunn/vim-peekaboo"; - rev = "a7c940b15b008afdcea096d3fc4d25e3e431eb49"; - sha256 = "1rc4hr6vwj2mmrgz8lifxf9rvcw1rb5dahq649yn8ccw03x8zn6m"; - }; - dependencies = []; - - }; - - vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eighties-2016-12-15"; - src = fetchgit { - url = "https://github.com/justincampbell/vim-eighties"; - rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170"; - sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2"; - }; - dependencies = []; - - }; - - vim-niceblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-niceblock-2018-01-30"; - src = fetchgit { - url = "https://github.com/kana/vim-niceblock"; - rev = "178629a8b81da2fa614bd6c19e7797e325ee9153"; - sha256 = "1bz8qjnwk3gz9h0194g3qqga91i4k78r9s1xymn2fv35llrfsdx0"; - }; - dependencies = []; - - }; - - vim-operator-replace = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-operator-replace-2015-02-25"; - src = fetchgit { - url = "https://github.com/kana/vim-operator-replace"; - rev = "1345a556a321a092716e149d4765a5e17c0e9f0f"; - sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q"; - }; - dependencies = []; - - }; - - vim-operator-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-operator-user-2015-02-17"; - src = fetchgit { - url = "https://github.com/kana/vim-operator-user"; - rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa"; - sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb"; - }; - dependencies = []; - - }; - - vim-tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tabpagecd-2013-11-29"; - src = fetchgit { - url = "https://github.com/kana/vim-tabpagecd"; - rev = "8b71a03a037608fa5918f5096812577cec6355e4"; - sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; - }; - dependencies = []; - - }; - - vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2018-02-27"; - src = fetchgit { - url = "https://github.com/kchmck/vim-coffee-script"; - rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; - sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; - }; - dependencies = []; - - }; - - swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "swift-vim-2018-07-21"; - src = fetchgit { - url = "https://github.com/keith/swift.vim"; - rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab"; - sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153"; - }; - dependencies = []; - - }; - - rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow_parentheses-vim-2013-03-04"; - src = fetchgit { - url = "https://github.com/kien/rainbow_parentheses.vim"; - rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; - sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; - }; - dependencies = []; - - }; - - fastfold = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fastfold-2018-06-02"; - src = fetchgit { - url = "https://github.com/konfekt/fastfold"; - rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30"; - sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r"; - }; - dependencies = []; - - }; - - vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2018-07-06"; - src = fetchgit { - url = "https://github.com/kshenoy/vim-signature"; - rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc"; - sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm"; - }; - dependencies = []; - - }; - - vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2017-02-20"; - src = fetchgit { - url = "https://github.com/lambdalisue/vim-gista"; - rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; - sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; - }; - dependencies = []; - - }; - - latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "latex-box-2015-06-01"; - src = fetchgit { - url = "https://github.com/latex-box-team/latex-box"; - rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1"; - sha256 = "1z4mdy47cpwcdhvy8mr72vhlybxn1y59yd3ixf6ids1bzpkrd7zl"; - }; - dependencies = []; - - }; - - typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "typescript-vim-2018-03-08"; - src = fetchgit { - url = "https://github.com/leafgarland/typescript-vim"; - rev = "e25636b44211a4be7b089bfed7cf09aa7dd086f5"; - sha256 = "1i422j4za5xwcv3zz7cjw523nnh5q652c04phqp681lgdmgqszh4"; - }; - dependencies = []; - - }; - - vim-ledger = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ledger-2017-12-12"; - src = fetchgit { - url = "https://github.com/ledger/vim-ledger"; - rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d"; - sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01"; - }; - dependencies = []; - - }; - - vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jinja-2016-11-16"; - src = fetchgit { - url = "https://github.com/lepture/vim-jinja"; - rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6"; - sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q"; - }; - dependencies = []; - - }; - - vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-07-25"; - src = fetchgit { - url = "https://github.com/lervag/vimtex"; - rev = "5c5cd72b680bca8c3b5b45ee790f3f6f5890e77c"; - sha256 = "1pahrkf536ay56jdiqdda1bq0q5d788bvf099r0wvxwgqk77hr6n"; - }; - dependencies = []; - - }; - - cosco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "cosco-vim-2018-02-15"; - src = fetchgit { - url = "https://github.com/lfilho/cosco.vim"; - rev = "434dc68b93b8f42babe1887a269145ce39c97edf"; - sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv"; - }; - dependencies = []; - - }; - - vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2018-06-05"; - src = fetchgit { - url = "https://github.com/lokaltog/vim-easymotion"; - rev = "1a0244c90c3ff46219cf9597bb13662be4232407"; - sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy"; - }; - dependencies = []; - - }; - - vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-lawrencium-2017-01-10"; - src = fetchgit { - url = "https://github.com/ludovicchabant/vim-lawrencium"; - rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f"; - sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab"; - }; - dependencies = []; - - }; - - rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow-2018-06-19"; - src = fetchgit { - url = "https://github.com/luochen1990/rainbow"; - rev = "549724c2123c5a06834676963be0d76d5c37abc1"; - sha256 = "0hh0w337qw5yk9flk4iz4vfpa4q13blvyv10hgbfrqy72s30gpdf"; - }; - dependencies = []; - - }; - - vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-xkbswitch-2017-03-27"; - src = fetchgit { - url = "https://github.com/lyokha/vim-xkbswitch"; - rev = "a85ebddb9038e6b05138c48868a319a9e13d1868"; - sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr"; - }; - dependencies = []; - patchPhase = '' - substituteInPlace plugin/xkbswitch.vim \ - --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so - ''; - buildInputs = [ xkb_switch ]; - }; - - vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2018-06-01"; - src = fetchgit { - url = "https://github.com/machakann/vim-highlightedyank"; - rev = "eafae05916e670da8bc99e44b1534cd8c7f87c7a"; - sha256 = "1z6xjb9244fgnhmw21m7y3bd9vs9gvxbb9ig73iwy0ny886hjlnk"; - }; - dependencies = []; - - }; - - tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tagbar-2017-12-17"; - src = fetchgit { - url = "https://github.com/majutsushi/tagbar"; - rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70"; - sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9"; - }; - dependencies = []; - - }; - - vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsbeautify-2018-01-31"; - src = fetchgit { - url = "https://github.com/maksimr/vim-jsbeautify"; - rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624"; - sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq"; - }; - dependencies = []; - - }; - - Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Jenkinsfile-vim-syntax-2018-04-03"; - src = fetchgit { - url = "https://github.com/martinda/Jenkinsfile-vim-syntax"; - rev = "45418b171e06f63e0814cac6a656832384708aba"; - sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p"; - }; - dependencies = []; - - }; - - gist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gist-vim-2016-10-10"; - src = fetchgit { - url = "https://github.com/mattn/gist-vim"; - rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; - sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; - }; - dependencies = []; - - }; - - webapi-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "webapi-vim-2018-03-14"; - src = fetchgit { - url = "https://github.com/mattn/webapi-vim"; - rev = "252250381a9509257bfb06b9f95441e41e3e23b5"; - sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a"; - }; - dependencies = []; - - }; - - undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2018-07-02"; - src = fetchgit { - url = "https://github.com/mbbill/undotree"; - rev = "a80159c9f5c238575b63984b8bc610bc5de6b233"; - sha256 = "10l091qbigcj053l65bs3cdnysasl7f2qdbsk8bk6k0xj7rrpgzl"; - }; - dependencies = []; - - }; - - forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "forms-2012-11-28"; - src = fetchgit { - url = "https://github.com/megaannum/forms"; - rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; - sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; - }; - dependencies = ["self"]; - - }; - - self = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "self-2014-05-28"; - src = fetchgit { - url = "https://github.com/megaannum/self"; - rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f"; - sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn"; - }; - dependencies = []; - - }; - - robotframework-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "robotframework-vim-2017-04-14"; - src = fetchgit { - url = "https://github.com/mfukar/robotframework-vim"; - rev = "75d5b371a4da2a090a2872d55bd0dead013f334e"; - sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad"; - }; - dependencies = []; - - }; - - vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grepper-git-2018-04-24"; - src = fetchgit { - url = "https://github.com/mhinz/vim-grepper.git"; - rev = "04d659c9e0a57e0c3e989069601d2a98df0386c4"; - sha256 = "16k5ahcn9i4wvlhw16j0gfgxw0clry72l78lk28qmx9p2gh1ka3g"; - }; - dependencies = []; - - }; - - vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-07-25"; - src = fetchgit { - url = "https://github.com/mhinz/vim-signify"; - rev = "a9fc705b9bdffaac46f13e47d6565c904102dedc"; - sha256 = "0hk24anfhh1v62zn03cbqrf8c260q6g5cka8dpq8c5943v6kln59"; - }; - dependencies = []; - - }; - - vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-07-21"; - src = fetchgit { - url = "https://github.com/mhinz/vim-startify"; - rev = "8cde338d1f35057fd64146090c960a55b953dcd9"; - sha256 = "01aali5s946589cxy8k5qb0qzhxwlgwv4grri3x60h2520fc1z29"; - }; - dependencies = []; - - }; - - vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-indent-object-2018-04-08"; - src = fetchgit { - url = "https://github.com/michaeljsmith/vim-indent-object"; - rev = "5c5b24c959478929b54a9e831a8e2e651a465965"; - sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19"; - }; - dependencies = []; - - }; - - ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ack-vim-2018-02-28"; - src = fetchgit { - url = "https://github.com/mileszs/ack.vim"; - rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042"; - sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm"; - }; - dependencies = []; - - }; - - vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-yapf-2018-06-05"; - src = fetchgit { - url = "https://github.com/mindriot101/vim-yapf"; - rev = "cae79733a1a39732c5305d4a89cd093d17cb917d"; - sha256 = "16bmzvzks6kbqm6dk908k23b9wj7qf3x8bz3kikrzj27s0p7s9cc"; - }; - dependencies = []; + command-t = command-t.overrideAttrs(old: { + buildInputs = [ ruby rake ]; buildPhase = '' - substituteInPlace ftplugin/python_yapf.vim \ - --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"' + rake make + rm ruby/command-t/ext/command-t/*.o ''; - }; + }); - lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lushtags-2017-04-19"; - src = fetchgit { - url = "https://github.com/mkasa/lushtags"; - rev = "fd7fa5a0162d9aa159559880d5ba4731e180eeaf"; - sha256 = "1si5n07k4r8kji4whglav9q59ksv6bi5v58xbpc2l5bavlk8kn6n"; - }; - dependencies = []; - - }; - - gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gruvbox-2018-02-25"; - src = fetchgit { - url = "https://github.com/morhetz/gruvbox"; - rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86"; - sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi"; - }; - dependencies = []; - - }; - - hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "hlint-refactor-vim-2015-12-05"; - src = fetchgit { - url = "https://github.com/mpickering/hlint-refactor-vim"; - rev = "fffb044ecef854a82c5c2efda252e09044ba03e0"; - sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8"; - }; - dependencies = []; - - }; - - vim-indent-guides = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-indent-guides-2018-05-14"; - src = fetchgit { - url = "https://github.com/nathanaelkane/vim-indent-guides"; - rev = "54d889a63716ee2f1818aa2ec5082db47147147b"; - sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2"; - }; - dependencies = []; - - }; - - vim-stylish-haskell = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-stylish-haskell-2015-05-10"; - src = fetchgit { - url = "https://github.com/nbouscal/vim-stylish-haskell"; - rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671"; - sha256 = "1xm5ark2mwphznv3xsyzgcldnr52i5jzk1pfqdh0080j07aama8j"; - }; - dependencies = []; - - }; - - vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easygit-2018-07-08"; - src = fetchgit { - url = "https://github.com/neoclide/vim-easygit"; - rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a"; - sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8"; - }; - dependencies = []; - - }; - - haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2018-05-22"; - src = fetchgit { - url = "https://github.com/neovimhaskell/haskell-vim"; - rev = "b1ac46807835423c4a4dd063df6d5b613d89c731"; - sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br"; - }; - dependencies = []; - - }; - - cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "cpsm-2018-02-01"; - src = fetchgit { - url = "https://github.com/nixprime/cpsm"; - rev = "8a4a0a05162762b857b656d51b59a5bf01850877"; - sha256 = "0v44gf9ygrqc6rpfpiq329jija4icy0iy240yk30c0r04mjahc0b"; - }; - dependencies = []; + cpsm = cpsm.overrideAttrs(old: { buildInputs = [ python3 stdenv @@ -2039,170 +133,119 @@ self = rec { export PY3=ON ./install.sh ''; - }; + }); - vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-iced-coffee-script-2013-12-27"; - src = fetchgit { - url = "https://github.com/noc7c9/vim-iced-coffee-script"; - rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; - sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; - }; - dependencies = []; + ctrlp-cmatcher = ctrlp-cmatcher.overrideAttrs(old: { + buildInputs = [ python ]; + buildPhase = '' + patchShebangs . + ./install.sh + ''; + }); - }; + deoplete-go = deoplete-go.overrideAttrs(old: { + buildInputs = [ python3 ]; + buildPhase = '' + pushd ./rplugin/python3/deoplete/ujson + python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build + popd + find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; + ''; + }); - shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "shabadou-vim-2016-07-19"; - src = fetchgit { - url = "https://github.com/osyo-manga/shabadou.vim"; - rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1"; - sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870"; - }; - dependencies = []; + ensime-vim = ensime-vim.overrideAttrs(old: { + passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; + dependencies = ["vimproc" "vimshell" "self" "forms"]; + }); - }; + forms = forms.overrideAttrs(old: { + dependencies = ["self"]; + }); - vim-textobj-multiblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-textobj-multiblock-2014-06-02"; - src = fetchgit { - url = "https://github.com/osyo-manga/vim-textobj-multiblock"; - rev = "670a5ba57d73fcd793f480e262617c6eb0103355"; - sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf"; - }; - dependencies = []; + gitv = gitv.overrideAttrs(old: { + dependencies = ["gitv"]; + }); - }; + taglist = taglist.overrideAttrs(old: { + setSourceRoot = '' + export sourceRoot=taglist + mkdir taglist + mv doc taglist + mv plugin taglist + ''; + }); - vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-watchdogs-2017-12-03"; - src = fetchgit { - url = "https://github.com/osyo-manga/vim-watchdogs"; - rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; - sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; - }; - dependencies = []; + vimshell-vim = vimshell-vim.overrideAttrs(old: { + dependencies = [ "vimproc-vim" ]; + }); - }; + vim-addon-manager = vim-addon-manager.overrideAttrs(old: { + buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; + }); - vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-javascript-2018-07-14"; - src = fetchgit { - url = "https://github.com/pangloss/vim-javascript"; - rev = "39e332a3c36c0115e1eab85c34cf121b7585869d"; - sha256 = "04ycwh298i213zw0zvj99igfmxf36swycryapsgp9jrh9jjd9hmw"; - }; - dependencies = []; + vim-addon-actions = vim-addon-actions.overrideAttrs(old: { + dependencies = [ "vim-addon-mw-utils" "tlib" ]; + }); - }; + vim-addon-async = vim-addon-async.overrideAttrs(old: { + dependencies = [ "vim-addon-signs" ]; + }); - vim-qml = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-qml-2018-07-22"; - src = fetchgit { - url = "https://github.com/peterhoeg/vim-qml"; - rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a"; - sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc"; - }; - dependencies = []; + vim-addon-background-cmd = vim-addon-background-cmd.overrideAttrs(old: { + dependencies = [ "vim-addon-mw-utils" ]; + }); - }; + vim-addon-completion = vim-addon-completion.overrideAttrs(old: { + dependencies = [ "tlib" ]; + }); - vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-markdown-2018-06-05"; - src = fetchgit { - url = "https://github.com/plasticboy/vim-markdown"; - rev = "6d2cb3c06cd546fd4bee4136679db3a3d5de97fa"; - sha256 = "17izjzgpwpl6i1vvz2hcd7ympgxyjmsb0k62rhvl15jmx06c3ysz"; - }; - dependencies = []; + vim-addon-goto-thing-at-cursor = vim-addon-goto-thing-at-cursor.overrideAttrs(old: { + dependencies = [ "tlib" ]; + }); - }; + vim-addon-mru = vim-addon-mru.overrideAttrs(old: { + dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; + }); - python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2018-07-23"; - src = fetchgit { - url = "https://github.com/python-mode/python-mode"; - rev = "d241974f40e8d206f9970e51fb0069951862ba35"; - sha256 = "1cjhlbk71785zy0g0lf2bmsdsnvqwx03v8lxq7i7j2qazalszxci"; - }; - dependencies = []; + vim-addon-nix = vim-addon-nix.overrideAttrs(old: { + dependencies = [ + "vim-addon-completion" + "vim-addon-goto-thing-at-cursor" + "vim-addon-errorformats" + "vim-addon-actions" + "vim-addon-mw-utils" "tlib" + ]; + }); - }; + vim-addon-sql = vim-addon-sql.overrideAttrs(old: { + dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; + }); - vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2018-05-13"; - src = fetchgit { - url = "https://github.com/racer-rust/vim-racer"; - rev = "cd663ddacc89fb3cbbb9649f7cd36528960b1fe9"; - sha256 = "1k75ypgiy13l28mndi6p95lc818k04imlm7xk0y9sck8bsny1vhi"; - }; - dependencies = []; + vim-addon-syntax-checker = vim-addon-syntax-checker.overrideAttrs(old: { + dependencies = ["vim-addon-mw-utils" "tlib"]; + }); - }; + vim-addon-toggle-buffer = vim-addon-toggle-buffer.overrideAttrs(old: { + dependencies = [ "vim-addon-mw-utils" "tlib" ]; + }); - awesome-vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "awesome-vim-colorschemes-2018-01-20"; - src = fetchgit { - url = "https://github.com/rafi/awesome-vim-colorschemes"; - rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d"; - sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z"; - }; - dependencies = []; + vim-addon-xdebug = vim-addon-xdebug.overrideAttrs(old: { + dependencies = [ "WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async" ]; + }); - }; + vim-bazel = vim-bazel.overrideAttrs(old: { + dependencies = ["maktaba"]; + }); - purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "purescript-vim-2018-07-05"; - src = fetchgit { - url = "https://github.com/raichoo/purescript-vim"; - rev = "ab8547cef5827f046d43ba57203acb6692b7ef06"; - sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33"; - }; - dependencies = []; + vim-codefmt = vim-codefmt.overrideAttrs(old: { + dependencies = ["maktaba"]; + }); - }; + vim-easytags = vim-easytags.overrideAttrs(old: { + dependencies = ["vim-misc"]; + }); - vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pencil-2017-06-14"; - src = fetchgit { - url = "https://github.com/reedes/vim-pencil"; - rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; - sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; - }; - dependencies = []; - - }; - - vim-wordy = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wordy-2018-03-10"; - src = fetchgit { - url = "https://github.com/reedes/vim-wordy"; - rev = "14b9dbf76a82e29273a74768573900361200467f"; - sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk"; - }; - dependencies = []; - - }; - - committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "committia-vim-git-2018-07-14"; - src = fetchgit { - url = "https://github.com/rhysd/committia.vim.git"; - rev = "6aa77b9161e75828d0be2ba40ed420cbf7a55279"; - sha256 = "0sr7wzccj805fnc48qgcshp8rypz3vb8507pkc1r3pn7wbxqkni1"; - }; - dependencies = []; - - }; - - vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2018-06-22"; - src = fetchgit { - url = "https://github.com/rhysd/vim-grammarous"; - rev = "0d8a0272389a32bd49e74bb00527c02f9aca19a8"; - sha256 = "0ji18hjhp1gx147z682b4xy1w02kqcr8rb5frccyqn4kdpqhqvbk"; - }; - dependencies = []; + vim-grammarous = vim-grammarous.overrideAttrs(old: { # use `:GrammarousCheck` to initialize checking # In neovim, you also want to use set # let g:grammarous#show_first_error = 1 @@ -2213,302 +256,48 @@ self = rec { inherit languagetool; }) ]; - }; + }); - vim-operator-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-operator-surround-2017-12-23"; - src = fetchgit { - url = "https://github.com/rhysd/vim-operator-surround"; - rev = "001c0da077b5b38a723151b19760d220e02363db"; - sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh"; - }; - dependencies = []; + vim-hier = vim-hier.overrideAttrs(old: { + buildInputs = [ vim ]; + }); - }; + vim-isort = vim-isort.overrideAttrs(old: { + postPatch = '' + substituteInPlace ftplugin/python_vimisort.vim \ + --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' + ''; + }); - vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-puppet-2018-04-12"; - src = fetchgit { - url = "https://github.com/rodjek/vim-puppet"; - rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097"; - sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv"; - }; - dependencies = []; + vim-snipmate = vim-snipmate.overrideAttrs(old: { + dependencies = ["vim-addon-mw-utils" "tlib"]; + }); - }; - nvim-cm-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nvim-cm-racer-2017-07-27"; - src = fetchgit { - url = "https://github.com/roxma/nvim-cm-racer"; - rev = "2a8a4a49fa58c5dac9e0bed9511f6928930cacd2"; - sha256 = "1yljxwypgn91084yyicbc2qprn31ld7s4drvnddzczyhzq5m2gpx"; - }; - dependencies = []; + vim-wakatime = vim-wakatime.overrideAttrs(old: { + buildInputs = [ python ]; + }); - }; + vim-xdebug = vim-xdebug.overrideAttrs(old: { + postInstall = false; + }); - nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nvim-completion-manager-2018-04-18"; - src = fetchgit { - url = "https://github.com/roxma/nvim-completion-manager"; - rev = "3ef5ade36e7321aace4e9e22da216202bdcd65f1"; - sha256 = "0vfcnvdcxhs3in4pwcqjb5h3ns7ik53n4xb1h9r94w1gfw00lh1l"; - }; - dependencies = []; + vim-xkbswitch = vim-xkbswitch.overrideAttrs(old: { + patchPhase = '' + substituteInPlace plugin/xkbswitch.vim \ + --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so + ''; + buildInputs = [ xkb_switch ]; + }); - }; + vim-yapf = vim-yapf.overrideAttrs(old: { + buildPhase = '' + substituteInPlace ftplugin/python_yapf.vim \ + --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"' + ''; + }); - rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2018-07-17"; - src = fetchgit { - url = "https://github.com/rust-lang/rust.vim"; - rev = "2fa74427456a68e9e90f542567f851df50d48a8c"; - sha256 = "0vqvw5czwy3v99dv5gbgy8ljg31qhsnhqjfl0a4dfij6p66xyi46"; - }; - dependencies = []; - - }; - - vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-devicons-2018-06-21"; - src = fetchgit { - url = "https://github.com/ryanoasis/vim-devicons"; - rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26"; - sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg"; - }; - dependencies = []; - - }; - - neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2018-07-16"; - src = fetchgit { - url = "https://github.com/sbdchd/neoformat"; - rev = "f20e73193f2260d4437d160759d6b623a74a5a35"; - sha256 = "0460v5h82zsgslqxkiwf2qbkah15hf3p33ddvcipfqg0rnrbwynp"; - }; - dependencies = []; - - }; - - nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nerdcommenter-2018-06-21"; - src = fetchgit { - url = "https://github.com/scrooloose/nerdcommenter"; - rev = "9a32fd2534427f7a1dcfe22e9c0ea6b67b6dbe78"; - sha256 = "0s862kzhvv9qpr7gxd3h52hczjvm55zyff5qn0z5095072pr3wjx"; - }; - dependencies = []; - - }; - - nerdtree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nerdtree-2018-06-15"; - src = fetchgit { - url = "https://github.com/scrooloose/nerdtree"; - rev = "d6032c876c6d6932ab7f07e262a16c9a85a31d5b"; - sha256 = "0s7z60rcdkziqqjc45adfqykpznv7aagfyfi5ybsxi5w4b8f2b9s"; - }; - dependencies = []; - - }; - - syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "syntastic-2018-07-16"; - src = fetchgit { - url = "https://github.com/scrooloose/syntastic"; - rev = "0dde090ed41b383b1fa56f8db49d89e0735b1ca9"; - sha256 = "027g3wmfdrhb65krlfs89xk3imbm2mgzb2ddv7xwrhch736nvb2q"; - }; - dependencies = []; - - }; - - deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-rust-2017-07-18"; - src = fetchgit { - url = "https://github.com/sebastianmarkow/deoplete-rust"; - rev = "0a86e502113910c33448b337c4d50cabea120d25"; - sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h"; - }; - dependencies = []; - - }; - - vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2018-07-08"; - src = fetchgit { - url = "https://github.com/sheerun/vim-polyglot"; - rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751"; - sha256 = "1q1aw0sapr2zgrxbh97g6hj22f2xym3apzfxw5xxmqzmjc0kiq4p"; - }; - dependencies = []; - - }; - - context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "context_filetype-vim-2018-04-01"; - src = fetchgit { - url = "https://github.com/shougo/context_filetype.vim"; - rev = "9ed76080795ef76f52b8c9ae4432df7cd81abc5a"; - sha256 = "137ki4104j4ch54k9n1l1xd75vbxqssi1fdckzv8kd07m5i159i2"; - }; - dependencies = []; - - }; - - denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-07-22"; - src = fetchgit { - url = "https://github.com/shougo/denite.nvim"; - rev = "93d8eb0bf21eb6db3f6a0bf6a84a98bd578176c8"; - sha256 = "0bhvg9rynqr2nkj7h2h8ws6mm1s7wmgif8avwbirq4pxby5j5f8r"; - }; - dependencies = []; - - }; - - deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-07-22"; - src = fetchgit { - url = "https://github.com/shougo/deoplete.nvim"; - rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73"; - sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz"; - }; - dependencies = []; - - }; - - echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "echodoc-vim-2018-03-26"; - src = fetchgit { - url = "https://github.com/shougo/echodoc.vim"; - rev = "f1f711bc814165cf5b09b56fd5d733917ed1c015"; - sha256 = "0l0sm862fbr8p8m4wykx1riidxgp233cq6r2zdm2l7gvmqyj3zcr"; - }; - dependencies = []; - - }; - - neco-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-syntax-2017-10-01"; - src = fetchgit { - url = "https://github.com/shougo/neco-syntax"; - rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3"; - sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip"; - }; - dependencies = []; - - }; - - neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-vim-2017-10-01"; - src = fetchgit { - url = "https://github.com/shougo/neco-vim"; - rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9"; - sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73"; - }; - dependencies = []; - - }; - - neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2018-03-28"; - src = fetchgit { - url = "https://github.com/shougo/neocomplete.vim"; - rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3"; - sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8"; - }; - dependencies = []; - - }; - - neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoinclude-vim-2018-05-22"; - src = fetchgit { - url = "https://github.com/shougo/neoinclude.vim"; - rev = "2fa77b9211d3f10c29559b715b6863da67ae7d3a"; - sha256 = "0pdahb2z9q4dk67xkwvaqrlpai86slhncfb4gn88x40dlnd7rkbg"; - }; - dependencies = []; - - }; - - neomru-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomru-vim-2017-10-01"; - src = fetchgit { - url = "https://github.com/shougo/neomru.vim"; - rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d"; - sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7"; - }; - dependencies = []; - - }; - - neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2018-06-17"; - src = fetchgit { - url = "https://github.com/shougo/neosnippet-snippets"; - rev = "e5946e9ec4c68965dbabfaaf2584b1c057738afd"; - sha256 = "114w2vm28075bz85867lz0rzam1m0wk7dkbkm1lm0jbknbpk606n"; - }; - dependencies = []; - - }; - - neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2018-07-19"; - src = fetchgit { - url = "https://github.com/shougo/neosnippet.vim"; - rev = "2959ae99f6e8f422e7d9062fd0a3cd692d2221fb"; - sha256 = "0zdyfc9lrp8g76b6qigci6dlxz0zqpqf5y9887x2zdy631dksfi4"; - }; - dependencies = []; - - }; - - neoyank-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoyank-vim-git-2018-03-26"; - src = fetchgit { - url = "https://github.com/shougo/neoyank.vim.git"; - rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef"; - sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928"; - }; - dependencies = []; - - }; - - tabpagebuffer-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tabpagebuffer-vim-2014-09-30"; - src = fetchgit { - url = "https://github.com/shougo/tabpagebuffer.vim"; - rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc"; - sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f"; - }; - dependencies = []; - - }; - - unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2018-06-17"; - src = fetchgit { - url = "https://github.com/shougo/unite.vim"; - rev = "c175ba7df239a5971e4c189ecbc9486b160fbde2"; - sha256 = "16j5vhmqs04y5rps5g86bgpf91w067gyw9rz47hf0y0a52niy436"; - }; - dependencies = []; - - }; - - vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2018-01-07"; - src = fetchgit { - url = "https://github.com/shougo/vimproc.vim"; - rev = "2300224d366642f4f8d6f88861535d4ccbe20143"; - sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia"; - }; - dependencies = []; + vimproc-vim = vimproc-vim.overrideAttrs(old: { buildInputs = [ which ]; buildPhase = '' @@ -2518,904 +307,31 @@ self = rec { --replace vimproc_linux32.so vimproc_unix.so make -f make_unix.mak ''; - }; + }); - fugitive-gitlab-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-gitlab-vim-2018-07-04"; - src = fetchgit { - url = "https://github.com/shumphrey/fugitive-gitlab.vim"; - rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838"; - sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d"; - }; - dependencies = []; + YankRing-vim = YankRing-vim.overrideAttrs(old: { + sourceRoot = "."; + }); - }; - - gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gundo-vim-2017-05-09"; - src = fetchgit { - url = "https://github.com/sjl/gundo.vim"; - rev = "46c443ee9d5854320eb965a1fdee781ba83a070e"; - sha256 = "0adk7agzmbfv342zw6lc8jad6yjs1wap4c0ca98s0qm2bs0r1hl2"; - }; - dependencies = []; - - }; - - splice-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "splice-vim-2017-09-03"; - src = fetchgit { - url = "https://github.com/sjl/splice.vim"; - rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d"; - sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx"; - }; - dependencies = []; - - }; - - last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "last256-2017-06-11"; - src = fetchgit { - url = "https://github.com/sk1418/last256"; - rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0"; - sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv"; - }; - dependencies = []; - - }; - - alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2018-06-25"; - src = fetchgit { - url = "https://github.com/slashmili/alchemist.vim"; - rev = "5575fc8e18695b050b1c4d51623ae37f12ff7648"; - sha256 = "0s1x0avshxfrqj9vd8bahkw10sn9hmajwch285zib9aynqp5x2ma"; - }; - dependencies = []; - - }; - - vim-smalls = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-smalls-2015-05-02"; - src = fetchgit { - url = "https://github.com/t9md/vim-smalls"; - rev = "9619eae81626bd63f88165e0520c467698264e34"; - sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad"; - }; - dependencies = []; - - }; - - vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hardtime-2017-03-31"; - src = fetchgit { - url = "https://github.com/takac/vim-hardtime"; - rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b"; - sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5"; - }; - dependencies = []; - - }; - - vim-expand-region = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-expand-region-2013-08-19"; - src = fetchgit { - url = "https://github.com/terryma/vim-expand-region"; - rev = "966513543de0ddc2d673b5528a056269e7917276"; - sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv"; - }; - dependencies = []; - - }; - - vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2018-07-16"; - src = fetchgit { - url = "https://github.com/terryma/vim-multiple-cursors"; - rev = "b9e17a51bb2d857f6a5099363232c4fc7715115d"; - sha256 = "0dd9m0a33r4diwykk5nxya199zimn0n4gmp2mi8fnwk6m1f8fwnw"; - }; - dependencies = []; - - }; - - vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimpreviewpandoc-2018-05-12"; - src = fetchgit { - url = "https://github.com/tex/vimpreviewpandoc"; - rev = "266d14d362f6c069863b2d63edb683e802e7e3ee"; - sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly"; - }; - dependencies = []; - - }; - - vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ft-diff_fold-2013-02-10"; - src = fetchgit { - url = "https://github.com/thinca/vim-ft-diff_fold"; - rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; - sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; - }; - dependencies = []; - - }; - - vim-prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-prettyprint-2016-07-16"; - src = fetchgit { - url = "https://github.com/thinca/vim-prettyprint"; - rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; - sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; - }; - dependencies = []; - - }; - - vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2018-06-19"; - src = fetchgit { - url = "https://github.com/thinca/vim-quickrun"; - rev = "825f9f195521646f7001f10cad8627c48017311f"; - sha256 = "0ckcwij5y71dxrga34jxgvf41hs44p4mrd31hbmkz1qrq1i7glpa"; - }; - dependencies = []; - - }; - - vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scouter-2014-08-10"; - src = fetchgit { - url = "https://github.com/thinca/vim-scouter"; - rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; - sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; - }; - dependencies = []; - - }; - - vim-themis = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-themis-2017-12-28"; - src = fetchgit { - url = "https://github.com/thinca/vim-themis"; - rev = "691cd3912ba318dbd8d9fa0035fee629b424766d"; - sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd"; - }; - dependencies = []; - - }; - - molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "molokai-2015-11-11"; - src = fetchgit { - url = "https://github.com/tomasr/molokai"; - rev = "c67bdfcdb31415aa0ade7f8c003261700a885476"; - sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s"; - }; - dependencies = []; - - }; - - vim-solidity = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-solidity-2018-04-17"; - src = fetchgit { - url = "https://github.com/tomlion/vim-solidity"; - rev = "569bbbedc3898236d5912fed0caf114936112ae4"; - sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx"; - }; - dependencies = []; - - }; - - tlib_vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib_vim-2018-04-08"; - src = fetchgit { - url = "https://github.com/tomtom/tlib_vim"; - rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b"; - sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx"; - }; - dependencies = []; - - }; - - vim-abolish = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-abolish-2017-03-10"; - src = fetchgit { - url = "https://github.com/tpope/vim-abolish"; - rev = "b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd"; - sha256 = "0i9q3l7r5p8mk4in3c1j4x0jbln7ir9lg1cqjxci0chjjzfzc53m"; - }; - dependencies = []; - - }; - - vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-commentary-2018-07-11"; - src = fetchgit { - url = "https://github.com/tpope/vim-commentary"; - rev = "8295187ea1210138c0b171d8e3ec3569936f4c1a"; - sha256 = "1zgbpgl0n11b4jlgx7h7rr1jbgdib7yf8vmh62cxrdj5hrngb6h6"; - }; - dependencies = []; - - }; - - vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-07-25"; - src = fetchgit { - url = "https://github.com/tpope/vim-dispatch"; - rev = "dbb9320d000caa56dfada5f99fe0b5209ef0590b"; - sha256 = "1yqc8fwyf66jckvjf8z8h62399kzgfdzcbnnd9ax8q3wjyk3lfsh"; - }; - dependencies = []; - - }; - - vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2018-07-13"; - src = fetchgit { - url = "https://github.com/tpope/vim-eunuch"; - rev = "e5f4f955d53e07192fb330ff272604c1b8290532"; - sha256 = "0cv3j3bkapb45ywlfiz8csxmz7gnsdngwgmkrgfg6sljnsgav2za"; - }; - dependencies = []; - - }; - - vim-fireplace = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-fireplace-2018-06-01"; - src = fetchgit { - url = "https://github.com/tpope/vim-fireplace"; - rev = "1ef0f0726cadd96547a5f79103b66339f170da02"; - sha256 = "0ihhd34bl98xssa602386ji013pjj6xnkgww3y2wg73sx2nk6qc4"; - }; - dependencies = []; - - }; - - vim-flagship = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-flagship-2018-07-24"; - src = fetchgit { - url = "https://github.com/tpope/vim-flagship"; - rev = "5e70829913900eb3a37dd6c055ac660c33fa6bff"; - sha256 = "1v2kaisydi1vjfy66bwq2whllbickr3ppp9wqxjqv2qhfsnqny8f"; - }; - dependencies = []; - - }; - - vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-fugitive-2018-07-25"; - src = fetchgit { - url = "https://github.com/tpope/vim-fugitive"; - rev = "6bab1a0c398a9a6aaef607a5361709393eba79ac"; - sha256 = "1rsiha7a0k7ib455dvxrl46zl7x386i70rhwnbmy8lk6wa32mz7v"; - }; - dependencies = []; - - }; - - vim-pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pathogen-2018-04-05"; - src = fetchgit { - url = "https://github.com/tpope/vim-pathogen"; - rev = "06da921608b971fb47603671bcafdb2843992eb3"; - sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi"; - }; - dependencies = []; - - }; - - vim-projectionist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-projectionist-2018-07-24"; - src = fetchgit { - url = "https://github.com/tpope/vim-projectionist"; - rev = "873e492b4bb92834beb186028fbf6d4e5edfca5a"; - sha256 = "0np7vm97y5ga8gz6qma15awcmgxi41hljp50bgy49sz62z8h0psz"; - }; - dependencies = []; - - }; - - vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-repeat-2018-07-02"; - src = fetchgit { - url = "https://github.com/tpope/vim-repeat"; - rev = "43d2678fa59d068c815d8298331c195e850ff5a7"; - sha256 = "0nb20503ka95qbx0mwhhni15drc86gfcd6kg92nf65llrvyfivk0"; - }; - dependencies = []; - - }; - - vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-rhubarb-2018-07-21"; - src = fetchgit { - url = "https://github.com/tpope/vim-rhubarb"; - rev = "848841083d5d4550b5ebbd3bd67dfb3e5146b64a"; - sha256 = "19b36lbsry994y78lnnnjl83q2laz7j6xvk6h6xbl8kj10v6m4l9"; - }; - dependencies = []; - - }; - - vim-scriptease = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scriptease-2018-07-18"; - src = fetchgit { - url = "https://github.com/tpope/vim-scriptease"; - rev = "baea08bb5fff63cd2adf6e46429cad1f75bc7300"; - sha256 = "01xfnda5paywfsb6ziq00zcgia7ls0v2924i1mcnvnqg4md890x4"; - }; - dependencies = []; - - }; - - vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sensible-2018-07-16"; - src = fetchgit { - url = "https://github.com/tpope/vim-sensible"; - rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525"; - sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q"; - }; - dependencies = []; - - }; - - vim-sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sleuth-2018-05-24"; - src = fetchgit { - url = "https://github.com/tpope/vim-sleuth"; - rev = "478e495d40434fb42c655ea2881c8c6b114ecd49"; - sha256 = "1dicdxxfd5sywk02hbpknbr100n96qggy3zy5v520dxdknq0sccz"; - }; - dependencies = []; - - }; - - vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-speeddating-2017-05-24"; - src = fetchgit { - url = "https://github.com/tpope/vim-speeddating"; - rev = "a418667791f03694065948342f2d6c5cca8d0f32"; - sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw"; - }; - dependencies = []; - - }; - - vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-surround-2018-07-23"; - src = fetchgit { - url = "https://github.com/tpope/vim-surround"; - rev = "597068870b8f093a8b2d11536c62ff31222ee8d0"; - sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x"; - }; - dependencies = []; - - }; - - vim-tbone = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tbone-2018-06-27"; - src = fetchgit { - url = "https://github.com/tpope/vim-tbone"; - rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737"; - sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4"; - }; - dependencies = []; - - }; - - vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-vinegar-2018-06-20"; - src = fetchgit { - url = "https://github.com/tpope/vim-vinegar"; - rev = "7b9dff85aec34a0be1a6980b2e686a5d27d70f63"; - sha256 = "033w3wsg5ijwmkq5l1d5r7l0mqfy784sbh8mbjcsx13ndl8fc2g8"; - }; - dependencies = []; - - }; - - hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "hasksyn-2014-09-03"; - src = fetchgit { - url = "https://github.com/travitch/hasksyn"; - rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; - sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx"; - }; - dependencies = []; - - }; - - vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-haskellconceal-2017-06-15"; - src = fetchgit { - url = "https://github.com/twinside/vim-haskellconceal"; - rev = "802f82a5afee56e9e1251e6f756104a3bd114234"; - sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r"; - }; - dependencies = []; - - }; - - caw-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "caw-vim-2018-06-16"; - src = fetchgit { - url = "https://github.com/tyru/caw.vim"; - rev = "e82ae00f3fc03289d4054b44f100025a1bc81939"; - sha256 = "16sbrc34nxbrgpj8gyi1drwh52qg3z2nq4frd5f2nfgxsgjrjjjc"; - }; - dependencies = []; - - }; - - open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "open-browser-vim-2018-04-26"; - src = fetchgit { - url = "https://github.com/tyru/open-browser.vim"; - rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246"; - sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db"; - }; - dependencies = []; - - }; - - neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-look-2018-01-21"; - src = fetchgit { - url = "https://github.com/ujihisa/neco-look"; - rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c"; - sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj"; - }; - dependencies = []; - - }; - - youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-07-25"; - src = fetchgit { - url = "https://github.com/valloric/youcompleteme"; - rev = "15362d9cb8ec054c929e9a202252825eabe47e58"; - sha256 = "0nk3wqlz15pvm6hbla8shd3sskbdmwd1x9cq85la223h6s138hwy"; - }; - dependencies = []; + youcompleteme = youcompleteme.overrideAttrs(old: { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ --replace "'ycm_path_to_python_interpreter', '''" \ - "'ycm_path_to_python_interpreter', '${python}/bin/python'" + "'ycm_path_to_python_interpreter', '${python}/bin/python'" rm -r third_party/ycmd ln -s ${ycmd}/lib/ycmd third_party ''; meta = { - description = "Fastest non utf-8 aware word and C completion engine for Vim"; + description = "A code-completion engine for Vim"; homepage = https://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; platforms = stdenv.lib.platforms.unix; }; - }; - - vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-07-24"; - src = fetchgit { - url = "https://github.com/vim-airline/vim-airline"; - rev = "59f3669a42728406da6d1b948608cae120d1453f"; - sha256 = "12rgvaqfqh0mfv85qdqpr5zn3q3v6npbk11al62fzpa9s55q0025"; - }; - dependencies = []; - - }; - - vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2018-06-14"; - src = fetchgit { - url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "b35f952a6ae6768ae2c6a9f4febc7945cc311f74"; - sha256 = "1j9y9irrzsq1bwp3b22ls016byi0yc9ymigzhw0n180rk6nb36c7"; - }; - dependencies = []; - - }; - - vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2018-07-23"; - src = fetchgit { - url = "https://github.com/vim-pandoc/vim-pandoc"; - rev = "0060e5c6ac9e4a2391e8a36359dcbbb5827978cb"; - sha256 = "0y0ppy1imy4kjkyflxwh5hfp6vcs93xia6myyd5sc6l3gbcg1lrk"; - }; - dependencies = []; - - }; - - vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-after-2017-11-22"; - src = fetchgit { - url = "https://github.com/vim-pandoc/vim-pandoc-after"; - rev = "844f27debf4d72811049167f97191a3b551ddfd5"; - sha256 = "0i99g9lnk1xzarw3vzbc47i4bg4iybaywkjvd2krln4q426a6saf"; - }; - dependencies = []; - - }; - - vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2017-04-13"; - src = fetchgit { - url = "https://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3"; - sha256 = "19ll4zrw5yd0frgsbi7pg9b68lmy4bfiwbnwgzii7inifrqsykfw"; - }; - dependencies = []; - - }; - - vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ruby-2018-07-08"; - src = fetchgit { - url = "https://github.com/vim-ruby/vim-ruby"; - rev = "3e0f241b544c63d44ac925ec557ce6735b24d9cf"; - sha256 = "16ywzvb78pxinls0za1bzcds9aznsgvds8q2l4wimp4q9wrs1scs"; - }; - dependencies = []; - - }; - - Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Colour-Sampler-Pack-2012-11-29"; - src = fetchgit { - url = "https://github.com/vim-scripts/Colour-Sampler-Pack"; - rev = "05cded87b2ef29aaa9e930230bb88e23abff4441"; - sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3"; - }; - dependencies = []; - - }; - - Improved-AnsiEsc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Improved-AnsiEsc-2015-08-25"; - src = fetchgit { - url = "https://github.com/vim-scripts/Improved-AnsiEsc"; - rev = "e1c59a8e9203fab6b9150721f30548916da73351"; - sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz"; - }; - dependencies = []; - - }; - - Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Rename-2011-08-30"; - src = fetchgit { - url = "https://github.com/vim-scripts/Rename"; - rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34"; - sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r"; - }; - dependencies = []; - - }; - - ReplaceWithRegister = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ReplaceWithRegister-2014-10-30"; - src = fetchgit { - url = "https://github.com/vim-scripts/ReplaceWithRegister"; - rev = "832efc23111d19591d495dc72286de2fb0b09345"; - sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g"; - }; - dependencies = []; - - }; - - YankRing-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "YankRing-vim-2015-07-28"; - src = fetchgit { - url = "https://github.com/vim-scripts/YankRing.vim"; - rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65"; - sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw"; - }; - dependencies = []; - - }; - - a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "a-vim-2010-11-06"; - src = fetchgit { - url = "https://github.com/vim-scripts/a.vim"; - rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; - sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; - }; - dependencies = []; - - }; - - align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "align-2012-08-07"; - src = fetchgit { - url = "https://github.com/vim-scripts/align"; - rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; - sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp"; - }; - dependencies = []; - - }; - - argtextobj-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "argtextobj-vim-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/argtextobj.vim"; - rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b"; - sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48"; - }; - dependencies = []; - - }; - - bats-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "bats-vim-2013-07-03"; - src = fetchgit { - url = "https://github.com/vim-scripts/bats.vim"; - rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a"; - sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx"; - }; - dependencies = []; - - }; - - changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "changeColorScheme-vim-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/changeColorScheme.vim"; - rev = "b041d49f828629d72f2232531a230d1ec5de2405"; - sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09"; - }; - dependencies = []; - - }; - - matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "matchit-zip-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/matchit.zip"; - rev = "ced6c409c9beeb0b4142d21906606bd194411d1d"; - sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm"; - }; - dependencies = []; - - }; - - mayansmoke-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "mayansmoke-git-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/mayansmoke.git"; - rev = "168883af7aec05f139af251f47eadd5dfb802c9d"; - sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd"; - }; - dependencies = []; - - }; - - random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "random-vim-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/random.vim"; - rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989"; - sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp"; - }; - dependencies = []; - - }; - - tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tabmerge-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/tabmerge"; - rev = "074e5f06f26e7108a0570071a0f938a821768c06"; - sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq"; - }; - dependencies = []; - - }; - - taglist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "taglist-vim-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/taglist.vim"; - rev = "53041fbc45398a9af631a20657e109707a455339"; - sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd"; - }; - dependencies = []; - - }; - - wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "wombat256-vim-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/wombat256.vim"; - rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; - sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg"; - }; - dependencies = []; - - }; - - vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimoutliner-2018-07-04"; - src = fetchgit { - url = "https://github.com/vimoutliner/vimoutliner"; - rev = "aad0a213069b8a1b5de91cca07d153fc8352c957"; - sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2"; - }; - dependencies = []; - - }; - - vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2018-07-21"; - src = fetchgit { - url = "https://github.com/vimwiki/vimwiki"; - rev = "9f797f6ad9fd2a5e943bc99b5f9cd44b2cbd0fb4"; - sha256 = "0snqxbfpc9jy9zy3n0g2xc01kgxznnnd0g00v2nb17vs3m1b7arc"; - }; - dependencies = []; - - }; - - dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "dhall-vim-2018-07-23"; - src = fetchgit { - url = "https://github.com/vmchale/dhall-vim"; - rev = "5bdddb86e660f172841109a28e2a98efb76448ce"; - sha256 = "0rkzgn5ny84624q7phc8wdm4nvkq2ypkq5lkbmahhm26cxvlkqlq"; - }; - dependencies = []; - - }; - - ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-07-25"; - src = fetchgit { - url = "https://github.com/w0rp/ale"; - rev = "79ffdde267323a206a96227904549c370f27decf"; - sha256 = "02np0jnz50qs3fl6n0wh1xfzgq8lbfgagf2mw8cbj8a4gmzx67fg"; - }; - dependencies = []; - - }; - - vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2018-07-14"; - src = fetchgit { - url = "https://github.com/wakatime/vim-wakatime"; - rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf"; - sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2"; - }; - dependencies = []; - buildInputs = [ python ]; - }; - - targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "targets-vim-2018-05-27"; - src = fetchgit { - url = "https://github.com/wellle/targets.vim"; - rev = "c3042dc18acc0dfcee479310d3efc6aefe92db75"; - sha256 = "0shnlgwrxzrd0m3k6hnmr66i2l4zknp0pn7f71d2frx937gih34q"; - }; - dependencies = []; - - }; - - vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dirdiff-2018-01-30"; - src = fetchgit { - url = "https://github.com/will133/vim-dirdiff"; - rev = "b5a3d59bfbeb5cef7dbadbe69c455b470988b58c"; - sha256 = "16hc88k00xa757k0h53r1sbqwxdxdy0118yl2vsigd6rqk474nw1"; - }; - dependencies = []; - - }; - - command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2017-11-16"; - src = fetchgit { - url = "https://github.com/wincent/command-t"; - rev = "7147ba92c9c1eef8269fd47d47ba636ce7f365a6"; - sha256 = "171z1jjjv1l15rh3i2hc400vjf4zns8sjvda0vcjkx2717ax658r"; - }; - dependencies = []; - buildInputs = [ ruby rake ]; - buildPhase = '' - rake make - rm ruby/command-t/ext/command-t/*.o - ''; - }; - - vim-easytags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easytags-2015-07-01"; - src = fetchgit { - url = "https://github.com/xolox/vim-easytags"; - rev = "72a8753b5d0a951e547c51b13633f680a95b5483"; - sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i"; - }; - dependencies = ["vim-misc"]; - - }; - - vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-misc-2015-05-21"; - src = fetchgit { - url = "https://github.com/xolox/vim-misc"; - rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b"; - sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi"; - }; - dependencies = []; - - }; - - vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2017-11-09"; - src = fetchgit { - url = "https://github.com/xuhdev/vim-latex-live-preview"; - rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; - sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; - }; - dependencies = []; - - }; - - nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nim-vim-2018-05-20"; - src = fetchgit { - url = "https://github.com/zah/nim.vim"; - rev = "704dd5d63cac54c22fe25c6efbcf18796df412e7"; - sha256 = "0azk3m33c47ja24iirlrjqphmd8rzlivinqkx69izmd7l150ds2m"; - }; - dependencies = []; - - }; - - deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2018-07-03"; - src = fetchgit { - url = "https://github.com/zchee/deoplete-go"; - rev = "2d402d856d98d4a351fdcf40d837da0cf52ccdfd"; - sha256 = "0hj5bhfhd9am11ixaxad370p982bjig53mbm74fi6slhjpikdrdq"; - }; - dependencies = []; - buildInputs = [ python3 ]; - buildPhase = '' - pushd ./rplugin/python3/deoplete/ujson - python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build - popd - find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; - ''; - }; - - deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2018-07-10"; - src = fetchgit { - url = "https://github.com/zchee/deoplete-jedi"; - rev = "5540e76ee3194f2eaa2df51945297cb847a1dfa8"; - sha256 = "0mqq42v4l2y0hkcs83j0cp7hxamv6gn5g8z4bccrbssgrsv61cg6"; - }; - dependencies = []; - - }; - - zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zig-vim-2018-07-18"; - src = fetchgit { - url = "https://github.com/zig-lang/zig.vim"; - rev = "2dc38afd6af04ea563a0d0d6f61891b5c820e8fe"; - sha256 = "1nyrg87biwq6b3jk40fyjd5mlnl4pbvwsqi9095y8gjanf9a9dck"; - }; - dependencies = []; - - }; - -} // lib.optionalAttrs (config.allowAliases or true) (with self; { - + }); +}) // lib.optionalAttrs (config.allowAliases or true) (with self; { # aliasess airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 @@ -3431,7 +347,7 @@ self = rec { Colour_Sampler_Pack = Colour-Sampler-Pack; command_T = command-t; # backwards compat, added 2014-10-18 commentary = vim-commentary; - committia = committia-vim-git; + committia = committia-vim; concealedyank = concealedyank-vim; context-filetype = context_filetype-vim; Cosco = cosco-vim; @@ -3439,7 +355,7 @@ self = rec { CSApprox = csapprox; csv = csv-vim; ctrlp = ctrlp-vim; - cute-python = vim-cute-python-git; + cute-python = vim-cute-python; denite = denite-nvim; easy-align = vim-easy-align; easygit = vim-easygit; @@ -3465,19 +381,16 @@ self = rec { ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; maktaba = vim-maktaba; - mayansmoke = mayansmoke-git; multiple-cursors = vim-multiple-cursors; necoGhc = neco-ghc; # backwards compat, added 2014-10-18 neocomplete = neocomplete-vim; neoinclude = neoinclude-vim; neomru = neomru-vim; neosnippet = neosnippet-vim; - neoyank = neoyank-vim-git; The_NERD_Commenter = nerdcommenter; The_NERD_tree = nerdtree; open-browser = open-browser-vim; pathogen = vim-pathogen; - peskcolor = peskcolor-vim-git; polyglot = vim-polyglot; prettyprint = vim-prettyprint; quickrun = vim-quickrun; @@ -3511,8 +424,7 @@ self = rec { tslime = tslime-vim; unite = unite-vim; UltiSnips = ultisnips; - vim-grepper = vim-grepper-git; - vim-test = vim-test-git; + vim-addon-vim2nix = vim2nix; vimproc = vimproc-vim; vimshell = vimshell-vim; vinegar = vim-vinegar; @@ -3524,5 +436,6 @@ self = rec { YouCompleteMe = youcompleteme; xterm-color-table = xterm-color-table-vim; zeavim = zeavim-vim; + }); in self diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix new file mode 100644 index 000000000000..45c5f950babb --- /dev/null +++ b/pkgs/misc/vim-plugins/generated.nix @@ -0,0 +1,2941 @@ +# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! +{ buildVimPluginFrom2Nix, fetchFromGitHub }: + +{ + a-vim = buildVimPluginFrom2Nix { + name = "a-vim-2010-11-06"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "a.vim"; + rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; + sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; + }; + }; + + ack-vim = buildVimPluginFrom2Nix { + name = "ack-vim-2018-02-27"; + src = fetchFromGitHub { + owner = "mileszs"; + repo = "ack.vim"; + rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042"; + sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm"; + }; + }; + + acp = buildVimPluginFrom2Nix { + name = "acp-2013-02-05"; + src = fetchFromGitHub { + owner = "eikenb"; + repo = "acp"; + rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e"; + sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg"; + }; + }; + + agda-vim = buildVimPluginFrom2Nix { + name = "agda-vim-2018-05-23"; + src = fetchFromGitHub { + owner = "derekelkins"; + repo = "agda-vim"; + rev = "24169e70c1dbd784349b1551b6a3753680d9bb87"; + sha256 = "1bn2g89dvwccfl4ki07jb8iydb3d0s4rm7z5gv5q1bv3lccndax6"; + }; + }; + + alchemist-vim = buildVimPluginFrom2Nix { + name = "alchemist-vim-2018-09-02"; + src = fetchFromGitHub { + owner = "slashmili"; + repo = "alchemist.vim"; + rev = "35e7e3062d1661b1c081765ed05bd8f0f5265183"; + sha256 = "08i2nzsaq73iz8wkryq5nly3hl0xb3zy16zk7k28bslvyj3ricnc"; + }; + }; + + ale = buildVimPluginFrom2Nix { + name = "ale-2018-09-07"; + src = fetchFromGitHub { + owner = "w0rp"; + repo = "ale"; + rev = "0ae4ea23c8573f9c693fcd5cd5ff9a3acc795b58"; + sha256 = "005lmxhh07agdqa6qlk5f4vd3z2im8drrjy6ficrmwy7idp7cjyn"; + }; + }; + + align = buildVimPluginFrom2Nix { + name = "align-2012-08-08"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "align"; + rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; + sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp"; + }; + }; + + argtextobj-vim = buildVimPluginFrom2Nix { + name = "argtextobj-vim-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "argtextobj.vim"; + rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b"; + sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48"; + }; + }; + + auto-pairs = buildVimPluginFrom2Nix { + name = "auto-pairs-2017-07-03"; + src = fetchFromGitHub { + owner = "jiangmiao"; + repo = "auto-pairs"; + rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; + sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; + }; + }; + + awesome-vim-colorschemes = buildVimPluginFrom2Nix { + name = "awesome-vim-colorschemes-2018-01-20"; + src = fetchFromGitHub { + owner = "rafi"; + repo = "awesome-vim-colorschemes"; + rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d"; + sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z"; + }; + }; + + base16-vim = buildVimPluginFrom2Nix { + name = "base16-vim-2018-05-24"; + src = fetchFromGitHub { + owner = "chriskempson"; + repo = "base16-vim"; + rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d"; + sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk"; + }; + }; + + bats-vim = buildVimPluginFrom2Nix { + name = "bats-vim-2013-07-03"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "bats.vim"; + rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a"; + sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx"; + }; + }; + + calendar-vim = buildVimPluginFrom2Nix { + name = "calendar-vim-2018-08-05"; + src = fetchFromGitHub { + owner = "itchyny"; + repo = "calendar.vim"; + rev = "1f20b779171d4d3a20abd47508692fbae32e3188"; + sha256 = "01aiaslaww117kdwf7qxjc647g6bxcqr694mi3l0llblq549ih5l"; + }; + }; + + caw-vim = buildVimPluginFrom2Nix { + name = "caw-vim-2018-06-15"; + src = fetchFromGitHub { + owner = "tyru"; + repo = "caw.vim"; + rev = "e82ae00f3fc03289d4054b44f100025a1bc81939"; + sha256 = "16sbrc34nxbrgpj8gyi1drwh52qg3z2nq4frd5f2nfgxsgjrjjjc"; + }; + }; + + changeColorScheme-vim = buildVimPluginFrom2Nix { + name = "changeColorScheme-vim-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "changeColorScheme.vim"; + rev = "b041d49f828629d72f2232531a230d1ec5de2405"; + sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09"; + }; + }; + + CheckAttach = buildVimPluginFrom2Nix { + name = "CheckAttach-2018-09-02"; + src = fetchFromGitHub { + owner = "chrisbra"; + repo = "CheckAttach"; + rev = "e9167ad91e85d401441b8ac64b8dcbe3d0cf4df7"; + sha256 = "1xif7lplm35scb36pzh2mq24j2khyzriiaqa2lzhwfilb7nq9c91"; + }; + }; + + clang_complete = buildVimPluginFrom2Nix { + name = "clang_complete-2018-01-18"; + src = fetchFromGitHub { + owner = "Rip-Rip"; + repo = "clang_complete"; + rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275"; + sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p"; + }; + }; + + clighter8 = buildVimPluginFrom2Nix { + name = "clighter8-2018-07-25"; + src = fetchFromGitHub { + owner = "bbchung"; + repo = "clighter8"; + rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181"; + sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg"; + }; + }; + + Colour-Sampler-Pack = buildVimPluginFrom2Nix { + name = "Colour-Sampler-Pack-2012-11-30"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "Colour-Sampler-Pack"; + rev = "05cded87b2ef29aaa9e930230bb88e23abff4441"; + sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3"; + }; + }; + + command-t = buildVimPluginFrom2Nix { + name = "command-t-2017-11-17"; + src = fetchFromGitHub { + owner = "wincent"; + repo = "command-t"; + rev = "7147ba92c9c1eef8269fd47d47ba636ce7f365a6"; + sha256 = "171z1jjjv1l15rh3i2hc400vjf4zns8sjvda0vcjkx2717ax658r"; + fetchSubmodules = true; + }; + }; + + committia-vim = buildVimPluginFrom2Nix { + name = "committia-vim-2018-08-16"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "committia.vim"; + rev = "293a0078ec8fc6e302fa49f48db5fd609d27ab20"; + sha256 = "12s0976agvxkayvxm86ppk97x1sbdrgg8gkc97fpac83vah7lc1r"; + }; + }; + + concealedyank-vim = buildVimPluginFrom2Nix { + name = "concealedyank-vim-2013-03-24"; + src = fetchFromGitHub { + owner = "chikatoike"; + repo = "concealedyank.vim"; + rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd"; + sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb"; + }; + }; + + context_filetype-vim = buildVimPluginFrom2Nix { + name = "context_filetype-vim-2018-08-30"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "context_filetype.vim"; + rev = "5392e3f0f3ff82b7149818a5700680f4bbcfea45"; + sha256 = "0xnqn96qnlvpvqc4sx8vmnryfqgcxrgczlmadgkms18gd3ib6i0z"; + }; + }; + + cosco-vim = buildVimPluginFrom2Nix { + name = "cosco-vim-2018-08-07"; + src = fetchFromGitHub { + owner = "lfilho"; + repo = "cosco.vim"; + rev = "5752622192d9b27b3a5a274a5455613b56df6386"; + sha256 = "01byd7j4gl7zb1bh61p839ka04x2sm0rgwvbb126az7dr6gpclyf"; + }; + }; + + cpsm = buildVimPluginFrom2Nix { + name = "cpsm-2018-09-08"; + src = fetchFromGitHub { + owner = "nixprime"; + repo = "cpsm"; + rev = "900023c56dfdd200841d5c2f2f7000f332d2614f"; + sha256 = "1p1ry11f39fcz32i3b3p0p8n99qrnvrx4d7p0123123dj7wbxk3p"; + }; + }; + + csapprox = buildVimPluginFrom2Nix { + name = "csapprox-2013-07-27"; + src = fetchFromGitHub { + owner = "godlygeek"; + repo = "csapprox"; + rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; + sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; + }; + }; + + csv-vim = buildVimPluginFrom2Nix { + name = "csv-vim-2018-08-21"; + src = fetchFromGitHub { + owner = "chrisbra"; + repo = "csv.vim"; + rev = "23bc07d2f6b755f2194210dcebf912093849404d"; + sha256 = "0c2m2nvm5j6hsyhhjqlh9g1df7zhxwxsb9n2mamicncaqay7kx9x"; + }; + }; + + ctrlp-cmatcher = buildVimPluginFrom2Nix { + name = "ctrlp-cmatcher-2015-10-15"; + src = fetchFromGitHub { + owner = "JazzCore"; + repo = "ctrlp-cmatcher"; + rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; + sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; + }; + }; + + ctrlp-py-matcher = buildVimPluginFrom2Nix { + name = "ctrlp-py-matcher-2017-11-01"; + src = fetchFromGitHub { + owner = "FelikZ"; + repo = "ctrlp-py-matcher"; + rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; + sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; + }; + }; + + ctrlp-z = buildVimPluginFrom2Nix { + name = "ctrlp-z-2015-10-17"; + src = fetchFromGitHub { + owner = "amiorin"; + repo = "ctrlp-z"; + rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; + sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; + }; + }; + + ctrlp-vim = buildVimPluginFrom2Nix { + name = "ctrlp-vim-2018-06-28"; + src = fetchFromGitHub { + owner = "ctrlpvim"; + repo = "ctrlp.vim"; + rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989"; + sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk"; + }; + }; + + denite-extra = buildVimPluginFrom2Nix { + name = "denite-extra-2018-08-13"; + src = fetchFromGitHub { + owner = "chemzqm"; + repo = "denite-extra"; + rev = "8e46f87ceb619d0db93bac58120fe01584e565fd"; + sha256 = "0pm63yi1qv1r4s098skr8pqx956d87f34cvj4vly67gj59lfyzzz"; + }; + }; + + denite-git = buildVimPluginFrom2Nix { + name = "denite-git-2018-07-19"; + src = fetchFromGitHub { + owner = "chemzqm"; + repo = "denite-git"; + rev = "edd2c202e05c3f84e31b94a841fef236b923d559"; + sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd"; + }; + }; + + denite-nvim = buildVimPluginFrom2Nix { + name = "denite-nvim-2018-09-05"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "denite.nvim"; + rev = "2771c7ae323c2a24341e0f6a83b81f1a1559df0c"; + sha256 = "07gmrsn815i91wzw9d326kwlph9bqcli75dzg6c8gl0r5vib2v5b"; + }; + }; + + deoplete-go = buildVimPluginFrom2Nix { + name = "deoplete-go-2018-08-21"; + src = fetchFromGitHub { + owner = "zchee"; + repo = "deoplete-go"; + rev = "c1bdcfa71dcdaec8a1be8f396fc681e104e93a05"; + sha256 = "0v9i6gz150m7dl7hwk1jzk8f0l23rbagfwwmvhn45akgjyxk4dmq"; + fetchSubmodules = true; + }; + }; + + deoplete-jedi = buildVimPluginFrom2Nix { + name = "deoplete-jedi-2018-08-10"; + src = fetchFromGitHub { + owner = "zchee"; + repo = "deoplete-jedi"; + rev = "12e6d8f745efd64e08d474fa3b3d35c8c1fa0305"; + sha256 = "1ni1sfnh2bnl42m4fvwcc003b7ng501j21njk3wx5d395g5p4w81"; + fetchSubmodules = true; + }; + }; + + deoplete-rust = buildVimPluginFrom2Nix { + name = "deoplete-rust-2017-07-18"; + src = fetchFromGitHub { + owner = "sebastianmarkow"; + repo = "deoplete-rust"; + rev = "0a86e502113910c33448b337c4d50cabea120d25"; + sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h"; + }; + }; + + deoplete-nvim = buildVimPluginFrom2Nix { + name = "deoplete-nvim-2018-09-02"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "deoplete.nvim"; + rev = "8c2117b966a7f05091cd49609f8ee3641f260997"; + sha256 = "0pklmb89g3hqxilv0546c21yjav26frsxb5g24ma49pii8lmzgjg"; + }; + }; + + dhall-vim = buildVimPluginFrom2Nix { + name = "dhall-vim-2018-07-30"; + src = fetchFromGitHub { + owner = "vmchale"; + repo = "dhall-vim"; + rev = "2693bfaf9167ac69ee96c1165b4354f03f4d8b24"; + sha256 = "0qm6z8z70cxqqlmxgq497w96nv5sn2gbxnc74balbhpk17bms4m0"; + }; + }; + + echodoc-vim = buildVimPluginFrom2Nix { + name = "echodoc-vim-2018-07-29"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "echodoc.vim"; + rev = "7b2b1853c4d88fc5ed929bf062a9f3136e051335"; + sha256 = "1apxla41as44jnrrgxhgrz9g88q3y4mlpdbrb218fw5w3hyw51qj"; + }; + }; + + editorconfig-vim = buildVimPluginFrom2Nix { + name = "editorconfig-vim-2018-07-25"; + src = fetchFromGitHub { + owner = "editorconfig"; + repo = "editorconfig-vim"; + rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4"; + sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x"; + fetchSubmodules = true; + }; + }; + + elm-vim = buildVimPluginFrom2Nix { + name = "elm-vim-2018-06-18"; + src = fetchFromGitHub { + owner = "elmcast"; + repo = "elm-vim"; + rev = "e51e2e43ad617c26205a84453481d3ac152c8fec"; + sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b"; + }; + }; + + ensime-vim = buildVimPluginFrom2Nix { + name = "ensime-vim-2018-04-20"; + src = fetchFromGitHub { + owner = "ensime"; + repo = "ensime-vim"; + rev = "634cce6eae10a31cd6eec259890bdcda326ee3c2"; + sha256 = "03sr53680kcwxaa5xbqzdfbsgday3bkzja33wym49w9gjmlaa320"; + }; + }; + + fastfold = buildVimPluginFrom2Nix { + name = "fastfold-2018-06-03"; + src = fetchFromGitHub { + owner = "konfekt"; + repo = "fastfold"; + rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30"; + sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r"; + }; + }; + + flake8-vim = buildVimPluginFrom2Nix { + name = "flake8-vim-2017-02-17"; + src = fetchFromGitHub { + owner = "andviro"; + repo = "flake8-vim"; + rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795"; + sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g"; + fetchSubmodules = true; + }; + }; + + floobits-neovim = buildVimPluginFrom2Nix { + name = "floobits-neovim-2018-08-01"; + src = fetchFromGitHub { + owner = "floobits"; + repo = "floobits-neovim"; + rev = "29ab2ed4bd5c879df0bd6df313a776155eb98ad8"; + sha256 = "0bnncn3waw9birpd51j27hrzlriz8dk4naxdajmbwznwcnbkkgwx"; + }; + }; + + forms = buildVimPluginFrom2Nix { + name = "forms-2012-11-28"; + src = fetchFromGitHub { + owner = "megaannum"; + repo = "forms"; + rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; + sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; + }; + }; + + fugitive-gitlab-vim = buildVimPluginFrom2Nix { + name = "fugitive-gitlab-vim-2018-07-04"; + src = fetchFromGitHub { + owner = "shumphrey"; + repo = "fugitive-gitlab.vim"; + rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838"; + sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d"; + }; + }; + + fzf-vim = buildVimPluginFrom2Nix { + name = "fzf-vim-2018-09-07"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "fzf.vim"; + rev = "8fa84e0fdf97842d94caee8d50584836edf5b509"; + sha256 = "0di5xmd3i9m034npr6zc1f793jcj1vsy95wdyhpf55b6hclm7bbd"; + }; + }; + + ghcmod-vim = buildVimPluginFrom2Nix { + name = "ghcmod-vim-2016-06-19"; + src = fetchFromGitHub { + owner = "eagletmt"; + repo = "ghcmod-vim"; + rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; + sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; + }; + }; + + gist-vim = buildVimPluginFrom2Nix { + name = "gist-vim-2016-10-10"; + src = fetchFromGitHub { + owner = "mattn"; + repo = "gist-vim"; + rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; + sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; + }; + }; + + gitv = buildVimPluginFrom2Nix { + name = "gitv-2018-06-10"; + src = fetchFromGitHub { + owner = "gregsexton"; + repo = "gitv"; + rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2"; + sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn"; + }; + }; + + goyo-vim = buildVimPluginFrom2Nix { + name = "goyo-vim-2017-05-31"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "goyo.vim"; + rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; + sha256 = "10racxq8zfj2fpl09vbvv5hbnr4xmm4ba75kgyp9byjapzkbq1pi"; + }; + }; + + gruvbox = buildVimPluginFrom2Nix { + name = "gruvbox-2018-02-25"; + src = fetchFromGitHub { + owner = "morhetz"; + repo = "gruvbox"; + rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86"; + sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi"; + }; + }; + + gundo-vim = buildVimPluginFrom2Nix { + name = "gundo-vim-2017-05-09"; + src = fetchFromGitHub { + owner = "sjl"; + repo = "gundo.vim"; + rev = "46c443ee9d5854320eb965a1fdee781ba83a070e"; + sha256 = "0adk7agzmbfv342zw6lc8jad6yjs1wap4c0ca98s0qm2bs0r1hl2"; + }; + }; + + haskell-vim = buildVimPluginFrom2Nix { + name = "haskell-vim-2018-05-22"; + src = fetchFromGitHub { + owner = "neovimhaskell"; + repo = "haskell-vim"; + rev = "b1ac46807835423c4a4dd063df6d5b613d89c731"; + sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br"; + }; + }; + + hasksyn = buildVimPluginFrom2Nix { + name = "hasksyn-2014-09-04"; + src = fetchFromGitHub { + owner = "travitch"; + repo = "hasksyn"; + rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; + sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx"; + }; + }; + + hlint-refactor-vim = buildVimPluginFrom2Nix { + name = "hlint-refactor-vim-2015-12-05"; + src = fetchFromGitHub { + owner = "mpickering"; + repo = "hlint-refactor-vim"; + rev = "fffb044ecef854a82c5c2efda252e09044ba03e0"; + sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8"; + }; + }; + + idris-vim = buildVimPluginFrom2Nix { + name = "idris-vim-2017-12-04"; + src = fetchFromGitHub { + owner = "idris-hackers"; + repo = "idris-vim"; + rev = "091ed6b267749927777423160eeab520109dd9c1"; + sha256 = "1zibar2vxcmai0k37ricwnimfdv1adxfbbvz871rc4l6h3q85if1"; + }; + }; + + Improved-AnsiEsc = buildVimPluginFrom2Nix { + name = "Improved-AnsiEsc-2015-08-26"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "Improved-AnsiEsc"; + rev = "e1c59a8e9203fab6b9150721f30548916da73351"; + sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz"; + }; + }; + + Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { + name = "Jenkinsfile-vim-syntax-2018-04-04"; + src = fetchFromGitHub { + owner = "martinda"; + repo = "Jenkinsfile-vim-syntax"; + rev = "45418b171e06f63e0814cac6a656832384708aba"; + sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p"; + }; + }; + + julia-vim = buildVimPluginFrom2Nix { + name = "julia-vim-2018-09-09"; + src = fetchFromGitHub { + owner = "JuliaEditorSupport"; + repo = "julia-vim"; + rev = "3018668f89ca4bf125d1d57effdea88b07a3b466"; + sha256 = "13fn3566ql4fcqzh6lfb6qj2xyqyvz70psc67k184k88arqm3y55"; + }; + }; + + last256 = buildVimPluginFrom2Nix { + name = "last256-2017-06-10"; + src = fetchFromGitHub { + owner = "sk1418"; + repo = "last256"; + rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0"; + sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv"; + }; + }; + + latex-box = buildVimPluginFrom2Nix { + name = "latex-box-2015-06-01"; + src = fetchFromGitHub { + owner = "latex-box-team"; + repo = "latex-box"; + rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1"; + sha256 = "1z4mdy47cpwcdhvy8mr72vhlybxn1y59yd3ixf6ids1bzpkrd7zl"; + }; + }; + + lightline-vim = buildVimPluginFrom2Nix { + name = "lightline-vim-2018-09-01"; + src = fetchFromGitHub { + owner = "itchyny"; + repo = "lightline.vim"; + rev = "166f179cf89320b1b6f95def3a49fda448f4f711"; + sha256 = "04vcv5ig854n5yaibhwjbqwjiw0rbk7laiysn8s5lj1abycg92qq"; + }; + }; + + limelight-vim = buildVimPluginFrom2Nix { + name = "limelight-vim-2016-06-23"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "limelight.vim"; + rev = "106fb5749d227a0de72e36068ed72798c6fd48e6"; + sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh"; + }; + }; + + lushtags = buildVimPluginFrom2Nix { + name = "lushtags-2017-04-19"; + src = fetchFromGitHub { + owner = "mkasa"; + repo = "lushtags"; + rev = "fd7fa5a0162d9aa159559880d5ba4731e180eeaf"; + sha256 = "03saw1w5pybj6yywzi8hinciv18znimm7k0h34k4pqp5gi1jfaql"; + }; + }; + + matchit-zip = buildVimPluginFrom2Nix { + name = "matchit-zip-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "matchit.zip"; + rev = "ced6c409c9beeb0b4142d21906606bd194411d1d"; + sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm"; + }; + }; + + mayansmoke = buildVimPluginFrom2Nix { + name = "mayansmoke-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "mayansmoke"; + rev = "168883af7aec05f139af251f47eadd5dfb802c9d"; + sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd"; + }; + }; + + molokai = buildVimPluginFrom2Nix { + name = "molokai-2015-11-11"; + src = fetchFromGitHub { + owner = "tomasr"; + repo = "molokai"; + rev = "c67bdfcdb31415aa0ade7f8c003261700a885476"; + sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s"; + }; + }; + + neco-ghc = buildVimPluginFrom2Nix { + name = "neco-ghc-2018-05-13"; + src = fetchFromGitHub { + owner = "eagletmt"; + repo = "neco-ghc"; + rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; + sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; + }; + }; + + neco-look = buildVimPluginFrom2Nix { + name = "neco-look-2018-01-21"; + src = fetchFromGitHub { + owner = "ujihisa"; + repo = "neco-look"; + rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c"; + sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj"; + }; + }; + + neco-syntax = buildVimPluginFrom2Nix { + name = "neco-syntax-2017-10-01"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neco-syntax"; + rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3"; + sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip"; + }; + }; + + neco-vim = buildVimPluginFrom2Nix { + name = "neco-vim-2017-10-01"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neco-vim"; + rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9"; + sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73"; + }; + }; + + neocomplete-vim = buildVimPluginFrom2Nix { + name = "neocomplete-vim-2018-03-28"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neocomplete.vim"; + rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3"; + sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8"; + }; + }; + + neoformat = buildVimPluginFrom2Nix { + name = "neoformat-2018-09-05"; + src = fetchFromGitHub { + owner = "sbdchd"; + repo = "neoformat"; + rev = "c8bc4ec044a0d8c96291426b5ce10f741d63e6b6"; + sha256 = "140f1q1wbn7d7mxb2q08421a8qgxii3ffd8lmhsjj7mjsdvxmcks"; + }; + }; + + neoinclude-vim = buildVimPluginFrom2Nix { + name = "neoinclude-vim-2018-05-21"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neoinclude.vim"; + rev = "2fa77b9211d3f10c29559b715b6863da67ae7d3a"; + sha256 = "0pdahb2z9q4dk67xkwvaqrlpai86slhncfb4gn88x40dlnd7rkbg"; + }; + }; + + neomake = buildVimPluginFrom2Nix { + name = "neomake-2018-09-07"; + src = fetchFromGitHub { + owner = "benekastah"; + repo = "neomake"; + rev = "28f6991f3546195e764052d5e1c731432ac8f706"; + sha256 = "1sw4c5h8w6yw3dfybar72dzxvf44yypkhcvi15zxklvicb4xak9p"; + }; + }; + + neomru-vim = buildVimPluginFrom2Nix { + name = "neomru-vim-2017-10-01"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neomru.vim"; + rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d"; + sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7"; + }; + }; + + neosnippet-snippets = buildVimPluginFrom2Nix { + name = "neosnippet-snippets-2018-08-30"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neosnippet-snippets"; + rev = "a2e90c49850fff72e923f92f1672c3dc18e2f99b"; + sha256 = "0qfmiamy3y3h2dqpg965g801bfi9c7cnqgal3ybb66xs79afgi99"; + }; + }; + + neosnippet-vim = buildVimPluginFrom2Nix { + name = "neosnippet-vim-2018-07-30"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neosnippet.vim"; + rev = "70700ddef65f8f0639b336d04a0d2dbdc4eb0830"; + sha256 = "0szhmdqqgpfy6shwiw7wnsd06cz8c7v5zmpaa3hzs32gyrx49rza"; + }; + }; + + neoyank-vim = buildVimPluginFrom2Nix { + name = "neoyank-vim-2018-03-26"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neoyank.vim"; + rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef"; + sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928"; + }; + }; + + nerdcommenter = buildVimPluginFrom2Nix { + name = "nerdcommenter-2018-07-31"; + src = fetchFromGitHub { + owner = "scrooloose"; + repo = "nerdcommenter"; + rev = "fdf950f20b3907c6a6fa0bc5c7ac0aeb567841dd"; + sha256 = "17b742fzybdcsf623n6xz21kb11xk2wz6w24iwdh8pkmqqh5mgzp"; + }; + }; + + nerdtree = buildVimPluginFrom2Nix { + name = "nerdtree-2018-08-25"; + src = fetchFromGitHub { + owner = "scrooloose"; + repo = "nerdtree"; + rev = "808f5b225b090bb4a94a2c47bb08d1bc1f7f8a4e"; + sha256 = "1isnx83ay3r4f7bkfck98pq92m1kyafa96zzliyjdlgbplwmjq9y"; + }; + }; + + nerdtree-git-plugin = buildVimPluginFrom2Nix { + name = "nerdtree-git-plugin-2017-03-12"; + src = fetchFromGitHub { + owner = "albfan"; + repo = "nerdtree-git-plugin"; + rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d"; + sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj"; + }; + }; + + nim-vim = buildVimPluginFrom2Nix { + name = "nim-vim-2018-08-16"; + src = fetchFromGitHub { + owner = "zah"; + repo = "nim.vim"; + rev = "7d1211cc1588d8970e44435c612405f41ab5a36b"; + sha256 = "1s28sk7d73vckh37xhld99i8kkx2dxcvsiv8ixlkhgg1pdcchd6d"; + }; + }; + + nvim-cm-racer = buildVimPluginFrom2Nix { + name = "nvim-cm-racer-2017-07-27"; + src = fetchFromGitHub { + owner = "roxma"; + repo = "nvim-cm-racer"; + rev = "2a8a4a49fa58c5dac9e0bed9511f6928930cacd2"; + sha256 = "1yljxwypgn91084yyicbc2qprn31ld7s4drvnddzczyhzq5m2gpx"; + }; + }; + + nvim-completion-manager = buildVimPluginFrom2Nix { + name = "nvim-completion-manager-2018-07-27"; + src = fetchFromGitHub { + owner = "roxma"; + repo = "nvim-completion-manager"; + rev = "45a026afb8b309b3b80f2c1b5910f72a54a9b563"; + sha256 = "0znwgry4ill0nxm096hc8s9vf20rf9xcq3dz8y8h7xlqzzsycl7a"; + }; + }; + + open-browser-vim = buildVimPluginFrom2Nix { + name = "open-browser-vim-2018-04-26"; + src = fetchFromGitHub { + owner = "tyru"; + repo = "open-browser.vim"; + rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246"; + sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db"; + }; + }; + + peskcolor-vim = buildVimPluginFrom2Nix { + name = "peskcolor-vim-2016-06-11"; + src = fetchFromGitHub { + owner = "andsild"; + repo = "peskcolor.vim"; + rev = "cba4fc739bbebacd503158f6509d9c226651f363"; + sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq"; + }; + }; + + pony-vim-syntax = buildVimPluginFrom2Nix { + name = "pony-vim-syntax-2017-09-26"; + src = fetchFromGitHub { + owner = "dleonard0"; + repo = "pony-vim-syntax"; + rev = "caa34b3d7a15d9bfbfbb2f5944c85eb1eddcfafc"; + sha256 = "0r2lv99hkm95dv8wy9rkrkcwz5wkmwggfwi5vakgw497l3a9jskr"; + }; + }; + + psc-ide-vim = buildVimPluginFrom2Nix { + name = "psc-ide-vim-2018-03-11"; + src = fetchFromGitHub { + owner = "frigoeu"; + repo = "psc-ide-vim"; + rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f"; + sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g"; + }; + }; + + purescript-vim = buildVimPluginFrom2Nix { + name = "purescript-vim-2018-07-05"; + src = fetchFromGitHub { + owner = "raichoo"; + repo = "purescript-vim"; + rev = "ab8547cef5827f046d43ba57203acb6692b7ef06"; + sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33"; + }; + }; + + python-mode = buildVimPluginFrom2Nix { + name = "python-mode-2018-04-29"; + src = fetchFromGitHub { + owner = "python-mode"; + repo = "python-mode"; + rev = "f94b0d7b21714f950f5878b430fbfde21c3b7ad9"; + sha256 = "0zxsa1agigzb9adrwq54pdyl984drdqzz3kkixaijkq77kkdvj0n"; + }; + }; + + quickfixstatus = buildVimPluginFrom2Nix { + name = "quickfixstatus-2011-09-03"; + src = fetchFromGitHub { + owner = "dannyob"; + repo = "quickfixstatus"; + rev = "fd3875b914fc51bbefefa8c4995588c088163053"; + sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; + }; + }; + + rainbow = buildVimPluginFrom2Nix { + name = "rainbow-2018-07-31"; + src = fetchFromGitHub { + owner = "luochen1990"; + repo = "rainbow"; + rev = "d7bb89e6a6fae25765ee16020ea7a85d43bd6e41"; + sha256 = "0zh2x1bm0sq00gq6350kckjl1fhwqdxl3b8d3k9lb1736xggd1p8"; + }; + }; + + rainbow_parentheses-vim = buildVimPluginFrom2Nix { + name = "rainbow_parentheses-vim-2013-03-05"; + src = fetchFromGitHub { + owner = "kien"; + repo = "rainbow_parentheses.vim"; + rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; + sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; + }; + }; + + random-vim = buildVimPluginFrom2Nix { + name = "random-vim-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "random.vim"; + rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989"; + sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp"; + }; + }; + + Rename = buildVimPluginFrom2Nix { + name = "Rename-2011-08-31"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "Rename"; + rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34"; + sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r"; + }; + }; + + ReplaceWithRegister = buildVimPluginFrom2Nix { + name = "ReplaceWithRegister-2014-10-31"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "ReplaceWithRegister"; + rev = "832efc23111d19591d495dc72286de2fb0b09345"; + sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g"; + }; + }; + + riv-vim = buildVimPluginFrom2Nix { + name = "riv-vim-2018-06-20"; + src = fetchFromGitHub { + owner = "Rykka"; + repo = "riv.vim"; + rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8"; + sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch"; + }; + }; + + robotframework-vim = buildVimPluginFrom2Nix { + name = "robotframework-vim-2017-04-14"; + src = fetchFromGitHub { + owner = "mfukar"; + repo = "robotframework-vim"; + rev = "75d5b371a4da2a090a2872d55bd0dead013f334e"; + sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad"; + }; + }; + + rust-vim = buildVimPluginFrom2Nix { + name = "rust-vim-2018-09-08"; + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "rust.vim"; + rev = "b7fc97c5f757c2b9f1e911dd4a800678d202d083"; + sha256 = "1h0n55y7ybjaxxrch0fnq1c74h994d539qi62ba3x1k7sh5am887"; + }; + }; + + self = buildVimPluginFrom2Nix { + name = "self-2014-05-28"; + src = fetchFromGitHub { + owner = "megaannum"; + repo = "self"; + rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f"; + sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn"; + }; + }; + + shabadou-vim = buildVimPluginFrom2Nix { + name = "shabadou-vim-2016-07-19"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "shabadou.vim"; + rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1"; + sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870"; + }; + }; + + sourcemap-vim = buildVimPluginFrom2Nix { + name = "sourcemap-vim-2012-09-19"; + src = fetchFromGitHub { + owner = "chikatoike"; + repo = "sourcemap.vim"; + rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; + sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; + }; + }; + + Spacegray-vim = buildVimPluginFrom2Nix { + name = "Spacegray-vim-2018-06-21"; + src = fetchFromGitHub { + owner = "ajh17"; + repo = "Spacegray.vim"; + rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81"; + sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9"; + }; + }; + + spacevim = buildVimPluginFrom2Nix { + name = "spacevim-2018-03-29"; + src = fetchFromGitHub { + owner = "ctjhoa"; + repo = "spacevim"; + rev = "30142a518ba77feb22791b5cb2387d88b70c58f2"; + sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg"; + }; + }; + + sparkup = buildVimPluginFrom2Nix { + name = "sparkup-2012-06-11"; + src = fetchFromGitHub { + owner = "chrisgeo"; + repo = "sparkup"; + rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; + sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; + }; + }; + + splice-vim = buildVimPluginFrom2Nix { + name = "splice-vim-2017-09-03"; + src = fetchFromGitHub { + owner = "sjl"; + repo = "splice.vim"; + rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d"; + sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx"; + }; + }; + + supertab = buildVimPluginFrom2Nix { + name = "supertab-2017-11-14"; + src = fetchFromGitHub { + owner = "ervandew"; + repo = "supertab"; + rev = "40fe711e088e2ab346738233dd5adbb1be355172"; + sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; + }; + }; + + swift-vim = buildVimPluginFrom2Nix { + name = "swift-vim-2018-07-22"; + src = fetchFromGitHub { + owner = "keith"; + repo = "swift.vim"; + rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab"; + sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153"; + }; + }; + + syntastic = buildVimPluginFrom2Nix { + name = "syntastic-2018-08-27"; + src = fetchFromGitHub { + owner = "scrooloose"; + repo = "syntastic"; + rev = "0295d8241db23e24b120e0360a899cb375793a1e"; + sha256 = "1fpfsc8snmkkbsjb4j1l872sgr840q73rdykr29w1q68q4m06vbc"; + }; + }; + + tabmerge = buildVimPluginFrom2Nix { + name = "tabmerge-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "tabmerge"; + rev = "074e5f06f26e7108a0570071a0f938a821768c06"; + sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq"; + }; + }; + + tabpagebuffer-vim = buildVimPluginFrom2Nix { + name = "tabpagebuffer-vim-2014-09-30"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "tabpagebuffer.vim"; + rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc"; + sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f"; + }; + }; + + tabular = buildVimPluginFrom2Nix { + name = "tabular-2016-05-04"; + src = fetchFromGitHub { + owner = "godlygeek"; + repo = "tabular"; + rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; + sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz"; + }; + }; + + tagbar = buildVimPluginFrom2Nix { + name = "tagbar-2017-12-17"; + src = fetchFromGitHub { + owner = "majutsushi"; + repo = "tagbar"; + rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70"; + sha256 = "130rxvlkqzlqh09w6fpmq7x3b7s4s56qxly9m4jh6s2jrab1cxak"; + }; + }; + + taglist-vim = buildVimPluginFrom2Nix { + name = "taglist-vim-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "taglist.vim"; + rev = "53041fbc45398a9af631a20657e109707a455339"; + sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd"; + }; + }; + + targets-vim = buildVimPluginFrom2Nix { + name = "targets-vim-2018-05-27"; + src = fetchFromGitHub { + owner = "wellle"; + repo = "targets.vim"; + rev = "c3042dc18acc0dfcee479310d3efc6aefe92db75"; + sha256 = "0shnlgwrxzrd0m3k6hnmr66i2l4zknp0pn7f71d2frx937gih34q"; + }; + }; + + tender-vim = buildVimPluginFrom2Nix { + name = "tender-vim-2017-03-14"; + src = fetchFromGitHub { + owner = "jacoborus"; + repo = "tender.vim"; + rev = "6b0497a59233b3e67fb528a498069eb1d24743f9"; + sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn"; + }; + }; + + thumbnail-vim = buildVimPluginFrom2Nix { + name = "thumbnail-vim-2017-04-24"; + src = fetchFromGitHub { + owner = "itchyny"; + repo = "thumbnail.vim"; + rev = "71cb5d48e59fc77149c1d1036ecd9e39f0b46a00"; + sha256 = "0b25n28ri6n5rrvgfynv8rm5pzzxpnrnj1l3647pf2fjxd2z2rv5"; + }; + }; + + tlib_vim = buildVimPluginFrom2Nix { + name = "tlib_vim-2018-04-08"; + src = fetchFromGitHub { + owner = "tomtom"; + repo = "tlib_vim"; + rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b"; + sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx"; + }; + }; + + tslime-vim = buildVimPluginFrom2Nix { + name = "tslime-vim-2018-07-23"; + src = fetchFromGitHub { + owner = "jgdavey"; + repo = "tslime.vim"; + rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; + sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; + }; + }; + + tsuquyomi = buildVimPluginFrom2Nix { + name = "tsuquyomi-2018-08-03"; + src = fetchFromGitHub { + owner = "Quramy"; + repo = "tsuquyomi"; + rev = "05e6515f6d21545959ac4eb570c917e1d225b1f1"; + sha256 = "0hbd2d8zb86c8ncrrm4zyj92j523xay2lwk2k9arwacn8fj42hir"; + }; + }; + + typescript-vim = buildVimPluginFrom2Nix { + name = "typescript-vim-2018-08-15"; + src = fetchFromGitHub { + owner = "leafgarland"; + repo = "typescript-vim"; + rev = "db131b8cd42973ed26928e9e445c1a745a98cff8"; + sha256 = "1l7wbwv3xirl9nvjb2f693knxsif5qanjknd9lija8m7gnwagzm4"; + }; + }; + + ultisnips = buildVimPluginFrom2Nix { + name = "ultisnips-2018-04-30"; + src = fetchFromGitHub { + owner = "SirVer"; + repo = "ultisnips"; + rev = "6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba"; + sha256 = "1zp3xcmxk6cn38zmxxy5s2wnw9djskwkmspq2s9vqliyhprf9sy3"; + }; + }; + + undotree = buildVimPluginFrom2Nix { + name = "undotree-2018-09-07"; + src = fetchFromGitHub { + owner = "mbbill"; + repo = "undotree"; + rev = "364c73dae83bbaa552fa901dbcb082be22f846f4"; + sha256 = "1swjgdgbr63a5xp9nlmcpa5f31r1jc9n4wqz4sgmhrcdc4xxq8ah"; + }; + }; + + unite-vim = buildVimPluginFrom2Nix { + name = "unite-vim-2018-08-06"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "unite.vim"; + rev = "7ed231f2dbceb82b3ed81dc5ef999c94c2528586"; + sha256 = "0p2xfsyflds74lrpk14nb388nh2rc3hmqg3i9kgzxqns4i6w5s8v"; + }; + }; + + vim = buildVimPluginFrom2Nix { + name = "vim-2018-07-23"; + src = fetchFromGitHub { + owner = "dracula"; + repo = "vim"; + rev = "d329d61c1752807059aef388c4e9629296760a35"; + sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm"; + }; + }; + + vim-abolish = buildVimPluginFrom2Nix { + name = "vim-abolish-2018-08-02"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-abolish"; + rev = "40e8b973971beb5da279a499231464ae1d959c8b"; + sha256 = "0ibhd9d57cwb2kls99wmbyl49w7v2niwqrf3pp7191pj46157720"; + }; + }; + + vim-addon-actions = buildVimPluginFrom2Nix { + name = "vim-addon-actions-2018-01-18"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-actions"; + rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; + sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; + }; + }; + + vim-addon-async = buildVimPluginFrom2Nix { + name = "vim-addon-async-2017-03-20"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-async"; + rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; + sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; + }; + }; + + vim-addon-background-cmd = buildVimPluginFrom2Nix { + name = "vim-addon-background-cmd-2015-12-11"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-background-cmd"; + rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; + sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; + }; + }; + + vim-addon-commenting = buildVimPluginFrom2Nix { + name = "vim-addon-commenting-2013-06-10"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-commenting"; + rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; + sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; + }; + }; + + vim-addon-completion = buildVimPluginFrom2Nix { + name = "vim-addon-completion-2015-02-10"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-completion"; + rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; + sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; + }; + }; + + vim-addon-errorformats = buildVimPluginFrom2Nix { + name = "vim-addon-errorformats-2014-11-05"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-errorformats"; + rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; + sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; + }; + }; + + vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { + name = "vim-addon-goto-thing-at-cursor-2012-01-10"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-goto-thing-at-cursor"; + rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; + sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; + }; + }; + + vim-addon-local-vimrc = buildVimPluginFrom2Nix { + name = "vim-addon-local-vimrc-2015-03-19"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-local-vimrc"; + rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; + sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; + }; + }; + + vim-addon-manager = buildVimPluginFrom2Nix { + name = "vim-addon-manager-2018-07-27"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-manager"; + rev = "d9e865f3c2de5d9b7eabbc976f606cf1b89e29ea"; + sha256 = "0mgm2dqw8js9gajkrvm5n3k9m1grjxcrfc9xdzb3jxw1c0njdhcy"; + }; + }; + + vim-addon-mru = buildVimPluginFrom2Nix { + name = "vim-addon-mru-2013-08-08"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-mru"; + rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; + sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; + }; + }; + + vim-addon-mw-utils = buildVimPluginFrom2Nix { + name = "vim-addon-mw-utils-2018-03-09"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-mw-utils"; + rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2"; + sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f"; + }; + }; + + vim-addon-nix = buildVimPluginFrom2Nix { + name = "vim-addon-nix-2017-09-11"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-nix"; + rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; + sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; + }; + }; + + vim-addon-other = buildVimPluginFrom2Nix { + name = "vim-addon-other-2014-07-15"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-other"; + rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; + sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6"; + }; + }; + + vim-addon-php-manual = buildVimPluginFrom2Nix { + name = "vim-addon-php-manual-2015-01-01"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-php-manual"; + rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; + sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; + }; + }; + + vim-addon-signs = buildVimPluginFrom2Nix { + name = "vim-addon-signs-2013-04-19"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-signs"; + rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; + sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; + }; + }; + + vim-addon-sql = buildVimPluginFrom2Nix { + name = "vim-addon-sql-2017-02-11"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-sql"; + rev = "048a139af36829fce670c8ff80d3aad927557ee6"; + sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; + }; + }; + + vim-addon-syntax-checker = buildVimPluginFrom2Nix { + name = "vim-addon-syntax-checker-2017-06-26"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-syntax-checker"; + rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; + sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; + }; + }; + + vim-addon-toggle-buffer = buildVimPluginFrom2Nix { + name = "vim-addon-toggle-buffer-2012-01-13"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-toggle-buffer"; + rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; + sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; + }; + }; + + vim-addon-xdebug = buildVimPluginFrom2Nix { + name = "vim-addon-xdebug-2014-08-29"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-xdebug"; + rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; + sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; + }; + }; + + vim-airline = buildVimPluginFrom2Nix { + name = "vim-airline-2018-09-07"; + src = fetchFromGitHub { + owner = "vim-airline"; + repo = "vim-airline"; + rev = "d342c3cb1e1365d7cfd0328bb0bc20321db34125"; + sha256 = "19p8w2jyigzfq0qqqgc4gw82scqpjxfy0h4w1f6c0vrjbnk6xxx9"; + }; + }; + + vim-airline-themes = buildVimPluginFrom2Nix { + name = "vim-airline-themes-2018-09-05"; + src = fetchFromGitHub { + owner = "vim-airline"; + repo = "vim-airline-themes"; + rev = "725789c110fbab52f8c18021f9d043839d7e31ed"; + sha256 = "15k5s8yysnvm0swfi27g2yhrnkb8kzvswb58k1jbzb65nwdw139z"; + }; + }; + + vim-auto-save = buildVimPluginFrom2Nix { + name = "vim-auto-save-2017-11-08"; + src = fetchFromGitHub { + owner = "907th"; + repo = "vim-auto-save"; + rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; + sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; + }; + }; + + vim-autoformat = buildVimPluginFrom2Nix { + name = "vim-autoformat-2018-09-08"; + src = fetchFromGitHub { + owner = "Chiel92"; + repo = "vim-autoformat"; + rev = "98233b8f353fa5d237e89859a8f1b91c14c21397"; + sha256 = "18xb803vx11wx9yhxvp6aq8kh0vbidxmwhwrjfcslrw0k1zis3yl"; + }; + }; + + vim-bazel = buildVimPluginFrom2Nix { + name = "vim-bazel-2018-01-11"; + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = "vim-bazel"; + rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3"; + sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy"; + }; + }; + + vim-buffergator = buildVimPluginFrom2Nix { + name = "vim-buffergator-2018-05-02"; + src = fetchFromGitHub { + owner = "jeetsukumaran"; + repo = "vim-buffergator"; + rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916"; + sha256 = "0g7ymflzfdsj5793s32gc83bidqys5dxmw455viwpqgmgjxnar5c"; + }; + }; + + vim-closetag = buildVimPluginFrom2Nix { + name = "vim-closetag-2018-09-03"; + src = fetchFromGitHub { + owner = "alvan"; + repo = "vim-closetag"; + rev = "8c71d524d98be4f3c6c1e4ff6ddf6b9f422220bb"; + sha256 = "1w42qzcw33akycgqj8v60l2yfilhhy9j0zw6rifa66d58xaiv6jy"; + }; + }; + + vim-codefmt = buildVimPluginFrom2Nix { + name = "vim-codefmt-2018-08-17"; + src = fetchFromGitHub { + owner = "google"; + repo = "vim-codefmt"; + rev = "18fe8fbd7a6c0875f922aa682f5dec81b9f4e554"; + sha256 = "0fzhwxcg4yx6zm1ndzp4vmrsi4za9kxymqbrrsj9zk46lm4bv74h"; + }; + }; + + vim-coffee-script = buildVimPluginFrom2Nix { + name = "vim-coffee-script-2018-02-27"; + src = fetchFromGitHub { + owner = "kchmck"; + repo = "vim-coffee-script"; + rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; + sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; + }; + }; + + vim-colors-solarized = buildVimPluginFrom2Nix { + name = "vim-colors-solarized-2011-05-09"; + src = fetchFromGitHub { + owner = "altercation"; + repo = "vim-colors-solarized"; + rev = "528a59f26d12278698bb946f8fb82a63711eec21"; + sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; + }; + }; + + vim-colorschemes = buildVimPluginFrom2Nix { + name = "vim-colorschemes-2017-08-22"; + src = fetchFromGitHub { + owner = "flazz"; + repo = "vim-colorschemes"; + rev = "eab315701f4627967fd62582eefc4e37a3745786"; + sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k"; + }; + }; + + vim-colorstepper = buildVimPluginFrom2Nix { + name = "vim-colorstepper-2016-01-28"; + src = fetchFromGitHub { + owner = "jonbri"; + repo = "vim-colorstepper"; + rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05"; + sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs"; + }; + }; + + vim-commentary = buildVimPluginFrom2Nix { + name = "vim-commentary-2018-07-27"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-commentary"; + rev = "141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a"; + sha256 = "0nncs32ayfhr557aiynq7b0sc7rxqwv7xanram53x1wvmfy14zf0"; + }; + }; + + vim-css-color = buildVimPluginFrom2Nix { + name = "vim-css-color-2018-08-11"; + src = fetchFromGitHub { + owner = "ap"; + repo = "vim-css-color"; + rev = "22211783b5bcc052748c80fad7d2916b595da09c"; + sha256 = "12z965xij9393m6jkwkn32ykfgnjqjdhy7571cihmvhknvhd0dsk"; + }; + }; + + vim-cursorword = buildVimPluginFrom2Nix { + name = "vim-cursorword-2017-10-19"; + src = fetchFromGitHub { + owner = "itchyny"; + repo = "vim-cursorword"; + rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; + sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; + }; + }; + + vim-cute-python = buildVimPluginFrom2Nix { + name = "vim-cute-python-2016-04-04"; + src = fetchFromGitHub { + owner = "ehamberg"; + repo = "vim-cute-python"; + rev = "d7a6163f794500447242df2bedbe20bd751b92da"; + sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf"; + }; + }; + + vim-devicons = buildVimPluginFrom2Nix { + name = "vim-devicons-2018-06-21"; + src = fetchFromGitHub { + owner = "ryanoasis"; + repo = "vim-devicons"; + rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26"; + sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg"; + }; + }; + + vim-dirdiff = buildVimPluginFrom2Nix { + name = "vim-dirdiff-2018-01-31"; + src = fetchFromGitHub { + owner = "will133"; + repo = "vim-dirdiff"; + rev = "b5a3d59bfbeb5cef7dbadbe69c455b470988b58c"; + sha256 = "16hc88k00xa757k0h53r1sbqwxdxdy0118yl2vsigd6rqk474nw1"; + }; + }; + + vim-dispatch = buildVimPluginFrom2Nix { + name = "vim-dispatch-2018-08-20"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-dispatch"; + rev = "4566b8892715361f9952fa4c29c05035fdede09d"; + sha256 = "1v1wmvasymllvjgg8kfh8zag99mlbaf366v9byvp8fpskzaza1nz"; + }; + }; + + vim-docbk = buildVimPluginFrom2Nix { + name = "vim-docbk-2015-04-01"; + src = fetchFromGitHub { + owner = "jhradilek"; + repo = "vim-docbk"; + rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e"; + sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d"; + }; + }; + + vim-easy-align = buildVimPluginFrom2Nix { + name = "vim-easy-align-2017-06-03"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-easy-align"; + rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; + sha256 = "16yis2wlgi8v0h04hiqmnkm9qrby4kbc2fvkw4szfsbg5m3qx0fc"; + }; + }; + + vim-easygit = buildVimPluginFrom2Nix { + name = "vim-easygit-2018-07-08"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "vim-easygit"; + rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a"; + sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8"; + }; + }; + + vim-easymotion = buildVimPluginFrom2Nix { + name = "vim-easymotion-2018-06-04"; + src = fetchFromGitHub { + owner = "lokaltog"; + repo = "vim-easymotion"; + rev = "1a0244c90c3ff46219cf9597bb13662be4232407"; + sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy"; + }; + }; + + vim-easytags = buildVimPluginFrom2Nix { + name = "vim-easytags-2015-07-01"; + src = fetchFromGitHub { + owner = "xolox"; + repo = "vim-easytags"; + rev = "72a8753b5d0a951e547c51b13633f680a95b5483"; + sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i"; + }; + }; + + vim-eighties = buildVimPluginFrom2Nix { + name = "vim-eighties-2016-12-15"; + src = fetchFromGitHub { + owner = "justincampbell"; + repo = "vim-eighties"; + rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170"; + sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2"; + }; + }; + + vim-elixir = buildVimPluginFrom2Nix { + name = "vim-elixir-2018-08-17"; + src = fetchFromGitHub { + owner = "elixir-lang"; + repo = "vim-elixir"; + rev = "0a847f0faed5ba2d94bb3d51f355c50f37ba025b"; + sha256 = "1jl85wpgywhcvhgw02y8zpvqf0glr4i8522kxpvhsiacb1v1xh04"; + }; + }; + + vim-eunuch = buildVimPluginFrom2Nix { + name = "vim-eunuch-2018-08-10"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-eunuch"; + rev = "632d92e85d4b6d5413ee4a643ce570efb09c8d6b"; + sha256 = "0mw2wxr4y5r1j3lj4ilihs83l2afsr0lnxzy73v1hsahs70vayx8"; + }; + }; + + vim-expand-region = buildVimPluginFrom2Nix { + name = "vim-expand-region-2013-08-19"; + src = fetchFromGitHub { + owner = "terryma"; + repo = "vim-expand-region"; + rev = "966513543de0ddc2d673b5528a056269e7917276"; + sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv"; + }; + }; + + vim-extradite = buildVimPluginFrom2Nix { + name = "vim-extradite-2015-09-22"; + src = fetchFromGitHub { + owner = "int3"; + repo = "vim-extradite"; + rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; + sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; + }; + }; + + vim-fireplace = buildVimPluginFrom2Nix { + name = "vim-fireplace-2018-06-01"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-fireplace"; + rev = "1ef0f0726cadd96547a5f79103b66339f170da02"; + sha256 = "0ihhd34bl98xssa602386ji013pjj6xnkgww3y2wg73sx2nk6qc4"; + }; + }; + + vim-flagship = buildVimPluginFrom2Nix { + name = "vim-flagship-2018-08-15"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-flagship"; + rev = "66abd2fc519f4339ec751874279c14da7833dd99"; + sha256 = "0ijfa076a5jr6gi11j2zcgh5c7kj0vlwipzk1myjc1a77pss7nlg"; + }; + }; + + vim-ft-diff_fold = buildVimPluginFrom2Nix { + name = "vim-ft-diff_fold-2013-02-10"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-ft-diff_fold"; + rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; + sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; + }; + }; + + vim-fugitive = buildVimPluginFrom2Nix { + name = "vim-fugitive-2018-09-03"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-fugitive"; + rev = "4bf30ce907f74cbf442b41f85c25967c397a3413"; + sha256 = "0k0rp4r4783dszbcag82ijrnkvp7hd5jrqsmpi45v4gxdxfj6slm"; + }; + }; + + vim-gista = buildVimPluginFrom2Nix { + name = "vim-gista-2017-02-20"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "vim-gista"; + rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; + sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; + }; + }; + + vim-gitbranch = buildVimPluginFrom2Nix { + name = "vim-gitbranch-2017-05-27"; + src = fetchFromGitHub { + owner = "itchyny"; + repo = "vim-gitbranch"; + rev = "8118dc1cdd387bd609852be4bf350360ce881193"; + sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j"; + }; + }; + + vim-gitgutter = buildVimPluginFrom2Nix { + name = "vim-gitgutter-2018-08-15"; + src = fetchFromGitHub { + owner = "airblade"; + repo = "vim-gitgutter"; + rev = "50a7062909d91a290fae04219887b1b45f3138db"; + sha256 = "1bgpy85dxvn40ybzxih25gysy941jvylxm0fmkd5qpwkf7xm26wq"; + }; + }; + + vim-github-dashboard = buildVimPluginFrom2Nix { + name = "vim-github-dashboard-2018-09-03"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-github-dashboard"; + rev = "8012a2016a9e39a50081c9d5db2deb09ae4a6010"; + sha256 = "0jkr6mz5zcpbyswmiyprcbm8l93lkg5sr46r8kyds1n2vz19cf7x"; + }; + }; + + vim-go = buildVimPluginFrom2Nix { + name = "vim-go-2018-09-06"; + src = fetchFromGitHub { + owner = "fatih"; + repo = "vim-go"; + rev = "fb173c3a849fdc47a267e905cee5e29a88797d61"; + sha256 = "0i3kprznlys1pa6ii6rbcsxar2zwsygc4hv22h0svmpajbzwvfp9"; + }; + }; + + vim-grammarous = buildVimPluginFrom2Nix { + name = "vim-grammarous-2018-08-05"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "vim-grammarous"; + rev = "d52086d0f99e8008be9fa717bfaa0ee028f09e29"; + sha256 = "1p48p2ml284ssylnd6dr7dwb5kpq6arkfzg0d8y94317cmzagpkx"; + }; + }; + + vim-grepper = buildVimPluginFrom2Nix { + name = "vim-grepper-2018-04-23"; + src = fetchFromGitHub { + owner = "mhinz"; + repo = "vim-grepper"; + rev = "04d659c9e0a57e0c3e989069601d2a98df0386c4"; + sha256 = "16k5ahcn9i4wvlhw16j0gfgxw0clry72l78lk28qmx9p2gh1ka3g"; + }; + }; + + vim-hardtime = buildVimPluginFrom2Nix { + name = "vim-hardtime-2017-03-31"; + src = fetchFromGitHub { + owner = "takac"; + repo = "vim-hardtime"; + rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b"; + sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5"; + }; + }; + + vim-haskellconceal = buildVimPluginFrom2Nix { + name = "vim-haskellconceal-2017-06-15"; + src = fetchFromGitHub { + owner = "twinside"; + repo = "vim-haskellconceal"; + rev = "802f82a5afee56e9e1251e6f756104a3bd114234"; + sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r"; + }; + }; + + vim-haskellConcealPlus = buildVimPluginFrom2Nix { + name = "vim-haskellConcealPlus-2018-08-07"; + src = fetchFromGitHub { + owner = "enomsg"; + repo = "vim-haskellConcealPlus"; + rev = "12608ecab20c3eda9a89a55931397b5e020f38a4"; + sha256 = "0i75casdf20l22s1p669nfk67f10d6ry0i76bbwbn0anq66hn7n0"; + }; + }; + + vim-hdevtools = buildVimPluginFrom2Nix { + name = "vim-hdevtools-2017-03-11"; + src = fetchFromGitHub { + owner = "bitc"; + repo = "vim-hdevtools"; + rev = "4ffdace7002915cb10d663a2c56386286c5b8e37"; + sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka"; + }; + }; + + vim-hier = buildVimPluginFrom2Nix { + name = "vim-hier-2011-08-27"; + src = fetchFromGitHub { + owner = "jceb"; + repo = "vim-hier"; + rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; + sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n"; + }; + }; + + vim-highlightedyank = buildVimPluginFrom2Nix { + name = "vim-highlightedyank-2018-06-01"; + src = fetchFromGitHub { + owner = "machakann"; + repo = "vim-highlightedyank"; + rev = "eafae05916e670da8bc99e44b1534cd8c7f87c7a"; + sha256 = "1z6xjb9244fgnhmw21m7y3bd9vs9gvxbb9ig73iwy0ny886hjlnk"; + }; + }; + + vim-hoogle = buildVimPluginFrom2Nix { + name = "vim-hoogle-2018-03-04"; + src = fetchFromGitHub { + owner = "Twinside"; + repo = "vim-hoogle"; + rev = "871d104c92e33cb238506f2805f1652561978cc8"; + sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; + }; + }; + + vim-iced-coffee-script = buildVimPluginFrom2Nix { + name = "vim-iced-coffee-script-2013-12-26"; + src = fetchFromGitHub { + owner = "noc7c9"; + repo = "vim-iced-coffee-script"; + rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; + sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; + }; + }; + + vim-indent-guides = buildVimPluginFrom2Nix { + name = "vim-indent-guides-2018-05-14"; + src = fetchFromGitHub { + owner = "nathanaelkane"; + repo = "vim-indent-guides"; + rev = "54d889a63716ee2f1818aa2ec5082db47147147b"; + sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2"; + }; + }; + + vim-indent-object = buildVimPluginFrom2Nix { + name = "vim-indent-object-2018-04-08"; + src = fetchFromGitHub { + owner = "michaeljsmith"; + repo = "vim-indent-object"; + rev = "5c5b24c959478929b54a9e831a8e2e651a465965"; + sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19"; + }; + }; + + vim-ipython = buildVimPluginFrom2Nix { + name = "vim-ipython-2015-06-23"; + src = fetchFromGitHub { + owner = "ivanov"; + repo = "vim-ipython"; + rev = "42499f094b805b90b683afa5009cee99abd0bb75"; + sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x"; + }; + }; + + vim-isort = buildVimPluginFrom2Nix { + name = "vim-isort-2018-08-22"; + src = fetchFromGitHub { + owner = "fisadev"; + repo = "vim-isort"; + rev = "2fbab3401b7f81ac7f629e34e4f40a7e52934a99"; + sha256 = "09vq27jqmzp01qg5zssxcr93nmhly7cnc728qa4ivvmqkgg4myz1"; + }; + }; + + vim-jade = buildVimPluginFrom2Nix { + name = "vim-jade-2017-04-07"; + src = fetchFromGitHub { + owner = "digitaltoad"; + repo = "vim-jade"; + rev = "ddc5592f8c36bf4bd915c16b38b8c76292c2b975"; + sha256 = "069pha18g1nlzg44k742vjxm4zwjd1qjzhfllkr35qaiflvjm84y"; + }; + }; + + vim-javascript = buildVimPluginFrom2Nix { + name = "vim-javascript-2018-08-29"; + src = fetchFromGitHub { + owner = "pangloss"; + repo = "vim-javascript"; + rev = "dd84369d731bcb8feee0901cbb9b63a2b219bf28"; + sha256 = "1ca0dd4niy0lkdslgzfjp8pbr7szx6mgzax451r1c479dkmhh4cl"; + }; + }; + + vim-jinja = buildVimPluginFrom2Nix { + name = "vim-jinja-2016-11-16"; + src = fetchFromGitHub { + owner = "lepture"; + repo = "vim-jinja"; + rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6"; + sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q"; + }; + }; + + vim-jsbeautify = buildVimPluginFrom2Nix { + name = "vim-jsbeautify-2018-01-31"; + src = fetchFromGitHub { + owner = "maksimr"; + repo = "vim-jsbeautify"; + rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624"; + sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq"; + fetchSubmodules = true; + }; + }; + + vim-jsdoc = buildVimPluginFrom2Nix { + name = "vim-jsdoc-2018-05-05"; + src = fetchFromGitHub { + owner = "heavenshell"; + repo = "vim-jsdoc"; + rev = "5ef086789f5ac431d1d5aab53e771f00f1c25503"; + sha256 = "0f0dbcvbmha2nfadvf27crxkkxc1ps1inss5n66vy1p5bffv0bpm"; + }; + }; + + vim-json = buildVimPluginFrom2Nix { + name = "vim-json-2018-01-10"; + src = fetchFromGitHub { + owner = "elzr"; + repo = "vim-json"; + rev = "3727f089410e23ae113be6222e8a08dd2613ecf2"; + sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1"; + }; + }; + + vim-jsonnet = buildVimPluginFrom2Nix { + name = "vim-jsonnet-2018-04-11"; + src = fetchFromGitHub { + owner = "google"; + repo = "vim-jsonnet"; + rev = "1425166887329363381194adc457b02b663b1354"; + sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j"; + }; + }; + + vim-lastplace = buildVimPluginFrom2Nix { + name = "vim-lastplace-2017-06-13"; + src = fetchFromGitHub { + owner = "farmergreg"; + repo = "vim-lastplace"; + rev = "102b68348eff0d639ce88c5094dab0fdbe4f7c55"; + sha256 = "1d0mjjyissjvl80wgmn7z1gsjs3fhk0vnmx84l9q7g04ql4l9pja"; + }; + }; + + vim-latex-live-preview = buildVimPluginFrom2Nix { + name = "vim-latex-live-preview-2017-11-09"; + src = fetchFromGitHub { + owner = "xuhdev"; + repo = "vim-latex-live-preview"; + rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; + sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; + }; + }; + + vim-lawrencium = buildVimPluginFrom2Nix { + name = "vim-lawrencium-2017-01-11"; + src = fetchFromGitHub { + owner = "ludovicchabant"; + repo = "vim-lawrencium"; + rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f"; + sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab"; + }; + }; + + vim-leader-guide = buildVimPluginFrom2Nix { + name = "vim-leader-guide-2017-03-18"; + src = fetchFromGitHub { + owner = "hecal3"; + repo = "vim-leader-guide"; + rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e"; + sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw"; + }; + }; + + vim-ledger = buildVimPluginFrom2Nix { + name = "vim-ledger-2017-12-12"; + src = fetchFromGitHub { + owner = "ledger"; + repo = "vim-ledger"; + rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d"; + sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01"; + }; + }; + + vim-localvimrc = buildVimPluginFrom2Nix { + name = "vim-localvimrc-2018-08-21"; + src = fetchFromGitHub { + owner = "embear"; + repo = "vim-localvimrc"; + rev = "7f8fbfedaaf217488bbc9ae3fbd2539a5d825623"; + sha256 = "1q12lxblymv0j594161lpy5a6dlsg4510gmsdf2p70kbd8jfp1ar"; + }; + }; + + vim-logreview = buildVimPluginFrom2Nix { + name = "vim-logreview-2017-07-08"; + src = fetchFromGitHub { + owner = "andreshazard"; + repo = "vim-logreview"; + rev = "b7b66ab338e904127d796af49235b8c29742f18f"; + sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; + }; + }; + + vim-maktaba = buildVimPluginFrom2Nix { + name = "vim-maktaba-2018-05-07"; + src = fetchFromGitHub { + owner = "google"; + repo = "vim-maktaba"; + rev = "ffdb1a5a9921f7fd722c84d0f60e166f9916b67d"; + sha256 = "1cmhgd9xvx09l6ypks09gxqs1vad1bddinf4cx2jmd516bv8qss3"; + }; + }; + + vim-markdown = buildVimPluginFrom2Nix { + name = "vim-markdown-2018-07-30"; + src = fetchFromGitHub { + owner = "plasticboy"; + repo = "vim-markdown"; + rev = "f19506b1bfe5e60c39581dd53f6913a09385f5dd"; + sha256 = "0x0lsynmwg41fq8zf7149a2anj2b7fnm0d7b0vqnj3dwdwrjj5a1"; + }; + }; + + vim-misc = buildVimPluginFrom2Nix { + name = "vim-misc-2015-05-21"; + src = fetchFromGitHub { + owner = "xolox"; + repo = "vim-misc"; + rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b"; + sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi"; + }; + }; + + vim-multiple-cursors = buildVimPluginFrom2Nix { + name = "vim-multiple-cursors-2018-08-10"; + src = fetchFromGitHub { + owner = "terryma"; + repo = "vim-multiple-cursors"; + rev = "dd9289af03abafa76b28c503e20747ff7d7d89e5"; + sha256 = "082y4xsvsq2psllds7bncshzjsvh48l4200mri9vkv3f5mydz985"; + }; + }; + + vim-nerdtree-tabs = buildVimPluginFrom2Nix { + name = "vim-nerdtree-tabs-2018-05-05"; + src = fetchFromGitHub { + owner = "jistr"; + repo = "vim-nerdtree-tabs"; + rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b"; + sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa"; + }; + }; + + vim-niceblock = buildVimPluginFrom2Nix { + name = "vim-niceblock-2018-09-06"; + src = fetchFromGitHub { + owner = "kana"; + repo = "vim-niceblock"; + rev = "9302f527eefc0fde8df983cbb9710ad52c4213b5"; + sha256 = "1d0rx7s10jl1q9y5s4235imizbyxrgkm4dxh5ankcr8s617l7mz2"; + }; + }; + + vim-nix = buildVimPluginFrom2Nix { + name = "vim-nix-2018-08-27"; + src = fetchFromGitHub { + owner = "LnL7"; + repo = "vim-nix"; + rev = "be0c6bb409732b79cc86c177ca378b0b334e1efe"; + sha256 = "1ivkwlm6lz43xk1m7aii0bgn2p3225dixck0qyhxw4zxhp2xiz06"; + }; + }; + + vim-operator-replace = buildVimPluginFrom2Nix { + name = "vim-operator-replace-2015-02-24"; + src = fetchFromGitHub { + owner = "kana"; + repo = "vim-operator-replace"; + rev = "1345a556a321a092716e149d4765a5e17c0e9f0f"; + sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q"; + }; + }; + + vim-operator-surround = buildVimPluginFrom2Nix { + name = "vim-operator-surround-2017-12-22"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "vim-operator-surround"; + rev = "001c0da077b5b38a723151b19760d220e02363db"; + sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh"; + }; + }; + + vim-operator-user = buildVimPluginFrom2Nix { + name = "vim-operator-user-2015-02-17"; + src = fetchFromGitHub { + owner = "kana"; + repo = "vim-operator-user"; + rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa"; + sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb"; + }; + }; + + vim-orgmode = buildVimPluginFrom2Nix { + name = "vim-orgmode-2018-07-25"; + src = fetchFromGitHub { + owner = "jceb"; + repo = "vim-orgmode"; + rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c"; + sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx"; + }; + }; + + vim-pandoc = buildVimPluginFrom2Nix { + name = "vim-pandoc-2018-08-13"; + src = fetchFromGitHub { + owner = "vim-pandoc"; + repo = "vim-pandoc"; + rev = "d0911146c68512defcf9d947542b06d7f7eed37e"; + sha256 = "13qqwpmnzida7bm57r306w3fpb397h6b2gxclq9in0ccq5h92xid"; + }; + }; + + vim-pandoc-after = buildVimPluginFrom2Nix { + name = "vim-pandoc-after-2017-11-21"; + src = fetchFromGitHub { + owner = "vim-pandoc"; + repo = "vim-pandoc-after"; + rev = "844f27debf4d72811049167f97191a3b551ddfd5"; + sha256 = "0i99g9lnk1xzarw3vzbc47i4bg4iybaywkjvd2krln4q426a6saf"; + }; + }; + + vim-pandoc-syntax = buildVimPluginFrom2Nix { + name = "vim-pandoc-syntax-2017-04-13"; + src = fetchFromGitHub { + owner = "vim-pandoc"; + repo = "vim-pandoc-syntax"; + rev = "56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3"; + sha256 = "19ll4zrw5yd0frgsbi7pg9b68lmy4bfiwbnwgzii7inifrqsykfw"; + }; + }; + + vim-pathogen = buildVimPluginFrom2Nix { + name = "vim-pathogen-2018-04-05"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-pathogen"; + rev = "06da921608b971fb47603671bcafdb2843992eb3"; + sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi"; + }; + }; + + vim-peekaboo = buildVimPluginFrom2Nix { + name = "vim-peekaboo-2017-03-20"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-peekaboo"; + rev = "a7c940b15b008afdcea096d3fc4d25e3e431eb49"; + sha256 = "1rc4hr6vwj2mmrgz8lifxf9rvcw1rb5dahq649yn8ccw03x8zn6m"; + }; + }; + + vim-pencil = buildVimPluginFrom2Nix { + name = "vim-pencil-2017-06-14"; + src = fetchFromGitHub { + owner = "reedes"; + repo = "vim-pencil"; + rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; + sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; + }; + }; + + vim-polyglot = buildVimPluginFrom2Nix { + name = "vim-polyglot-2018-07-08"; + src = fetchFromGitHub { + owner = "sheerun"; + repo = "vim-polyglot"; + rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751"; + sha256 = "1yyqsy3q1kjvlqffc10zn3kl0k468xj8mycc22xp1hp1zrkxcf5x"; + }; + }; + + vim-prettyprint = buildVimPluginFrom2Nix { + name = "vim-prettyprint-2016-07-16"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-prettyprint"; + rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; + sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; + }; + }; + + vim-projectionist = buildVimPluginFrom2Nix { + name = "vim-projectionist-2018-09-03"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-projectionist"; + rev = "285a6946a646e0f29e18fc16fe963cb2b3ab1f27"; + sha256 = "0nmn0f8q8sh1fxss94ga7k1by1ajgf4ms8s30f212h09d2k3j5x5"; + }; + }; + + vim-puppet = buildVimPluginFrom2Nix { + name = "vim-puppet-2018-04-12"; + src = fetchFromGitHub { + owner = "rodjek"; + repo = "vim-puppet"; + rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097"; + sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv"; + }; + }; + + vim-qml = buildVimPluginFrom2Nix { + name = "vim-qml-2018-07-22"; + src = fetchFromGitHub { + owner = "peterhoeg"; + repo = "vim-qml"; + rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a"; + sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc"; + }; + }; + + vim-quickrun = buildVimPluginFrom2Nix { + name = "vim-quickrun-2018-09-06"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-quickrun"; + rev = "0a78a3fe79b3607e01543cd33d8f2d8aceb35909"; + sha256 = "1alpirkl6gi840ja21wn62gfmcyri6669p8r2c0qyjsajwx8gm8y"; + }; + }; + + vim-racer = buildVimPluginFrom2Nix { + name = "vim-racer-2018-08-26"; + src = fetchFromGitHub { + owner = "racer-rust"; + repo = "vim-racer"; + rev = "9c0a05e8b97700ee5d3e742fab889cf40e9e7b88"; + sha256 = "1gywh4xqbc7z15nvqr0v3h0n51fpaik8z1is0pxvpmj0fwzds0b3"; + }; + }; + + vim-repeat = buildVimPluginFrom2Nix { + name = "vim-repeat-2018-07-02"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-repeat"; + rev = "43d2678fa59d068c815d8298331c195e850ff5a7"; + sha256 = "0nb20503ka95qbx0mwhhni15drc86gfcd6kg92nf65llrvyfivk0"; + }; + }; + + vim-rhubarb = buildVimPluginFrom2Nix { + name = "vim-rhubarb-2018-08-22"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-rhubarb"; + rev = "b6cbbb0ad3e22870a3cd8d79a22722c63d98d18b"; + sha256 = "13mndz5p7slhn7ba8nnmzkh20ixhsq5rsy07y61sm5fxnb128r4n"; + }; + }; + + vim-ruby = buildVimPluginFrom2Nix { + name = "vim-ruby-2018-08-13"; + src = fetchFromGitHub { + owner = "vim-ruby"; + repo = "vim-ruby"; + rev = "68aa43c524b20aaaa269265d315a87b89e6d0148"; + sha256 = "027lyy5wjgi0p23qxiaxssbargdv81ip2z04l7c2wgx4lgs5mi86"; + }; + }; + + vim-scala = buildVimPluginFrom2Nix { + name = "vim-scala-2017-11-10"; + src = fetchFromGitHub { + owner = "derekwyatt"; + repo = "vim-scala"; + rev = "0b909e24f31d94552eafae610da0f31040c08f2b"; + sha256 = "1lqqapimgjr7k4imr26ap0lgx6k4qjl5gmgb1knvh5kz100bsjl5"; + }; + }; + + vim-scouter = buildVimPluginFrom2Nix { + name = "vim-scouter-2014-08-10"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-scouter"; + rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; + sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; + }; + }; + + vim-scriptease = buildVimPluginFrom2Nix { + name = "vim-scriptease-2018-07-27"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-scriptease"; + rev = "2619a1f5f63b670578ed0a504a6f844807804436"; + sha256 = "0mmrkbxi6gzv8q94cps010nbw95v9f3cc87l77klslg57hl515pl"; + }; + }; + + vim-sensible = buildVimPluginFrom2Nix { + name = "vim-sensible-2018-07-16"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-sensible"; + rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525"; + sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q"; + }; + }; + + vim-signature = buildVimPluginFrom2Nix { + name = "vim-signature-2018-07-06"; + src = fetchFromGitHub { + owner = "kshenoy"; + repo = "vim-signature"; + rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc"; + sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm"; + }; + }; + + vim-signify = buildVimPluginFrom2Nix { + name = "vim-signify-2018-08-05"; + src = fetchFromGitHub { + owner = "mhinz"; + repo = "vim-signify"; + rev = "40d1a4ee19ac61ad772dfcedc4d4bd21810f1c0b"; + sha256 = "1gvj2dqq96mf8h2jdyxr21jrvhr6r9bq9lsxgagvzi4ab81fm507"; + }; + }; + + vim-sleuth = buildVimPluginFrom2Nix { + name = "vim-sleuth-2018-08-19"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-sleuth"; + rev = "7a104e34c10c6f3581c6e98da7834d765d0b067c"; + sha256 = "0i147vhrrkarir36ysyaic42d22hk38cnpaqzqck7b2zdwnqrvbv"; + }; + }; + + vim-smalls = buildVimPluginFrom2Nix { + name = "vim-smalls-2015-05-02"; + src = fetchFromGitHub { + owner = "t9md"; + repo = "vim-smalls"; + rev = "9619eae81626bd63f88165e0520c467698264e34"; + sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad"; + }; + }; + + vim-snipmate = buildVimPluginFrom2Nix { + name = "vim-snipmate-2017-04-20"; + src = fetchFromGitHub { + owner = "garbas"; + repo = "vim-snipmate"; + rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; + sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; + }; + }; + + vim-snippets = buildVimPluginFrom2Nix { + name = "vim-snippets-2018-09-03"; + src = fetchFromGitHub { + owner = "honza"; + repo = "vim-snippets"; + rev = "1a08e283d48b4a1ada1fbcc7c363ee040aeec0c9"; + sha256 = "0ska56i77dd2n2c428c9hsl2zskyag41xfsl5dg00dyjv4amvnin"; + }; + }; + + vim-solidity = buildVimPluginFrom2Nix { + name = "vim-solidity-2018-04-17"; + src = fetchFromGitHub { + owner = "tomlion"; + repo = "vim-solidity"; + rev = "569bbbedc3898236d5912fed0caf114936112ae4"; + sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx"; + }; + }; + + vim-sort-motion = buildVimPluginFrom2Nix { + name = "vim-sort-motion-2018-07-15"; + src = fetchFromGitHub { + owner = "christoomey"; + repo = "vim-sort-motion"; + rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5"; + sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb"; + }; + }; + + vim-speeddating = buildVimPluginFrom2Nix { + name = "vim-speeddating-2017-05-24"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-speeddating"; + rev = "a418667791f03694065948342f2d6c5cca8d0f32"; + sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw"; + }; + }; + + vim-startify = buildVimPluginFrom2Nix { + name = "vim-startify-2018-08-02"; + src = fetchFromGitHub { + owner = "mhinz"; + repo = "vim-startify"; + rev = "187e46aea30e242ef214cbfb20afc0ad49d38171"; + sha256 = "15gmqm5qscnj70icibdjlw68r5zk1p5xzbznbzhar8l1yd5kkqgk"; + }; + }; + + vim-stylish-haskell = buildVimPluginFrom2Nix { + name = "vim-stylish-haskell-2018-08-31"; + src = fetchFromGitHub { + owner = "nbouscal"; + repo = "vim-stylish-haskell"; + rev = "0df8a2dd397f232a9ee0e56bc57071ccf29e21bf"; + sha256 = "05f2ms2c914ycxjjd7csga89mpsk3wzyhi56vikg3nd7a8z54gzw"; + }; + }; + + vim-surround = buildVimPluginFrom2Nix { + name = "vim-surround-2018-07-23"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-surround"; + rev = "597068870b8f093a8b2d11536c62ff31222ee8d0"; + sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x"; + }; + }; + + vim-SyntaxRange = buildVimPluginFrom2Nix { + name = "vim-SyntaxRange-2018-03-09"; + src = fetchFromGitHub { + owner = "inkarkat"; + repo = "vim-SyntaxRange"; + rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; + sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; + }; + }; + + vim-table-mode = buildVimPluginFrom2Nix { + name = "vim-table-mode-2018-05-16"; + src = fetchFromGitHub { + owner = "dhruvasagar"; + repo = "vim-table-mode"; + rev = "5483e163bd0a67e729e0e8436315f33f9e126baf"; + sha256 = "0mmpa7zhrj8mqf4931ldf6n9jlpfxc4kg8xdhqlp7srlnq4h8siw"; + }; + }; + + vim-tabpagecd = buildVimPluginFrom2Nix { + name = "vim-tabpagecd-2013-11-29"; + src = fetchFromGitHub { + owner = "kana"; + repo = "vim-tabpagecd"; + rev = "8b71a03a037608fa5918f5096812577cec6355e4"; + sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; + }; + }; + + vim-tbone = buildVimPluginFrom2Nix { + name = "vim-tbone-2018-06-28"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-tbone"; + rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737"; + sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4"; + }; + }; + + vim-test = buildVimPluginFrom2Nix { + name = "vim-test-2018-08-30"; + src = fetchFromGitHub { + owner = "janko-m"; + repo = "vim-test"; + rev = "0941cfc91cdaa896f16f5e32d20940aab902f88c"; + sha256 = "0zggwjyiyiipykw42b5qxgz8zhh10vi5ci3ywj1rh5h7kl858bwb"; + }; + }; + + vim-textobj-multiblock = buildVimPluginFrom2Nix { + name = "vim-textobj-multiblock-2014-06-02"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "vim-textobj-multiblock"; + rev = "670a5ba57d73fcd793f480e262617c6eb0103355"; + sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf"; + }; + }; + + vim-themis = buildVimPluginFrom2Nix { + name = "vim-themis-2017-12-27"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-themis"; + rev = "691cd3912ba318dbd8d9fa0035fee629b424766d"; + sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd"; + }; + }; + + vim-tmux-navigator = buildVimPluginFrom2Nix { + name = "vim-tmux-navigator-2018-07-13"; + src = fetchFromGitHub { + owner = "christoomey"; + repo = "vim-tmux-navigator"; + rev = "18b775fbccde5ff02e516c014290650bb40e257d"; + sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj"; + }; + }; + + vim-toml = buildVimPluginFrom2Nix { + name = "vim-toml-2018-06-15"; + src = fetchFromGitHub { + owner = "cespare"; + repo = "vim-toml"; + rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80"; + sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n"; + }; + }; + + vim-trailing-whitespace = buildVimPluginFrom2Nix { + name = "vim-trailing-whitespace-2017-09-23"; + src = fetchFromGitHub { + owner = "bronson"; + repo = "vim-trailing-whitespace"; + rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; + sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; + }; + }; + + vim-vinegar = buildVimPluginFrom2Nix { + name = "vim-vinegar-2018-08-06"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-vinegar"; + rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296"; + sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf"; + }; + }; + + vim-wakatime = buildVimPluginFrom2Nix { + name = "vim-wakatime-2018-07-14"; + src = fetchFromGitHub { + owner = "wakatime"; + repo = "vim-wakatime"; + rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf"; + sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2"; + }; + }; + + vim-watchdogs = buildVimPluginFrom2Nix { + name = "vim-watchdogs-2017-12-03"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "vim-watchdogs"; + rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; + sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; + }; + }; + + vim-wordy = buildVimPluginFrom2Nix { + name = "vim-wordy-2018-03-10"; + src = fetchFromGitHub { + owner = "reedes"; + repo = "vim-wordy"; + rev = "14b9dbf76a82e29273a74768573900361200467f"; + sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk"; + }; + }; + + vim-xdebug = buildVimPluginFrom2Nix { + name = "vim-xdebug-2012-08-15"; + src = fetchFromGitHub { + owner = "joonty"; + repo = "vim-xdebug"; + rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; + sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw"; + }; + }; + + vim-xkbswitch = buildVimPluginFrom2Nix { + name = "vim-xkbswitch-2017-03-27"; + src = fetchFromGitHub { + owner = "lyokha"; + repo = "vim-xkbswitch"; + rev = "a85ebddb9038e6b05138c48868a319a9e13d1868"; + sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr"; + }; + }; + + vim-yapf = buildVimPluginFrom2Nix { + name = "vim-yapf-2018-06-05"; + src = fetchFromGitHub { + owner = "mindriot101"; + repo = "vim-yapf"; + rev = "cae79733a1a39732c5305d4a89cd093d17cb917d"; + sha256 = "16bmzvzks6kbqm6dk908k23b9wj7qf3x8bz3kikrzj27s0p7s9cc"; + }; + }; + + vim2hs = buildVimPluginFrom2Nix { + name = "vim2hs-2014-04-16"; + src = fetchFromGitHub { + owner = "dag"; + repo = "vim2hs"; + rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; + sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; + }; + }; + + vimoutliner = buildVimPluginFrom2Nix { + name = "vimoutliner-2018-07-04"; + src = fetchFromGitHub { + owner = "vimoutliner"; + repo = "vimoutliner"; + rev = "aad0a213069b8a1b5de91cca07d153fc8352c957"; + sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2"; + }; + }; + + vimpreviewpandoc = buildVimPluginFrom2Nix { + name = "vimpreviewpandoc-2018-05-12"; + src = fetchFromGitHub { + owner = "tex"; + repo = "vimpreviewpandoc"; + rev = "266d14d362f6c069863b2d63edb683e802e7e3ee"; + sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly"; + }; + }; + + vimproc-vim = buildVimPluginFrom2Nix { + name = "vimproc-vim-2018-01-07"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "vimproc.vim"; + rev = "2300224d366642f4f8d6f88861535d4ccbe20143"; + sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia"; + }; + }; + + vimshell-vim = buildVimPluginFrom2Nix { + name = "vimshell-vim-2018-06-02"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "vimshell.vim"; + rev = "03bf7673a5098918a533000d67dca97546695237"; + sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi"; + }; + }; + + vimtex = buildVimPluginFrom2Nix { + name = "vimtex-2018-09-06"; + src = fetchFromGitHub { + owner = "lervag"; + repo = "vimtex"; + rev = "2777bda5d774bd4b96580ecc8cffbff7b9801a33"; + sha256 = "0r5x666z9zmn7ad7c378l97mqk65xv3ayqxqf3nypvq0ni5ax9hw"; + }; + }; + + vimwiki = buildVimPluginFrom2Nix { + name = "vimwiki-2018-09-03"; + src = fetchFromGitHub { + owner = "vimwiki"; + repo = "vimwiki"; + rev = "f55ec31675e372e2f59d51322b445ea91191ec2b"; + sha256 = "1qjczzj35nwhv1lrl9cf1bdpisr5vlwhf444apzj9c9pcjymc00z"; + }; + }; + + vundle = buildVimPluginFrom2Nix { + name = "vundle-2018-02-03"; + src = fetchFromGitHub { + owner = "gmarik"; + repo = "vundle"; + rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; + sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; + }; + }; + + webapi-vim = buildVimPluginFrom2Nix { + name = "webapi-vim-2018-03-14"; + src = fetchFromGitHub { + owner = "mattn"; + repo = "webapi-vim"; + rev = "252250381a9509257bfb06b9f95441e41e3e23b5"; + sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a"; + }; + }; + + wombat256-vim = buildVimPluginFrom2Nix { + name = "wombat256-vim-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "wombat256.vim"; + rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; + sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg"; + }; + }; + + xptemplate = buildVimPluginFrom2Nix { + name = "xptemplate-2017-12-06"; + src = fetchFromGitHub { + owner = "drmingdrmer"; + repo = "xptemplate"; + rev = "74aac3aebaf9c67c12c21d6b25295b9bec9c93b3"; + sha256 = "01yvas50hg7iwwrdh61407mc477byviccksgi0fkaz89p78bbd1p"; + }; + }; + + xterm-color-table-vim = buildVimPluginFrom2Nix { + name = "xterm-color-table-vim-2014-01-01"; + src = fetchFromGitHub { + owner = "guns"; + repo = "xterm-color-table.vim"; + rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; + sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; + }; + }; + + YankRing-vim = buildVimPluginFrom2Nix { + name = "YankRing-vim-2015-07-29"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "YankRing.vim"; + rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65"; + sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw"; + }; + }; + + youcompleteme = buildVimPluginFrom2Nix { + name = "youcompleteme-2018-08-19"; + src = fetchFromGitHub { + owner = "valloric"; + repo = "youcompleteme"; + rev = "e018777b38eedaa23b96cfee40382d000e464e31"; + sha256 = "1j4r6gkjs7kk2nwhmlwzm1nzzwrk96sr8xfbj0vwa847bsq3p591"; + fetchSubmodules = true; + }; + }; + + YUNOcommit-vim = buildVimPluginFrom2Nix { + name = "YUNOcommit-vim-2014-11-26"; + src = fetchFromGitHub { + owner = "esneider"; + repo = "YUNOcommit.vim"; + rev = "981082055a73ef076d7e27477874d2303153a448"; + sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab"; + }; + }; + + zeavim-vim = buildVimPluginFrom2Nix { + name = "zeavim-vim-2018-03-22"; + src = fetchFromGitHub { + owner = "KabbAmine"; + repo = "zeavim.vim"; + rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa"; + sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj"; + }; + }; + + zenburn = buildVimPluginFrom2Nix { + name = "zenburn-2018-04-29"; + src = fetchFromGitHub { + owner = "jnurmine"; + repo = "zenburn"; + rev = "2cacfcb222d9db34a8d1a13bb8bb814f039b98cd"; + sha256 = "0m5d5sjckirfpdhg9sf1nl5xywvzdx6y04r13m47jlavf79hhimi"; + }; + }; + + zig-vim = buildVimPluginFrom2Nix { + name = "zig-vim-2018-08-02"; + src = fetchFromGitHub { + owner = "zig-lang"; + repo = "zig.vim"; + rev = "c10a46c0b960c9e0b7ea9a7286b0ff9abccd19f3"; + sha256 = "1vk9ny3jrk175srkbcxhj5jl2lvq5y98ms9mwl90ry49cqk9ciaj"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a49542c88e03..e582127ef474 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,293 +1,293 @@ -"github:907th/vim-auto-save" -"github:airblade/vim-gitgutter" -"github:ajh17/Spacegray.vim" -"github:albfan/nerdtree-git-plugin" -"github:altercation/vim-colors-solarized" -"github:alvan/vim-closetag" -"github:amiorin/ctrlp-z" -"github:andreshazard/vim-logreview" -"github:andsild/peskcolor.vim" -"github:andviro/flake8-vim" -"github:ap/vim-css-color" -"github:bazelbuild/vim-bazel" -"github:bbchung/clighter8" -"github:benekastah/neomake" -"github:bitc/vim-hdevtools" -"github:bronson/vim-trailing-whitespace" -"github:cespare/vim-toml" -"github:chemzqm/denite-extra" -"github:chemzqm/denite-git" -"github:Chiel92/vim-autoformat" -"github:chikatoike/concealedyank.vim" -"github:chikatoike/sourcemap.vim" -"github:chrisbra/CheckAttach" -"github:chrisbra/csv.vim" -"github:chrisgeo/sparkup" -"github:chriskempson/base16-vim" -"github:christoomey/vim-sort-motion" -"github:christoomey/vim-tmux-navigator" -"github:ctjhoa/spacevim" -"github:ctrlpvim/ctrlp.vim" -"github:dag/vim2hs" -"github:dannyob/quickfixstatus" -"github:derekelkins/agda-vim" -"github:derekwyatt/vim-scala" -"github:dhruvasagar/vim-table-mode" -"github:digitaltoad/vim-jade" -"github:dleonard0/pony-vim-syntax" -"github:dracula/vim" -"github:drmingdrmer/xptemplate" -"github:eagletmt/ghcmod-vim" -"github:eagletmt/neco-ghc" -"github:editorconfig/editorconfig-vim" -"github:ehamberg/vim-cute-python" -"github:eikenb/acp" -"github:elixir-lang/vim-elixir" -"github:elmcast/elm-vim" -"github:elzr/vim-json" -"github:embear/vim-localvimrc" -"github:enomsg/vim-haskellConcealPlus" -"github:ensime/ensime-vim" -"github:ervandew/supertab" -"github:esneider/YUNOcommit.vim" -"github:farmergreg/vim-lastplace" -"github:fatih/vim-go" -"github:FelikZ/ctrlp-py-matcher" -"github:fisadev/vim-isort" -"github:flazz/vim-colorschemes" -"github:floobits/floobits-neovim" -"github:frigoeu/psc-ide-vim" -"github:garbas/vim-snipmate" -"github:gmarik/vundle" -"github:godlygeek/csapprox" -"github:godlygeek/tabular" -"github:google/vim-codefmt" -"github:google/vim-jsonnet" -"github:google/vim-maktaba" -"github:gregsexton/gitv" -"github:guns/xterm-color-table.vim" -"github:heavenshell/vim-jsdoc" -"github:hecal3/vim-leader-guide" -"github:honza/vim-snippets" -"github:idris-hackers/idris-vim" -"github:inkarkat/vim-SyntaxRange" -"github:int3/vim-extradite" -"github:itchyny/calendar.vim" -"github:itchyny/lightline.vim" -"github:itchyny/thumbnail.vim" -"github:itchyny/vim-cursorword" -"github:itchyny/vim-gitbranch" -"github:ivanov/vim-ipython" -"github:jacoborus/tender.vim" -"github:janko-m/vim-test" -"github:JazzCore/ctrlp-cmatcher" -"github:jceb/vim-hier" -"github:jceb/vim-orgmode" -"github:jeetsukumaran/vim-buffergator" -"github:jgdavey/tslime.vim" -"github:jhradilek/vim-docbk" -"github:jiangmiao/auto-pairs" -"github:jistr/vim-nerdtree-tabs" -"github:jnurmine/zenburn" -"github:jonbri/vim-colorstepper" -"github:joonty/vim-xdebug" -"github:JuliaEditorSupport/julia-vim" -"github:junegunn/fzf.vim" -"github:junegunn/goyo.vim" -"github:junegunn/limelight.vim" -"github:junegunn/vim-easy-align" -"github:junegunn/vim-github-dashboard" -"github:junegunn/vim-peekaboo" -"github:justincampbell/vim-eighties" -"github:KabbAmine/zeavim.vim" -"github:kana/vim-niceblock" -"github:kana/vim-operator-replace" -"github:kana/vim-operator-user" -"github:kana/vim-tabpagecd" -"github:kchmck/vim-coffee-script" -"github:keith/swift.vim" -"github:kien/rainbow_parentheses.vim" -"github:konfekt/fastfold" -"github:kshenoy/vim-signature" -"github:lambdalisue/vim-gista" -"github:latex-box-team/latex-box" -"github:leafgarland/typescript-vim" -"github:ledger/vim-ledger" -"github:lepture/vim-jinja" -"github:lervag/vimtex" -"github:lfilho/cosco.vim" -"github:LnL7/vim-nix" -"github:lokaltog/vim-easymotion" -"github:ludovicchabant/vim-lawrencium" -"github:luochen1990/rainbow" -"github:lyokha/vim-xkbswitch" -"github:machakann/vim-highlightedyank" -"github:majutsushi/tagbar" -"github:maksimr/vim-jsbeautify" -"github:MarcWeber/vim-addon-actions" -"github:MarcWeber/vim-addon-async" -"github:MarcWeber/vim-addon-background-cmd" -"github:MarcWeber/vim-addon-commenting" -"github:MarcWeber/vim-addon-completion" -"github:MarcWeber/vim-addon-errorformats" -"github:MarcWeber/vim-addon-goto-thing-at-cursor" -"github:MarcWeber/vim-addon-local-vimrc" -"github:MarcWeber/vim-addon-manager" -"github:MarcWeber/vim-addon-mru" -"github:MarcWeber/vim-addon-mw-utils" -"github:MarcWeber/vim-addon-nix" -"github:MarcWeber/vim-addon-other" -"github:MarcWeber/vim-addon-php-manual" -"github:MarcWeber/vim-addon-signs" -"github:MarcWeber/vim-addon-sql" -"github:MarcWeber/vim-addon-syntax-checker" -"github:MarcWeber/vim-addon-toggle-buffer" -"github:MarcWeber/vim-addon-xdebug" -"github:martinda/Jenkinsfile-vim-syntax" -"github:mattn/gist-vim" -"github:mattn/webapi-vim" -"github:mbbill/undotree" -"github:megaannum/forms" -"github:megaannum/self" -"github:mfukar/robotframework-vim" -"github:mhinz/vim-grepper" -"github:mhinz/vim-signify" -"github:mhinz/vim-startify" -"github:michaeljsmith/vim-indent-object" -"github:mileszs/ack.vim" -"github:mindriot101/vim-yapf" -"github:mkasa/lushtags" -"github:morhetz/gruvbox" -"github:mpickering/hlint-refactor-vim" -"github:nathanaelkane/vim-indent-guides" -"github:nbouscal/vim-stylish-haskell" -"github:neoclide/vim-easygit" -"github:neovimhaskell/haskell-vim" -"github:nixprime/cpsm" -"github:noc7c9/vim-iced-coffee-script" -"github:osyo-manga/shabadou.vim" -"github:osyo-manga/vim-textobj-multiblock" -"github:osyo-manga/vim-watchdogs" -"github:pangloss/vim-javascript" -"github:peterhoeg/vim-qml" -"github:plasticboy/vim-markdown" -"github:python-mode/python-mode" -"github:Quramy/tsuquyomi" -"github:racer-rust/vim-racer" -"github:rafi/awesome-vim-colorschemes" -"github:raichoo/purescript-vim" -"github:reedes/vim-pencil" -"github:reedes/vim-wordy" -"github:rhysd/committia.vim" -"github:rhysd/vim-grammarous" -"github:rhysd/vim-operator-surround" -"github:Rip-Rip/clang_complete" -"github:rodjek/vim-puppet" -"github:roxma/nvim-cm-racer" -"github:roxma/nvim-completion-manager" -"github:rust-lang/rust.vim" -"github:ryanoasis/vim-devicons" -"github:ryanoasis/vim-devicons" -"github:Rykka/riv.vim" -"github:sbdchd/neoformat" -"github:scrooloose/nerdcommenter" -"github:scrooloose/nerdtree" -"github:scrooloose/syntastic" -"github:sebastianmarkow/deoplete-rust" -"github:sheerun/vim-polyglot" -"github:shougo/context_filetype.vim" -"github:shougo/denite.nvim" -"github:shougo/deoplete.nvim" -"github:shougo/echodoc.vim" -"github:shougo/neco-syntax" -"github:shougo/neco-vim" -"github:shougo/neocomplete.vim" -"github:shougo/neoinclude.vim" -"github:shougo/neomru.vim" -"github:shougo/neosnippet-snippets" -"github:shougo/neosnippet.vim" -"github:shougo/neoyank.vim" -"github:shougo/tabpagebuffer.vim" -"github:shougo/unite.vim" -"github:shougo/vimproc.vim" -"github:shumphrey/fugitive-gitlab.vim" -"github:SirVer/ultisnips" -"github:sjl/gundo.vim" -"github:sjl/splice.vim" -"github:sk1418/last256" -"github:slashmili/alchemist.vim" -"github:t9md/vim-smalls" -"github:takac/vim-hardtime" -"github:terryma/vim-expand-region" -"github:terryma/vim-multiple-cursors" -"github:tex/vimpreviewpandoc" -"github:thinca/vim-ft-diff_fold" -"github:thinca/vim-prettyprint" -"github:thinca/vim-quickrun" -"github:thinca/vim-scouter" -"github:thinca/vim-themis" -"github:tomasr/molokai" -"github:tomlion/vim-solidity" -"github:tomtom/tlib_vim" -"github:tpope/vim-abolish" -"github:tpope/vim-commentary" -"github:tpope/vim-dispatch" -"github:tpope/vim-eunuch" -"github:tpope/vim-fireplace" -"github:tpope/vim-flagship" -"github:tpope/vim-fugitive" -"github:tpope/vim-pathogen" -"github:tpope/vim-projectionist" -"github:tpope/vim-repeat" -"github:tpope/vim-rhubarb" -"github:tpope/vim-scriptease" -"github:tpope/vim-sensible" -"github:tpope/vim-sleuth" -"github:tpope/vim-speeddating" -"github:tpope/vim-surround" -"github:tpope/vim-tbone" -"github:tpope/vim-vinegar" -"github:travitch/hasksyn" -"github:twinside/vim-haskellconceal" -"github:Twinside/vim-hoogle" -"github:tyru/caw.vim" -"github:tyru/open-browser.vim" -"github:ujihisa/neco-look" -"github:valloric/youcompleteme" -"github:vim-airline/vim-airline" -"github:vim-airline/vim-airline-themes" -"github:vimoutliner/vimoutliner" -"github:vim-pandoc/vim-pandoc" -"github:vim-pandoc/vim-pandoc-after" -"github:vim-pandoc/vim-pandoc-syntax" -"github:vim-ruby/vim-ruby" -"github:vim-scripts/align" -"github:vim-scripts/argtextobj.vim" -"github:vim-scripts/a.vim" -"github:vim-scripts/bats.vim" -"github:vim-scripts/changeColorScheme.vim" -"github:vim-scripts/Colour-Sampler-Pack" -"github:vim-scripts/Improved-AnsiEsc" -"github:vim-scripts/matchit.zip" -"github:vim-scripts/mayansmoke" -"github:vim-scripts/random.vim" -"github:vim-scripts/Rename" -"github:vim-scripts/ReplaceWithRegister" -"github:vim-scripts/tabmerge" -"github:vim-scripts/taglist.vim" -"github:vim-scripts/wombat256.vim" -"github:vim-scripts/YankRing.vim" -"github:vimwiki/vimwiki" -"github:vmchale/dhall-vim" -"github:w0rp/ale" -"github:wakatime/vim-wakatime" -"github:wellle/targets.vim" -"github:will133/vim-dirdiff" -"github:wincent/command-t" -"github:xolox/vim-easytags" -"github:xolox/vim-misc" -"github:xuhdev/vim-latex-live-preview" -"github:zah/nim.vim" -"github:zchee/deoplete-go" -"github:zchee/deoplete-jedi" -"github:zig-lang/zig.vim" +907th/vim-auto-save +airblade/vim-gitgutter +ajh17/Spacegray.vim +albfan/nerdtree-git-plugin +altercation/vim-colors-solarized +alvan/vim-closetag +amiorin/ctrlp-z +andreshazard/vim-logreview +andsild/peskcolor.vim +andviro/flake8-vim +ap/vim-css-color +bazelbuild/vim-bazel +bbchung/clighter8 +benekastah/neomake +bitc/vim-hdevtools +bronson/vim-trailing-whitespace +cespare/vim-toml +chemzqm/denite-extra +chemzqm/denite-git +Chiel92/vim-autoformat +chikatoike/concealedyank.vim +chikatoike/sourcemap.vim +chrisbra/CheckAttach +chrisbra/csv.vim +chrisgeo/sparkup +chriskempson/base16-vim +christoomey/vim-sort-motion +christoomey/vim-tmux-navigator +ctjhoa/spacevim +ctrlpvim/ctrlp.vim +dag/vim2hs +dannyob/quickfixstatus +derekelkins/agda-vim +derekwyatt/vim-scala +dhruvasagar/vim-table-mode +digitaltoad/vim-jade +dleonard0/pony-vim-syntax +dracula/vim +drmingdrmer/xptemplate +eagletmt/ghcmod-vim +eagletmt/neco-ghc +editorconfig/editorconfig-vim +ehamberg/vim-cute-python +eikenb/acp +elixir-lang/vim-elixir +elmcast/elm-vim +elzr/vim-json +embear/vim-localvimrc +enomsg/vim-haskellConcealPlus +ensime/ensime-vim +ervandew/supertab +esneider/YUNOcommit.vim +farmergreg/vim-lastplace +fatih/vim-go +FelikZ/ctrlp-py-matcher +fisadev/vim-isort +flazz/vim-colorschemes +floobits/floobits-neovim +frigoeu/psc-ide-vim +garbas/vim-snipmate +gmarik/vundle +godlygeek/csapprox +godlygeek/tabular +google/vim-codefmt +google/vim-jsonnet +google/vim-maktaba +gregsexton/gitv +guns/xterm-color-table.vim +heavenshell/vim-jsdoc +hecal3/vim-leader-guide +honza/vim-snippets +idris-hackers/idris-vim +inkarkat/vim-SyntaxRange +int3/vim-extradite +itchyny/calendar.vim +itchyny/lightline.vim +itchyny/thumbnail.vim +itchyny/vim-cursorword +itchyny/vim-gitbranch +ivanov/vim-ipython +jacoborus/tender.vim +janko-m/vim-test +JazzCore/ctrlp-cmatcher +jceb/vim-hier +jceb/vim-orgmode +jeetsukumaran/vim-buffergator +jgdavey/tslime.vim +jhradilek/vim-docbk +jiangmiao/auto-pairs +jistr/vim-nerdtree-tabs +jnurmine/zenburn +jonbri/vim-colorstepper +joonty/vim-xdebug +JuliaEditorSupport/julia-vim +junegunn/fzf.vim +junegunn/goyo.vim +junegunn/limelight.vim +junegunn/vim-easy-align +junegunn/vim-github-dashboard +junegunn/vim-peekaboo +justincampbell/vim-eighties +KabbAmine/zeavim.vim +kana/vim-niceblock +kana/vim-operator-replace +kana/vim-operator-user +kana/vim-tabpagecd +kchmck/vim-coffee-script +keith/swift.vim +kien/rainbow_parentheses.vim +konfekt/fastfold +kshenoy/vim-signature +lambdalisue/vim-gista +latex-box-team/latex-box +leafgarland/typescript-vim +ledger/vim-ledger +lepture/vim-jinja +lervag/vimtex +lfilho/cosco.vim +LnL7/vim-nix +lokaltog/vim-easymotion +ludovicchabant/vim-lawrencium +luochen1990/rainbow +lyokha/vim-xkbswitch +machakann/vim-highlightedyank +majutsushi/tagbar +maksimr/vim-jsbeautify +MarcWeber/vim-addon-actions +MarcWeber/vim-addon-async +MarcWeber/vim-addon-background-cmd +MarcWeber/vim-addon-commenting +MarcWeber/vim-addon-completion +MarcWeber/vim-addon-errorformats +MarcWeber/vim-addon-goto-thing-at-cursor +MarcWeber/vim-addon-local-vimrc +MarcWeber/vim-addon-manager +MarcWeber/vim-addon-mru +MarcWeber/vim-addon-mw-utils +MarcWeber/vim-addon-nix +MarcWeber/vim-addon-other +MarcWeber/vim-addon-php-manual +MarcWeber/vim-addon-signs +MarcWeber/vim-addon-sql +MarcWeber/vim-addon-syntax-checker +MarcWeber/vim-addon-toggle-buffer +MarcWeber/vim-addon-xdebug +martinda/Jenkinsfile-vim-syntax +mattn/gist-vim +mattn/webapi-vim +mbbill/undotree +megaannum/forms +megaannum/self +mfukar/robotframework-vim +mhinz/vim-grepper +mhinz/vim-signify +mhinz/vim-startify +michaeljsmith/vim-indent-object +mileszs/ack.vim +mindriot101/vim-yapf +mkasa/lushtags +morhetz/gruvbox +mpickering/hlint-refactor-vim +nathanaelkane/vim-indent-guides +nbouscal/vim-stylish-haskell +neoclide/vim-easygit +neovimhaskell/haskell-vim +nixprime/cpsm +noc7c9/vim-iced-coffee-script +osyo-manga/shabadou.vim +osyo-manga/vim-textobj-multiblock +osyo-manga/vim-watchdogs +pangloss/vim-javascript +peterhoeg/vim-qml +plasticboy/vim-markdown +python-mode/python-mode +Quramy/tsuquyomi +racer-rust/vim-racer +rafi/awesome-vim-colorschemes +raichoo/purescript-vim +reedes/vim-pencil +reedes/vim-wordy +rhysd/committia.vim +rhysd/vim-grammarous +rhysd/vim-operator-surround +Rip-Rip/clang_complete +rodjek/vim-puppet +roxma/nvim-cm-racer +roxma/nvim-completion-manager +rust-lang/rust.vim +ryanoasis/vim-devicons +Rykka/riv.vim +sbdchd/neoformat +scrooloose/nerdcommenter +scrooloose/nerdtree +scrooloose/syntastic +sebastianmarkow/deoplete-rust +sheerun/vim-polyglot +shougo/context_filetype.vim +shougo/denite.nvim +shougo/deoplete.nvim +shougo/echodoc.vim +shougo/neco-syntax +shougo/neco-vim +shougo/neocomplete.vim +shougo/neoinclude.vim +shougo/neomru.vim +shougo/neosnippet-snippets +shougo/neosnippet.vim +shougo/neoyank.vim +shougo/tabpagebuffer.vim +shougo/unite.vim +shougo/vimproc.vim +shougo/vimshell.vim +shumphrey/fugitive-gitlab.vim +SirVer/ultisnips +sjl/gundo.vim +sjl/splice.vim +sk1418/last256 +slashmili/alchemist.vim +t9md/vim-smalls +takac/vim-hardtime +terryma/vim-expand-region +terryma/vim-multiple-cursors +tex/vimpreviewpandoc +thinca/vim-ft-diff_fold +thinca/vim-prettyprint +thinca/vim-quickrun +thinca/vim-scouter +thinca/vim-themis +tomasr/molokai +tomlion/vim-solidity +tomtom/tlib_vim +tpope/vim-abolish +tpope/vim-commentary +tpope/vim-dispatch +tpope/vim-eunuch +tpope/vim-fireplace +tpope/vim-flagship +tpope/vim-fugitive +tpope/vim-pathogen +tpope/vim-projectionist +tpope/vim-repeat +tpope/vim-rhubarb +tpope/vim-scriptease +tpope/vim-sensible +tpope/vim-sleuth +tpope/vim-speeddating +tpope/vim-surround +tpope/vim-tbone +tpope/vim-vinegar +travitch/hasksyn +twinside/vim-haskellconceal +Twinside/vim-hoogle +tyru/caw.vim +tyru/open-browser.vim +ujihisa/neco-look +valloric/youcompleteme +vim-airline/vim-airline +vim-airline/vim-airline-themes +vimoutliner/vimoutliner +vim-pandoc/vim-pandoc +vim-pandoc/vim-pandoc-after +vim-pandoc/vim-pandoc-syntax +vim-ruby/vim-ruby +vim-scripts/align +vim-scripts/argtextobj.vim +vim-scripts/a.vim +vim-scripts/bats.vim +vim-scripts/changeColorScheme.vim +vim-scripts/Colour-Sampler-Pack +vim-scripts/Improved-AnsiEsc +vim-scripts/matchit.zip +vim-scripts/mayansmoke +vim-scripts/random.vim +vim-scripts/Rename +vim-scripts/ReplaceWithRegister +vim-scripts/tabmerge +vim-scripts/taglist.vim +vim-scripts/wombat256.vim +vim-scripts/YankRing.vim +vimwiki/vimwiki +vmchale/dhall-vim +w0rp/ale +wakatime/vim-wakatime +wellle/targets.vim +will133/vim-dirdiff +wincent/command-t +xolox/vim-easytags +xolox/vim-misc +xuhdev/vim-latex-live-preview +zah/nim.vim +zchee/deoplete-go +zchee/deoplete-jedi +zig-lang/zig.vim From 836ce9d91ee08fb4dd6487593a488a39c938b945 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Sep 2018 05:16:41 -0700 Subject: [PATCH 356/600] nextcloud: 13.0.5 -> 13.0.6 (#46236) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from nextcloud --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3245666d8ec3..8a0a848aa5d6 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "13.0.5"; + version = "13.0.6"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "1sl0kvn52m6p7rglwhgfb737y1897897hc5g2fcbg6i594ld6451"; + sha256 = "1m38k5jafz2lniy6fmq17xffkgaqs6rl4w789sqpniva1fb9xz4h"; }; installPhase = '' From bbcf5eb13078b4bcfcbb7c977b53beac3f80ef02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 9 Sep 2018 14:37:30 +0200 Subject: [PATCH 357/600] cgit: use full path of groff in man2html groff may not be installed system-wide or may be outside cgit's path (e.g. when running cgit using uwsgi). As a result, the man2html filter fails. Replace groff by its full path in man2html. --- .../version-management/git-and-tools/cgit/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 3fb227909040..5bfd74344e8c 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit -, gzip, bzip2, xz +, groff, gzip, bzip2, xz , python, wrapPython, pygments, markdown }: @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ -e 's|"xz"|"${xz.bin}/bin/xz"|' \ -i ui-snapshot.c + + substituteInPlace filters/html-converters/man2html \ + --replace 'groff' '${groff}/bin/groff' ''; # Give cgit a git source tree and pass configuration parameters (as make From 68102e793df3bcbc6301444be78842bca509d474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 9 Sep 2018 09:50:22 -0300 Subject: [PATCH 358/600] xsettingsd: git-2015-06-14 -> 1.0.0 - Update to version 1.0.0 - Install man pages - Fix license - Add maintainer --- pkgs/tools/X11/xsettingsd/default.nix | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index 239b01e1345d..2f84711e61c4 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -1,39 +1,38 @@ -{ stdenv, fetchFromGitHub, scons, libX11, pkgconfig }: +{ stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }: stdenv.mkDerivation rec { name = "xsettingsd-${version}"; - version = "git-2015-06-14"; + version = "1.0.0"; src = fetchFromGitHub { owner = "derat"; repo = "xsettingsd"; - rev = "b4999f5e9e99224caf97d09f25ee731774ecd7be"; - sha256 = "18cp6a66ji483lrvf0vq855idwmcxd0s67ijpydgjlsr70c65j7s"; + rev = "v${version}"; + sha256 = "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v"; }; patches = [ ./SConstruct.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 scons ]; + nativeBuildInputs = [ scons pkgconfig ]; + + buildInputs = [ libX11 ]; + buildPhase = '' - mkdir -p "$out" - scons \ - -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ - "prefix=$out" + scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; installPhase = '' - mkdir -p "$out"/bin - install xsettingsd "$out"/bin - install dump_xsettings "$out"/bin + install -D -t "$out"/bin xsettingsd dump_xsettings + install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1 ''; meta = with stdenv.lib; { description = "Provides settings to X11 applications via the XSETTINGS specification"; homepage = https://github.com/derat/xsettingsd; - license = licenses.bsd2; + license = licenses.bsd3; platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; }; } From 4e282e295f6da95993c68b8f19d1a56762b352c7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 9 Sep 2018 14:54:16 +0200 Subject: [PATCH 359/600] altcoins.btc1: fix darwin build (#46398) Only hexdump was needed from utillinux which is also available on darwin through the unixtools meta package. --- pkgs/applications/altcoins/btc1.nix | 17 +++++++++-------- pkgs/applications/altcoins/default.nix | 7 +++++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix index 95e03ee6a213..2f85a8947972 100644 --- a/pkgs/applications/altcoins/btc1.nix +++ b/pkgs/applications/altcoins/btc1.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent -, withGui }: +{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48 +, boost, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, AppKit +, withGui ? !stdenv.isDarwin +}: with stdenv.lib; stdenv.mkDerivation rec{ @@ -12,11 +14,10 @@ stdenv.mkDerivation rec{ sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib - miniupnpc protobuf libevent] - ++ optionals stdenv.isLinux [ utillinux ] - ++ optionals withGui [ qt4 qrencode ]; + nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ]; + buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ] + ++ optionals withGui [ qt4 qrencode ] + ++ optional stdenv.isDarwin AppKit; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 95d79a8650fd..4236cd7910bc 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -32,8 +32,11 @@ rec { boost = boost165; withGui = false; }; - btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; }; - btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; }; + btc1 = callPackage ./btc1.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + boost = boost165; + }; + btc1d = btc1.override { withGui = false; }; cryptop = python3.pkgs.callPackage ./cryptop { }; From 939debc7a419b6924c0bc1460ed7debad0942e35 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 9 Sep 2018 15:16:24 +0200 Subject: [PATCH 360/600] bullet: fix darwin build The examples fail with an opengl related issue: Undefined symbols for architecture x86_64: "SimpleOpenGL3App::SimpleOpenGL3App(char const*, int, int, bool)", referenced from: _main in main_opengl_single_example.o "_useShadowMap", referenced from: GL_ShapeDrawer::drawScene(btDiscreteDynamicsWorld const*, bool, int) in GL_ShapeDrawer.o ld: symbol(s) not found for architecture x86_64 And the tests need an extra dependencly, possibley related to https://github.com/bulletphysics/bullet3/issues/819 ld: library not found for -lBussIK /cc ZHF #45961 --- pkgs/development/libraries/bullet/default.nix | 30 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 4d94faa9566a..fca5e8d70a3b 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut, darwin }: +{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut +, Cocoa, OpenGL +}: stdenv.mkDerivation rec { name = "bullet-${version}"; @@ -11,10 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3"; }; - buildInputs = [ cmake ] ++ - (if stdenv.isDarwin - then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ] - else [libGLU_combined freeglut]); + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; @@ -28,25 +29,26 @@ stdenv.mkDerivation rec { "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" ] ++ stdenv.lib.optionals stdenv.isDarwin [ - "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\"" "-DOPENGL_FOUND=true" - "-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" - "-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" - "-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" - "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework" + "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_gl_LIBRARY=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework" + "-DBUILD_BULLET2_DEMOS=OFF" + "-DBUILD_UNIT_TESTS=OFF" ]; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' Bullet 3D Game Multiphysics Library provides state of the art collision detection, soft body and rigid body dynamics. ''; homepage = http://bulletphysics.org; - license = stdenv.lib.licenses.zlib; - maintainers = with stdenv.lib.maintainers; [ aforemny ]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.zlib; + maintainers = with maintainers; [ aforemny ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e0425b26b9d..132c71064cf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22213,7 +22213,9 @@ with pkgs; inherit (gnome2) gtksourceview; }; - bullet = callPackage ../development/libraries/bullet {}; + bullet = callPackage ../development/libraries/bullet { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + }; spdlog = callPackage ../development/libraries/spdlog { }; From c4d8d4b4d6d1b7fc1f2d88d2b784c819fd6b76b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 9 Sep 2018 14:44:54 +0100 Subject: [PATCH 361/600] pyre: substituting %VERSION% in Makefile no longer required --- pkgs/development/tools/pyre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index a62310878ba2..b51f6344c9b7 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -49,7 +49,7 @@ let export HOME=. # "external" because https://github.com/facebook/pyre-check/pull/8/files - sed "s/%VERSION%/external ${pyre-version}/" Makefile.template > Makefile + cp Makefile.template Makefile sed "s/%VERSION%/external/" dune.in > dune cp ${versionFile} ./scripts/generate-version-number.sh From 2a5fa8b016ef1670b0fba9d0ba09537a29250f5e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 9 Sep 2018 13:56:58 +0000 Subject: [PATCH 362/600] webkitgtk24x: do not warn about expansion-to-defined It fills the log. --- pkgs/development/libraries/webkitgtk/2.4.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 1a17ae53313b..707abf1d30e6 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -77,7 +77,10 @@ stdenv.mkDerivation rec { "--disable-credential-storage" ]; - NIX_CFLAGS_COMPILE = "-DU_NOEXCEPT="; + NIX_CFLAGS_COMPILE = [ + "-DU_NOEXCEPT=" + "-Wno-expansion-to-defined" + ]; dontAddDisableDepTrack = true; From be32141cb023952ba83addb37990060b5dfe26f7 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 9 Sep 2018 13:50:55 +0000 Subject: [PATCH 363/600] webkitgtk24x: prune libtool files This fixes the build of claws-mail.override { enablePluginFancy = true; }, otherwise the linking fails to find transitive gst libraries. --- pkgs/development/libraries/webkitgtk/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 707abf1d30e6..7b62de69123d 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex -, pkgconfig, which, gettext, gobjectIntrospection +, pkgconfig, which, gettext, gobjectIntrospection, pruneLibtoolFiles , gtk2, gtk3, wayland, libwebp, enchant, sqlite , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg , gst-plugins-base, libobjc @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl python ruby bison gperf flex - pkgconfig which gettext gobjectIntrospection + pkgconfig which gettext gobjectIntrospection pruneLibtoolFiles ]; buildInputs = [ From 05f122c5612e76e643f504275a35e6e05223bda9 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Sun, 9 Sep 2018 17:00:51 +0200 Subject: [PATCH 364/600] spl/zfs: 0.7.9 -> 0.7.10 --- pkgs/os-specific/linux/spl/default.nix | 5 ++--- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 146e1c276965..6e22de4bcf62 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -10,13 +10,13 @@ assert kernel != null; stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; + sha256 = "1jkv6sdrd6yvaqx0jg86fjwnsqyxqb2061k7yrka7iyivgjzpi26"; }; patches = [ ./install_prefix.patch ]; @@ -52,6 +52,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index e6807f1214cc..e7cca579d624 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -158,12 +158,12 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.18"; + # incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.9"; + version = "0.7.10"; - sha256 = "0krpxrvnda2jx6l71xhw9fsksyp2a6h9l9asppac3szsd1n7fp9n"; + sha256 = "1kq35ij29fag77dxq21jf9ghbl4nkyjgc2bxzyry9rawznq542v1"; extraPatches = [ (fetchpatch { From 136fb311c7c0079db24e22f9d29656cdffb05e5e Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sun, 9 Sep 2018 17:14:59 +0200 Subject: [PATCH 365/600] elpy: fix build dep --- pkgs/top-level/emacs-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 6cd80613526b..a83c3baaa4a0 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -178,7 +178,7 @@ let for file in elpy.el elpy-pkg.el; do substituteInPlace $file \ --replace "company \"0.8.2\"" "company \"${company.version}\"" \ - --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${melpaPackages.find-file-in-project.version}\"" \ + --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${(melpaPackages self).find-file-in-project.version}\"" \ --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \ --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \ --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\"" From 4d8bb9a34aa3de134133980551b45dc4768f3ddc Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 9 Sep 2018 11:20:07 -0400 Subject: [PATCH 366/600] dockerTools: unpin go version The linked PR has been merged, and in fact dockerTools has upgraded to the latest `go1.11` compiler: https://github.com/moby/moby/pull/35739 https://github.com/moby/moby/pull/37358 --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc71d5ec6892..188956719884 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -129,8 +129,7 @@ with pkgs; digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; - # go 1.9 pin until https://github.com/moby/moby/pull/35739 - dockerTools = callPackage ../build-support/docker { go = go_1_9; }; + dockerTools = callPackage ../build-support/docker { }; docker_compose = pythonPackages.docker_compose; From 9dc661aa72e27fa9fdf38c16976a757626d5dd5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 9 Sep 2018 18:47:26 +0200 Subject: [PATCH 367/600] nixos/i2pd: Update options to encompass recent additions to the daemon Also: * switch to flat sysdir * remove nixos default reseeds, rely on program defaults * refactor config expressions --- nixos/modules/services/networking/i2pd.nix | 618 ++++++++++++++------- 1 file changed, 408 insertions(+), 210 deletions(-) diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 3afafaf3fed5..0e9b354cfcaf 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -8,6 +8,17 @@ let homeDir = "/var/lib/i2pd"; + strOpt = k: v: k + " = " + v; + boolOpt = k: v: k + " = " + boolToString v; + intOpt = k: v: k + " = " + toString v; + lstOpt = k: xs: k + " = " + concatStringsSep "," xs; + optionalNullString = o: s: optional (! isNull s) (strOpt o s); + optionalNullBool = o: b: optional (! isNull b) (boolOpt o b); + optionalNullInt = o: i: optional (! isNull i) (intOpt o i); + optionalEmptyList = o: l: optional ([] != l) (lstOpt o l); + + mkEnableTrueOption = name: mkEnableOption name // { default = true; }; + mkEndpointOpt = name: addr: port: { enable = mkEnableOption name; name = mkOption { @@ -18,42 +29,54 @@ let address = mkOption { type = types.str; default = addr; - description = "Bind address for ${name} endpoint. Default: " + addr; + description = "Bind address for ${name} endpoint."; }; port = mkOption { type = types.int; default = port; - description = "Bind port for ${name} endoint. Default: " + toString port; + description = "Bind port for ${name} endoint."; }; }; - mkKeyedEndpointOpt = name: addr: port: keyFile: + i2cpOpts = name: { + length = mkOption { + type = types.int; + description = "Guaranteed minimum hops for ${name} tunnels."; + default = 3; + }; + quantity = mkOption { + type = types.int; + description = "Number of simultaneous ${name} tunnels."; + default = 5; + }; + }; + + mkKeyedEndpointOpt = name: addr: port: keyloc: (mkEndpointOpt name addr port) // { keys = mkOption { - type = types.str; - default = ""; + type = with types; nullOr str; + default = keyloc; description = '' File to persist ${lib.toUpper name} keys. ''; }; + inbound = i2cpOpts name; + outbound = i2cpOpts name; + latency.min = mkOption { + type = with types; nullOr int; + description = "Min latency for tunnels."; + default = null; + }; + latency.max = mkOption { + type = with types; nullOr int; + description = "Max latency for tunnels."; + default = null; + }; }; - commonTunOpts = let - i2cpOpts = { - length = mkOption { - type = types.int; - description = "Guaranteed minimum hops."; - default = 3; - }; - quantity = mkOption { - type = types.int; - description = "Number of simultaneous tunnels."; - default = 5; - }; - }; - in name: { - outbound = i2cpOpts; - inbound = i2cpOpts; + commonTunOpts = name: { + outbound = i2cpOpts name; + inbound = i2cpOpts name; crypto.tagsToSend = mkOption { type = types.int; description = "Number of ElGamal/AES tags to send."; @@ -70,94 +93,142 @@ let }; } // mkEndpointOpt name "127.0.0.1" 0; - i2pdConf = pkgs.writeText "i2pd.conf" '' - # DO NOT EDIT -- this file has been generated automatically. - loglevel = ${cfg.logLevel} - - ipv4 = ${boolToString cfg.enableIPv4} - ipv6 = ${boolToString cfg.enableIPv6} - notransit = ${boolToString cfg.notransit} - floodfill = ${boolToString cfg.floodfill} - netid = ${toString cfg.netid} - ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" } - ${if isNull cfg.port then "" else "port = ${toString cfg.port}"} - - [limits] - transittunnels = ${toString cfg.limits.transittunnels} - - [upnp] - enabled = ${boolToString cfg.upnp.enable} - name = ${cfg.upnp.name} - - [precomputation] - elgamal = ${boolToString cfg.precomputation.elgamal} - - [reseed] - verify = ${boolToString cfg.reseed.verify} - file = ${cfg.reseed.file} - urls = ${builtins.concatStringsSep "," cfg.reseed.urls} - - [addressbook] - defaulturl = ${cfg.addressbook.defaulturl} - subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions} - - ${flip concatMapStrings + sec = name: "\n[" + name + "]"; + notice = "# DO NOT EDIT -- this file has been generated automatically."; + i2pdConf = let + opts = [ + notice + (strOpt "loglevel" cfg.logLevel) + (boolOpt "logclftime" cfg.logCLFTime) + (boolOpt "ipv4" cfg.enableIPv4) + (boolOpt "ipv6" cfg.enableIPv6) + (boolOpt "notransit" cfg.notransit) + (boolOpt "floodfill" cfg.floodfill) + (intOpt "netid" cfg.netid) + ] ++ (optionalNullInt "bandwidth" cfg.bandwidth) + ++ (optionalNullInt "port" cfg.port) + ++ (optionalNullString "family" cfg.family) + ++ (optionalNullString "datadir" cfg.dataDir) + ++ (optionalNullInt "share" cfg.share) + ++ (optionalNullBool "ssu" cfg.ssu) + ++ (optionalNullBool "ntcp" cfg.ntcp) + ++ (optionalNullString "ntcpproxy" cfg.ntcpProxy) + ++ (optionalNullString "ifname" cfg.ifname) + ++ (optionalNullString "ifname4" cfg.ifname4) + ++ (optionalNullString "ifname6" cfg.ifname6) + ++ [ + (sec "limits") + (intOpt "transittunnels" cfg.limits.transittunnels) + (intOpt "coresize" cfg.limits.coreSize) + (intOpt "openfiles" cfg.limits.openFiles) + (intOpt "ntcphard" cfg.limits.ntcpHard) + (intOpt "ntcpsoft" cfg.limits.ntcpSoft) + (intOpt "ntcpthreads" cfg.limits.ntcpThreads) + (sec "upnp") + (boolOpt "enabled" cfg.upnp.enable) + (sec "precomputation") + (boolOpt "elgamal" cfg.precomputation.elgamal) + (sec "reseed") + (boolOpt "verify" cfg.reseed.verify) + ] ++ (optionalNullString "file" cfg.reseed.file) + ++ (optionalEmptyList "urls" cfg.reseed.urls) + ++ (optionalNullString "floodfill" cfg.reseed.floodfill) + ++ (optionalNullString "zipfile" cfg.reseed.zipfile) + ++ (optionalNullString "proxy" cfg.reseed.proxy) + ++ [ + (sec "trust") + (boolOpt "enabled" cfg.trust.enable) + (boolOpt "hidden" cfg.trust.hidden) + ] ++ (optionalEmptyList "routers" cfg.trust.routers) + ++ (optionalNullString "family" cfg.trust.family) + ++ [ + (sec "websockets") + (boolOpt "enabled" cfg.websocket.enable) + (strOpt "address" cfg.websocket.address) + (intOpt "port" cfg.websocket.port) + (sec "exploratory") + (intOpt "inbound.length" cfg.exploratory.inbound.length) + (intOpt "inbound.quantity" cfg.exploratory.inbound.quantity) + (intOpt "outbound.length" cfg.exploratory.outbound.length) + (intOpt "outbound.quantity" cfg.exploratory.outbound.quantity) + (sec "ntcp2") + (boolOpt "enabled" cfg.ntcp2.enable) + (boolOpt "published" cfg.ntcp2.published) + (intOpt "port" cfg.ntcp2.port) + (sec "addressbook") + (strOpt "defaulturl" cfg.addressbook.defaulturl) + ] ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions) + ++ (flip map (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto) - (proto: '' - [${proto.name}] - enabled = ${boolToString proto.enable} - address = ${proto.address} - port = ${toString proto.port} - ${if proto ? keys then "keys = ${proto.keys}" else ""} - ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""} - ${if proto ? user then "user = ${proto.user}" else ""} - ${if proto ? pass then "pass = ${proto.pass}" else ""} - ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""} - ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""} - '') - } - ''; + (proto: let protoOpts = [ + (sec proto.name) + (boolOpt "enabled" proto.enable) + (strOpt "address" proto.address) + (intOpt "port" proto.port) + ] ++ (if proto ? keys then optionalNullString "keys" proto.keys else []) + ++ (if proto ? auth then optionalNullBool "auth" proto.auth else []) + ++ (if proto ? user then optionalNullString "user" proto.user else []) + ++ (if proto ? pass then optionalNullString "pass" proto.pass else []) + ++ (if proto ? strictHeaders then optionalNullBool "strictheaders" proto.strictHeaders else []) + ++ (if proto ? hostname then optionalNullString "hostname" proto.hostname else []) + ++ (if proto ? outproxy then optionalNullString "outproxy" proto.outproxy else []) + ++ (if proto ? outproxyPort then optionalNullInt "outproxyport" proto.outproxyPort else []) + ++ (if proto ? outproxyEnable then optionalNullBool "outproxy.enabled" proto.outproxyEnable else []); + in (concatStringsSep "\n" protoOpts) + )); + in + pkgs.writeText "i2pd.conf" (concatStringsSep "\n" opts); - i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" '' - # DO NOT EDIT -- this file has been generated automatically. - ${flip concatMapStrings + tunnelConf = let opts = [ + notice + (flip map (collect (tun: tun ? port && tun ? destination) cfg.outTunnels) - (tun: '' - [${tun.name}] - type = client - destination = ${tun.destination} - destinationport = ${toString tun.destinationPort} - keys = ${tun.keys} - address = ${tun.address} - port = ${toString tun.port} - inbound.length = ${toString tun.inbound.length} - outbound.length = ${toString tun.outbound.length} - inbound.quantity = ${toString tun.inbound.quantity} - outbound.quantity = ${toString tun.outbound.quantity} - crypto.tagsToSend = ${toString tun.crypto.tagsToSend} - '') - } - ${flip concatMapStrings + (tun: let outTunOpts = [ + (sec tun.name) + "type = client" + (intOpt "port" tun.port) + (strOpt "destination" tun.destination) + ] ++ (if tun ? destinationPort then optionalNullInt "destinationport" tun.destinationPort else []) + ++ (if tun ? keys then + optionalNullString "keys" tun.keys else []) + ++ (if tun ? address then + optionalNullString "address" tun.address else []) + ++ (if tun ? inbound.length then + optionalNullInt "inbound.length" tun.inbound.length else []) + ++ (if tun ? inbound.quantity then + optionalNullInt "inbound.quantity" tun.inbound.quantity else []) + ++ (if tun ? outbound.length then + optionalNullInt "outbound.length" tun.outbound.length else []) + ++ (if tun ? outbound.quantity then + optionalNullInt "outbound.quantity" tun.outbound.quantity else []) + ++ (if tun ? crypto.tagsToSend then + optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend else []); + in concatStringsSep "\n" outTunOpts)) + (flip map (collect (tun: tun ? port && tun ? address) cfg.inTunnels) - (tun: '' - [${tun.name}] - type = server - destination = ${tun.destination} - keys = ${tun.keys} - host = ${tun.address} - port = ${toString tun.port} - inport = ${toString tun.inPort} - accesslist = ${builtins.concatStringsSep "," tun.accessList} - '') - } - ''; + (tun: let inTunOpts = [ + (sec tun.name) + "type = server" + (intOpt "port" tun.port) + (strOpt "host" tun.address) + ] ++ (if tun ? destination then + optionalNullString "destination" tun.destination else []) + ++ (if tun ? keys then + optionalNullString "keys" tun.keys else []) + ++ (if tun ? inPort then + optionalNullInt "inport" tun.inPort else []) + ++ (if tun ? accessList then + optionalEmptyList "accesslist" tun.accessList else []); + in concatStringsSep "\n" inTunOpts))]; + in pkgs.writeText "i2pd-tunnels.conf" opts; i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh exec ${pkgs.i2pd}/bin/i2pd \ ${if isNull cfg.address then "" else "--host="+cfg.address} \ + --service \ --conf=${i2pdConf} \ - --tunconf=${i2pdTunnelConf} + --tunconf=${tunnelConf} ''; in @@ -170,9 +241,7 @@ in services.i2pd = { - enable = mkOption { - type = types.bool; - default = false; + enable = mkEnableOption "I2Pd daemon" // { description = '' Enables I2Pd as a running service upon activation. Please read http://i2pd.readthedocs.io/en/latest/ for further @@ -192,6 +261,8 @@ in ''; }; + logCLFTime = mkEnableOption "Full CLF-formatted date and time to log"; + address = mkOption { type = with types; nullOr str; default = null; @@ -200,17 +271,72 @@ in ''; }; - notransit = mkOption { - type = types.bool; - default = false; + family = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify a family the router belongs to. + ''; + }; + + dataDir = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Alternative path to storage of i2pd data (RI, keys, peer profiles, ...) + ''; + }; + + share = mkOption { + type = types.int; + default = 100; + description = '' + Limit of transit traffic from max bandwidth in percents. + ''; + }; + + ifname = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Network interface to bind to. + ''; + }; + + ifname4 = mkOption { + type = with types; nullOr str; + default = null; + description = '' + IPv4 interface to bind to. + ''; + }; + + ifname6 = mkOption { + type = with types; nullOr str; + default = null; + description = '' + IPv6 interface to bind to. + ''; + }; + + ntcpProxy = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Proxy URL for NTCP transport. + ''; + }; + + ntcp = mkEnableTrueOption "ntcp"; + ssu = mkEnableTrueOption "ssu"; + + notransit = mkEnableOption "notransit" // { description = '' Tells the router to not accept transit tunnels during startup. ''; }; - floodfill = mkOption { - type = types.bool; - default = false; + floodfill = mkEnableOption "floodfill" // { description = '' If the router is declared to be unreachable and needs introduction nodes. ''; @@ -241,51 +367,20 @@ in ''; }; - enableIPv4 = mkOption { - type = types.bool; - default = true; + enableIPv4 = mkEnableTrueOption "IPv4 connectivity"; + enableIPv6 = mkEnableOption "IPv6 connectivity"; + nat = mkEnableTrueOption "NAT bypass"; + + upnp.enable = mkEnableOption "UPnP service discovery"; + upnp.name = mkOption { + type = types.str; + default = "I2Pd"; description = '' - Enables IPv4 connectivity. Enabled by default. + Name i2pd appears in UPnP forwardings list. ''; }; - enableIPv6 = mkOption { - type = types.bool; - default = false; - description = '' - Enables IPv6 connectivity. Disabled by default. - ''; - }; - - nat = mkOption { - type = types.bool; - default = true; - description = '' - Assume router is NATed. Enabled by default. - ''; - }; - - upnp = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enables UPnP. - ''; - }; - - name = mkOption { - type = types.str; - default = "I2Pd"; - description = '' - Name i2pd appears in UPnP forwardings list. - ''; - }; - }; - - precomputation.elgamal = mkOption { - type = types.bool; - default = true; + precomputation.elgamal = mkEnableTrueOption "Precomputed ElGamal tables" // { description = '' Whenever to use precomputated tables for ElGamal. i2pd defaults to false @@ -296,76 +391,154 @@ in ''; }; - reseed = { - verify = mkOption { - type = types.bool; - default = false; - description = '' - Request SU3 signature verification - ''; - }; + reseed.verify = mkEnableOption "SU3 signature verification"; - file = mkOption { - type = types.str; - default = ""; - description = '' - Full path to SU3 file to reseed from - ''; - }; - - urls = mkOption { - type = with types; listOf str; - default = [ - "https://reseed.i2p-project.de/" - "https://i2p.mooo.com/netDb/" - "https://netdb.i2p2.no/" - "https://us.reseed.i2p2.no:444/" - "https://uk.reseed.i2p2.no:444/" - "https://i2p.manas.ca:8443/" - ]; - description = '' - Reseed URLs - ''; - }; + reseed.file = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Full path to SU3 file to reseed from. + ''; }; - addressbook = { - defaulturl = mkOption { - type = types.str; - default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt"; - description = '' - AddressBook subscription URL for initial setup - ''; - }; - subscriptions = mkOption { - type = with types; listOf str; - default = [ - "http://inr.i2p/export/alive-hosts.txt" - "http://i2p-projekt.i2p/hosts.txt" - "http://stats.i2p/cgi-bin/newhosts.txt" - ]; - description = '' - AddressBook subscription URLs - ''; - }; + reseed.urls = mkOption { + type = with types; listOf str; + default = []; + description = '' + Reseed URLs. + ''; + }; + + reseed.floodfill = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Path to router info of floodfill to reseed from. + ''; + }; + + reseed.zipfile = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Path to local .zip file to reseed from. + ''; + }; + + reseed.proxy = mkOption { + type = with types; nullOr str; + default = null; + description = '' + URL for reseed proxy, supports http/socks. + ''; + }; + + addressbook.defaulturl = mkOption { + type = types.str; + default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt"; + description = '' + AddressBook subscription URL for initial setup + ''; + }; + addressbook.subscriptions = mkOption { + type = with types; listOf str; + default = [ + "http://inr.i2p/export/alive-hosts.txt" + "http://i2p-projekt.i2p/hosts.txt" + "http://stats.i2p/cgi-bin/newhosts.txt" + ]; + description = '' + AddressBook subscription URLs + ''; + }; + + trust.enable = mkEnableOption "Explicit trust options"; + + trust.family = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Router Familiy to trust for first hops. + ''; + }; + + trust.routers = mkOption { + type = with types; listOf str; + default = []; + description = '' + Only connect to the listed routers. + ''; + }; + + trust.hidden = mkEnableOption "Router concealment."; + + websocket = mkEndpointOpt "websockets" "127.0.0.1" 7666; + + exploratory.inbound = i2cpOpts "exploratory"; + exploratory.outbound = i2cpOpts "exploratory"; + + ntcp2.enable = mkEnableTrueOption "NTCP2."; + ntcp2.published = mkEnableOption "NTCP2 publication."; + ntcp2.port = mkOption { + type = types.int; + default = 0; + description = '' + Port to listen for incoming NTCP2 connections (0=auto). + ''; }; limits.transittunnels = mkOption { type = types.int; default = 2500; description = '' - Maximum number of active transit sessions + Maximum number of active transit sessions. + ''; + }; + + limits.coreSize = mkOption { + type = types.int; + default = 0; + description = '' + Maximum size of corefile in Kb (0 - use system limit). + ''; + }; + + limits.openFiles = mkOption { + type = types.int; + default = 0; + description = '' + Maximum number of open files (0 - use system default). + ''; + }; + + limits.ntcpHard = mkOption { + type = types.int; + default = 0; + description = '' + Maximum number of active transit sessions. + ''; + }; + + limits.ntcpSoft = mkOption { + type = types.int; + default = 0; + description = '' + Threshold to start probabalistic backoff with ntcp sessions (default: use system limit). + ''; + }; + + limits.ntcpThreads = mkOption { + type = types.int; + default = 1; + description = '' + Maximum number of threads used by NTCP DH worker. ''; }; proto.http = (mkEndpointOpt "http" "127.0.0.1" 7070) // { - auth = mkOption { - type = types.bool; - default = false; - description = '' - Enable authentication for webconsole. - ''; - }; + + auth = mkEnableOption "Webconsole authentication"; + user = mkOption { type = types.str; default = "i2pd"; @@ -373,6 +546,7 @@ in Username for webconsole access ''; }; + pass = mkOption { type = types.str; default = "i2pd"; @@ -380,11 +554,35 @@ in Password for webconsole access. ''; }; + + strictHeaders = mkOption { + type = with types; nullOr bool; + default = null; + description = '' + Enable strict host checking on WebUI. + ''; + }; + + hostname = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Expected hostname for WebUI. + ''; + }; }; - proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 ""; - proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "") + proto.httpProxy = (mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "httpproxy-keys.dat") // { + outproxy = mkOption { + type = with types; nullOr str; + default = null; + description = "Upstream outproxy bind address."; + }; + }; + proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "socksproxy-keys.dat") + // { + outproxyEnable = mkEnableOption "SOCKS outproxy"; outproxy = mkOption { type = types.str; default = "127.0.0.1"; @@ -408,8 +606,8 @@ in { name, ... }: { options = { destinationPort = mkOption { - type = types.int; - default = 0; + type = with types; nullOr int; + default = null; description = "Connect to particular port at destination."; }; } // commonTunOpts name; From d4e89680d2400a28de8fee772070680458e9e1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 9 Sep 2018 20:39:15 +0200 Subject: [PATCH 368/600] pythonPackages.flask_ldap_login: Fix build --- .../python-modules/flask-ldap-login/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index b95e694a232f..02f4290d9590 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch , flask, flask_wtf, flask_testing, ldap , mock, nose }: @@ -11,6 +11,14 @@ buildPythonPackage rec { sha256 = "085rik7q8xrp5g95346p6jcp9m2yr8kamwb2kbiw4q0b0fpnnlgq"; }; + patches = [ + # Fix flask_wtf>=0.9.0 incompatibility. See https://github.com/ContinuumIO/flask-ldap-login/issues/41 + (fetchpatch { + url = https://github.com/ContinuumIO/flask-ldap-login/commit/ed08c03c818dc63b97b01e2e7c56862eaa6daa43.patch; + sha256 = "19pkhbldk8jq6m10kdylvjf1c8m84fvvj04v5qda4cjyks15aq48"; + }) + ]; + checkInputs = [ nose mock flask_testing ]; propagatedBuildInputs = [ flask flask_wtf ldap ]; From 8a53488904df856b9e947c03f83372952989c970 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 9 Sep 2018 20:39:17 +0200 Subject: [PATCH 369/600] opentracker: 2016-10-02 -> 2018-05-26 --- pkgs/applications/networking/p2p/opentracker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index abddc22c285c..83ddb456153c 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, libowfat, zlib }: stdenv.mkDerivation { - name = "opentracker-2016-10-02"; + name = "opentracker-2018-05-26"; src = fetchgit { url = "git://erdgeist.org/opentracker"; - rev = "0ebc0ed6a3e3b7acc9f9e338cc23cea5f4f22f61"; - sha256 = "0qi0a8fygjwgs3yacramfn53jdabfgrlzid7q597x9lr94anfpyl"; + rev = "6411f1567f64248b0d145493c2e61004d2822623"; + sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j"; }; buildInputs = [ libowfat zlib ]; From 25f8753bf446b9a9f6ccf0cb0e643306ec49f172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 9 Sep 2018 20:39:46 +0200 Subject: [PATCH 370/600] pythonPackages.flask_ldap_login: 0.3.0 -> 0.3.4 --- .../python-modules/flask-ldap-login/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index 02f4290d9590..9aae92df30e2 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -1,14 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch , flask, flask_wtf, flask_testing, ldap , mock, nose }: buildPythonPackage rec { pname = "flask-ldap-login"; - version = "0.3.0"; + version = "0.3.4"; - src = fetchPypi { - inherit pname version; - sha256 = "085rik7q8xrp5g95346p6jcp9m2yr8kamwb2kbiw4q0b0fpnnlgq"; + src = fetchFromGitHub { + owner = "ContinuumIO"; + repo = "flask-ldap-login"; + rev = version; + sha256 = "1l6zahqhwn5g9fmhlvjv80288b5h2fk5mssp7amdkw5ysk570wzp"; }; patches = [ From 063aa389dfaa29b697acf2db72610324b1b6aa39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 9 Sep 2018 20:56:34 +0200 Subject: [PATCH 371/600] pythonPackages.libusb1: Fix darwin build --- pkgs/development/python-modules/libusb1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 245ea90038ea..a460fb8a1185 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "a49917a2262cf7134396f6720c8be011f14aabfc5cdc53f880cc672c0f39d271"; }; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = '' substituteInPlace usb1/libusb1.py --replace \ "ctypes.util.find_library(base_name)" \ "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" From d0413d1ac95460ff669cb5f5f4509e024454d21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Sep 2018 21:19:29 +0200 Subject: [PATCH 372/600] racket: warn to avoid repeating #45952 --- pkgs/development/interpreters/racket/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index e8b6cc93c2c1..1f2a28cb8fb8 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "7.0"; + version = "7.0"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { From 88cf02421bcf92e3e67a065b261abaa3ac78353a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 15:09:20 -0700 Subject: [PATCH 373/600] osinfo-db: 20180531 -> 20180903 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from osinfo-db --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 9919fb57f7cc..93ee6d38c7c3 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180531"; + name = "osinfo-db-20180903"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0vw6hn7xdfj0q7wc3k9b0nvbghdp1b9dl63xz2v7frr55qv59m5x"; + sha256 = "0xkxqyn2b03d4rd91f5rw3xar5vnv2n8l5pp8sm3hqm1wm5z5my9"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; From a4b040e69f4f56a5e9e8df15b2941fdceca06bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 9 Sep 2018 21:33:45 +0200 Subject: [PATCH 374/600] pythonPackages.cozy: Disable on python2 (#46436) Cozy does not support python2. --- pkgs/development/python-modules/cozy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix index 0feca2773b37..7515891456e9 100644 --- a/pkgs/development/python-modules/cozy/default.nix +++ b/pkgs/development/python-modules/cozy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, lib, +{ buildPythonPackage, isPy3k, fetchFromGitHub, lib, z3, ply, python-igraph, oset, ordered-set, dictionaries }: buildPythonPackage { @@ -29,6 +29,8 @@ buildPythonPackage { $out/bin/cozy --help ''; + disabled = !isPy3k; + meta = { description = "The collection synthesizer"; homepage = https://cozy.uwplse.org/; From b667a76eacc60a8485f1dff82f7ff47417b8545e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 9 Sep 2018 21:48:52 +0200 Subject: [PATCH 375/600] pythonPackages.flask_ldap_login: Disable on python3 --- pkgs/development/python-modules/flask-ldap-login/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index 9aae92df30e2..99b57dac816f 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -1,10 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch , flask, flask_wtf, flask_testing, ldap , mock, nose }: buildPythonPackage rec { pname = "flask-ldap-login"; version = "0.3.4"; + disabled = isPy3k; src = fetchFromGitHub { owner = "ContinuumIO"; From b633fc4fb4b3bbd44b4bbb1d29d3f3fa642991f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 9 Sep 2018 22:09:34 +0200 Subject: [PATCH 376/600] pythonPackages.libusb1: Disable flaky test --- pkgs/development/python-modules/libusb1/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index a460fb8a1185..8a9b5da68ef9 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1 }: +{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1, pytest }: buildPythonPackage rec { pname = "libusb1"; @@ -17,8 +17,12 @@ buildPythonPackage rec { buildInputs = [ libusb1 ]; + checkInputs = [ pytest ]; + checkPhase = '' - ${python.interpreter} -m usb1.testUSB1 + # USBPollerThread is unreliable. Let's not test it. + # See: https://github.com/vpelletier/python-libusb1/issues/16 + py.test -k 'not testUSBPollerThreadExit' usb1/testUSB1.py ''; meta = with stdenv.lib; { From 8473168bef1dfe142d12189366eef85fc59ba585 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 9 Sep 2018 22:12:52 +0200 Subject: [PATCH 377/600] mtxclient: init at 0.1.0 --- .../libraries/mtxclient/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/mtxclient/default.nix diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix new file mode 100644 index 000000000000..465a70576356 --- /dev/null +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, boost, openssl, zlib, libsodium, olm, gtest, spdlog, nlohmann_json }: + +stdenv.mkDerivation rec { + name = "mtxclient-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "mujx"; + repo = "mtxclient"; + rev = "v${version}"; + sha256 = "0i58y45diysayjzy5ick15356972z67dfxm0w41ay88nm42x1imp"; + }; + + postPatch = '' + ln -s ${nlohmann_json}/include/nlohmann/json.hpp include/json.hpp + ''; + + cmakeFlags = [ "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost openssl zlib libsodium olm ]; + + meta = with stdenv.lib; { + description = "Client API library for Matrix, built on top of Boost.Asio"; + homepage = https://github.com/mujx/mtxclient; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc71d5ec6892..a7f3f7b05679 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11244,6 +11244,8 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; + mtxclient = callPackage ../development/libraries/mtxclient { }; + mu = callPackage ../tools/networking/mu { texinfo = texinfo4; }; From 4d11a37c69d2914c24250dd3eea780bef6be0932 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 9 Sep 2018 22:13:24 +0200 Subject: [PATCH 378/600] spdlog_1: init 1.1.0 --- pkgs/development/libraries/spdlog/default.nix | 66 +++++++++++-------- pkgs/top-level/all-packages.nix | 9 ++- 2 files changed, 47 insertions(+), 28 deletions(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 1c9e67f87675..a96cd455f554 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,32 +1,46 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { - name = "spdlog-${version}"; - version = "0.14.0"; +let + generic = { version, sha256 }: + stdenv.mkDerivation { + name = "spdlog-${version}"; + inherit version; - src = fetchFromGitHub { - owner = "gabime"; - repo = "spdlog"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "gabime"; + repo = "spdlog"; + rev = "v${version}"; + inherit sha256; + }; + + nativeBuildInputs = [ cmake ]; + + # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ]; + + outputs = [ "out" "doc" ]; + + postInstall = '' + mkdir -p $out/share/doc/spdlog + cp -rv ../example $out/share/doc/spdlog + ''; + + meta = with stdenv.lib; { + description = "Very fast, header only, C++ logging library."; + homepage = https://github.com/gabime/spdlog; + license = licenses.mit; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.all; + }; + }; +in +{ + spdlog_1 = generic { + version = "1.1.0"; + sha256 = "0yckz5w02v8193jhxihk9v4i8f6jafyg2a33amql0iclhk17da8f"; + }; + + spdlog_0 = generic { + version = "0.14.0"; sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q"; }; - - nativeBuildInputs = [ cmake ]; - - # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ]; - - outputs = [ "out" "doc" ]; - - postInstall = '' - mkdir -p $out/share/doc/spdlog - cp -rv ../example $out/share/doc/spdlog - ''; - - meta = with stdenv.lib; { - description = "Very fast, header only, C++ logging library."; - homepage = https://github.com/gabime/spdlog; - license = licenses.mit; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7f3f7b05679..182eb55557e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2347,7 +2347,9 @@ with pkgs; enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; - cryfs = callPackage ../tools/filesystems/cryfs { }; + cryfs = callPackage ../tools/filesystems/cryfs { + spdlog = spdlog_0; + }; encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; @@ -22217,7 +22219,10 @@ with pkgs; bullet = callPackage ../development/libraries/bullet {}; - spdlog = callPackage ../development/libraries/spdlog { }; + inherit (callPackages ../development/libraries/spdlog { }) + spdlog_0 spdlog_1; + + spdlog = spdlog_1; dart = callPackage ../development/interpreters/dart { }; dart_stable = dart.override { version = "1.24.3"; }; From ff8fc5c46c81095d63c688072c91915a3e5cc41d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 9 Sep 2018 22:14:27 +0200 Subject: [PATCH 379/600] nheko: 0.4.3 -> 0.5.5 --- .../instant-messengers/nheko/default.nix | 63 ++++--------- .../nheko/external-deps.patch | 94 ------------------- .../instant-messengers/nheko/fetchurls.patch | 21 ----- 3 files changed, 17 insertions(+), 161 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/nheko/external-deps.patch delete mode 100644 pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index cf9558b4b955..6716305df8b5 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,39 +1,9 @@ -{ - lib, stdenv, fetchFromGitHub, fetchurl, - cmake, doxygen, lmdb, qt5, qtmacextras +{ lib, stdenv, fetchFromGitHub, fetchurl +, cmake, lmdb, qt5, qtmacextras, mtxclient +, boost, spdlog, olm, pkgconfig }: let - json_hpp = fetchurl { - url = https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp; - sha256 = "fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733"; - }; - - variant_hpp = fetchurl { - url = https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp; - sha256 = "1vjiz1x5l8ynqqyb5l9mlrzgps526v45hbmwjilv4brgyi5445fq"; - }; - - matrix-structs = stdenv.mkDerivation rec { - name = "matrix-structs-git"; - - src = fetchFromGitHub { - owner = "mujx"; - repo = "matrix-structs"; - rev = "5e57c2385a79b6629d1998fec4a7c0baee23555e"; - sha256 = "112b7gnvr04g1ak7fnc7ch7w2n825j4qkw0jb49xx06ag93nb6m6"; - }; - - postUnpack = '' - cp ${json_hpp} "$sourceRoot/include/json.hpp" - cp ${variant_hpp} "$sourceRoot/include/variant.hpp" - ''; - - patches = [ ./fetchurls.patch ]; - - nativeBuildInputs = [ cmake doxygen ]; - }; - tweeny = fetchFromGitHub { owner = "mobius3"; repo = "tweeny"; @@ -50,19 +20,15 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.4.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "0qjia42nam3hj835k2jb5b6j6n56rdkb8rn67yqf45xdz8ypmbmv"; + sha256 = "0k5gmfwmisfavliyz0nfsmwy317ps8a4r3l1d831giqp9pvqvi0i"; }; - # This patch is likely not strictly speaking needed, but will help detect when - # a dependency is updated, so that the fetches up there can be updated too - patches = [ ./external-deps.patch ]; - # If, on Darwin, you encounter the error # error: must specify at least one argument for '...' parameter of variadic # macro [-Werror,-Wgnu-zero-variadic-macro-arguments] @@ -79,25 +45,30 @@ stdenv.mkDerivation rec { # export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments #''; + postPatch = '' + mkdir -p .deps/include/ + ln -s ${tweeny}/include .deps/include/tweeny + ln -s ${spdlog} .deps/spdlog + ''; + cmakeFlags = [ - "-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a" - "-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs" - "-DTWEENY_INCLUDE_DIR=${tweeny}/include" + "-DTWEENY_INCLUDE_DIR=.deps/include" "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny + mtxclient olm boost lmdb spdlog + qt5.qtbase qt5.qtmultimedia qt5.qttools ] ++ lib.optional stdenv.isDarwin qtmacextras; enableParallelBuilding = true; meta = with stdenv.lib; { description = "Desktop client for the Matrix protocol"; - maintainers = with maintainers; [ ekleog ]; - platforms = platforms.all; + maintainers = with maintainers; [ ekleog fpletz ]; + platforms = platforms.unix; license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch deleted file mode 100644 index fa388edfb75a..000000000000 --- a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/cmake/LMDBXX.cmake b/cmake/LMDBXX.cmake -index 3b9817d..e69de29 100644 ---- a/cmake/LMDBXX.cmake -+++ b/cmake/LMDBXX.cmake -@@ -1,23 +0,0 @@ --include(ExternalProject) -- --# --# Build lmdbxx. --# -- --set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) --set(LMDBXX_ROOT ${THIRD_PARTY_ROOT}/lmdbxx) -- --set(LMDBXX_INCLUDE_DIR ${LMDBXX_ROOT}) -- --ExternalProject_Add( -- lmdbxx -- -- GIT_REPOSITORY https://github.com/bendiken/lmdbxx -- GIT_TAG 0b43ca87d8cfabba392dfe884eb1edb83874de02 -- -- BUILD_IN_SOURCE 1 -- SOURCE_DIR ${LMDBXX_ROOT} -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "" --) -diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake -index cef00f6..e69de29 100644 ---- a/cmake/MatrixStructs.cmake -+++ b/cmake/MatrixStructs.cmake -@@ -1,33 +0,0 @@ --include(ExternalProject) -- --# --# Build matrix-structs. --# -- --set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) --set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs) --set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include) --set(MATRIX_STRUCTS_LIBRARY matrix_structs) -- --link_directories(${MATRIX_STRUCTS_ROOT}) -- --set(WINDOWS_FLAGS "") -- --if(MSVC) -- set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64") --endif() -- --ExternalProject_Add( -- MatrixStructs -- -- GIT_REPOSITORY https://github.com/mujx/matrix-structs -- GIT_TAG 5e57c2385a79b6629d1998fec4a7c0baee23555e -- -- BUILD_IN_SOURCE 1 -- SOURCE_DIR ${MATRIX_STRUCTS_ROOT} -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -- -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT} -- ${WINDOWS_FLAGS} -- BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release -- INSTALL_COMMAND "" --) -diff --git a/cmake/Tweeny.cmake b/cmake/Tweeny.cmake -index 537ac92..e69de29 100644 ---- a/cmake/Tweeny.cmake -+++ b/cmake/Tweeny.cmake -@@ -1,23 +0,0 @@ --include(ExternalProject) -- --# --# Build tweeny --# -- --set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) --set(TWEENY_ROOT ${THIRD_PARTY_ROOT}/tweeny) -- --set(TWEENY_INCLUDE_DIR ${TWEENY_ROOT}/include) -- --ExternalProject_Add( -- Tweeny -- -- GIT_REPOSITORY https://github.com/mobius3/tweeny -- GIT_TAG b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf -- -- BUILD_IN_SOURCE 1 -- SOURCE_DIR ${TWEENY_ROOT} -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "" --) diff --git a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch deleted file mode 100644 index e2f72f600ed8..000000000000 --- a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 077ac37..c639d71 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,16 +18,6 @@ include(Doxygen) - # - include(CompilerFlags) - --file(DOWNLOAD -- "https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp" -- ${PROJECT_SOURCE_DIR}/include/json.hpp -- EXPECTED_HASH SHA256=fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733) -- --file(DOWNLOAD -- "https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp" -- ${PROJECT_SOURCE_DIR}/include/variant.hpp -- EXPECTED_MD5 "be0ce322cdd408e1b347b9f1d59ea67a") -- - include_directories(include) - - set(SRC From 4ab5625c9524c8e73f8f9d2c3c7ada276e60a63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 9 Sep 2018 22:18:34 +0200 Subject: [PATCH 380/600] castxml: Fix build (#46442) --- pkgs/development/tools/castxml/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index 603b155ee4f9..aea94633bae3 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { sha256 = "1hjh8ihjyp1m2jb5yypp5c45bpbz8k004f4p1cjw4gc7pxhjacdj"; }; + cmakeFlags = [ + "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}" + "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}" + ]; + buildInputs = [ cmake llvmPackages.clang-unwrapped @@ -25,11 +30,6 @@ stdenv.mkDerivation rec { propagatedbuildInputs = [ llvmPackages.libclang ]; - preConfigure = '' - cmakeFlagsArray+=( - ${if withMan then "-DSPHINX_MAN=ON" else ""} - )''; - # 97% tests passed, 96 tests failed out of 2866 # mostly because it checks command line and nix append -isystem and all doCheck=false; From 5e0c468737111064e0449d4507c3754afb90face Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 9 Sep 2018 22:40:49 +0200 Subject: [PATCH 381/600] pythonPackages.fiona: Fix darwin build (#46435) --- pkgs/development/python-modules/fiona/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index e6d347b440d3..0e6ab256d0d8 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "a156129f0904cb7eb24aa0745b6075da54f2c31db168ed3bcac8a4bd716d77b2"; }; + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + buildInputs = [ gdal ]; From 6f891ff66ecc12db70de1ec1b6089eaa7336a34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 9 Sep 2018 22:42:17 +0200 Subject: [PATCH 382/600] pythonPackages.joblib: Disable flaky test (#46439) The test `test_nested_parallelism_limit` fails on darwin. --- pkgs/development/python-modules/joblib/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 7164fd1197b8..91406c5331fb 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -18,7 +18,9 @@ buildPythonPackage rec { checkInputs = [ sphinx numpydoc pytest ]; checkPhase = '' - py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test + py.test -k 'not test_disk_used and \ + not test_nested_parallel_warnings and \ + not test_nested_parallelism_limit' joblib/test ''; meta = { From b47c5870f47bc27a1afafe2561dfe5523b97853b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 9 Sep 2018 23:16:07 +0200 Subject: [PATCH 383/600] nano: 2.9.8 -> 3.0 Changelog: http://lists.gnu.org/archive/html/info-nano/2018-09/msg00000.html Also updated the nix highlighting for nano --- pkgs/applications/editors/nano/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 64b8e48b2881..9c50d8e8b78e 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -14,17 +14,17 @@ let nixSyntaxHighlight = fetchFromGitHub { owner = "seitz"; repo = "nanonix"; - rev = "7483fd8b79f1f3f2179dbbd46aa400df4320ba10"; - sha256 = "10pv75kfrgnziz8sr83hdbb0c3klm2fmsdw3i5cpqqf5va1fzb8h"; + rev = "bf8d898efaa10dce3f7972ff765b58c353b4b4ab"; + sha256 = "0773s5iz8aw9npgyasb0r2ybp6gvy2s9sq51az8w7h52bzn5blnn"; }; in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.8"; + version = "3.0"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2"; + sha256 = "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From 73ae8e53e24bf5bf31dbf09b003bf2d4207321a0 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 9 Sep 2018 14:36:03 -0700 Subject: [PATCH 384/600] rPackages.RPostgres: fix configure paths and includes closes #46208 --- pkgs/development/r-modules/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 9bbab76d4a2f..a2c586c06a96 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -906,6 +906,14 @@ let TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"; }); + RPostgres = old.RPostgres.overrideDerivation (attrs: { + preConfigure = '' + export INCLUDE_DIR=${pkgs.postgresql}/include + export LIB_DIR=${pkgs.postgresql.lib}/lib + patchShebangs configure + ''; + }); + OpenMx = old.OpenMx.overrideDerivation (attrs: { preConfigure = '' patchShebangs configure From 8ccdd29578790ad643d83fcc67508f27c8a82981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 9 Sep 2018 23:19:41 +0100 Subject: [PATCH 385/600] vim-plugins: add missing update.py This file was accidentally not included in 953199fd829f0b9d3c3ed95cf2e1b138d2268a3b --- pkgs/misc/vim-plugins/update.py | 327 ++++++++++++++++++++++++++++++++ 1 file changed, 327 insertions(+) create mode 100755 pkgs/misc/vim-plugins/update.py diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py new file mode 100755 index 000000000000..fbdceea2a9af --- /dev/null +++ b/pkgs/misc/vim-plugins/update.py @@ -0,0 +1,327 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p python3 nix -i python3 + +# format: +# $ nix run nixpkgs.python3Packages.black -c black update.py +# type-check: +# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# linted: +# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py + +import functools +import json +import os +import subprocess +import sys +import traceback +import urllib.error +import urllib.request +import xml.etree.ElementTree as ET +from datetime import datetime +from multiprocessing.dummy import Pool +from pathlib import Path +from typing import Dict, List, Optional, Tuple, Union +from urllib.parse import urljoin, urlparse + +ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" +ATOM_LINK = "{http://www.w3.org/2005/Atom}link" +ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" + +ROOT = Path(__file__).parent + + +class Repo: + def __init__(self, owner: str, name: str) -> None: + self.owner = owner + self.name = name + + def url(self, path: str) -> str: + return urljoin(f"https://github.com/{self.owner}/{self.name}/", path) + + def __repr__(self) -> str: + return f"Repo({self.owner}, {self.name})" + + def has_submodules(self) -> bool: + try: + urllib.request.urlopen(self.url("blob/master/.gitmodules")).close() + except urllib.error.HTTPError as e: + if e.code == 404: + return False + else: + raise + return True + + def latest_commit(self) -> Tuple[str, datetime]: + with urllib.request.urlopen(self.url("commits/master.atom")) as req: + xml = req.read() + root = ET.fromstring(xml) + latest_entry = root.find(ATOM_ENTRY) + assert latest_entry is not None, f"No commits found in repository {self}" + commit_link = latest_entry.find(ATOM_LINK) + assert commit_link is not None, f"No link tag found feed entry {xml}" + url = urlparse(commit_link.get("href")) + updated_tag = latest_entry.find(ATOM_UPDATED) + assert ( + updated_tag is not None and updated_tag.text is not None + ), f"No updated tag found feed entry {xml}" + updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ") + return Path(url.path).name, updated + + def prefetch_git(self, ref: str) -> str: + data = subprocess.check_output( + ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref] + ) + return json.loads(data)["sha256"] + + def prefetch_github(self, ref: str) -> str: + data = subprocess.check_output( + ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")] + ) + return data.strip().decode("utf-8") + + +class Plugin: + def __init__( + self, + name: str, + commit: str, + has_submodules: bool, + sha256: str, + date: Optional[datetime] = None, + ) -> None: + self.name = name + self.commit = commit + self.has_submodules = has_submodules + self.sha256 = sha256 + self.date = date + + @property + def normalized_name(self) -> str: + return self.name.replace(".", "-") + + @property + def version(self) -> str: + assert self.date is not None + return self.date.strftime("%Y-%m-%d") + + def as_json(self) -> Dict[str, str]: + copy = self.__dict__.copy() + del copy["date"] + return copy + + +GET_PLUGINS = """(with import {}; +let + hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; + getChecksum = name: value: + if hasChecksum value then { + submodules = value.src.fetchSubmodules or false; + sha256 = value.src.outputHash; + rev = value.src.rev; + } else null; + checksums = lib.mapAttrs getChecksum vimPlugins; +in lib.filterAttrs (n: v: v != null) checksums)""" + + +def get_current_plugins() -> List[Plugin]: + out = subprocess.check_output(["nix", "eval", "--json", GET_PLUGINS]) + data = json.loads(out) + plugins = [] + for name, attr in data.items(): + p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"]) + plugins.append(p) + return plugins + + +def prefetch_plugin(user: str, repo_name: str, cache: "Cache") -> Plugin: + repo = Repo(user, repo_name) + commit, date = repo.latest_commit() + has_submodules = repo.has_submodules() + cached_plugin = cache[commit] + if cached_plugin is not None: + cached_plugin.date = date + return cached_plugin + + print(f"prefetch {user}/{repo_name}") + if has_submodules: + sha256 = repo.prefetch_git(commit) + else: + sha256 = repo.prefetch_github(commit) + + return Plugin(repo_name, commit, has_submodules, sha256, date=date) + + +def print_download_error(plugin: str, ex: Exception): + print(f"{plugin}: {ex}", file=sys.stderr) + ex_traceback = ex.__traceback__ + tb_lines = [ + line.rstrip("\n") + for line in traceback.format_exception(ex.__class__, ex, ex_traceback) + ] + print("\n".join(tb_lines)) + + +def check_results( + results: List[Tuple[str, str, Union[Exception, Plugin]]] +) -> List[Tuple[str, Plugin]]: + failures: List[Tuple[str, Exception]] = [] + plugins = [] + for (owner, name, result) in results: + if isinstance(result, Exception): + failures.append((name, result)) + else: + plugins.append((owner, result)) + + print(f"{len(results) - len(failures)} plugins were checked", end="") + if len(failures) == 0: + print() + else: + print(f", {len(failures)} plugin(s) could not be downloaded:\n") + + for (plugin, exception) in failures: + print_download_error(plugin, exception) + return plugins + + +def load_plugin_spec() -> List[Tuple[str, str]]: + plugin_file = ROOT.joinpath("vim-plugin-names") + plugins = [] + with open(plugin_file) as f: + for line in f: + spec = line.strip() + parts = spec.split("/") + if len(parts) != 2: + msg = f"Invalid repository {spec}, must be in the format owner/repo" + print(msg, file=sys.stderr) + sys.exit(1) + plugins.append((parts[0], parts[1])) + return plugins + + +def get_cache_path() -> Optional[Path]: + xdg_cache = os.environ.get("XDG_CACHE_HOME", None) + if xdg_cache is None: + home = os.environ.get("HOME", None) + if home is None: + return None + xdg_cache = str(Path(home, ".cache")) + + return Path(xdg_cache, "vim-plugin-cache.json") + + +class Cache: + def __init__(self, initial_plugins: List[Plugin]) -> None: + self.cache_file = get_cache_path() + + downloads = {} + for plugin in initial_plugins: + downloads[plugin.commit] = plugin + downloads.update(self.load()) + self.downloads = downloads + + def load(self) -> Dict[str, Plugin]: + if self.cache_file is None or not self.cache_file.exists(): + return {} + + downloads: Dict[str, Plugin] = {} + with open(self.cache_file) as f: + data = json.load(f) + for attr in data.values(): + p = Plugin( + attr["name"], attr["commit"], attr["has_submodules"], attr["sha256"] + ) + downloads[attr["commit"]] = p + return downloads + + def store(self) -> None: + if self.cache_file is None: + return + + os.makedirs(self.cache_file.parent, exist_ok=True) + with open(self.cache_file, "w+") as f: + data = {} + for name, attr in self.downloads.items(): + data[name] = attr.as_json() + json.dump(data, f, indent=4, sort_keys=True) + + def __getitem__(self, key: str) -> Optional[Plugin]: + return self.downloads.get(key, None) + + def __setitem__(self, key: str, value: Plugin) -> None: + self.downloads[key] = value + + +def prefetch( + args: Tuple[str, str], cache: Cache +) -> Tuple[str, str, Union[Exception, Plugin]]: + assert len(args) == 2 + owner, repo = args + try: + plugin = prefetch_plugin(owner, repo, cache) + cache[plugin.commit] = plugin + return (owner, repo, plugin) + except Exception as e: + return (owner, repo, e) + + +header = ( + "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!" +) + + +def generate_nix(plugins: List[Tuple[str, Plugin]]): + sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower()) + + with open(ROOT.joinpath("generated.nix"), "w+") as f: + f.write(header) + f.write( + """ +{ buildVimPluginFrom2Nix, fetchFromGitHub }: + +{""" + ) + for owner, plugin in sorted_plugins: + if plugin.has_submodules: + submodule_attr = "\n fetchSubmodules = true;" + else: + submodule_attr = "" + + f.write( + f""" + {plugin.normalized_name} = buildVimPluginFrom2Nix {{ + name = "{plugin.normalized_name}-{plugin.version}"; + src = fetchFromGitHub {{ + owner = "{owner}"; + repo = "{plugin.name}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}";{submodule_attr} + }}; + }}; +""" + ) + f.write("}") + print("updated generated.nix") + + +def main() -> None: + plugin_names = load_plugin_spec() + current_plugins = get_current_plugins() + cache = Cache(current_plugins) + + prefetch_with_cache = functools.partial(prefetch, cache=cache) + + try: + # synchronous variant for debugging + # results = map(prefetch_with_cache, plugins) + pool = Pool(processes=30) + results = pool.map(prefetch_with_cache, plugin_names) + finally: + cache.store() + + plugins = check_results(results) + + generate_nix(plugins) + + +if __name__ == "__main__": + main() From 8d2cd63c1be113622ab80b2fa5f598c3996ed995 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 8 Aug 2018 08:19:28 -0500 Subject: [PATCH 386/600] spidermonkey_52: don't use jemalloc w/musl --- pkgs/development/interpreters/spidermonkey/52.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index ecbb1abb40ca..7c6844fdec09 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { "--with-intl-api" "--enable-readline" "--enable-shared-js" - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc"; enableParallelBuilding = true; From 9bdec58bc0c67411c2ec66a0b937c240be49d497 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Sep 2018 18:26:41 -0500 Subject: [PATCH 387/600] wal-g: 0.1.10 -> 0.1.12 --- pkgs/tools/backup/wal-g/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index 9c2fb0c0b002..0cd18dae1c27 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -2,18 +2,18 @@ buildGoPackage rec { name = "wal-g-${version}"; - version = "0.1.10"; + version = "0.1.12"; src = fetchFromGitHub { owner = "wal-g"; repo = "wal-g"; rev = "v${version}"; - sha256 = "0klqnrrjzzxcj3clg7vapmbga1vqsfh8mkci5r2ir1bjp0z1xfnp"; + sha256 = "06k71xz96jpg6966xj48a8j07v0vk37b5v2k1bnqrbin4sma3s0c"; }; goPackagePath = "github.com/wal-g/wal-g"; meta = { - homepage = https://github.com/wal-g/wal-g; + inherit (src.meta) homepage; license = stdenv.lib.licenses.asl20; description = "An archival restoration tool for Postgres"; maintainers = [ stdenv.lib.maintainers.ocharles ]; From 13728ed2b59d929925411c4a3923bf01dd89f5d2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 9 Sep 2018 19:29:23 -0400 Subject: [PATCH 388/600] linux: 4.4.154 -> 4.4.155 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0872856c1190..66df462f5960 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.154"; + version = "4.4.155"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1j00y6hgj4c82y3j0gaqj68kf46fwxz1y5wx6ry5sgxnr3xp12z0"; + sha256 = "1nbd88x3m4w2ffwgjnf8ry5p2z7al54q1lvl2kv3fz8hmr5qq28q"; }; } // (args.argsOverride or {})) From d40f4159ed9d99ce46228af7b450e3ac956675b4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 9 Sep 2018 19:29:35 -0400 Subject: [PATCH 389/600] linux: 4.9.125 -> 4.9.126 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 068cf25f0053..1bd29569e011 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.125"; + version = "4.9.126"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jqi25ld83l57lzcbhrzdnmsj4isz686ivdj0wfsrgxyc7pxwr57"; + sha256 = "1davk0c760if20h3f9r18lcvb7lqzlx0chxlph7ld5nlaz3ncskd"; }; } // (args.argsOverride or {})) From 276b2ab8925a5dcf710c0e25b21b95f74f6089d2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 9 Sep 2018 19:29:46 -0400 Subject: [PATCH 390/600] linux: 4.14.68 -> 4.14.69 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index eee2b132ae29..58cc1ab25da4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.68"; + version = "4.14.69"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1446sbyysrv6hws35nnippa1mz4g31w7sc433svg4fq3jwavy7br"; + sha256 = "1w0r7g04q9ac14krm5dmvl8sv88avsmdirvnfk964cz3n3xxbgb1"; }; } // (args.argsOverride or {})) From ea765b2e2b7bf4a5301650917ae96c516c6e198c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 9 Sep 2018 19:30:23 -0400 Subject: [PATCH 391/600] linux: 4.18.6 -> 4.18.7 --- pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 22bbd73f9859..f6f92d65938b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.6"; + version = "4.18.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1518q822fs28sfdqwsibj3bpibzj5r2dqfr0skv7l8cid3yrgnq5"; + sha256 = "0cgpb8zx7ckd9lmmaas6r1vszbz9lhrn4w1njw3yaw9a4rg44fzh"; }; } // (args.argsOverride or {})) From cf3795a25ecbd00e6d5dc7125806fe2785b67afd Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 9 Sep 2018 20:34:47 -0400 Subject: [PATCH 392/600] dbeaver: 5.1.6 -> 5.2.0 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 35698a323319..77cad142d41d 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.6"; + version = "5.2.0"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1zypadnyhinm6mfv91s7zs2s55bhzgkqhl6ai6x3yqwhvayc02nn"; + sha256 = "13j2qc4g24d2gmkxj9zpqrcbai9aq8rassrq3c9mp9ir6sf4q0jf"; }; installPhase = '' From 78bc2f9800db2036471963702e038b4f9371593d Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 10 Sep 2018 02:39:28 +0000 Subject: [PATCH 393/600] aseprite-unfree: 1.2.4 -> 1.2.9 --- .../applications/editors/aseprite/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 429b2430fce2..7af3742349a6 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig +, curl, freetype, giflib, harfbuzz, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , libX11, libXext, libXcursor, libXxf86vm , unfree ? false , cmark @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "aseprite-${version}"; - version = if unfree then "1.2.4" else "1.1.7"; + version = if unfree then "1.2.9" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,16 +19,27 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "1rnf4a8vgddz8x55rpqaihlxmqip1kgpdhqb4d3l71h1zmidg5k3" + then "0a9xk163j0984n8nn6pqf27n83gr6w7g25wkiv591zx88pa6cpbd" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib + curl freetype giflib harfbuzz libjpeg libpng libwebp pixman tinyxml zlib libX11 libXext libXcursor libXxf86vm - ] ++ lib.optionals unfree [ cmark ]; + ] ++ lib.optionals unfree [ cmark harfbuzz ]; + + patches = lib.optionals unfree [ + (fetchpatch { + url = "https://github.com/aseprite/aseprite/commit/cfb4dac6feef1f39e161c23c886055a8f9acfd0d.patch"; + sha256 = "1qhjfpngg8b1vvb9w26lhjjfamfx57ih0p31km3r5l96nm85l7f9"; + }) + (fetchpatch { + url = "https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17.patch"; + sha256 = "1vwn8ivap1pzdh444sdvvkndp55iz146nhmd80xbm8cyzn3qmg91"; + }) + ]; postPatch = '' sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-" @@ -49,6 +60,7 @@ stdenv.mkDerivation rec { "-DWITH_WEBP_SUPPORT=ON" ] ++ lib.optionals unfree [ "-DUSE_SHARED_CMARK=ON" + "-DUSE_SHARED_HARFBUZZ=ON" # Aseprite needs internal freetype headers. "-DUSE_SHARED_FREETYPE=OFF" # Disable libarchive programs. From bbf37b8c4528ac080b691226ada83305e2159917 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Mon, 3 Sep 2018 22:46:25 +0900 Subject: [PATCH 394/600] emacs: allow X and cli-only builds on Darwin --- pkgs/applications/editors/emacs/default.nix | 32 ++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 0a304fabe600..c1bfdf8157da 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,8 +4,9 @@ , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , systemd ? null , withX ? !stdenv.isDarwin -, withGTK2 ? false, gtk2 ? null -, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null +, withNS ? stdenv.isDarwin +, withGTK2 ? false, gtk2-x11 ? null +, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null @@ -13,10 +14,12 @@ assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise -assert withGTK2 -> withX || stdenv.isDarwin; -assert withGTK3 -> withX || stdenv.isDarwin; -assert withGTK2 -> !withGTK3 && gtk2 != null; -assert withGTK3 -> !withGTK2 && gtk3 != null; +assert withNS -> !withX; +assert withNS -> stdenv.isDarwin; +assert (withGTK2 && !withNS) -> withX; +assert (withGTK3 && !withNS) -> withX; +assert withGTK2 -> !withGTK3 && gtk2-x11 != null; +assert withGTK3 -> !withGTK2 && gtk3-x11 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; let @@ -56,19 +59,22 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gconf m17n_lib libotf ] - ++ lib.optional (withX && withGTK2) gtk2 - ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] + imagemagick gconf ] + ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] + ++ lib.optional (withX && withGTK2) gtk2-x11 + ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo ++ lib.optionals (withX && withXwidgets) [ webkitgtk ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; + propagatedBuildInputs = lib.optionals withNS [ AppKit GSS ImageIO ]; hardeningDisable = [ "format" ]; configureFlags = [ "--with-modules" ] ++ - (if stdenv.isDarwin - then [ "--with-ns" "--disable-ns-self-contained" ] + (lib.optional stdenv.isDarwin + (lib.withFeature withNS "ns")) ++ + (if withNS + then [ "--disable-ns-self-contained" ] else if withX then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" @@ -103,7 +109,7 @@ stdenv.mkDerivation rec { cp $srcdir/TAGS $dstdir echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString withNS '' mkdir -p $out/Applications mv nextstep/Emacs.app $out/Applications ''; From f7888652b89691930eccd1a5937934d5fd5e7703 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 10:20:01 -0700 Subject: [PATCH 395/600] stunnel: 5.46 -> 5.49 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from stunnel --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index bbef1f285c33..d2b9a54183d0 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.46"; + version = "5.49"; src = fetchurl { url = "https://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1iw4gap9ysag8iww2ik029scmdllk7jdzcpnnbj7hgbl526b9akn"; + sha256 = "0plmdnwmhjjganhprsw9a8w3h5w43hyirpizy8cmq5w278hl2rix"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; From 6682d041426f814e9cf57895f71a16caae1f62f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 23:42:12 -0700 Subject: [PATCH 396/600] duo-unix: 1.9.20 -> 1.10.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/duo-unix/versions --- pkgs/tools/security/duo-unix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 729f85a73fce..3ef07c44f501 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "duo-unix-${version}"; - version = "1.9.20"; + version = "1.10.4"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "0zxrpdbgi8k8jbqg5yxjv3b0lz9kpk89pglwb3lqlvzscbxdv5qj"; + sha256 = "1pbl6ii7sh66i277s5mqpnv092jd2q52qis3ar4lwy4mywfvrhjp"; }; buildInputs = [ pam openssl zlib ]; From aba0fe5d62d35638ee1fd9be2d6cb0c84c6ac403 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 17:00:47 -0700 Subject: [PATCH 397/600] metabase: 0.30.0 -> 0.30.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from metabase --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 5387a93b5e62..ac6dd44a8441 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.30.0"; + version = "0.30.1"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1wnzd2g1qxqpqjsqq1kfr0zrvjvqg54dvznbhf3637b0iqq3ahkh"; + sha256 = "13035yhbhsr4xg48hanbf8qchwyk6j59c90qkbjr914xcyvj6scc"; }; nativeBuildInputs = [ makeWrapper ]; From 1700698691b24b845bfd22414bd068b307fbdad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 17:55:37 -0700 Subject: [PATCH 398/600] lttng-ust: 2.10.1 -> 2.10.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from lttng-ust --- pkgs/development/tools/misc/lttng-ust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index b708ce490d29..039e5b1ec542 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.1"; + version = "2.10.2"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "17gfi1dn6bgg59qn4ihf8hag96lalx0g7dym2ccpzdz7f45krk07"; + sha256 = "0if0hrs32r98sp85c8c63zpgy5xjw6cx8wrs65xq227b0jwj5jn4"; }; buildInputs = [ python ]; From f188e90ba1aeb5cef6011324be41af19558cc6e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 14:04:32 -0700 Subject: [PATCH 399/600] qmmp: 1.2.2 -> 1.2.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from qmmp --- pkgs/applications/audio/qmmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index dc12baefed14..f58e75c9e263 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.2.2"; + name = "qmmp-1.2.3"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "01nnyg8m3p3px1fj3lfsqqv9zh1388dwx1bm2qv4v87jywimgp79"; + sha256 = "05lqmj22vr5ch1i0928d64ybdnn3qc66s9lgarx5s6x6ffr6589j"; }; buildInputs = From b7c0e4079646ad816366754283f06d872de2b219 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Mon, 10 Sep 2018 09:13:30 +0300 Subject: [PATCH 400/600] rclone: 1.43 -> 1.43.1 (#46448) --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 54d612387ac4..13e69427aa48 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.43"; + version = "1.43.1"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "1khg5jsrjmnblv8zg0zqs1n0hmjv05pjj94m9d7jbp9d936lxsxx"; + sha256 = "0iz427gdm8cxx3kbjmhw7jsvi9j0ppb5aqcq4alwf72fvpvql3mx"; }; outputs = [ "bin" "out" "man" ]; From 8fc2799e02975c7f44c761db6959af9804478649 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 10 Sep 2018 01:14:37 -0500 Subject: [PATCH 401/600] qemu: port musl patch to new version (#46449) --- .../virtualization/qemu/default.nix | 5 +--- .../virtualization/qemu/sigrtminmax.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/virtualization/qemu/sigrtminmax.patch diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bbb2a099666b..596bc9dd9e09 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -84,10 +84,7 @@ stdenv.mkDerivation rec { url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch; sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; }) - (fetchpatch { - url = https://raw.githubusercontent.com/alpinelinux/aports/61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch; - sha256 = "1ar6r1vpmhnbs72v6mhgyahcjcf7b9b4xi7asx17sy68m171d2g6"; - }) + ./sigrtminmax.patch (fetchpatch { url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch; sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; diff --git a/pkgs/applications/virtualization/qemu/sigrtminmax.patch b/pkgs/applications/virtualization/qemu/sigrtminmax.patch new file mode 100644 index 000000000000..41050447ac64 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/sigrtminmax.patch @@ -0,0 +1,30 @@ +From 2697fcc42546e814a2d2617671cb8398b15256fb Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Fri, 17 Aug 2018 00:22:35 -0500 +Subject: [PATCH] quick port __SIGRTMIN/__SIGRTMAX patch for qemu 3.0 + +--- + linux-user/signal.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/linux-user/signal.c b/linux-user/signal.c +index 602b631b92..87f9240134 100644 +--- a/linux-user/signal.c ++++ b/linux-user/signal.c +@@ -26,6 +26,13 @@ + #include "trace.h" + #include "signal-common.h" + ++#ifndef __SIGRTMIN ++#define __SIGRTMIN 32 ++#endif ++#ifndef __SIGRTMAX ++#define __SIGRTMAX (NSIG-1) ++#endif ++ + struct target_sigaltstack target_sigaltstack_used = { + .ss_sp = 0, + .ss_size = 0, +-- +2.18.0 + From 30500d23bcd1c0d0b36bf8a56a5bc174d947b659 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 10 Sep 2018 01:43:55 -0500 Subject: [PATCH 402/600] busybox: 1.29.2 -> 1.29.3 (#46458) --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 69fe94a1fe47..71ad6203e325 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -32,14 +32,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.2"; + name = "busybox-1.29.3"; # 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 = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "0qax9926qx9lpxiw75f4hkknz1pg0zcn5pkjx5gqfibs2ipgmlk7"; + sha256 = "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; From ba5176551e2facd5c9e4d43c0b1393f5608a058a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 10 Sep 2018 03:47:17 -0300 Subject: [PATCH 403/600] dtkwm: init at 2.0.9 (#46461) --- pkgs/desktops/deepin/default.nix | 1 + pkgs/desktops/deepin/dtkwm/default.nix | 39 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/desktops/deepin/dtkwm/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 49da151eefee..99ae05642d97 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -17,6 +17,7 @@ let wnck = pkgs.libwnck3; }; dtkcore = callPackage ./dtkcore { }; + dtkwm = callPackage ./dtkwm { }; dtkwidget = callPackage ./dtkwidget { }; go-dbus-factory = callPackage ./go-dbus-factory { }; go-dbus-generator = callPackage ./go-dbus-generator { }; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix new file mode 100644 index 000000000000..46ed7bcc3bef --- /dev/null +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dtkwm"; + version = "2.0.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0vkx6vlz83pgawhdwqkwpq3dy8whxmjdzfpgrvm2m6jmspfk9bab"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + ]; + + buildInputs = [ + dtkcore + qtx11extras + ]; + + preConfigure = '' + qmakeFlags="$qmakeFlags \ + QT_HOST_DATA=$out \ + INCLUDE_INSTALL_DIR=$out/include \ + LIB_INSTALL_DIR=$out/lib" + ''; + + meta = with stdenv.lib; { + description = "Deepin graphical user interface library"; + homepage = https://github.com/linuxdeepin/dtkwm; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} From e5b904818b656a596a541ee9f6ac694c8bda2476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 10 Sep 2018 03:48:02 -0300 Subject: [PATCH 404/600] dde-calendar: init at 1.2.5 (#46460) --- pkgs/desktops/deepin/dde-calendar/default.nix | 44 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/desktops/deepin/dde-calendar/default.nix diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix new file mode 100644 index 000000000000..ad6b0f1912a6 --- /dev/null +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, + deepin-gettext-tools, dtkcore, dtkwidget +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dde-calendar"; + version = "1.2.5"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1a5zxpz7zncw6mrzv8zmn0j1vk0c8fq0m1xhmnwllffzybrhn4y7"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + qttools + deepin-gettext-tools + ]; + + buildInputs = [ + dtkcore + dtkwidget + ]; + + postPatch = '' + patchShebangs . + sed -i translate_desktop.sh \ + -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," + sed -i com.deepin.Calendar.service \ + -e "s,/usr,$out," + ''; + + meta = with stdenv.lib; { + description = "Calendar for Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/dde-calendar; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 99ae05642d97..d2e5536a74aa 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -4,6 +4,7 @@ let packages = self: with self; { dbus-factory = callPackage ./dbus-factory { }; + dde-calendar = callPackage ./dde-calendar { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; From 6852e6ed253c16e4a088297357ada8681f52e72a Mon Sep 17 00:00:00 2001 From: Jethro Kuan Date: Mon, 10 Sep 2018 17:29:30 +0800 Subject: [PATCH 405/600] init et-book package --- maintainers/maintainer-list.nix | 5 +++++ pkgs/data/fonts/et-book/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/et-book/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ecec7bbaf7e3..3ed1957650d2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1847,6 +1847,11 @@ github = "jerith666"; name = "Matt McHenry"; }; + jethro = { + email = "jethrokuan95@gmail.com"; + github = "jethrokuan"; + name = "Jethro Kuan"; + }; jfb = { email = "james@yamtime.com"; github = "tftio"; diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix new file mode 100644 index 000000000000..79f2a2e66ca7 --- /dev/null +++ b/pkgs/data/fonts/et-book/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub }: + +fetchFromGitHub rec { + rev = "1.0"; + name = "et-book-${rev}"; + owner = "jethrokuan"; + repo = "et-book"; + sha256 = "1bfb1l8k7fzgk2l8cikiyfn5x9m0fiwrnsbc1483p8w3qp58s5n2"; + + postFetch = '' + tar -xzf $downloadedFile + mkdir -p $out/share/fonts/truetype + cp -t $out/share/fonts/truetype ${name}/*.ttf + ''; + + meta = with stdenv.lib; { + description = "Font for ET Book"; + license = licenses.free; + platforms = platforms.all; + maintainers = with maintainers; [ jethro ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd7dca53c84c..02a53902f815 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -151,6 +151,8 @@ with pkgs; ebook2cw = callPackage ../applications/misc/ebook2cw { }; + etBook = callPackage ../data/fonts/et-book { }; + fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; From ee897b64ffc87c75b32d01882be82d442615eedd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 Sep 2018 16:08:52 +0200 Subject: [PATCH 406/600] pythonPackages.mahotas: fix build, move expression See https://hydra.nixos.org/build/80828287 Moves `mahotas` out of `python-packages.nix` into its own file and fixes broken test cases by skipping them using nosetest's `@nottest` annotation. These tests broke from time to time in a sandbox and are therefore considered impure. Addresses #45960 --- .../python-modules/mahotas/default.nix | 33 ++++++++++++++++++ .../mahotas/disable-impure-tests.patch | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +--------------- 3 files changed, 68 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/mahotas/default.nix create mode 100644 pkgs/development/python-modules/mahotas/disable-impure-tests.patch diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix new file mode 100644 index 000000000000..a7e92e0b5b8e --- /dev/null +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, stdenv }: + +buildPythonPackage rec { + pname = "mahotas"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "luispedro"; + repo = "mahotas"; + rev = "v${version}"; + sha256 = "1d2hciag5sxw00qj7qz7lbna477ifzmpgl0cv3xqzjkhkn5m4d7r"; + }; + + # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed + patches = [ ./disable-impure-tests.patch ]; + + propagatedBuildInputs = [ numpy imread pillow scipy ]; + checkInputs = [ nose ]; + + checkPhase= '' + python setup.py test + ''; + + disabled = stdenv.isi686; # Failing tests + + meta = with stdenv.lib; { + description = "Computer vision package based on numpy"; + homepage = http://mahotas.readthedocs.io/; + maintainers = with maintainers; [ luispedro ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch new file mode 100644 index 000000000000..a61503f9522e --- /dev/null +++ b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch @@ -0,0 +1,34 @@ +diff --git a/mahotas/tests/test_colors.py b/mahotas/tests/test_colors.py +index 8a8183b..0d34c9f 100644 +--- a/mahotas/tests/test_colors.py ++++ b/mahotas/tests/test_colors.py +@@ -2,7 +2,9 @@ import mahotas + import numpy as np + from mahotas.tests.utils import luispedro_jpg + from mahotas.colors import rgb2xyz, rgb2lab, xyz2rgb, rgb2grey, rgb2sepia ++from nose.tools import nottest + ++@nottest + def test_colors(): + f = luispedro_jpg() + lab = rgb2lab(f) +diff --git a/mahotas/tests/test_features_shape.py b/mahotas/tests/test_features_shape.py +index 462f467..2381793 100644 +--- a/mahotas/tests/test_features_shape.py ++++ b/mahotas/tests/test_features_shape.py +@@ -2,6 +2,7 @@ import mahotas.features.shape + import numpy as np + import mahotas as mh + from mahotas.features.shape import roundness, eccentricity ++from nose.tools import nottest + + def test_eccentricity(): + D = mh.disk(32, 2) +@@ -29,6 +30,7 @@ def test_zeros(): + I[8:4:12] = 1 + assert eccentricity(I) == 0 + ++@nottest + def test_ellipse_axes(): + Y,X = np.mgrid[:1024,:1024] + Y = Y/1024. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2eae6212cd4d..7437443ad9c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1712,35 +1712,7 @@ in { idna = callPackage ../development/python-modules/idna { }; - mahotas = buildPythonPackage rec { - name = "python-mahotas-${version}"; - version = "1.4.2"; - - src = pkgs.fetchurl { - url = "https://github.com/luispedro/mahotas/archive/v${version}.tar.gz"; - sha256 = "1mvsxh0pa5vdvbknlv1m68n7gw2cv4pyqgqp3r770rnmf6nxbp7m"; - }; - - buildInputs = with self; [ - nose - pillow - scipy - ]; - propagatedBuildInputs = with self; [ - numpy - imread - ]; - - disabled = stdenv.isi686; # Failing tests - - meta = with stdenv.lib; { - description = "Computer vision package based on numpy"; - homepage = http://mahotas.readthedocs.io/; - maintainers = with maintainers; [ luispedro ]; - license = licenses.mit; - platforms = platforms.linux; - }; - }; + mahotas = callPackage ../development/python-modules/mahotas { }; MDP = callPackage ../development/python-modules/mdp {}; From a2bb5d69173623a4ab7d84a4e1af2aa310be09cc Mon Sep 17 00:00:00 2001 From: Toon Nolten Date: Mon, 10 Sep 2018 11:48:49 +0200 Subject: [PATCH 407/600] ranger: 1.9.1 -> 1.9.2 (#46454) * ranger: 1.9.1 -> 1.9.2 * Change maintainer attribute name to match usage --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/misc/ranger/default.nix | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ecec7bbaf7e3..5397845d728a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4163,6 +4163,11 @@ github = "tomsmeets"; name = "Tom Smeets"; }; + toonn = { + email = "nnoot@toonn.io"; + github = "toonn"; + name = "Toon Nolten"; + }; travisbhartwell = { email = "nafai@travishartwell.net"; github = "travisbhartwell"; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 33b8c33033ea..6d883d89de31 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -7,13 +7,13 @@ assert imagePreviewSupport -> w3m != null; python3Packages.buildPythonApplication rec { name = "ranger-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; rev = "v${version}"; - sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj"; + sha256= "1ws6g8z1m1hfp8bv4msvbaa9f7948p687jmc8h69yib4jkv3qyax"; }; checkInputs = with python3Packages; [ pytest ]; @@ -51,6 +51,6 @@ python3Packages.buildPythonApplication rec { homepage = http://ranger.github.io/; license = licenses.gpl3; platforms = platforms.unix; - maintainers = [ maintainers.magnetophon ]; + maintainers = [ maintainers.toonn maintainers.magnetophon ]; }; } From 00064c21cc328fb96b631917220acbc26f232f96 Mon Sep 17 00:00:00 2001 From: Amine Chikhaoui Date: Mon, 10 Sep 2018 11:53:45 +0200 Subject: [PATCH 408/600] ZHF 18.09: fix crypsetup build with python enabled. (#46468) Fixes https://hydra.nixos.org/build/81028247. --- pkgs/os-specific/linux/cryptsetup/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 2b5c3817ddf7..4eec4754ca9a 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs tests + ${stdenv.lib.optionalString enablePython '' + patchShebangs ./python/pycryptsetup-test.py + ''} # O_DIRECT is filesystem dependent and fails in a sandbox (on tmpfs) # and on several filesystem types (btrfs, zfs) without sandboxing. From 6d6cbd316d5f5c12c002c86b919d1f923b0d87fe Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Sep 2018 11:59:51 +0200 Subject: [PATCH 409/600] pythonmagick: fix build (#46469) The original build broke with the following linker issue: ``` CXXLD _PythonMagick.la /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/ld: cannot find -l-L/nix/store/4gh6ynzsd5ndx37hmkl62xa8z30k43y1-imagemagick-6.9.9-34/lib collect2: error: ld returned 1 exit status ``` This happens since `BOOST_PYTHON_LIB` wasn't set properly, however `_PythonMagick.la` was linked with `-l$(BOOST_PYTHON_LIB) $(MAGICK_LIBS)`. With an empty `BOOST_PYTHON_LIB` the linker got confused. To work around this, the `boost` library directory needs to be specified explicitly. To ensure that the changes take effect, the original `configure` script shipped with `$src` needs to be removed and recreated using the `autoreconfHook`. Additionally the `imagemagick` license (https://spdx.org/licenses/ImageMagick.html) needs to be added to `lib/licenses.nix` to document the proper license of `pythonmagick` in the meta section. --- lib/licenses.nix | 5 +++++ .../graphics/PythonMagick/default.nix | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 6f0e4217c196..c4db280645a4 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -355,6 +355,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Independent JPEG Group License"; }; + imagemagick = spdx { + fullName = "ImageMagick License"; + spdxId = "imagemagick"; + }; + inria-compcert = { fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler"; url = "http://compcert.inria.fr/doc/LICENSE"; diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index f0b4a991f74a..938df76e2572 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -1,6 +1,6 @@ # This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`. -{stdenv, fetchurl, python, boost, pkgconfig, imagemagick}: +{ stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }: stdenv.mkDerivation rec { name = "pythonmagick-${version}"; @@ -11,10 +11,18 @@ stdenv.mkDerivation rec { sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [python boost imagemagick]; + postPatch = '' + rm configure + ''; - meta = { + configureFlags = [ "--with-boost=${python.pkgs.boost}" ]; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ python python.pkgs.boost imagemagick ]; + + meta = with stdenv.lib; { homepage = http://www.imagemagick.org/script/api.php; + license = licenses.imagemagick; + description = "PythonMagick provides object oriented bindings for the ImageMagick Library."; }; } From 080b2fdd8c756f9784ab0940f256ef65c3e444fa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Sep 2018 13:00:00 +0200 Subject: [PATCH 410/600] openbsm: fix linux build See https://hydra.nixos.org/build/80705916 To fix the linux build the patch `bsm-add-audit_token_to_pid.patch` mustn't be applied during Linux builds, only for Darwin as it's an Apple-only fix. The compiler failure occurred because `audit_token_t` is part of `` which is not available on Linux. Addresses #45960 --- pkgs/development/libraries/openbsm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix index a9559c6abfba..136665425280 100644 --- a/pkgs/development/libraries/openbsm/default.nix +++ b/pkgs/development/libraries/openbsm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; }; - patches = [ ./bsm-add-audit_token_to_pid.patch ]; + patches = lib.optional stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ]; meta = { homepage = http://www.openbsm.org/; From 02feb90d4e2bd9f2ad000a1a5a4a1d621f79aea9 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 10 Sep 2018 13:34:28 +0200 Subject: [PATCH 411/600] safe-money: Fix dependencies for safe-money-* They all depend on safe-money-0.7, but hackage2nix made them incorrectly depend on safe-money-0.6 We should be able to remove this 'hack' as soon as the new Stackage LTS comes out, as safe-money-0.7 will then be the default version. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ef55272d6e97..2e293f1031b0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1130,4 +1130,12 @@ self: super: { # https://github.com/snapframework/xmlhtml/pull/37 xmlhtml = doJailbreak super.xmlhtml; + + # https://github.com/NixOS/nixpkgs/issues/46467 + safe-money-aeson = super.safe-money-aeson.override { safe-money = self.safe-money_0_7; }; + safe-money-store = super.safe-money-store.override { safe-money = self.safe-money_0_7; }; + safe-money-cereal = super.safe-money-cereal.override { safe-money = self.safe-money_0_7; }; + safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; }; + safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From ac679e721f257b408006fd88645c0738799e0b4c Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 10 Sep 2018 13:22:24 +0100 Subject: [PATCH 412/600] earlyoom: fix version number (#46481) earlyoom's Makefile attempts to detect the current version using git, but we don't keep .git in its source, so this fails. We can however set the VERSION environment variable to override this, as we now do. --- pkgs/os-specific/linux/earlyoom/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 081996dfd42b..52333c109ee0 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "earlyoom-${version}"; - version = "0.11"; + name = "earlyoom-${VERSION}"; + # This environment variable is read by make to set the build version. + VERSION = "0.11"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; - rev = "08b7ed8e72feed2eec2e558ba2cfacbf6d469594"; + rev = "v${VERSION}"; sha256 = "1k3xslb70fzk80wlka32l0k2v45qn1xgwyjkjiz85gv6v4mv92vl"; }; installPhase = '' - mkdir -p $out/bin - cp earlyoom $out/bin + install -D earlyoom $out/bin/earlyoom ''; meta = { From d1818ad6b10e8880f166a0c678389ea89dec88ce Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Mon, 10 Sep 2018 15:12:22 +1000 Subject: [PATCH 413/600] bazel: add bazel_jdk10 variant --- .../development/tools/build-managers/bazel/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 6a25aef8b36a..49d6abdc0098 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,11 +1,13 @@ { stdenv, lib, fetchurl, fetchpatch, runCommand, makeWrapper , jdk, zip, unzip, bash, writeCBin, coreutils , which, python, perl, gnused, gnugrep, findutils +# Apple dependencies +, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation +# Allow to independently override the jdks used to build and run respectively +, buildJdk ? jdk, runJdk ? jdk # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false -# Apple dependencies -, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation }: let @@ -152,7 +154,7 @@ stdenv.mkDerivation rec { + genericPatches; buildInputs = [ - jdk + buildJdk ]; nativeBuildInputs = [ @@ -190,7 +192,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mv output/bazel $out/bin - wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}" + wrapProgram "$out/bin/bazel" --set JAVA_HOME "${runJdk}" mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26409db6d01d..230f077602fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7954,6 +7954,11 @@ with pkgs; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; }; + bazel_jdk10 = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + runJdk = jdk10; + }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; From 162a176d34bf828985d442462732ebe3f7d6e0f3 Mon Sep 17 00:00:00 2001 From: Jethro Kuan Date: Mon, 10 Sep 2018 22:18:12 +0800 Subject: [PATCH 414/600] update to use original repo --- pkgs/data/fonts/et-book/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix index 79f2a2e66ca7..cbbc75f32855 100644 --- a/pkgs/data/fonts/et-book/default.nix +++ b/pkgs/data/fonts/et-book/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub }: fetchFromGitHub rec { - rev = "1.0"; - name = "et-book-${rev}"; - owner = "jethrokuan"; + rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; + name = "et-book-${builtins.substring 0 6 rev}"; + owner = "edwardtufte"; repo = "et-book"; sha256 = "1bfb1l8k7fzgk2l8cikiyfn5x9m0fiwrnsbc1483p8w3qp58s5n2"; postFetch = '' tar -xzf $downloadedFile mkdir -p $out/share/fonts/truetype - cp -t $out/share/fonts/truetype ${name}/*.ttf + cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf ''; meta = with stdenv.lib; { From 96b25ee5bd0616b278b7658f8c52db398cbbcb28 Mon Sep 17 00:00:00 2001 From: Jethro Kuan Date: Mon, 10 Sep 2018 22:31:41 +0800 Subject: [PATCH 415/600] fix wrong license --- pkgs/data/fonts/et-book/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix index cbbc75f32855..58586ba7db65 100644 --- a/pkgs/data/fonts/et-book/default.nix +++ b/pkgs/data/fonts/et-book/default.nix @@ -14,8 +14,8 @@ fetchFromGitHub rec { ''; meta = with stdenv.lib; { - description = "Font for ET Book"; - license = licenses.free; + description = "The typeface used in Edward Tufte’s books."; + license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jethro ]; }; From 7c96603af93e0066bfd9a078813a9c9152ba9e9e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 9 Sep 2018 20:42:59 -0400 Subject: [PATCH 416/600] pacman: substitute paths in repo-add --- pkgs/tools/package-management/pacman/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 8423caa49d59..461e8ff1ec5d 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ perl libarchive openssl zlib bzip2 lzma ]; + postFixup = '' + substituteInPlace $out/bin/repo-add \ + --replace bsdtar "${libarchive}/bin/bsdtar" + ''; + meta = with lib; { description = "A simple library-based package manager"; homepage = https://www.archlinux.org/pacman/; From 4a6b5503aaaa5ec280d6bb09919789f31db0fd17 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 10 Sep 2018 11:40:41 -0400 Subject: [PATCH 417/600] linux: 4.19-rc2 -> 4.19-rc3 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1f45348824a0..3be377205824 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.19-rc2"; - modDirVersion = "4.19.0-rc2"; + version = "4.19-rc3"; + modDirVersion = "4.19.0-rc3"; extraMeta.branch = "4.19"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0a5ip4dxv5y1mdi03m5rnz2l9k6kv30gciss6fag41lwsfwwln3z"; + sha256 = "0n372r1j3m2q47hwl8b1r57jq1b4fdhmadgvcvik6fpsvcw74w27"; }; # Should the testing kernels ever be built on Hydra? From 404b224529c59e485e1ea062d22e4f7581373070 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 10 Sep 2018 17:47:58 +0100 Subject: [PATCH 418/600] govendor: init at 1.0.9 (#46485) --- pkgs/development/tools/govendor/default.nix | 22 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/govendor/default.nix diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix new file mode 100644 index 000000000000..2030c8ba444a --- /dev/null +++ b/pkgs/development/tools/govendor/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "govendor-${version}"; + version = "1.0.9"; + + goPackagePath = "github.com/kardianos/govendor"; + + src = fetchFromGitHub { + owner = "kardianos"; + repo = "govendor"; + rev = "v${version}"; + sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/kardianos/govendor"; + description = "Go vendor tool that works with the standard vendor file"; + license = licenses.bsd3; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2243d3324a55..7961a769fac0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14466,6 +14466,8 @@ with pkgs; govers = callPackage ../development/tools/govers { }; + govendor = callPackage ../development/tools/govendor { }; + gotools = callPackage ../development/tools/gotools { }; gotop = callPackage ../tools/system/gotop { }; From fe1d9edfa7c7a25384bef968a6282542eac55849 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 10 Sep 2018 19:58:29 +0200 Subject: [PATCH 419/600] androidStudioPackages.beta: 3.2.0.24 -> 3.2.0.25 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 199793a44fb7..38d252b345d1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2"; }; betaVersion = { - version = "3.2.0.24"; # "Android Studio 3.2 RC 2" - build = "181.4974118"; - sha256Hash = "0sj848pzpsbmnfi2692gg73v6m72hr1pwlk5x8q912w60iypi3pz"; + version = "3.2.0.25"; # "Android Studio 3.2 RC 3" + build = "181.4987877"; + sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp"; }; latestVersion = { # canary & dev version = "3.3.0.7"; # "Android Studio 3.3 Canary 8" From 08b89237748ff446b6063dd8c2d7eb0626cce342 Mon Sep 17 00:00:00 2001 From: Oscar Vargas Torres Date: Mon, 10 Sep 2018 13:32:33 -0500 Subject: [PATCH 420/600] ammonite: 1.1.2 -> 1.2.0 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index f139e296d35e..0e98d63fdd3e 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.1.2"; + version = "1.2.0"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "1balr7ya7xlyq32jwb0w9c4klnw13mdn2c5azkwngq5cp29yrfrc"; + sha256 = "08kh4j9jsg3c3ks9q5f01i13d1ak701vjviy5wb3y6xsajg62nfj"; }; propagatedBuildInputs = [ jre ] ; From 8f4c5c72accb86392f218a05e80d5bf655f0a0b5 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 10 Sep 2018 20:50:27 +0200 Subject: [PATCH 421/600] vimPlugins: Fix update.py, add/update plugins --- pkgs/misc/vim-plugins/default.nix | 23 +- pkgs/misc/vim-plugins/generated.nix | 437 +++++++++++++++++++------ pkgs/misc/vim-plugins/update.py | 12 +- pkgs/misc/vim-plugins/vim-plugin-names | 25 +- 4 files changed, 375 insertions(+), 122 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 0b6ad80acbdb..4507b1125df8 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -111,7 +111,7 @@ self = generated // (with generated; { ''; }); - command-t = command-t.overrideAttrs(old: { + command_T = command_T.overrideAttrs(old: { buildInputs = [ ruby rake ]; buildPhase = '' rake make @@ -309,7 +309,7 @@ self = generated // (with generated; { ''; }); - YankRing-vim = YankRing-vim.overrideAttrs(old: { + yankring = yankring.overrideAttrs(old: { sourceRoot = "."; }); @@ -332,9 +332,9 @@ self = generated // (with generated; { }; }); }) // lib.optionalAttrs (config.allowAliases or true) (with self; { - # aliasess + # aliases airline = vim-airline; - alternative = a-vim; # backwards compat, added 2014-10-21 + a-vim = alternative; # backwards compat, added 2018-09-10 bats = bats-vim; calendar = calendar-vim; coffee-script = vim-coffee-script; @@ -343,9 +343,8 @@ self = generated // (with generated; { solarized = vim-colors-solarized; colors-solarized = vim-colors-solarized; caw = caw-vim; - colorsamplerpack = Colour_Sampler_Pack; - Colour_Sampler_Pack = Colour-Sampler-Pack; - command_T = command-t; # backwards compat, added 2014-10-18 + Colour_Sampler_Pack = colorsamplerpack; + command-t = command_T; # backwards compat, added 2018-09-10 commentary = vim-commentary; committia = committia-vim; concealedyank = concealedyank-vim; @@ -382,7 +381,7 @@ self = generated // (with generated; { latex-live-preview = vim-latex-live-preview; maktaba = vim-maktaba; multiple-cursors = vim-multiple-cursors; - necoGhc = neco-ghc; # backwards compat, added 2014-10-18 + neco-ghc = necoGhc; # backwards compat, added 2018-09-10 neocomplete = neocomplete-vim; neoinclude = neoinclude-vim; neomru = neomru-vim; @@ -427,12 +426,12 @@ self = generated // (with generated; { vim-addon-vim2nix = vim2nix; vimproc = vimproc-vim; vimshell = vimshell-vim; - vinegar = vim-vinegar; - watchdogs = vim-watchdogs; + vim-vinegar = vinegar; # backwards compat, added 2018-09-10 + vim-watchdogs = watchdogs; # backwards compat, added 2018-09-10 WebAPI = webapi-vim; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 - yankring = YankRing-vim; - Yankring = YankRing-vim; + YankRing-vim = yankring; + Yankring = yankring; YouCompleteMe = youcompleteme; xterm-color-table = xterm-color-table-vim; zeavim = zeavim-vim; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 45c5f950babb..88a91824ea06 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2,16 +2,6 @@ { buildVimPluginFrom2Nix, fetchFromGitHub }: { - a-vim = buildVimPluginFrom2Nix { - name = "a-vim-2010-11-06"; - src = fetchFromGitHub { - owner = "vim-scripts"; - repo = "a.vim"; - rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; - sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; - }; - }; - ack-vim = buildVimPluginFrom2Nix { name = "ack-vim-2018-02-27"; src = fetchFromGitHub { @@ -53,12 +43,12 @@ }; ale = buildVimPluginFrom2Nix { - name = "ale-2018-09-07"; + name = "ale-2018-09-10"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "0ae4ea23c8573f9c693fcd5cd5ff9a3acc795b58"; - sha256 = "005lmxhh07agdqa6qlk5f4vd3z2im8drrjy6ficrmwy7idp7cjyn"; + rev = "99e9417ef901824200040c6a2d3e84f2e0ff4b8e"; + sha256 = "1y7yp1wyghhgvmylkbdi3wbvqcw026mfaajhgna53xd3fl7z3bgd"; }; }; @@ -72,6 +62,16 @@ }; }; + alternative = buildVimPluginFrom2Nix { + name = "alternative-2010-11-06"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "a.vim"; + rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; + sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; + }; + }; + argtextobj-vim = buildVimPluginFrom2Nix { name = "argtextobj-vim-2010-10-18"; src = fetchFromGitHub { @@ -182,8 +182,8 @@ }; }; - Colour-Sampler-Pack = buildVimPluginFrom2Nix { - name = "Colour-Sampler-Pack-2012-11-30"; + colorsamplerpack = buildVimPluginFrom2Nix { + name = "colorsamplerpack-2012-11-30"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "Colour-Sampler-Pack"; @@ -192,8 +192,8 @@ }; }; - command-t = buildVimPluginFrom2Nix { - name = "command-t-2017-11-17"; + command_T = buildVimPluginFrom2Nix { + name = "command_T-2017-11-17"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; @@ -293,16 +293,6 @@ }; }; - ctrlp-z = buildVimPluginFrom2Nix { - name = "ctrlp-z-2015-10-17"; - src = fetchFromGitHub { - owner = "amiorin"; - repo = "ctrlp-z"; - rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; - sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; - }; - }; - ctrlp-vim = buildVimPluginFrom2Nix { name = "ctrlp-vim-2018-06-28"; src = fetchFromGitHub { @@ -313,6 +303,16 @@ }; }; + ctrlp-z = buildVimPluginFrom2Nix { + name = "ctrlp-z-2015-10-17"; + src = fetchFromGitHub { + owner = "amiorin"; + repo = "ctrlp-z"; + rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; + sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; + }; + }; + denite-extra = buildVimPluginFrom2Nix { name = "denite-extra-2018-08-13"; src = fetchFromGitHub { @@ -343,6 +343,27 @@ }; }; + deol-nvim = buildVimPluginFrom2Nix { + name = "deol-nvim-2018-06-07"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "deol.nvim"; + rev = "195e63e10f320c0dc5c7e6372fe4f6ba96e93dd8"; + sha256 = "0zb0pa1z847hpbb726i2vmryqap0yvdwnib4r8v1a7h06vvj17qy"; + }; + }; + + deoplete-clang = buildVimPluginFrom2Nix { + name = "deoplete-clang-2018-07-01"; + src = fetchFromGitHub { + owner = "zchee"; + repo = "deoplete-clang"; + rev = "3c4f14127b363ba9eac43d3506a563e2c8da0f97"; + sha256 = "1qi8flm0pbxw19fwj8nh4wpcmmzpwlqy5pmn4cmhn6j7b5vsm32i"; + fetchSubmodules = true; + }; + }; + deoplete-go = buildVimPluginFrom2Nix { name = "deoplete-go-2018-08-21"; src = fetchFromGitHub { @@ -365,13 +386,13 @@ }; }; - deoplete-rust = buildVimPluginFrom2Nix { - name = "deoplete-rust-2017-07-18"; + deoplete-julia = buildVimPluginFrom2Nix { + name = "deoplete-julia-2018-06-11"; src = fetchFromGitHub { - owner = "sebastianmarkow"; - repo = "deoplete-rust"; - rev = "0a86e502113910c33448b337c4d50cabea120d25"; - sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h"; + owner = "JuliaEditorSupport"; + repo = "deoplete-julia"; + rev = "d60b976910685c99ca773c974e91c44eeda03a19"; + sha256 = "0x5cc9g1g1w9myr6p1ahb9gpn2abpbggjdk2bc903f62pkrapvjf"; }; }; @@ -385,6 +406,26 @@ }; }; + deoplete-rust = buildVimPluginFrom2Nix { + name = "deoplete-rust-2017-07-18"; + src = fetchFromGitHub { + owner = "sebastianmarkow"; + repo = "deoplete-rust"; + rev = "0a86e502113910c33448b337c4d50cabea120d25"; + sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h"; + }; + }; + + deoplete-ternjs = buildVimPluginFrom2Nix { + name = "deoplete-ternjs-2018-06-05"; + src = fetchFromGitHub { + owner = "carlitux"; + repo = "deoplete-ternjs"; + rev = "4b6276019a1491cc5003a0b007ca1aaeab671f57"; + sha256 = "0v5033r75qxnhgmm0czxgwps0khbx1sn2dc7nsrscp441h5sgz6i"; + }; + }; + dhall-vim = buildVimPluginFrom2Nix { name = "dhall-vim-2018-07-30"; src = fetchFromGitHub { @@ -396,12 +437,12 @@ }; echodoc-vim = buildVimPluginFrom2Nix { - name = "echodoc-vim-2018-07-29"; + name = "echodoc-vim-2018-09-09"; src = fetchFromGitHub { owner = "shougo"; repo = "echodoc.vim"; - rev = "7b2b1853c4d88fc5ed929bf062a9f3136e051335"; - sha256 = "1apxla41as44jnrrgxhgrz9g88q3y4mlpdbrb218fw5w3hyw51qj"; + rev = "781b1622029cd89350e6383da8ead834fb0cedd2"; + sha256 = "018xrql2prik0v9g0099k883r5gdgnip36vidnzmkr0b0h5bgw6a"; }; }; @@ -607,6 +648,36 @@ }; }; + incsearch-easymotion-vim = buildVimPluginFrom2Nix { + name = "incsearch-easymotion-vim-2016-01-18"; + src = fetchFromGitHub { + owner = "haya14busa"; + repo = "incsearch-easymotion.vim"; + rev = "fcdd3aee6f4c0eef1a515727199ece8d6c6041b5"; + sha256 = "1bscr3xs1zggm9qzk1mb88fkc8qj6yrnkxmqwwyr75sf1xzy74mk"; + }; + }; + + incsearch-vim = buildVimPluginFrom2Nix { + name = "incsearch-vim-2017-11-24"; + src = fetchFromGitHub { + owner = "haya14busa"; + repo = "incsearch.vim"; + rev = "25e2547fb0566460f5999024f7a0de7b3775201f"; + sha256 = "05v0d9b5sm4d1bvhb01jk6s7brlli2xc16hvzr6gik1nm1ks6ai1"; + }; + }; + + intero-neovim = buildVimPluginFrom2Nix { + name = "intero-neovim-2018-08-07"; + src = fetchFromGitHub { + owner = "parsonsmatt"; + repo = "intero-neovim"; + rev = "9bb546e37adc1ffda28ff33922c506c15ed67b10"; + sha256 = "173kc8xrbmkhrc9ssaz6h5w1zisxsgz4bibihgj9bx60ibn4kaa7"; + }; + }; + Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { name = "Jenkinsfile-vim-syntax-2018-04-04"; src = fetchFromGitHub { @@ -707,16 +778,6 @@ }; }; - neco-ghc = buildVimPluginFrom2Nix { - name = "neco-ghc-2018-05-13"; - src = fetchFromGitHub { - owner = "eagletmt"; - repo = "neco-ghc"; - rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; - sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; - }; - }; - neco-look = buildVimPluginFrom2Nix { name = "neco-look-2018-01-21"; src = fetchFromGitHub { @@ -747,6 +808,16 @@ }; }; + necoGhc = buildVimPluginFrom2Nix { + name = "necoGhc-2018-05-13"; + src = fetchFromGitHub { + owner = "eagletmt"; + repo = "neco-ghc"; + rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; + sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; + }; + }; + neocomplete-vim = buildVimPluginFrom2Nix { name = "neocomplete-vim-2018-03-28"; src = fetchFromGitHub { @@ -778,12 +849,12 @@ }; neomake = buildVimPluginFrom2Nix { - name = "neomake-2018-09-07"; + name = "neomake-2018-09-09"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "28f6991f3546195e764052d5e1c731432ac8f706"; - sha256 = "1sw4c5h8w6yw3dfybar72dzxvf44yypkhcvi15zxklvicb4xak9p"; + rev = "11c6797b258dfe1c0b4ee8536f2bb961003a3f76"; + sha256 = "0lsrz6m29ghhz57m1ay2v26i0838czhmm6a06yfy39dy99sa02il"; }; }; @@ -838,12 +909,12 @@ }; nerdtree = buildVimPluginFrom2Nix { - name = "nerdtree-2018-08-25"; + name = "nerdtree-2018-09-10"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "808f5b225b090bb4a94a2c47bb08d1bc1f7f8a4e"; - sha256 = "1isnx83ay3r4f7bkfck98pq92m1kyafa96zzliyjdlgbplwmjq9y"; + rev = "15d06b676dfcd92ac9a0bc375668d127f9822539"; + sha256 = "1v1w4yg6mgmz0q00in0y46wcmcgh6gxx8szws5cmvwv43d5c18qs"; }; }; @@ -1027,13 +1098,23 @@ }; }; + rtorrent-syntax-file = buildVimPluginFrom2Nix { + name = "rtorrent-syntax-file-2016-03-19"; + src = fetchFromGitHub { + owner = "ccarpita"; + repo = "rtorrent-syntax-file"; + rev = "885ca182c02bbbed4b62a3fcfe6fe62fa5b419ca"; + sha256 = "1vhvmwnwi6862cckl8dqr8pgy0inrr0c31lic89826yv7mfl9mbz"; + }; + }; + rust-vim = buildVimPluginFrom2Nix { - name = "rust-vim-2018-09-08"; + name = "rust-vim-2018-09-09"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "b7fc97c5f757c2b9f1e911dd4a800678d202d083"; - sha256 = "1h0n55y7ybjaxxrch0fnq1c74h994d539qi62ba3x1k7sh5am887"; + rev = "1eb6598a72ff2746118451147817c718e40b5769"; + sha256 = "114xhwn1bdykh6vzic4k3xfpmkm7myfhixxw98qbxsnb2i068wl5"; }; }; @@ -1207,6 +1288,16 @@ }; }; + tern_for_vim = buildVimPluginFrom2Nix { + name = "tern_for_vim-2017-11-27"; + src = fetchFromGitHub { + owner = "ternjs"; + repo = "tern_for_vim"; + rev = "3cffc28f280fc599d3f997b1c8c00ddc78d8fc21"; + sha256 = "0idzkc65lw9zg4xq60w2nnvdgbdhngqccqwh1bzkvkzlmr7s43cl"; + }; + }; + thumbnail-vim = buildVimPluginFrom2Nix { name = "thumbnail-vim-2017-04-24"; src = fetchFromGitHub { @@ -1287,13 +1378,23 @@ }; }; + verilog_systemverilog-vim = buildVimPluginFrom2Nix { + name = "verilog_systemverilog-vim-2018-09-06"; + src = fetchFromGitHub { + owner = "vhda"; + repo = "verilog_systemverilog.vim"; + rev = "2cb0da6a325f19bf662c60c5363bb59e98442c33"; + sha256 = "1gyyaqj7assryaprxm9a3zcnappr3lvqmgphapa53qq6s6vmljw5"; + }; + }; + vim = buildVimPluginFrom2Nix { - name = "vim-2018-07-23"; + name = "vim-2018-09-09"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "d329d61c1752807059aef388c4e9629296760a35"; - sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm"; + rev = "fa16b1f1e04933aa9a28312e566d54040b8f4c3b"; + sha256 = "0v73f327gn0zpgpgl4f9pim35y4qmkrqgyh1zg2z5ivdvns5yyif"; }; }; @@ -1498,12 +1599,12 @@ }; vim-airline = buildVimPluginFrom2Nix { - name = "vim-airline-2018-09-07"; + name = "vim-airline-2018-09-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "d342c3cb1e1365d7cfd0328bb0bc20321db34125"; - sha256 = "19p8w2jyigzfq0qqqgc4gw82scqpjxfy0h4w1f6c0vrjbnk6xxx9"; + rev = "da8035d8a83c85197d27a258465d8373ec6d5cd4"; + sha256 = "1c2lh1w6qjgkian7ml5krwfc2m3g79bpz8rvpk1c93bn9zfz82h7"; }; }; @@ -1517,6 +1618,26 @@ }; }; + vim-android = buildVimPluginFrom2Nix { + name = "vim-android-2018-07-31"; + src = fetchFromGitHub { + owner = "hsanson"; + repo = "vim-android"; + rev = "c5647d65b4413c1a91712a80044e034aa705b858"; + sha256 = "0b70m6yv1w103zdya966r0632q7djmfcp78mw19y9sca0p2d0gm9"; + }; + }; + + vim-anzu = buildVimPluginFrom2Nix { + name = "vim-anzu-2018-02-28"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "vim-anzu"; + rev = "45b60d37cb9de90f6c89f7ddeacb7ae430ebcae2"; + sha256 = "1p5lh4xsv9xsl8kx0h1bg6iy0if4a69hvairq69p50ffka83pv00"; + }; + }; + vim-auto-save = buildVimPluginFrom2Nix { name = "vim-auto-save-2017-11-08"; src = fetchFromGitHub { @@ -1557,6 +1678,16 @@ }; }; + vim-bufferline = buildVimPluginFrom2Nix { + name = "vim-bufferline-2016-02-09"; + src = fetchFromGitHub { + owner = "bling"; + repo = "vim-bufferline"; + rev = "651fd010aa9613a4b8636a4af8a2db0d22800262"; + sha256 = "0zls47a3v8dv3h63drbak1mxf3j2x3scvclk7bjwzlk2yp447das"; + }; + }; + vim-closetag = buildVimPluginFrom2Nix { name = "vim-closetag-2018-09-03"; src = fetchFromGitHub { @@ -1677,6 +1808,16 @@ }; }; + vim-dirvish = buildVimPluginFrom2Nix { + name = "vim-dirvish-2018-06-20"; + src = fetchFromGitHub { + owner = "justinmk"; + repo = "vim-dirvish"; + rev = "c273c462d774ed2db5f6d382265cf5897e554de0"; + sha256 = "1fv1kk7y280kx8c0iy9rg43i8gr0h8308al8sm85qvmfx5fcbi9d"; + }; + }; + vim-dispatch = buildVimPluginFrom2Nix { name = "vim-dispatch-2018-08-20"; src = fetchFromGitHub { @@ -1720,7 +1861,7 @@ vim-easymotion = buildVimPluginFrom2Nix { name = "vim-easymotion-2018-06-04"; src = fetchFromGitHub { - owner = "lokaltog"; + owner = "easymotion"; repo = "vim-easymotion"; rev = "1a0244c90c3ff46219cf9597bb13662be4232407"; sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy"; @@ -1758,12 +1899,12 @@ }; vim-eunuch = buildVimPluginFrom2Nix { - name = "vim-eunuch-2018-08-10"; + name = "vim-eunuch-2018-09-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "632d92e85d4b6d5413ee4a643ce570efb09c8d6b"; - sha256 = "0mw2wxr4y5r1j3lj4ilihs83l2afsr0lnxzy73v1hsahs70vayx8"; + rev = "10da325fb032a1acfa9222d273459f53bad30ba4"; + sha256 = "125n4amz3vmc83yv76vidsnma5w2braa69dcpj858ahnzhh329qj"; }; }; @@ -1818,12 +1959,22 @@ }; vim-fugitive = buildVimPluginFrom2Nix { - name = "vim-fugitive-2018-09-03"; + name = "vim-fugitive-2018-09-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "4bf30ce907f74cbf442b41f85c25967c397a3413"; - sha256 = "0k0rp4r4783dszbcag82ijrnkvp7hd5jrqsmpi45v4gxdxfj6slm"; + rev = "d4fb2a2f5c2023f477beae6aef47cf0457351e6e"; + sha256 = "1m2pa29rf44ykmiy9za511v1cla8kb071yly7h2yyfmw7600swwq"; + }; + }; + + vim-ghost = buildVimPluginFrom2Nix { + name = "vim-ghost-2018-08-23"; + src = fetchFromGitHub { + owner = "raghur"; + repo = "vim-ghost"; + rev = "666a76c0783270eeb1ac1e0027df6f801a067bfd"; + sha256 = "1c5jyipcj4hi703dcdim1123p2yp4h67ci4f9kgaz9h65lmz4xn5"; }; }; @@ -1868,12 +2019,12 @@ }; vim-go = buildVimPluginFrom2Nix { - name = "vim-go-2018-09-06"; + name = "vim-go-2018-09-10"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "fb173c3a849fdc47a267e905cee5e29a88797d61"; - sha256 = "0i3kprznlys1pa6ii6rbcsxar2zwsygc4hv22h0svmpajbzwvfp9"; + rev = "5b9058e1232786c682be79b8a00510d3bd63eba9"; + sha256 = "14jcjdq48cnpdvp6k2lanr1chvkgky7xnz8zbcqhw2ma27zy16jf"; }; }; @@ -1888,12 +2039,22 @@ }; vim-grepper = buildVimPluginFrom2Nix { - name = "vim-grepper-2018-04-23"; + name = "vim-grepper-2018-09-10"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "04d659c9e0a57e0c3e989069601d2a98df0386c4"; - sha256 = "16k5ahcn9i4wvlhw16j0gfgxw0clry72l78lk28qmx9p2gh1ka3g"; + rev = "f61a745c1e19c80427a251f556f28fc31e962f6d"; + sha256 = "0l465qpphyi2c53hfwhc6fvj1s7vs2yc2l2spw387av6yqw83m9g"; + }; + }; + + vim-gutentags = buildVimPluginFrom2Nix { + name = "vim-gutentags-2018-06-13"; + src = fetchFromGitHub { + owner = "ludovicchabant"; + repo = "vim-gutentags"; + rev = "b1eb744786ec3e55c1c8ed8ab3221157b426f62e"; + sha256 = "0bx690n6zn28bzw99sis1q177x3s4yzdh6avsv49qpwwdg73s3c4"; }; }; @@ -1957,6 +2118,16 @@ }; }; + vim-hindent = buildVimPluginFrom2Nix { + name = "vim-hindent-2018-07-31"; + src = fetchFromGitHub { + owner = "alx741"; + repo = "vim-hindent"; + rev = "f8e84c199fd00a3ccaf5bbbc97786bde9a4faa13"; + sha256 = "1y4nnz38zal1ffs5n751dn9p9apk8q7pq3cw79r5z6fsdp942ai6"; + }; + }; + vim-hoogle = buildVimPluginFrom2Nix { name = "vim-hoogle-2018-03-04"; src = fetchFromGitHub { @@ -2018,12 +2189,22 @@ }; vim-jade = buildVimPluginFrom2Nix { - name = "vim-jade-2017-04-07"; + name = "vim-jade-2018-09-10"; src = fetchFromGitHub { owner = "digitaltoad"; repo = "vim-jade"; - rev = "ddc5592f8c36bf4bd915c16b38b8c76292c2b975"; - sha256 = "069pha18g1nlzg44k742vjxm4zwjd1qjzhfllkr35qaiflvjm84y"; + rev = "3f341b48e46a84891e19d449a5e336bcfc5a57a0"; + sha256 = "15gpb1a9d80gz8nzgl0w6wpnlxnrxd4qra2xj56jmmywsabkvqxk"; + }; + }; + + vim-javacomplete2 = buildVimPluginFrom2Nix { + name = "vim-javacomplete2-2018-08-20"; + src = fetchFromGitHub { + owner = "artur-shaik"; + repo = "vim-javacomplete2"; + rev = "2567a4f3ba2b1b902fd85ca24726aba3bf61aaa5"; + sha256 = "17mlip2mxv9sj2pxmj3clb7ax6m545pa5ynbr80vxww99537gxpr"; }; }; @@ -2268,6 +2449,16 @@ }; }; + vim-pager = buildVimPluginFrom2Nix { + name = "vim-pager-2015-08-26"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "vim-pager"; + rev = "a657d508b4d5a23aada7585c9f1e0063914c0c45"; + sha256 = "10xm77pia916zf9i2llyhs89s653r98l6zq8cswm7cw61bjfxvv6"; + }; + }; + vim-pandoc = buildVimPluginFrom2Nix { name = "vim-pandoc-2018-08-13"; src = fetchFromGitHub { @@ -2328,6 +2519,16 @@ }; }; + vim-plugin-AnsiEsc = buildVimPluginFrom2Nix { + name = "vim-plugin-AnsiEsc-2018-05-10"; + src = fetchFromGitHub { + owner = "powerman"; + repo = "vim-plugin-AnsiEsc"; + rev = "9df135fd4a564559aad0f6d28ae6975678cedcaf"; + sha256 = "06s6fz3jw6pmy08nqzlvzhcgnv2d2p0vs863hqvd39amhg1xa5nf"; + }; + }; + vim-polyglot = buildVimPluginFrom2Nix { name = "vim-polyglot-2018-07-08"; src = fetchFromGitHub { @@ -2349,12 +2550,12 @@ }; vim-projectionist = buildVimPluginFrom2Nix { - name = "vim-projectionist-2018-09-03"; + name = "vim-projectionist-2018-09-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "285a6946a646e0f29e18fc16fe963cb2b3ab1f27"; - sha256 = "0nmn0f8q8sh1fxss94ga7k1by1ajgf4ms8s30f212h09d2k3j5x5"; + rev = "ee68be42d26a8879b871c051e85ce0dfae7364f0"; + sha256 = "1x1v6q6gqw1f5h0rshj8q7x5cip78x2p6xdj05dglqdq1wz4w28i"; }; }; @@ -2578,6 +2779,16 @@ }; }; + vim-stylishask = buildVimPluginFrom2Nix { + name = "vim-stylishask-2018-07-05"; + src = fetchFromGitHub { + owner = "alx741"; + repo = "vim-stylishask"; + rev = "62608c70af8fafbbc9712238dafd2c5a433ed179"; + sha256 = "12vj2kf82kvmd6smimgnz9yy97n7bvrji063ig3wlicxwmz62fdr"; + }; + }; + vim-surround = buildVimPluginFrom2Nix { name = "vim-surround-2018-07-23"; src = fetchFromGitHub { @@ -2688,13 +2899,23 @@ }; }; - vim-vinegar = buildVimPluginFrom2Nix { - name = "vim-vinegar-2018-08-06"; + vim-unimpaired = buildVimPluginFrom2Nix { + name = "vim-unimpaired-2018-07-26"; src = fetchFromGitHub { owner = "tpope"; - repo = "vim-vinegar"; - rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296"; - sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf"; + repo = "vim-unimpaired"; + rev = "d6325994b3c16ce36fd494c47dae4dab8d21a3da"; + sha256 = "0l5g3xq0azplaq3i2rblg8d61czpj47k0126zi8x48na9sj0aslv"; + }; + }; + + vim-visualstar = buildVimPluginFrom2Nix { + name = "vim-visualstar-2015-08-27"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-visualstar"; + rev = "a18cd0e7a03311ac709595c1d261ed44b45c9098"; + sha256 = "0yz6ci4i84xxrgazjfa5nsj3q8733p0b6vwcljk1l7ghdfiflvy4"; }; }; @@ -2708,16 +2929,6 @@ }; }; - vim-watchdogs = buildVimPluginFrom2Nix { - name = "vim-watchdogs-2017-12-03"; - src = fetchFromGitHub { - owner = "osyo-manga"; - repo = "vim-watchdogs"; - rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; - sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; - }; - }; - vim-wordy = buildVimPluginFrom2Nix { name = "vim-wordy-2018-03-10"; src = fetchFromGitHub { @@ -2809,12 +3020,12 @@ }; vimtex = buildVimPluginFrom2Nix { - name = "vimtex-2018-09-06"; + name = "vimtex-2018-09-09"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2777bda5d774bd4b96580ecc8cffbff7b9801a33"; - sha256 = "0r5x666z9zmn7ad7c378l97mqk65xv3ayqxqf3nypvq0ni5ax9hw"; + rev = "cad3b43eca41b75cedab9ac86241f006aa3202ea"; + sha256 = "1nnn2xri8n6j34nq4l4b11m2n7aglj61ks156caqhkgdkskf0ks4"; }; }; @@ -2828,6 +3039,16 @@ }; }; + vinegar = buildVimPluginFrom2Nix { + name = "vinegar-2018-08-06"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-vinegar"; + rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296"; + sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf"; + }; + }; + vundle = buildVimPluginFrom2Nix { name = "vundle-2018-02-03"; src = fetchFromGitHub { @@ -2838,6 +3059,16 @@ }; }; + watchdogs = buildVimPluginFrom2Nix { + name = "watchdogs-2017-12-03"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "vim-watchdogs"; + rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; + sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; + }; + }; + webapi-vim = buildVimPluginFrom2Nix { name = "webapi-vim-2018-03-14"; src = fetchFromGitHub { @@ -2878,8 +3109,8 @@ }; }; - YankRing-vim = buildVimPluginFrom2Nix { - name = "YankRing-vim-2015-07-29"; + yankring = buildVimPluginFrom2Nix { + name = "yankring-2015-07-29"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "YankRing.vim"; @@ -2889,12 +3120,12 @@ }; youcompleteme = buildVimPluginFrom2Nix { - name = "youcompleteme-2018-08-19"; + name = "youcompleteme-2018-09-09"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "e018777b38eedaa23b96cfee40382d000e464e31"; - sha256 = "1j4r6gkjs7kk2nwhmlwzm1nzzwrk96sr8xfbj0vwa847bsq3p591"; + rev = "487b8ab2b4d5bcaece29a17a26818a62616e21b5"; + sha256 = "1r0sdcllnqgi376hbj1f31irppqw1qqx7rna1jvj5qvi5d81s2nr"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index fbdceea2a9af..c19b439493c6 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -163,14 +163,14 @@ def print_download_error(plugin: str, ex: Exception): def check_results( results: List[Tuple[str, str, Union[Exception, Plugin]]] -) -> List[Tuple[str, Plugin]]: +) -> List[Tuple[str, str, Plugin]]: failures: List[Tuple[str, Exception]] = [] plugins = [] for (owner, name, result) in results: if isinstance(result, Exception): failures.append((name, result)) else: - plugins.append((owner, result)) + plugins.append((owner, name, result)) print(f"{len(results) - len(failures)} plugins were checked", end="") if len(failures) == 0: @@ -269,8 +269,8 @@ header = ( ) -def generate_nix(plugins: List[Tuple[str, Plugin]]): - sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower()) +def generate_nix(plugins: List[Tuple[str, str, Plugin]]): + sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) with open(ROOT.joinpath("generated.nix"), "w+") as f: f.write(header) @@ -280,7 +280,7 @@ def generate_nix(plugins: List[Tuple[str, Plugin]]): {""" ) - for owner, plugin in sorted_plugins: + for owner, repo, plugin in sorted_plugins: if plugin.has_submodules: submodule_attr = "\n fetchSubmodules = true;" else: @@ -292,7 +292,7 @@ def generate_nix(plugins: List[Tuple[str, Plugin]]): name = "{plugin.normalized_name}-{plugin.version}"; src = fetchFromGitHub {{ owner = "{owner}"; - repo = "{plugin.name}"; + repo = "{repo}"; rev = "{plugin.commit}"; sha256 = "{plugin.sha256}";{submodule_attr} }}; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e582127ef474..8bcfc667da34 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -4,16 +4,22 @@ ajh17/Spacegray.vim albfan/nerdtree-git-plugin altercation/vim-colors-solarized alvan/vim-closetag +alx741/vim-hindent +alx741/vim-stylishask amiorin/ctrlp-z andreshazard/vim-logreview andsild/peskcolor.vim andviro/flake8-vim ap/vim-css-color +artur-shaik/vim-javacomplete2 bazelbuild/vim-bazel bbchung/clighter8 benekastah/neomake bitc/vim-hdevtools +bling/vim-bufferline bronson/vim-trailing-whitespace +carlitux/deoplete-ternjs +ccarpita/rtorrent-syntax-file cespare/vim-toml chemzqm/denite-extra chemzqm/denite-git @@ -39,6 +45,7 @@ dracula/vim drmingdrmer/xptemplate eagletmt/ghcmod-vim eagletmt/neco-ghc +easymotion/vim-easymotion editorconfig/editorconfig-vim ehamberg/vim-cute-python eikenb/acp @@ -66,9 +73,12 @@ google/vim-jsonnet google/vim-maktaba gregsexton/gitv guns/xterm-color-table.vim +haya14busa/incsearch-easymotion.vim +haya14busa/incsearch.vim heavenshell/vim-jsdoc hecal3/vim-leader-guide honza/vim-snippets +hsanson/vim-android idris-hackers/idris-vim inkarkat/vim-SyntaxRange int3/vim-extradite @@ -91,6 +101,7 @@ jistr/vim-nerdtree-tabs jnurmine/zenburn jonbri/vim-colorstepper joonty/vim-xdebug +JuliaEditorSupport/deoplete-julia JuliaEditorSupport/julia-vim junegunn/fzf.vim junegunn/goyo.vim @@ -99,6 +110,7 @@ junegunn/vim-easy-align junegunn/vim-github-dashboard junegunn/vim-peekaboo justincampbell/vim-eighties +justinmk/vim-dirvish KabbAmine/zeavim.vim kana/vim-niceblock kana/vim-operator-replace @@ -110,6 +122,7 @@ kien/rainbow_parentheses.vim konfekt/fastfold kshenoy/vim-signature lambdalisue/vim-gista +lambdalisue/vim-pager latex-box-team/latex-box leafgarland/typescript-vim ledger/vim-ledger @@ -117,7 +130,7 @@ lepture/vim-jinja lervag/vimtex lfilho/cosco.vim LnL7/vim-nix -lokaltog/vim-easymotion +ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium luochen1990/rainbow lyokha/vim-xkbswitch @@ -166,15 +179,19 @@ neovimhaskell/haskell-vim nixprime/cpsm noc7c9/vim-iced-coffee-script osyo-manga/shabadou.vim +osyo-manga/vim-anzu osyo-manga/vim-textobj-multiblock osyo-manga/vim-watchdogs pangloss/vim-javascript +parsonsmatt/intero-neovim peterhoeg/vim-qml plasticboy/vim-markdown +powerman/vim-plugin-AnsiEsc python-mode/python-mode Quramy/tsuquyomi racer-rust/vim-racer rafi/awesome-vim-colorschemes +raghur/vim-ghost raichoo/purescript-vim reedes/vim-pencil reedes/vim-wordy @@ -196,6 +213,7 @@ sebastianmarkow/deoplete-rust sheerun/vim-polyglot shougo/context_filetype.vim shougo/denite.nvim +Shougo/deol.nvim shougo/deoplete.nvim shougo/echodoc.vim shougo/neco-syntax @@ -218,6 +236,7 @@ sk1418/last256 slashmili/alchemist.vim t9md/vim-smalls takac/vim-hardtime +ternjs/tern_for_vim terryma/vim-expand-region terryma/vim-multiple-cursors tex/vimpreviewpandoc @@ -226,6 +245,7 @@ thinca/vim-prettyprint thinca/vim-quickrun thinca/vim-scouter thinca/vim-themis +thinca/vim-visualstar tomasr/molokai tomlion/vim-solidity tomtom/tlib_vim @@ -246,6 +266,7 @@ tpope/vim-sleuth tpope/vim-speeddating tpope/vim-surround tpope/vim-tbone +tpope/vim-unimpaired tpope/vim-vinegar travitch/hasksyn twinside/vim-haskellconceal @@ -254,6 +275,7 @@ tyru/caw.vim tyru/open-browser.vim ujihisa/neco-look valloric/youcompleteme +vhda/verilog_systemverilog.vim vim-airline/vim-airline vim-airline/vim-airline-themes vimoutliner/vimoutliner @@ -288,6 +310,7 @@ xolox/vim-easytags xolox/vim-misc xuhdev/vim-latex-live-preview zah/nim.vim +zchee/deoplete-clang zchee/deoplete-go zchee/deoplete-jedi zig-lang/zig.vim From fb4345384022232042f00626bd8b8adece2a8fc2 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 10 Sep 2018 21:37:56 +0200 Subject: [PATCH 422/600] cloc: 1.76 -> 1.78 --- pkgs/tools/misc/cloc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 97c0251d9d64..0eff3f0c3916 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.76"; + version = "1.78"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = "v${version}"; - sha256 = "03z4ar959ximsddd92zchi013lh82ganzisk309y3b09q10hl9k7"; + rev = version; + sha256 = "030cnvl83hgynri3jimhhqp238375m1g6liqfiggl0habrnlbck2"; }; setSourceRoot = '' From 5cb824f4c4d23cb6a9177700e8e6ccaa2ff116fb Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Mon, 10 Sep 2018 22:08:48 +0200 Subject: [PATCH 423/600] arx-libertatis: 2017-10-30 -> 2018-08-26 (#46039) --- pkgs/games/arx-libertatis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index e000f743173b..1ac5ce5007d9 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "arx-libertatis-${version}"; - version = "2017-10-30"; + version = "2018-08-26"; src = fetchFromGitHub { owner = "arx"; repo = "ArxLibertatis"; - rev = "e5ea4e8f0f7e86102cfc9113c53daeb0bdee6dd3"; - sha256 = "11z0ndhk802jr3w3z5gfqw064g98v99xin883q1qd36jw96s27p5"; + rev = "7b551739cc22fa25dae83bcc1a2b784ddecc729c"; + sha256 = "1ybv3p74rywn0ajdbw7pyk7pd7py1db9h6x2pav2d28ndkkj4z8n"; }; buildInputs = [ From 50789a0b19ba7bb93c8b7bb6711f8870f4cfd9cd Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 10 Sep 2018 20:13:45 +0000 Subject: [PATCH 424/600] perlPackages: ZHF 18.09 (#46493) --- pkgs/top-level/perl-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d3bd223d412..6bf58f5db28d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2620,6 +2620,7 @@ let prePatch = '' # Attempts to use network. rm t/01-proxy-http.t + rm t/01-proxy-proc-safeexec.t ''; meta = { description = "A generic connection to a hierarchical-structured data set"; @@ -9988,10 +9989,10 @@ let }; }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-7.93"; + name = "Mojolicious-7.88"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "00c30fc566fee0823af0a75bdf4f170531655df14beca6d51f0e453a43aaad5d"; + sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785"; }; meta = { homepage = https://mojolicious.org/; @@ -11645,6 +11646,8 @@ let sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9"; }; buildInputs = [ pkgs.zookeeper_mt ]; + # fix "error: format not a string literal and no format arguments [-Werror=format-security]" + hardeningDisable = stdenv.lib.optional (stdenv.lib.versionAtLeast perl.version "5.28") "format"; NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include"; NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; meta = { From aad2acfab7c210d8f14c299f3768c76c4bfc7b87 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:11:06 +0200 Subject: [PATCH 425/600] bsd-finger: add license --- pkgs/tools/networking/bsd-finger/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index 25f795d52c2c..d011665a492b 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/man/man1 $out/bin ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.bsdOriginal; }; } From 19148bd2f19c5273506c4b5171c768d8ad0bd285 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:12:55 +0200 Subject: [PATCH 426/600] carddav-util: add license --- pkgs/tools/networking/carddav-util/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index 86a13ba90e65..7cc89bebf477 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -31,9 +31,10 @@ stdenv.mkDerivation rec { --prefix PATH : "$prefix/bin:$PATH" ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/ljanyst/carddav-util; description = "A CardDAV import/export utility"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.isc; }; } From 5d42f2b37fb68cd0805b0bff31f22d3e2f2f7306 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:14:40 +0200 Subject: [PATCH 427/600] cksfv: add license --- pkgs/tools/networking/cksfv/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index c14770fb32be..3098b091dc64 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { name = "cksfv-1.3.14"; - + src = fetchurl { url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2"; sha256 = "0lnz0z57phl6s52hjvlryn96xrlph9b0h89ahhv027sa79pj8g4g"; }; - meta = { + meta = with stdenv.lib; { homepage = http://zakalwe.fi/~shd/foss/cksfv/; description = "A tool for verifying files against a SFV checksum file"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.gpl2; }; } From 4dcdb693af38d6c091fea6bb5e06148c13de7728 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:15:57 +0200 Subject: [PATCH 428/600] dhcpd: add license --- pkgs/tools/networking/dhcpcd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 1fe29b8b96ff..a03d2a123932 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -34,10 +34,11 @@ stdenv.mkDerivation rec { find $out -type f -print0 | xargs --null sed -i 's|${stdenv.shellPackage}|${runtimeShellPackage}|' ''; - meta = { + meta = with stdenv.lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = https://roy.marples.name/projects/dhcpcd; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ eelco fpletz ]; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ eelco fpletz ]; }; } From 0f6134f8ad54b6171771a57398f3ee87445c4c16 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:20:19 +0200 Subject: [PATCH 429/600] dhcpdump: add license, update homepage --- pkgs/tools/networking/dhcpdump/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index af4b03ab700b..8ed9d1d1d706 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { cp dhcpdump $out/bin ''; - meta = { + meta = with stdenv.lib; { description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; - homepage = https://packages.ubuntu.com/ru/lucid/dhcpdump; - platforms = stdenv.lib.platforms.linux; + homepage = http://www.mavetju.org/unix/dhcpdump-man.php; + platforms = platforms.linux; + license = licenses.bsd2; }; } From 6d859b3b1e4dfa9abe43c995f889a9741c68ec0f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:22:10 +0200 Subject: [PATCH 430/600] driftnet: add license --- pkgs/tools/networking/driftnet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index 5b39ca464601..bf0a43ce5153 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/deiv/driftnet; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; + license = licenses.gpl2; }; } From 28bac355998729b180248bdcd5856087c7764a7f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:23:27 +0200 Subject: [PATCH 431/600] fdm: add license --- pkgs/tools/networking/fdm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 3984922abe28..54e205390666 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux; homepage = https://github.com/nicm/fdm; downloadPage = https://github.com/nicm/fdm/releases; + license = licenses.isc; }; } From 460c0145e7fc313349a0912802ef606bb6e811b4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:26:36 +0200 Subject: [PATCH 432/600] gvpe: add license + homepage --- pkgs/tools/networking/gvpe/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 07676cb18712..bcc68a2a19f7 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -24,9 +24,11 @@ stdenv.mkDerivation rec { sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C ''; - meta = { + meta = with stdenv.lib; { description = "A protected multinode virtual network"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = with stdenv.lib.platforms; linux ++ freebsd; + homepage = http://software.schmorp.de/pkg/gvpe.html; + maintainers = [ maintainers.raskin ]; + platforms = with platforms; linux ++ freebsd; + license = licenses.gpl2; }; } From bb27094df1b67c6fa7c6dcb4a3dc40b146f7dbb7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:28:59 +0200 Subject: [PATCH 433/600] libreswan: add license --- pkgs/tools/networking/libreswan/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index fd2461f51719..9a0b8c9ebf54 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -76,10 +76,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = https://libreswan.org; description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd; - maintainers = [ stdenv.lib.maintainers.afranchuk ]; + platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; + license = licenses.gpl2; + maintainers = [ maintainers.afranchuk ]; }; } From a8bc08c6332eb7f9a02c86f35cb9e9a1a796d157 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:31:33 +0200 Subject: [PATCH 434/600] miniupnpc: add license --- pkgs/tools/networking/miniupnpc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 902055e0d798..b4c2a6ea3970 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -19,10 +19,11 @@ let makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; - meta = { + meta = with stdenv.lib; { homepage = http://miniupnp.free.fr/; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ darwin; + platforms = with platforms; linux ++ freebsd ++ darwin; + license = licenses.bsd3; }; }; in { From cdf332f254427568cc26de1f51ef1b31c0a1f6e8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:32:49 +0200 Subject: [PATCH 435/600] miniupnpd: add license --- pkgs/tools/networking/miniupnpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 07112d1497af..f794a4e27c7a 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://miniupnp.free.fr/; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; + license = licenses.bsd3; }; } From 4d24db6e0c568c0988c968a1bba1d8a4e9fae31b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:34:25 +0200 Subject: [PATCH 436/600] ncftp: add license --- pkgs/tools/networking/ncftp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 0a0eadbfcba4..90ac44aa375a 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { homepage = https://www.ncftp.com/ncftp/; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; + license = licenses.clArtistic; }; } From 3f1849e29cb37facafac5690143130a57f1d2a9b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:40:21 +0200 Subject: [PATCH 437/600] philter: add license + homepage --- pkgs/tools/networking/philter/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index f8f37e05a72e..5dff64e27c5c 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mail sorter for Maildirs"; + homepage = http://philter.sourceforge.net; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.gpl2; }; passthru = { From d2b062760dc390ee02a2a311e762fef0a88d6885 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:41:18 +0200 Subject: [PATCH 438/600] polygraph: add license --- pkgs/tools/networking/polygraph/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index c05e44fb1c07..0b679bc60b53 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -9,11 +9,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl zlib ncurses ]; - + meta = with stdenv.lib; { homepage = http://www.web-polygraph.org; description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; + license = licenses.asl20; maintainers = [ maintainers.lethalman ]; }; } From 44d84db9409de4215d53fd7912b7eb6d9c1b9a40 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:43:07 +0200 Subject: [PATCH 439/600] polysh: add license --- pkgs/tools/networking/polysh/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix index b94ec8e429fa..2a70218f2879 100644 --- a/pkgs/tools/networking/polysh/default.nix +++ b/pkgs/tools/networking/polysh/default.nix @@ -11,14 +11,15 @@ buildPythonApplication rec { sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4"; }; - meta = { + meta = with stdenv.lib; { description = "A tool to aggregate several remote shells into one"; longDescription = '' Polysh is a tool to aggregate several remote shells into one. It is used to launch an interactive remote shell on many machines at once. ''; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + maintainers = [ maintainers.astsmtl ]; homepage = http://guichaz.free.fr/polysh/; + license = licenses.gpl2; }; } From 50a7adf43a13b8db0e1e1b1b4b8e103b789819cc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:44:15 +0200 Subject: [PATCH 440/600] pptpd: add license --- pkgs/tools/networking/pptpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix index d5464b97a335..4c29cd949ee6 100644 --- a/pkgs/tools/networking/pptpd/default.nix +++ b/pkgs/tools/networking/pptpd/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "The PPTP Server for Linux"; platforms = platforms.linux; maintainers = with maintainers; [ obadz ]; + license = licenses.gpl2; }; } From ff633d166ff7380a4b1a84284ccbcfc6f31cb39a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:45:28 +0200 Subject: [PATCH 441/600] quicktun: add license --- pkgs/tools/networking/quicktun/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index ceee8cca1aae..3d7dc68e3578 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://wiki.ucis.nl/QuickTun; maintainers = [ maintainers.fpletz ]; platforms = platforms.unix; + license = licenses.bsd2; }; } From 9e94e8ae4aef44f53cfc188e79c67e2096b69578 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:48:02 +0200 Subject: [PATCH 442/600] rp-pppoe: add license --- pkgs/tools/networking/rp-pppoe/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index b2584a4f4974..2beb8aec3893 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -21,9 +21,10 @@ stdenv.mkDerivation rec { sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@' ''; - meta = { + meta = with stdenv.lib; { description = "Roaring Penguin Point-to-Point over Ethernet tool"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; homepage = https://www.roaringpenguin.com/products/pppoe; + license = licenses.gpl2Plus; }; } From 6e9477385476b83a9e4fe3435bb3b02e12d56ccf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:49:56 +0200 Subject: [PATCH 443/600] vde2: add license --- pkgs/tools/networking/vde2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 39674d22aa1d..ac87a5c10e9f 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -20,9 +20,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { homepage = http://vde.sourceforge.net/; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } From fc080c22f80a612c2a9ca59b640925ddba59b753 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:52:21 +0200 Subject: [PATCH 444/600] vlan: add license --- pkgs/tools/networking/vlan/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 41ece0537ab4..1684da45ccc3 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { cp vconfig.8 $out/share/man/man8/ ''; - meta = { + meta = with stdenv.lib; { description = "User mode programs to enable VLANs on Ethernet devices"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2Plus; }; } From 4e8871e7b4fdb3b3afc77df8bab7dc35595f4262 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:55:44 +0200 Subject: [PATCH 445/600] webalizer: update meta data --- pkgs/tools/networking/webalizer/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index 67a95f32b619..e9b9452c7563 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace ./configure \ - --replace "--static" "" + --replace "--static" "" ''; - buildInputs = [zlib libpng gd geoip db]; + buildInputs = [zlib libpng gd geoip db]; configureFlags = [ "--enable-dns" @@ -23,7 +23,10 @@ stdenv.mkDerivation { "--enable-shared" ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Web server log file analysis program"; + homepage = http://www.webalizer.org; + platforms = platforms.unix; + license = licenses.gpl2; }; } From fd7e69be1c71ec8d8e1d87a93ae121915fb84212 Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Mon, 10 Sep 2018 22:17:00 +0200 Subject: [PATCH 446/600] antimony: 0.9.3 -> 2018-10-17 (#46486) --- .../graphics/antimony/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 334a5a33dadf..aa6305ce8311 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,29 +1,34 @@ -{ stdenv, fetchFromGitHub, libpng, python3, boost, libGLU_combined, qtbase, ncurses, cmake, flex, lemon }: +{ stdenv, fetchFromGitHub, libpng, python3 +, libGLU_combined, qtbase, ncurses +, cmake, flex, lemon +}: let - gitRev = "020910c25614a3752383511ede5a1f5551a8bd39"; - gitBranch = "master"; + gitRev = "60a58688e552f12501980c4bdab034ab0f2ba059"; + gitBranch = "develop"; gitTag = "0.9.3"; in stdenv.mkDerivation rec { name = "antimony-${version}"; - version = gitTag; + version = "2018-07-17"; src = fetchFromGitHub { - owner = "mkeeter"; - repo = "antimony"; - rev = gitTag; - sha256 = "1vm5h5py8l3b8h4pbmm8s3wlxvlw492xfwnlwx0nvl0cjs8ba6r4"; + owner = "mkeeter"; + repo = "antimony"; + rev = gitRev; + sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl"; }; patches = [ ./paths-fix.patch ]; postPatch = '' - sed -i "s,/usr/local,$out,g" app/CMakeLists.txt app/app/app.cpp app/app/main.cpp + sed -i "s,/usr/local,$out,g" \ + app/CMakeLists.txt app/app/app.cpp app/app/main.cpp + sed -i "s,python-py35,python36," CMakeLists.txt ''; buildInputs = [ - libpng python3 (boost.override { python = python3; }) + libpng python3 python3.pkgs.boost libGLU_combined qtbase ncurses ]; @@ -41,6 +46,7 @@ in description = "A computer-aided design (CAD) tool from a parallel universe"; homepage = "https://github.com/mkeeter/antimony"; license = licenses.mit; + maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; }; } From b1bee94d72128a9af79a08a0c1ae9e3932a45f7b Mon Sep 17 00:00:00 2001 From: Niclas <33751841+countingsort@users.noreply.github.com> Date: Mon, 10 Sep 2018 22:53:30 +0200 Subject: [PATCH 447/600] bunny: 1.2 -> 1.3 (#46498) --- pkgs/tools/package-management/bunny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix index 623c7a5b2f6b..cb99e5af055b 100644 --- a/pkgs/tools/package-management/bunny/default.nix +++ b/pkgs/tools/package-management/bunny/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bunny-${version}"; - version = "1.2"; + version = "1.3"; src = fetchFromGitLab { owner = "tim241"; repo = "bunny"; rev = version; - sha256 = "13qsgv4n4c96pgm2l5kvwxpk97x2jpk3wp2m56vdj07hcgywgj3h"; + sha256 = "0nh2h5kj9b0nkb6yrzf4if7anfdmy9vijzy4bl3s7qck0nzbpy8s"; }; dontBuild = true; From 2047e28c7fe94a8541f19ac2c57cf4866a318c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 10 Sep 2018 18:00:14 -0300 Subject: [PATCH 448/600] lxqt: mv contents of base, core and optional to parent directory (#46484) --- .../{optional => }/compton-conf/default.nix | 0 pkgs/desktops/lxqt/default.nix | 62 +++++++++---------- .../lxqt/{core => }/libfm-qt/default.nix | 0 .../lxqt/{base => }/liblxqt/default.nix | 0 .../lxqt/{base => }/libqtxdg/default.nix | 0 .../lxqt/{base => }/libsysstat/default.nix | 0 .../{optional => }/lximage-qt/default.nix | 0 .../lxqt/{core => }/lxqt-about/default.nix | 0 .../lxqt/{core => }/lxqt-admin/default.nix | 0 .../{base => }/lxqt-build-tools/default.nix | 0 .../lxqt/{core => }/lxqt-config/default.nix | 0 .../{core => }/lxqt-globalkeys/default.nix | 0 .../lxqt/{core => }/lxqt-l10n/default.nix | 0 .../{core => }/lxqt-notificationd/default.nix | 0 .../lxqt-openssh-askpass/default.nix | 0 .../lxqt/{core => }/lxqt-panel/default.nix | 0 .../{core => }/lxqt-policykit/default.nix | 0 .../lxqt-powermanagement/default.nix | 0 .../lxqt/{core => }/lxqt-qtplugin/default.nix | 0 .../lxqt/{core => }/lxqt-runner/default.nix | 0 .../lxqt/{core => }/lxqt-session/default.nix | 0 .../lxqt/{core => }/lxqt-sudo/default.nix | 0 .../lxqt/{core => }/lxqt-themes/default.nix | 0 .../lxqt/{optional => }/obconf-qt/default.nix | 0 .../{core => }/pavucontrol-qt/default.nix | 0 .../lxqt/{core => }/pcmanfm-qt/default.nix | 0 .../lxqt/{optional => }/qlipper/default.nix | 0 .../lxqt/{optional => }/qps/default.nix | 0 .../lxqt/{optional => }/qterminal/default.nix | 0 .../lxqt/{core => }/qtermwidget/0.7.1.nix | 0 .../lxqt/{core => }/qtermwidget/default.nix | 0 .../{optional => }/screengrab/default.nix | 0 32 files changed, 31 insertions(+), 31 deletions(-) rename pkgs/desktops/lxqt/{optional => }/compton-conf/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/libfm-qt/default.nix (100%) rename pkgs/desktops/lxqt/{base => }/liblxqt/default.nix (100%) rename pkgs/desktops/lxqt/{base => }/libqtxdg/default.nix (100%) rename pkgs/desktops/lxqt/{base => }/libsysstat/default.nix (100%) rename pkgs/desktops/lxqt/{optional => }/lximage-qt/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-about/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-admin/default.nix (100%) rename pkgs/desktops/lxqt/{base => }/lxqt-build-tools/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-config/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-globalkeys/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-l10n/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-notificationd/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-openssh-askpass/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-panel/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-policykit/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-powermanagement/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-qtplugin/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-runner/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-session/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-sudo/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/lxqt-themes/default.nix (100%) rename pkgs/desktops/lxqt/{optional => }/obconf-qt/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/pavucontrol-qt/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/pcmanfm-qt/default.nix (100%) rename pkgs/desktops/lxqt/{optional => }/qlipper/default.nix (100%) rename pkgs/desktops/lxqt/{optional => }/qps/default.nix (100%) rename pkgs/desktops/lxqt/{optional => }/qterminal/default.nix (100%) rename pkgs/desktops/lxqt/{core => }/qtermwidget/0.7.1.nix (100%) rename pkgs/desktops/lxqt/{core => }/qtermwidget/default.nix (100%) rename pkgs/desktops/lxqt/{optional => }/screengrab/default.nix (100%) diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/compton-conf/default.nix rename to pkgs/desktops/lxqt/compton-conf/default.nix diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 015807ec684e..62b8aaf25abe 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -7,44 +7,44 @@ let # - https://github.com/lxqt/lxqt/wiki/Building-from-source ### BASE - libqtxdg = callPackage ./base/libqtxdg { }; - lxqt-build-tools = callPackage ./base/lxqt-build-tools { }; - libsysstat = callPackage ./base/libsysstat { }; - liblxqt = callPackage ./base/liblxqt { }; + libqtxdg = callPackage ./libqtxdg { }; + lxqt-build-tools = callPackage ./lxqt-build-tools { }; + libsysstat = callPackage ./libsysstat { }; + liblxqt = callPackage ./liblxqt { }; ### CORE 1 - libfm-qt = callPackage ./core/libfm-qt { }; - lxqt-about = callPackage ./core/lxqt-about { }; - lxqt-admin = callPackage ./core/lxqt-admin { }; - lxqt-config = callPackage ./core/lxqt-config { }; - lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { }; - lxqt-l10n = callPackage ./core/lxqt-l10n { }; - lxqt-notificationd = callPackage ./core/lxqt-notificationd { }; - lxqt-openssh-askpass = callPackage ./core/lxqt-openssh-askpass { }; - lxqt-policykit = callPackage ./core/lxqt-policykit { }; - lxqt-powermanagement = callPackage ./core/lxqt-powermanagement { }; - lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { }; - lxqt-session = callPackage ./core/lxqt-session { }; - lxqt-sudo = callPackage ./core/lxqt-sudo { }; - lxqt-themes = callPackage ./core/lxqt-themes { }; - pavucontrol-qt = libsForQt5.callPackage ./core/pavucontrol-qt { }; - qtermwidget = callPackage ./core/qtermwidget { }; + libfm-qt = callPackage ./libfm-qt { }; + lxqt-about = callPackage ./lxqt-about { }; + lxqt-admin = callPackage ./lxqt-admin { }; + lxqt-config = callPackage ./lxqt-config { }; + lxqt-globalkeys = callPackage ./lxqt-globalkeys { }; + lxqt-l10n = callPackage ./lxqt-l10n { }; + lxqt-notificationd = callPackage ./lxqt-notificationd { }; + lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { }; + lxqt-policykit = callPackage ./lxqt-policykit { }; + lxqt-powermanagement = callPackage ./lxqt-powermanagement { }; + lxqt-qtplugin = callPackage ./lxqt-qtplugin { }; + lxqt-session = callPackage ./lxqt-session { }; + lxqt-sudo = callPackage ./lxqt-sudo { }; + lxqt-themes = callPackage ./lxqt-themes { }; + pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { }; + qtermwidget = callPackage ./qtermwidget { }; # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0 - qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { }; + qtermwidget_0_7_1 = callPackage ./qtermwidget/0.7.1.nix { }; ### CORE 2 - lxqt-panel = callPackage ./core/lxqt-panel { }; - lxqt-runner = callPackage ./core/lxqt-runner { }; - pcmanfm-qt = callPackage ./core/pcmanfm-qt { }; + lxqt-panel = callPackage ./lxqt-panel { }; + lxqt-runner = callPackage ./lxqt-runner { }; + pcmanfm-qt = callPackage ./pcmanfm-qt { }; ### OPTIONAL - qterminal = callPackage ./optional/qterminal { }; - compton-conf = pkgs.qt5.callPackage ./optional/compton-conf { }; - obconf-qt = callPackage ./optional/obconf-qt { }; - lximage-qt = callPackage ./optional/lximage-qt { }; - qps = callPackage ./optional/qps { }; - screengrab = callPackage ./optional/screengrab { }; - qlipper = callPackage ./optional/qlipper { }; + qterminal = callPackage ./qterminal { }; + compton-conf = pkgs.qt5.callPackage ./compton-conf { }; + obconf-qt = callPackage ./obconf-qt { }; + lximage-qt = callPackage ./lximage-qt { }; + qps = callPackage ./qps { }; + screengrab = callPackage ./screengrab { }; + qlipper = callPackage ./qlipper { }; preRequisitePackages = [ pkgs.gvfs # virtual file systems support for PCManFM-QT diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/libfm-qt/default.nix rename to pkgs/desktops/lxqt/libfm-qt/default.nix diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/base/liblxqt/default.nix rename to pkgs/desktops/lxqt/liblxqt/default.nix diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix similarity index 100% rename from pkgs/desktops/lxqt/base/libqtxdg/default.nix rename to pkgs/desktops/lxqt/libqtxdg/default.nix diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix similarity index 100% rename from pkgs/desktops/lxqt/base/libsysstat/default.nix rename to pkgs/desktops/lxqt/libsysstat/default.nix diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/lximage-qt/default.nix rename to pkgs/desktops/lxqt/lximage-qt/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-about/default.nix rename to pkgs/desktops/lxqt/lxqt-about/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-admin/default.nix rename to pkgs/desktops/lxqt/lxqt-admin/default.nix diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix similarity index 100% rename from pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix rename to pkgs/desktops/lxqt/lxqt-build-tools/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-config/default.nix rename to pkgs/desktops/lxqt/lxqt-config/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix rename to pkgs/desktops/lxqt/lxqt-globalkeys/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/lxqt-l10n/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-l10n/default.nix rename to pkgs/desktops/lxqt/lxqt-l10n/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix rename to pkgs/desktops/lxqt/lxqt-notificationd/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix rename to pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-panel/default.nix rename to pkgs/desktops/lxqt/lxqt-panel/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-policykit/default.nix rename to pkgs/desktops/lxqt/lxqt-policykit/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix rename to pkgs/desktops/lxqt/lxqt-powermanagement/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix rename to pkgs/desktops/lxqt/lxqt-qtplugin/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-runner/default.nix rename to pkgs/desktops/lxqt/lxqt-runner/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-session/default.nix rename to pkgs/desktops/lxqt/lxqt-session/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-sudo/default.nix rename to pkgs/desktops/lxqt/lxqt-sudo/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-themes/default.nix rename to pkgs/desktops/lxqt/lxqt-themes/default.nix diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/obconf-qt/default.nix rename to pkgs/desktops/lxqt/obconf-qt/default.nix diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix rename to pkgs/desktops/lxqt/pavucontrol-qt/default.nix diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix rename to pkgs/desktops/lxqt/pcmanfm-qt/default.nix diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/qlipper/default.nix rename to pkgs/desktops/lxqt/qlipper/default.nix diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/qps/default.nix rename to pkgs/desktops/lxqt/qps/default.nix diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/qterminal/default.nix rename to pkgs/desktops/lxqt/qterminal/default.nix diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/qtermwidget/0.7.1.nix similarity index 100% rename from pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix rename to pkgs/desktops/lxqt/qtermwidget/0.7.1.nix diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/qtermwidget/default.nix rename to pkgs/desktops/lxqt/qtermwidget/default.nix diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/screengrab/default.nix rename to pkgs/desktops/lxqt/screengrab/default.nix From cc68ac9807683e91df2c2b895243ccc402f4f849 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Mon, 10 Sep 2018 22:45:36 +0200 Subject: [PATCH 449/600] zsh: 5.6 -> 5.6.1 Signed-off-by: Christoph Hrdinka --- pkgs/shells/zsh/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 100657312da0..656414aabfcc 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre }: let - version = "5.6"; + version = "5.6.1"; documentation = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "1kz57w4l0jank67a2hiz6y5idbff5avwg52zdxx3qnflkjvkn2kx"; + url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; + sha256 = "15j8w1ddfparfnqymx67rycgfdl50xcrnd6p1d6q9n3n0462jjmn"; }; in @@ -14,8 +14,8 @@ stdenv.mkDerivation { name = "zsh-${version}"; src = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "1vik7s3q5hvazvgw4jm4b90qlk6zcry0s314xw1liarspkd721g3"; + url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; + sha256 = "1s5kzfbfvixibb1sbzmmlrrx898zqwi5cfmnnq4bhcbx64zparlm"; }; buildInputs = [ ncurses pcre ]; From 1cf44e6a07b5ba66dcf015bb729d44b6418f0486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 10 Sep 2018 22:41:23 +0100 Subject: [PATCH 450/600] opentracker: use https for downloading --- pkgs/applications/networking/p2p/opentracker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 83ddb456153c..46c482818f8b 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "opentracker-2018-05-26"; src = fetchgit { - url = "git://erdgeist.org/opentracker"; + url = "https://erdgeist.org/gitweb/opentracker"; rev = "6411f1567f64248b0d145493c2e61004d2822623"; sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j"; }; @@ -12,9 +12,9 @@ stdenv.mkDerivation { buildInputs = [ libowfat zlib ]; installPhase = '' - mkdir -p $out/bin $out/share/doc - cp opentracker $out/bin - cp opentracker.conf.sample $out/share/doc + runHook preInstall + install -D opentracker $out/bin/opentracker + install -D opentracker.conf.sample $out/share/doc/opentracker.conf.sample runHook postInstall ''; From 6d8a48e5856c3f686da11cba9278560f458e9148 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Sep 2018 15:07:37 -0700 Subject: [PATCH 451/600] gitAndTools.svn-all-fast-export: 1.0.12 -> 1.0.13 (#46173) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from svn-all-fast-export --- .../git-and-tools/svn-all-fast-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 17fb74945dc4..35c6d33d74da 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: let - version = "1.0.12"; + version = "1.0.13"; in stdenv.mkDerivation { name = "svn-all-fast-export-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "svn-all-fast-export"; repo = "svn2git"; rev = version; - sha256 = "158w2ynz16dlp992g8nfk7v2f5962z88b4xyv5dyjvbl4l1v7r0v"; + sha256 = "0f1qj0c4cdq46mz54wcy17g7rq1fy2q0bq3sswhr7r5a2s433x4f"; }; nativeBuildInputs = [ qmake qttools ]; From 19ae5948a689d73043f99d55ce9210110ed50996 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Sep 2018 15:08:41 -0700 Subject: [PATCH 452/600] papirus-icon-theme: 20180401 -> 20180816 (#46230) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from papirus-icon-theme --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index c0f4727f48fb..1efd4145ce03 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20180401"; + version = "20180816"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "1cbzv3igc6j05h0mq2850fwfd8sxxwixzgmhh85mc1k326rvncil"; + sha256 = "0rmf5hvp6711pyqdq5sdxkrjr21nbk6113r4a7d8735ynvm8znkk"; }; nativeBuildInputs = [ gtk3 ]; From a026fea9e6443239060e747b320cab8028ad61ad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Sep 2018 15:12:50 -0700 Subject: [PATCH 453/600] mate.mate-session-manager: 1.20.1 -> 1.21.0 (#46239) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from mate-session-manager --- pkgs/desktops/mate/mate-session-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 47657375bbab..38881e425762 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0gdxa46ps0fxspri08kpp99vzx06faw6x30k6vbjg5m7x1xfq7i5"; + sha256 = "1556kn4sk41x70m8cx200g4c9q3wndnhdxj4vp93sw262yqmk9mn"; }; nativeBuildInputs = [ From dc6b36b994c05debb881c049fadaae353507e0b7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 11 Sep 2018 00:25:49 +0200 Subject: [PATCH 454/600] perl-Module-Build-XSUtil: fix darwin build While building the tests LD gets called with -mmacosx-version-min=10.10 which is a CC flag, causing the build to fail with LD=ld. This is pretty common with perl packages. /cc ZHF #45961 --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6bf58f5db28d..14ac1ca2e2c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9650,11 +9650,12 @@ let sha256 = "004ly9xxjlsbrr2vhxsa1n84z3034gxrzr7z0wl45szd8v1v6qwh"; }; buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ]; + propagatedBuildInputs = [ DevelCheckCompiler ]; + perlPreHook = "export LD=$CC"; meta = { description = "A Module::Build class for building XS modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ DevelCheckCompiler ]; }; ModuleCPANTSAnalyse = buildPerlPackage rec { From 5e8fd8792b043c437c07e353f20a6ccb09f8283d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 11 Sep 2018 00:48:15 +0200 Subject: [PATCH 455/600] perl-Mouse: fix darwin build /cc ZHF #45961 --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 14ac1ca2e2c6..2ec4efed8863 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10884,6 +10884,7 @@ let sha256 = "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l"; }; buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ]; + perlPreHook = "export LD=$CC"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector"; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; }; From f2836b36228800851237ec4a958da61ada355e30 Mon Sep 17 00:00:00 2001 From: Marica Odagaki Date: Mon, 10 Sep 2018 16:52:14 -0800 Subject: [PATCH 456/600] aws-vault: 4.1.0 -> 4.3.0 --- pkgs/tools/admin/aws-vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 4f8b1bc1368f..6e0bf2d147a3 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "${pname}-${version}"; pname = "aws-vault"; - version = "4.1.0"; + version = "4.3.0"; goPackagePath = "github.com/99designs/${pname}"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "04cdynqmkbs7bkl2aay4sjxq49i90fg048lw0ssw1fpwldbvnl6j"; + sha256 = "0cwzvw1rcvg7y3m8dahr9r05s4i9apnfw5xhiaf0rlkdh3vy33wp"; }; meta = with lib; { From 962712524eba87ab3993e2095a8387b1b8ee7b72 Mon Sep 17 00:00:00 2001 From: Marica Odagaki Date: Mon, 10 Sep 2018 16:52:53 -0800 Subject: [PATCH 457/600] aws-vault: pass the app version to the linker Otherwise, "aws-vault --version" just outputs "dev" --- pkgs/tools/admin/aws-vault/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 6e0bf2d147a3..71360f8030c5 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -13,6 +13,12 @@ buildGoPackage rec { sha256 = "0cwzvw1rcvg7y3m8dahr9r05s4i9apnfw5xhiaf0rlkdh3vy33wp"; }; + # set the version. see: aws-vault's Makefile + buildFlagsArray = '' + -ldflags= + -X main.Version=v${version} + ''; + meta = with lib; { description = "A vault for securely storing and accessing AWS credentials in development environments"; homepage = "https://github.com/99designs/aws-vault"; From bc7c56f2a499d41f508793399f116de38dfac9e4 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 11 Sep 2018 03:06:29 +0200 Subject: [PATCH 458/600] taskjuggler: 3.5.0 -> 3.6.0 --- .../misc/taskjuggler/Gemfile.lock | 14 ++-- .../applications/misc/taskjuggler/default.nix | 13 ++-- pkgs/applications/misc/taskjuggler/gemset.nix | 66 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 54 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock index d1642e76fa65..ebd04c20ea6d 100644 --- a/pkgs/applications/misc/taskjuggler/Gemfile.lock +++ b/pkgs/applications/misc/taskjuggler/Gemfile.lock @@ -1,15 +1,15 @@ GEM remote: http://rubygems.org/ specs: - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.6.1) - taskjuggler (3.5.0) + mail (2.7.0) + mini_mime (>= 0.1.1) + mini_mime (1.0.1) + taskjuggler (3.6.0) mail (>= 2.4.3) term-ansicolor (>= 1.0.7) - term-ansicolor (1.3.2) + term-ansicolor (1.6.0) tins (~> 1.0) - tins (1.6.0) + tins (1.16.3) PLATFORMS ruby @@ -18,4 +18,4 @@ DEPENDENCIES taskjuggler BUNDLED WITH - 1.10.5 + 1.14.6 diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index c5429b6c8510..f3f9285b312d 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -1,16 +1,21 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp, ruby }: -bundlerEnv { - name = "taskjuggler-3.5.0"; +bundlerApp { + pname = "taskjuggler"; inherit ruby; gemdir = ./.; + exes = [ + "tj3" "tj3client" "tj3d" "tj3man" "tj3ss_receiver" "tj3ss_sender" + "tj3ts_receiver" "tj3ts_sender" "tj3ts_summary" "tj3webd" + ]; + meta = { - broken = true; # needs ruby 2.0 description = "A modern and powerful project management tool"; homepage = http://taskjuggler.org/; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.manveru ]; }; } diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix index e65ab3451a62..24c1e4311777 100644 --- a/pkgs/applications/misc/taskjuggler/gemset.nix +++ b/pkgs/applications/misc/taskjuggler/gemset.nix @@ -1,47 +1,55 @@ { - "mail" = { - version = "2.6.3"; + mail = { + dependencies = ["mini_mime"]; + groups = ["default"]; + platforms = []; source = { + remotes = ["http://rubygems.org"]; + sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz"; type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; }; - dependencies = [ - "mime-types" - ]; + version = "2.7.0"; }; - "mime-types" = { - version = "2.6.1"; + mini_mime = { + groups = ["default"]; + platforms = []; source = { + remotes = ["http://rubygems.org"]; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; - sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; }; + version = "1.0.1"; }; - "taskjuggler" = { - version = "3.5.0"; + taskjuggler = { + dependencies = ["mail" "term-ansicolor"]; + groups = ["default"]; + platforms = []; source = { + remotes = ["http://rubygems.org"]; + sha256 = "0ky3cydl3szhdyxsy4k6zxzjlbll7mlq025aj6xd5jmh49k3pfbp"; type = "gem"; - sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2"; }; - dependencies = [ - "mail" - "term-ansicolor" - ]; + version = "3.6.0"; }; - "term-ansicolor" = { - version = "1.3.2"; + term-ansicolor = { + dependencies = ["tins"]; + groups = ["default"]; + platforms = []; source = { + remotes = ["http://rubygems.org"]; + sha256 = "1b1wq9ljh7v3qyxkk8vik2fqx2qzwh5lval5f92llmldkw7r7k7b"; type = "gem"; - sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys"; }; - dependencies = [ - "tins" - ]; - }; - "tins" = { version = "1.6.0"; - source = { - type = "gem"; - sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz"; - }; }; -} + tins = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["http://rubygems.org"]; + sha256 = "0g95xs4nvx5n62hb4fkbkd870l9q3y9adfc4h8j21phj9mxybkb8"; + type = "gem"; + }; + version = "1.16.3"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40440f1b379f..4cc58a009fba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18794,7 +18794,7 @@ with pkgs; teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - uaskjuggler = callPackage ../applications/misc/taskjuggler { }; + taskjuggler = callPackage ../applications/misc/taskjuggler { }; tasknc = callPackage ../applications/misc/tasknc { }; From f384fdb24091c028c23a977ad0f463c90b585c30 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 11 Sep 2018 10:01:45 +0800 Subject: [PATCH 459/600] pulseaudio-modules-bt: init at unstable-2018-09-11 --- .../audio/pulseaudio-modules-bt/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/applications/audio/pulseaudio-modules-bt/default.nix diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix new file mode 100644 index 000000000000..e3d07fcc2457 --- /dev/null +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, runCommand +, fetchFromGitHub +, libpulseaudio +, pulseaudio +, pkgconfig +, libtool +, cmake +, bluez +, dbus +, sbc +}: + +let + pulseSources = runCommand "pulseaudio-sources" {} '' + mkdir $out + tar -xf ${pulseaudio.src} + mv pulseaudio*/* $out/ + ''; + +in stdenv.mkDerivation rec { + name = "pulseaudio-modules-bt-${version}"; + version = "unstable-2018-09-11"; + + src = fetchFromGitHub { + owner = "EHfive"; + repo = "pulseaudio-modules-bt"; + rev = "9c6ad75382f3855916ad2feaa6b40e37356d80cc"; + sha256 = "1iz4m3y6arsvwcyvqc429w252dl3apnhvl1zhyvfxlbg00d2ii0h"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkgconfig + cmake + ]; + + buildInputs = [ + libpulseaudio + pulseaudio + libtool + bluez + dbus + sbc + ]; + + NIX_CFLAGS_COMPILE = [ + "-L${pulseaudio}/lib/pulseaudio" + ]; + + prePatch = '' + rm -r pa + ln -s ${pulseSources} pa + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/EHfive/pulseaudio-modules-bt; + description = "SBC, Sony LDAC codec (A2DP Audio) support for Pulseaudio"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ adisbladis ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40440f1b379f..249e96610841 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13706,6 +13706,8 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez { }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { }; + bluez = bluez5; inherit (python3Packages) bedup; From 36b5ffa40bb4cfd98c86e94a396add4f5d3b9f5a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 10 Sep 2018 22:28:05 -0500 Subject: [PATCH 460/600] nodejs: use https for downloading --- pkgs/development/web/nodejs/nodejs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index b2ee7528814f..ea764ef22e6e 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -42,7 +42,7 @@ in name = "${baseName}-${version}"; src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; + url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; inherit sha256; }; From bfdfb73ff154967e80caa98e8717993b037383dd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 10 Sep 2018 22:28:20 -0500 Subject: [PATCH 461/600] nodejs-6_x: 6.14.3 -> 6.14.4 --- pkgs/development/web/nodejs/v6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 2e94923441fc..7250613e8628 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "6.14.3"; - sha256 = "1jbrfk875aimm65wni059rrydmhp4z0hrxskq3ci6jvykxr8gwg3"; + version = "6.14.4"; + sha256 = "03zc6jhid6jyi871zlcrkjqffmrpxh01z2xfsl3xp2vzg2czqjws"; } From d24f81b825935dee3ce6e8019036a3abdc1a9695 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Mon, 10 Sep 2018 21:33:19 -0700 Subject: [PATCH 462/600] bazel: 0.16.0 -> 0.16.1 --- pkgs/development/tools/build-managers/bazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 49d6abdc0098..ff9cc3eb45aa 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { - version = "0.16.0"; + version = "0.16.1"; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1ca9pncnj6v4r1kvgxys7607wpz4d2ic6g0i7lpsc2zg2qwmjc67"; + sha256 = "0v5kcz8q9vzf4cpmlx8k2gg0dsr8mj0jmx9a44pwb0kc6na6pih9"; }; sourceRoot = "."; From a33df7750ef16440e4810440d40f63937bafc3ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Sep 2018 23:56:15 -0700 Subject: [PATCH 463/600] log4cplus: 1.2.0 -> 2.0.2 (#46233) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from log4cplus --- pkgs/development/libraries/log4cplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 3fdad73d9fa5..7a390021d1fa 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-1.2.0"; + name = "log4cplus-2.0.2"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "1fb3g9l12sps3mv4xjiql2kcvj439mww3skz735y7113cnlcf338"; + sha256 = "0y9yy32lhgrcss8i2gcc9incdy55rcrr16dx051gkia1vdzfkay4"; }; meta = { From f201f8c3fdb51e3bf45cc2bcbcf982843c147c4f Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Tue, 11 Sep 2018 11:15:03 +0200 Subject: [PATCH 464/600] pythonPackages.pytestflakes: fix build (#46500) - disable a failing test case that looks broken - remove pytestcache depencency that was dropped upstream --- pkgs/development/python-modules/pytest-flakes/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index f8823b966da0..52cfed14150a 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytestpep8, pytest, pyflakes, pytestcache }: +, pytestpep8, pytest, pyflakes }: buildPythonPackage rec { pname = "pytest-flakes"; @@ -11,10 +11,11 @@ buildPythonPackage rec { }; buildInputs = [ pytestpep8 pytest ]; - propagatedBuildInputs = [ pyflakes pytestcache ]; + propagatedBuildInputs = [ pyflakes ]; + # disable one test case that looks broken checkPhase = '' - py.test test_flakes.py + py.test test_flakes.py -k 'not test_syntax_error' ''; meta = with stdenv.lib; { From 7a42623c23c3753c5f4a9edace3576a01b5bc543 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 10 Sep 2018 21:44:48 +0200 Subject: [PATCH 465/600] networking.hostId: fix cmd in description 1. Simplify the command by reading directly from /etc/machine-id which is already a random, lower-case hex string 2. Previously, the command output could be too short because of missing leading digits. This is now fixed. --- nixos/modules/tasks/network-interfaces.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 20a740ce1f0c..815523093dde 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -341,7 +341,7 @@ in You should try to make this ID unique among your machines. You can generate a random 32-bit ID using the following commands: - cksum /etc/machine-id | while read c rest; do printf "%x" $c; done + head -c 8 /etc/machine-id (this derives it from the machine-id that systemd generates) or From c8ccc433dfe372164387504587596defcf0b8578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Sep 2018 10:38:04 +0100 Subject: [PATCH 466/600] nixos/hylafax: show correct option in warning message. --- nixos/modules/services/networking/hylafax/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/hylafax/default.nix b/nixos/modules/services/networking/hylafax/default.nix index 6e28e8c5d8bc..4c63b822d165 100644 --- a/nixos/modules/services/networking/hylafax/default.nix +++ b/nixos/modules/services/networking/hylafax/default.nix @@ -21,7 +21,7 @@ message = '' HylaFAX cannot be used without modems. Please define at least one modem with - . + . ''; }]; }; From 2a6e4ae49a891adc7c0562fda08b17d60beb1b4f Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 11 Sep 2018 12:04:00 +0200 Subject: [PATCH 467/600] Revert "top-level: Deprecate top-level `{build,host,target}Platform`" This reverts commit e51f736076548459f36a1250de4bf6867f880b66. --- doc/cross-compilation.xml | 10 +++++++--- pkgs/top-level/stage.nix | 16 +++++----------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index c7187d86d1b3..3b90596bcc2c 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -47,9 +47,13 @@ In Nixpkgs, these three platforms are defined as attribute sets under the - names buildPlatform, hostPlatform, and - targetPlatform. They are always defined as attributes in - the standard environment. That means one can access them like: + names buildPlatform, hostPlatform, + and targetPlatform. All three are always defined as + attributes in the standard environment, and at the top level. That means + one can get at them just like a dependency in a function that is imported + with callPackage: +{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform... + , or just off stdenv: { stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform... . diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index ff09fa5ad1fd..06978d1067bf 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -79,17 +79,11 @@ let # The old identifiers for cross-compiling. These should eventually be removed, # and the packages that rely on them refactored accordingly. - platformCompat = self: super: { - buildPlatform = lib.warn - "top-level `buildPlatform` is deprecated since 18.09. Please use `stdenv.buildPlatform`." - super.stdenv.buildPlatform; - hostPlatform = lib.warn - "top-level `hostPlatform` is deprecated since 18.09. Please use `stdenv.hostPlatform`." - super.stdenv.hostPlatform; - targetPlatform = lib.warn - "top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`." - super.stdenv.targetPlatform; - inherit (super.stdenv.hostPlatform) system; + platformCompat = self: super: let + inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; + in { + inherit buildPlatform hostPlatform targetPlatform; + inherit (buildPlatform) system; }; splice = self: super: import ./splice.nix lib self (buildPackages != null); From ed5283fcf54083464c38867c00d2e1e6b04f0330 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 11 Sep 2018 12:33:02 +0200 Subject: [PATCH 468/600] tor-browser-bundle-bin: 7.5.6 -> 8.0 --- .../tor-browser-bundle-bin/default.nix | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) 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 ffa5d4472527..d922de7d6a55 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -14,7 +14,7 @@ , freetype , gdk_pixbuf , glib -, gtk2 +, gtk3 , libxcb , libX11 , libXext @@ -70,7 +70,7 @@ let freetype gdk_pixbuf glib - gtk2 + gtk3 libxcb libX11 libXext @@ -101,7 +101,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.5.6"; + version = "8.0"; lang = "en-US"; @@ -111,7 +111,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "07z7lg5firyah0897pr04wqnbgf4mvsnk3gq2zgsg1rrwladxz5s"; + sha256 = "139cizh33x3nzr0f4b2q3cchrv9l01n3c2v0v0mghq30hap55p79"; }; "i686-linux" = fetchurl { @@ -119,7 +119,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1s0k82ch7ypjyc5k5rb4skb9ylnp7b9ipvf8gb7pdhb8m4zjk461"; + sha256 = "1vw5wh193vs5x3wizz34m2nyzlxpn24727hdxqpiqwlhwhj7y3nx"; }; }; in @@ -154,10 +154,14 @@ stdenv.mkDerivation rec { pushd "$TBB_IN_STORE" # Set ELF interpreter - for exe in firefox TorBrowser/Tor/tor ; do + for exe in firefox.real TorBrowser/Tor/tor ; do + echo "Setting ELF interpreter on $exe ..." >&2 patchelf --set-interpreter "$interp" "$exe" done + # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path + mv firefox.real firefox + # The final libPath. Note, we could split this into firefoxLibPath # and torLibPath for accuracy, but this is more convenient ... libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor @@ -219,7 +223,7 @@ stdenv.mkDerivation rec { // Insist on using IPC for communicating with Tor // - // Defaults to creating $TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket + // Defaults to creating \$TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket lockPref("extensions.torlauncher.control_port_use_ipc", true); lockPref("extensions.torlauncher.socks_port_use_ipc", true); @@ -245,10 +249,6 @@ stdenv.mkDerivation rec { sed -i "$FONTCONFIG_FILE" \ -e "s,fonts,$TBB_IN_STORE/fonts," - # Move default extension overrides into distribution dir, to avoid - # having to synchronize between local state and store. - mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js - # Preload extensions by moving into the runtime instead of storing under the # user's profile directory. mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \ @@ -384,11 +384,7 @@ stdenv.mkDerivation rec { cp $desktopItem/share/applications"/"* $out/share/applications sed -i $out/share/applications/torbrowser.desktop \ -e "s,Exec=.*,Exec=$out/bin/tor-browser," \ - -e "s,Icon=.*,Icon=$out/share/pixmaps/torbrowser.png," - - # Install icons - mkdir -p $out/share/pixmaps - cp browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png + -e "s,Icon=.*,Icon=web-browser," # Check installed apps echo "Checking bundled Tor ..." From 35df0f7f0cd0bf8c504c5287144d5fe1acd491db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 Sep 2018 12:47:16 +0100 Subject: [PATCH 469/600] dep2nix: 0.0.1 -> 0.0.2 --- pkgs/development/tools/dep2nix/default.nix | 10 +- pkgs/development/tools/dep2nix/deps.nix | 145 --------------------- 2 files changed, 5 insertions(+), 150 deletions(-) delete mode 100644 pkgs/development/tools/dep2nix/deps.nix diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix index 6367f6be2981..14cce35f19e2 100644 --- a/pkgs/development/tools/dep2nix/default.nix +++ b/pkgs/development/tools/dep2nix/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, buildGoPackage -, makeWrapper, nix-prefetch-git }: +, makeWrapper, nix-prefetch-scripts }: buildGoPackage rec { name = "dep2nix-${version}"; - version = "0.0.1"; + version = "0.0.2"; goPackagePath = "github.com/nixcloud/dep2nix"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "nixcloud"; repo = "dep2nix"; rev = version; - sha256 = "05b06wgcy88fb5ccqwq3mfhrhcblr1akpxgsf44kgbdwf5nzz87g"; + sha256 = "17csgnd6imr1l0gpirsvr5qg7z0mpzxj211p2nwqilrvbp8zj7vg"; }; nativeBuildInputs = [ @@ -20,10 +20,10 @@ buildGoPackage rec { postFixup = '' wrapProgram $bin/bin/dep2nix \ - --prefix PATH : ${nix-prefetch-git}/bin + --prefix PATH : ${nix-prefetch-scripts}/bin ''; - goDeps = ./deps.nix; + goDeps = src + "/deps.nix"; meta = with stdenv.lib; { description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`"; diff --git a/pkgs/development/tools/dep2nix/deps.nix b/pkgs/development/tools/dep2nix/deps.nix deleted file mode 100644 index fc9280e9df5b..000000000000 --- a/pkgs/development/tools/dep2nix/deps.nix +++ /dev/null @@ -1,145 +0,0 @@ - - # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) - [ - - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"; - sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik"; - }; - } - - { - goPackagePath = "github.com/Masterminds/vcs"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/vcs"; - rev = "6f1c6d150500e452704e9863f68c2559f58616bf"; - sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j"; - }; - } - - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61"; - sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic"; - }; - } - - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; - sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; - }; - } - - { - goPackagePath = "github.com/golang/dep"; - fetch = { - type = "git"; - url = "https://github.com/CrushedPixel/dep"; - rev = "fa9f32339c8855ebe7e7bc66e549036a7e06d37a"; - sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; - sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; - }; - } - - { - goPackagePath = "github.com/jmank88/nuts"; - fetch = { - type = "git"; - url = "https://github.com/jmank88/nuts"; - rev = "8b28145dffc87104e66d074f62ea8080edfad7c8"; - sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k"; - }; - } - - { - goPackagePath = "github.com/nightlyone/lockfile"; - fetch = { - type = "git"; - url = "https://github.com/nightlyone/lockfile"; - rev = "6a197d5ea61168f2ac821de2b7f011b250904900"; - sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl"; - }; - } - - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; - sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; - }; - } - - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - - { - goPackagePath = "github.com/sdboyer/constext"; - fetch = { - type = "git"; - url = "https://github.com/sdboyer/constext"; - rev = "836a144573533ea4da4e6929c235fd348aed1c80"; - sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "dc948dff8834a7fe1ca525f8d04e261c2b56e70d"; - sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; - sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; - sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; - }; - } - -] From e8621a45a2e8b7d593e0bbd0953950aa6257e0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 Sep 2018 12:56:14 +0100 Subject: [PATCH 470/600] dep2nix: fix eval (no IFD) --- pkgs/development/tools/dep2nix/default.nix | 2 +- pkgs/development/tools/dep2nix/deps.nix | 145 +++++++++++++++++++++ 2 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/dep2nix/deps.nix diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix index 14cce35f19e2..e7033c44dd49 100644 --- a/pkgs/development/tools/dep2nix/default.nix +++ b/pkgs/development/tools/dep2nix/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { --prefix PATH : ${nix-prefetch-scripts}/bin ''; - goDeps = src + "/deps.nix"; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`"; diff --git a/pkgs/development/tools/dep2nix/deps.nix b/pkgs/development/tools/dep2nix/deps.nix new file mode 100644 index 000000000000..fc9280e9df5b --- /dev/null +++ b/pkgs/development/tools/dep2nix/deps.nix @@ -0,0 +1,145 @@ + + # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) + [ + + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"; + sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik"; + }; + } + + { + goPackagePath = "github.com/Masterminds/vcs"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/vcs"; + rev = "6f1c6d150500e452704e9863f68c2559f58616bf"; + sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j"; + }; + } + + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61"; + sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic"; + }; + } + + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; + sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; + }; + } + + { + goPackagePath = "github.com/golang/dep"; + fetch = { + type = "git"; + url = "https://github.com/CrushedPixel/dep"; + rev = "fa9f32339c8855ebe7e7bc66e549036a7e06d37a"; + sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; + sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; + }; + } + + { + goPackagePath = "github.com/jmank88/nuts"; + fetch = { + type = "git"; + url = "https://github.com/jmank88/nuts"; + rev = "8b28145dffc87104e66d074f62ea8080edfad7c8"; + sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k"; + }; + } + + { + goPackagePath = "github.com/nightlyone/lockfile"; + fetch = { + type = "git"; + url = "https://github.com/nightlyone/lockfile"; + rev = "6a197d5ea61168f2ac821de2b7f011b250904900"; + sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl"; + }; + } + + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; + sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; + }; + } + + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + + { + goPackagePath = "github.com/sdboyer/constext"; + fetch = { + type = "git"; + url = "https://github.com/sdboyer/constext"; + rev = "836a144573533ea4da4e6929c235fd348aed1c80"; + sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "dc948dff8834a7fe1ca525f8d04e261c2b56e70d"; + sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg"; + }; + } + + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; + sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; + }; + } + + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; + sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; + }; + } + +] From 2c18d48c0e687f083dcd80f53efa3ed9c2be3984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 8 Sep 2018 22:39:55 +0100 Subject: [PATCH 471/600] datadog-agent: 6.1.4 -> 6.4.2 --- pkgs/tools/networking/dd-agent/6.nix | 24 +- pkgs/tools/networking/dd-agent/README.md | 8 + pkgs/tools/networking/dd-agent/deps.nix | 975 ++++++++++++++++++++--- 3 files changed, 887 insertions(+), 120 deletions(-) create mode 100644 pkgs/tools/networking/dd-agent/README.md diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix index 56a71595cea7..c095a77fda05 100644 --- a/pkgs/tools/networking/dd-agent/6.nix +++ b/pkgs/tools/networking/dd-agent/6.nix @@ -1,26 +1,27 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig }: +{ stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd }: let # keep this in sync with github.com/DataDog/agent-payload dependency - payloadVersion = "4.7"; + payloadVersion = "4.7.1"; in buildGoPackage rec { name = "datadog-agent-${version}"; - version = "6.1.4"; + version = "6.4.2"; owner = "DataDog"; repo = "datadog-agent"; src = fetchFromGitHub { inherit owner repo; - rev = "a8ee76deb11fa334470d9b8f2356214999980894"; - sha256 = "06grcwwbfvcw1k1d4nqrasrf76qkpik1gsw60zwafllfd9ffhl1v"; + rev = "155fddb3547919bd54530dfdb250e0cb2defae7d"; + sha256 = "0l7ic0p2h27x386k1gzzm20af2s06cpalmqz0h0c5zq4wszmw5zy"; }; subPackages = [ "cmd/agent" "cmd/dogstatsd" "cmd/py-launcher" - "cmd/cluster-agent" + # Does not compile: go/src/github.com/DataDog/datadog-agent/cmd/cluster-agent/main.go:31:12: undefined: app.ClusterAgentCmd + #"cmd/cluster-agent" ]; goDeps = ./deps.nix; goPackagePath = "github.com/${owner}/${repo}"; @@ -29,9 +30,11 @@ in buildGoPackage rec { python = pythonPackages.python; nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ systemd ]; PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; - buildFlagsArray = let + + preBuild = let ldFlags = stdenv.lib.concatStringsSep " " [ "-X ${goPackagePath}/pkg/version.Commit=${src.rev}" "-X ${goPackagePath}/pkg/version.AgentVersion=${version}" @@ -39,10 +42,9 @@ in buildGoPackage rec { "-X ${goPackagePath}/pkg/collector/py.pythonHome=${python}" "-r ${python}/lib" ]; - in [ - "-ldflags=${ldFlags}" - ]; - buildFlags = "-tags cpython"; + in '' + buildFlagsArray=( "-tags" "ec2 systemd cpython process log" "-ldflags" "${ldFlags}") + ''; # DataDog use paths relative to the agent binary, so fix these. postPatch = '' diff --git a/pkgs/tools/networking/dd-agent/README.md b/pkgs/tools/networking/dd-agent/README.md new file mode 100644 index 000000000000..b04af72aef10 --- /dev/null +++ b/pkgs/tools/networking/dd-agent/README.md @@ -0,0 +1,8 @@ +To update v6 (v5 is deprecated and should be removed): + +1. Bump `version`, `rev`, `sha256` and `payloadVersion` in `6.nix` +2. `git clone https://github.com/DataDog/datadog-agent.git && cd datadog-agent` +3. `git checkout ` +4. `nix-env -i -f https://github.com/nixcloud/dep2nix/archive/master.tar.gz` +5. `deps2nix` +6. `cp deps.nix $NIXPKGS/pkgs/tools/networking/dd-agent/deps.nix` diff --git a/pkgs/tools/networking/dd-agent/deps.nix b/pkgs/tools/networking/dd-agent/deps.nix index 7a8fc69b2a42..eddd16e0ab9d 100644 --- a/pkgs/tools/networking/dd-agent/deps.nix +++ b/pkgs/tools/networking/dd-agent/deps.nix @@ -1,353 +1,1110 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "github.com/DataDog/agent-payload"; + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "https://bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/DataDog/agent-payload"; fetch = { type = "git"; url = "https://github.com/DataDog/agent-payload"; - rev = "3b793015ecfa5b829e8a466bd7cce836891502cc"; - sha256 = "0lg7c1whmvk4a13mrivdjfzfxqan07kvs2calgylncy7yf4szdp6"; + rev = "c76e9d5be7457cafb7b3e056c6e8ae127b1f0431"; + sha256 = "0wva55yz5gs5gw23icz1z23hwhjw5vmijx4aa3fp3bq6pi63s873"; }; } { - goPackagePath = "github.com/DataDog/gohai"; + goPackagePath = "github.com/DataDog/gohai"; fetch = { type = "git"; url = "https://github.com/DataDog/gohai"; - rev = "d80d0f562a71fa2380fbeccc93ba5a2e325606e4"; - sha256 = "1frslms7f5i8dc8n0v9pb64mf4zdj3q2c005qxajl8j8i9nhj7yb"; + rev = "508b4f7bfc834501c944ab00e99b6f0e760f5ea7"; + sha256 = "0qnhckvj3sk9rwc3dxz48zhx5p8ajg71azhi3y1l7ac6ayzpsc7f"; }; } { - goPackagePath = "github.com/DataDog/mmh3"; + goPackagePath = "github.com/DataDog/mmh3"; fetch = { type = "git"; url = "https://github.com/DataDog/mmh3"; - rev = "2cfb68475274527a10701355c739f31dd404718c"; + rev = "2cfb68475274527a10701355c739f31dd404718c"; sha256 = "09jgzxi08pkxllxk3f5qwipz96jxrw5v035fj2bkid1d4akn8y0b"; }; } { - goPackagePath = "github.com/beevik/ntp"; + goPackagePath = "github.com/DataDog/zstd"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/zstd"; + rev = "aebefd9fcb99f22cd691ef778a12ed68f0e6a1ab"; + sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8"; + }; + } + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "67921128fb397dd80339870d2193d6b1e6856fd4"; + sha256 = "1m3ajjwpdmbzhn5iclhzgyknfncw06fnd5n91yxlf75qsq235rz3"; + }; + } + { + goPackagePath = "github.com/NYTimes/gziphandler"; + fetch = { + type = "git"; + url = "https://github.com/NYTimes/gziphandler"; + rev = "2600fb119af974220d3916a5916d6e31176aac1b"; + sha256 = "0bh6qqz2iyrnxhhj02s8mqayqwqxy182ldxh97q1vg7phlbm52xx"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"; + sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/StackExchange/wmi"; + fetch = { + type = "git"; + url = "https://github.com/StackExchange/wmi"; + rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; + sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "bff41fb23b7550368282029f6478819d6a99ae0f"; + sha256 = "1hcd8f3m2cq02mj9i8c1ynbh3j0iyw14l1wszm0qgs18nsj1rzgn"; + }; + } + { + goPackagePath = "github.com/beevik/ntp"; fetch = { type = "git"; url = "https://github.com/beevik/ntp"; - rev = "cb3dae3a7588ae35829eb5724df611cd75152fba"; + rev = "cb3dae3a7588ae35829eb5724df611cd75152fba"; sha256 = "0nc6f7d0xw23y18z9qxrmm8kvnywihassyk706mn9v4makmhalnz"; }; } { - goPackagePath = "github.com/cihub/seelog"; + goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; - url = "https://github.com/cihub/seelog"; - rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4"; - sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; }; } { - goPackagePath = "github.com/docker/docker"; + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "2ea60e5f094469f9e65adb9cd103795b73ae743e"; + sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; + }; + } + { + goPackagePath = "github.com/cihub/seelog"; + fetch = { + type = "git"; + url = "https://github.com/cihub/seelog"; + rev = "d2c6e5aa9fbfdd1c624e140287063c7730654115"; + sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p"; + }; + } + { + goPackagePath = "github.com/clbanning/mxj"; + fetch = { + type = "git"; + url = "https://github.com/clbanning/mxj"; + rev = "1f00e0bf9bacd7ea9c93d27594d1d1f5a41bac36"; + sha256 = "1cb7kib79xrzr8n91p6kskmn30ayqrhbqql2ppyf879967wbm8qy"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "c9504f61fc7f29b0ad30bf8bab02d9e1b600e962"; + sha256 = "1ap8zhfz6pcn2ipn27s84ihpyrvpjrb48mpy4n5pr6khrni83p1a"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "40e2722dffead74698ca12a750f64ef313ddce05"; + sha256 = "0kq7aa0pbn8gv9ny2a1gfx3ybsqyryfwz9gv7fck6zfc8xxbl1fa"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1"; + sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"; + sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b"; + }; + } + { + goPackagePath = "github.com/docker/docker"; fetch = { type = "git"; url = "https://github.com/docker/docker"; - rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363"; + rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363"; sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; }; } { - goPackagePath = "github.com/dsnet/compress"; + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"; + sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; + sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; + }; + } + { + goPackagePath = "github.com/dsnet/compress"; fetch = { type = "git"; url = "https://github.com/dsnet/compress"; - rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; + rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; }; } { - goPackagePath = "github.com/fatih/color"; + goPackagePath = "github.com/dustin/go-humanize"; fetch = { type = "git"; - url = "https://github.com/fatih/color"; - rev = "507f6050b8568533fb3f5504de8e5205fa62a114"; - sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; + url = "https://github.com/dustin/go-humanize"; + rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; }; } { - goPackagePath = "github.com/fsnotify/fsnotify"; + 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/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "3658237ded108b4134956c1b3050349d93e7b895"; + sha256 = "07sm3b5dlrqld4r8r1w79s37y41fk4zmw4afhi2ragjy1iarqck3"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful-swagger12"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful-swagger12"; + rev = "dcef7f55730566d41eae5db10e7d6981829720f6"; + sha256 = "0zz1f6n1qfbyrp592mgyrkyfhki3r0ksic6ja9lxisg8br1ibrvq"; + }; + } + { + goPackagePath = "github.com/evanphx/json-patch"; + fetch = { + type = "git"; + url = "https://github.com/evanphx/json-patch"; + rev = "afac545df32f2287a079e2dfb7ba2745a643747e"; + sha256 = "1d90prf8wfvndqjn6nr0k405ykia5vb70sjw4ywd49s9p3wcdyn8"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } { - goPackagePath = "github.com/go-ini/ini"; + goPackagePath = "github.com/geoffgarside/ber"; + fetch = { + type = "git"; + url = "https://github.com/geoffgarside/ber"; + rev = "0b763e6b6fb1cb7422c29cd9195a3abf625651fb"; + sha256 = "04k9k6805mvgp6gxs53frvlpp45hvkvrpj1jl1hc27ldwv5gpjrk"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; fetch = { type = "git"; url = "https://github.com/go-ini/ini"; - rev = "bda519ae5f4cbc60d391ff8610711627a08b86ae"; - sha256 = "05vcc3ssxyrk8g3sr4gs888vllgjqfq11na63qz2pvaiy7m0rqrs"; + rev = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"; + sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a"; }; } { - goPackagePath = "github.com/gogo/protobuf"; + goPackagePath = "github.com/go-ole/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/go-ole/go-ole"; + rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; + sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "3a0015ad55fa9873f41605d3e8f28cd279c32ab2"; + sha256 = "02an755ashhckqwxyq2avgn8mm4qq3hxda2jsj1a3bix2gkb45v7"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "3fb327e6747da3043567ee86abd02bb6376b6be2"; + sha256 = "0zwsrmqqcihm0lj2pc18cpm7wnn1dzwr4kvrlyrxf0lnn7dsdsbm"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "bcff419492eeeb01f76e77d2ebc714dc97b607f5"; + sha256 = "00z8sv766kjdrdvpyzm9c5x3d45gssbwsm77qihmkflric6a3d3l"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "811b1089cde9dad18d4d0c2d09fbdbf28dbd27a5"; + sha256 = "0hkbrq4jq9s4nrz7xpx03z1zljss1zdylm3zb76hhjpp0s7hz418"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; fetch = { type = "git"; url = "https://github.com/gogo/protobuf"; - rev = "1ef32a8b9fc3f8ec940126907cedb5998f6318e4"; - sha256 = "0zk2n0n35ksskr5cd83k5k8wg21ckrcggjy88bym2s21ngj5w4fh"; + rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; + sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; }; } { - goPackagePath = "github.com/golang/snappy"; + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "24b0969c4cb722950103eed87108c8d291a8df00"; + sha256 = "0rj588dxg4ncanj8vcsixi00161xq54nz7siv47d5ijmzgxs82zf"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; fetch = { type = "git"; url = "https://github.com/golang/snappy"; - rev = "553a641470496b2327abcac10b36396bd98e45c9"; - sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; + rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; + sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; }; } { - goPackagePath = "github.com/gorilla/mux"; + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "7c663266750e7d82587642f65e60bc4083f1f84e"; + sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "ded0c29b24f96f46cf349e6701b099db601cf8ec"; - sha256 = "125dxfxs7his95fd2r28bn1rpb78pldfgm3lmw84ha1c0v5gfh33"; + rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; }; } { - goPackagePath = "github.com/hashicorp/hcl"; + goPackagePath = "github.com/hashicorp/consul"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/consul"; + rev = "fb848fc48818f58690db09d14640513aa6bf3c02"; + sha256 = "0ra38xrh6ghcnix8w6gjs33yr2ra1n5jvf8lww4csr4dgw5bh5b1"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; + sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-rootcerts"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-rootcerts"; + rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; + sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; + sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; + rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; }; } { - goPackagePath = "github.com/kardianos/osext"; + goPackagePath = "github.com/hashicorp/serf"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/serf"; + rev = "d6574a5bb1226678d7010325fb6c985db20ee458"; + sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; + }; + } + { + goPackagePath = "github.com/hectane/go-acl"; + fetch = { + type = "git"; + url = "https://github.com/hectane/go-acl"; + rev = "7f56832555fc229dad908c67d65ed3ce6156b70c"; + sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58"; + sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682"; + sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd"; + }; + } + { + goPackagePath = "github.com/k-sone/snmpgo"; + fetch = { + type = "git"; + url = "https://github.com/k-sone/snmpgo"; + rev = "de09377ff34857b08afdc16ea8c7c2929eb1fc6e"; + sha256 = "0fia82msxviawcp5w4j4ll9n7z3gfjjvigqcq0d94cshj9ras10j"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; fetch = { type = "git"; url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; }; } { - goPackagePath = "github.com/magiconair/properties"; + goPackagePath = "github.com/kubernetes-incubator/custom-metrics-apiserver"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver"; + rev = "e61f72fec56ab519d74ebd396cd3fcf31b084558"; + sha256 = "1cgbn0yzvrqrxq4kwwz2d6vddi9py2z18dx33yjd8w85j9ghhg6g"; + }; + } + { + goPackagePath = "github.com/lxn/walk"; + fetch = { + type = "git"; + url = "https://github.com/lxn/walk"; + rev = "02935bac0ab8448d5f9bf72ebeeb7ca0d5553f9b"; + sha256 = "0m0dva6nyv6vxc188c9003g5ylxb6clmlcvqjgaibbcrxkxjw1d5"; + }; + } + { + goPackagePath = "github.com/lxn/win"; + fetch = { + type = "git"; + url = "https://github.com/lxn/win"; + rev = "7e1250ba2e7749fb9eb865da9ee93fb5a2fe73f1"; + sha256 = "1n5ksvy3va3zd0iqpl64advjscm2w9n8kxn45ahahvbrbi7zy1zw"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "2c9e9502788518c97fe44e8955cd069417ee89df"; - sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl"; + rev = "c2353362d570a7bfa228149c62842019201cfb71"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; }; } { - goPackagePath = "github.com/mholt/archiver"; + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mholt/archiver"; fetch = { type = "git"; url = "https://github.com/mholt/archiver"; - rev = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3"; - sha256 = "1krxyh6iq0s0rwhz7gg6dn795j9qq64rsgq9nivav7fhrqpgr6hb"; + rev = "26cf5bb32d07aa4e8d0de15f56ce516f4641d7df"; + sha256 = "1r2gcxh8gkyn1l0h7sshachg2fxz6542lbqcar9zym6n2dni30mm"; }; } { - goPackagePath = "github.com/mitchellh/mapstructure"; + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; + sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; - sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"; + sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7"; }; } { - goPackagePath = "github.com/nwaples/rardecode"; + goPackagePath = "github.com/mitchellh/reflectwalk"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/reflectwalk"; + rev = "63d60e9d0dbc60cf9164e6510889b0db6683d98c"; + sha256 = "1hpq6sjr6l1h25x68mz13q7sd52dv1mjfxbl5p7m3j7cv85khnvc"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; + sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; + }; + } + { + goPackagePath = "github.com/nwaples/rardecode"; fetch = { type = "git"; url = "https://github.com/nwaples/rardecode"; - rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6"; + rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6"; sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw"; }; } { - goPackagePath = "github.com/patrickmn/go-cache"; + goPackagePath = "github.com/openshift/api"; + fetch = { + type = "git"; + url = "https://github.com/openshift/api"; + rev = "0d921e363e951d89f583292c60d013c318df64dc"; + sha256 = "171xac4hr665q08mp17fld2zfpp95h9mjws2wikcr0brwq878p3s"; + }; + } + { + goPackagePath = "github.com/patrickmn/go-cache"; fetch = { type = "git"; url = "https://github.com/patrickmn/go-cache"; - rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; + rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; }; } { - goPackagePath = "github.com/pelletier/go-toml"; + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "e790cca94e6cc75c7064b1332e63811d4aae1a53"; + sha256 = "0y1crv4wkly2naki2f68ln9sc8l9skswkc696vr8vc43p4p67wam"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"; - sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15"; + rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; }; } { - goPackagePath = "github.com/pierrec/lz4"; + goPackagePath = "github.com/pierrec/lz4"; fetch = { type = "git"; url = "https://github.com/pierrec/lz4"; - rev = "ed8d4cc3b461464e69798080a0092bd028910298"; - sha256 = "0flsn2ka108lb63gkxfzl90bkhndh1znnscv4v1k6j5h2s3zksls"; + rev = "1958fd8fff7f115e79725b1288e0b878b3e06b00"; + sha256 = "1c4xi40bvcp91a3lw9nw1hylvdmb51hviwrqv5f6zj1sswkv24ps"; }; } { - goPackagePath = "github.com/pierrec/xxHash"; + goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; - url = "https://github.com/pierrec/xxHash"; - rev = "a0006b13c722f7f12368c00a3d3c2ae8a999a0c6"; - sha256 = "1hf7hqrqx0cbgx0alfwnqs0mrxg9rnwsijn5d0lv06w6vzqbvnzj"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } { - goPackagePath = "github.com/shirou/gopsutil"; + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; + sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "7600349dcfe1abd18d72d3a1770870d9800a7801"; + sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "7d6f385de8bea29190f15ba9931442a0eaef9af7"; + sha256 = "18cish8yas5r6xhgp8p8n7lg4wh3d4szzirszxra8m7rwy3swxxq"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + fetch = { + type = "git"; + url = "https://github.com/samuel/go-zookeeper"; + rev = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"; + sha256 = "0i7mxg9hz8ymglq2xcwwswy1pvcr53qd57lzcdlf3d5bjki73a4w"; + }; + } + { + goPackagePath = "github.com/sbinet/go-python"; + fetch = { + type = "git"; + url = "https://github.com/sbinet/go-python"; + rev = "f976f61134dc6f5b4920941eb1b0e7cec7e4ef4c"; + sha256 = "15l7wip7kr1z6v3315m9y0070wmwq447q7gwz6490xwnclrq85kl"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "57f370e13068146efe1cb7129f79e5d51da8a242"; - sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb"; + rev = "eeb1d38d69593f121e060d24d17f7b1f0936b203"; + sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w"; }; } { - goPackagePath = "github.com/spf13/afero"; + goPackagePath = "github.com/shirou/w32"; + fetch = { + type = "git"; + url = "https://github.com/shirou/w32"; + rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"; + sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "63644898a8da0bc22138abf860edaf5277b6102e"; - sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw"; + rev = "787d034dfe70e44075ccc060d346146ef53270ad"; + sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; }; } { - goPackagePath = "github.com/spf13/cast"; + goPackagePath = "github.com/spf13/cast"; fetch = { type = "git"; url = "https://github.com/spf13/cast"; - rev = "8965335b8c7107321228e3e3702cab9832751bac"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; }; } { - goPackagePath = "github.com/spf13/cobra"; + goPackagePath = "github.com/spf13/cobra"; fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; + rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; }; } { - goPackagePath = "github.com/spf13/jwalterweatherman"; + goPackagePath = "github.com/spf13/jwalterweatherman"; fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; + rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; }; } { - goPackagePath = "github.com/spf13/pflag"; + goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; }; } { - goPackagePath = "github.com/spf13/viper"; + goPackagePath = "github.com/spf13/viper"; fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "8dc2790b029dc41e2b8ff772c63c26adbb1db70d"; - sha256 = "147zq6v34pgb79r4m0m2mwm8739jxwawxs8mpqvvhq7gxwvhng40"; + rev = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"; + sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; - sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; + rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; }; } { - goPackagePath = "github.com/ulikunitz/xz"; + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "8c0409fcbb70099c748d71f714529204975f6c3f"; + sha256 = "0z61j0cniq3n5af0q57dbpyfmidihzimrwnysfphfzwyd0ic4rcv"; + }; + } + { + goPackagePath = "github.com/ulikunitz/xz"; fetch = { type = "git"; url = "https://github.com/ulikunitz/xz"; - rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; + rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; }; } { - goPackagePath = "github.com/urfave/negroni"; + goPackagePath = "github.com/urfave/negroni"; fetch = { type = "git"; url = "https://github.com/urfave/negroni"; - rev = "22c5532ea862c34fdad414e90f8cc00b4f6f4cab"; - sha256 = "0jxd10cr3imm96xa01mdgyad4nq6mc7yr49z830fv3vywfr7bac8"; + rev = "5dbbc83f748fc3ad38585842b0aedab546d0ea1e"; + sha256 = "10w4ygc78hgsryxwmjmz8w51d84bjh7jm8j0xfv4vnpz5gscc8dj"; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; + sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + }; + } + { + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "640f4622ab692b87c2f3a94265e6f579fe38263d"; - sha256 = "097m4qhcljhp180171j5fjhq4740iirfkkajfd7yrxqhp4s9hljx"; + rev = "97aa3a539ec716117a9d15a4659a911f50d13c3c"; + sha256 = "1738bi8l50f0iq0il6h4qy1cgy39yh3q4gh1lwp5y5j7jyy33ccd"; }; } { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "6f686a352de66814cdd080d970febae7767857a3"; - sha256 = "1z3pwvxlzq8kghjdsd9xmf184iiz13h8h66ipp626k4rc7kydr03"; + rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"; + sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0"; }; } { - goPackagePath = "golang.org/x/text"; + goPackagePath = "golang.org/x/text"; fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f"; - sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } { - goPackagePath = "gopkg.in/yaml.v2"; + goPackagePath = "golang.org/x/time"; fetch = { type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + url = "https://go.googlesource.com/time"; + rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; + sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; }; } { - goPackagePath = "github.com/sbinet/go-python"; + goPackagePath = "google.golang.org/genproto"; fetch = { type = "git"; - url = "https://github.com/sbinet/go-python"; - rev = "6d13f941744b9332d6ed00dc2cd2722acd79a47e"; - sha256 = "0x5q4nyv6gck9q33g54gy2ajmyjksxjmzh0jfqqn97jpgf4qfaym"; + url = "https://github.com/google/go-genproto"; + rev = "ff3583edef7de132f219f0efc00e097cabcc0ec0"; + sha256 = "0bpzxk85fgvznmdf9356nzh8riqhwzcil9r2a955rbfn27lh4lmy"; }; } { - goPackagePath = "github.com/mitchellh/reflectwalk"; + goPackagePath = "google.golang.org/grpc"; fetch = { type = "git"; - url = "https://github.com/mitchellh/reflectwalk"; - rev = "63d60e9d0dbc60cf9164e6510889b0db6683d98c"; - sha256 = "1hpq6sjr6l1h25x68mz13q7sd52dv1mjfxbl5p7m3j7cv85khnvc"; + url = "https://github.com/grpc/grpc-go"; + rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"; + sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; + }; + } + { + goPackagePath = "gopkg.in/Knetic/govaluate.v3"; + fetch = { + type = "git"; + url = "https://github.com/Knetic/govaluate"; + rev = "d216395917cc49052c7c7094cf57f09657ca08a8"; + sha256 = "1b0sy89hy5d1720i43ikqfcxr4v6p9g9c7rnbif8s6256a7c2rsq"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://github.com/go-inf/inf"; + rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } + { + goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; + fetch = { + type = "git"; + url = "https://github.com/natefinch/lumberjack"; + rev = "a96e63847dc3c67d17befa69c303767e2f84e54f"; + sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } + { + goPackagePath = "gopkg.in/zorkian/go-datadog-api.v2"; + fetch = { + type = "git"; + url = "https://github.com/zorkian/go-datadog-api"; + rev = "6c08e2322af96e867e5715aedd6ea194c42cf44f"; + sha256 = "16ha3azq9981hwpn18sd50ai6d1h85fsawbdxp352c4gi8bhj8zw"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "9e5ffd1f1320950b238cfce291b926411f0af722"; + sha256 = "03992x9n9b8w9rlf70wizn7iqk8cbyksxg0sdc1mm5jyzyvgksgf"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "e386b2658ed20923da8cc9250e552f082899a1ee"; + sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz"; + }; + } + { + goPackagePath = "k8s.io/apiserver"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apiserver"; + rev = "2cf66d2375dce045e1e02e1d7b74a0d1e34fedb3"; + sha256 = "0x0am99n25njpbd1x20bhyadpv9w6qqjmspp1ahzpmdwjzrnsagg"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "23781f4d6632d88e869066eaebb743857aa1ef9b"; + sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "b742be413d0a6f781c123bed504c8fb39264c57d"; + sha256 = "13ik6dri0f9fzs8p6987h6n3y2aqjz5cj957826xwkpv4fj2zgq8"; + }; + } + { + goPackagePath = "k8s.io/metrics"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/metrics"; + rev = "0d9ea2ac660031c8f2726a735dda29441f396f99"; + sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71"; }; } ] From 902dea15ec51780eb005597104bd632164e46e62 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 11 Sep 2018 13:34:21 +0100 Subject: [PATCH 472/600] cargo-edit: use buildRustPackage instead of Carnix Saving 3000 lines of Nix code. --- .../package-management/cargo-edit/Cargo.nix | 3148 ----------------- .../package-management/cargo-edit/default.nix | 41 +- 2 files changed, 19 insertions(+), 3170 deletions(-) delete mode 100644 pkgs/tools/package-management/cargo-edit/Cargo.nix diff --git a/pkgs/tools/package-management/cargo-edit/Cargo.nix b/pkgs/tools/package-management/cargo-edit/Cargo.nix deleted file mode 100644 index fa6cfaab387f..000000000000 --- a/pkgs/tools/package-management/cargo-edit/Cargo.nix +++ /dev/null @@ -1,3148 +0,0 @@ -# Generated by carnix 0.7.2: carnix nix -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; - updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); - mapFeatures = features: map (fun: fun { features = features; }); - mkFeatures = feat: lib.lists.foldl (features: featureName: - if feat.${featureName} or false then - [ featureName ] ++ features - else - features - ) [] (builtins.attrNames feat); -in -rec { - cargo_edit = f: cargo_edit_0_3_0 { features = cargo_edit_0_3_0_features { cargo_edit_0_3_0 = f; }; }; - __all = [ (cargo_edit {}) ]; - adler32_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "adler32"; - version = "1.0.3"; - authors = [ "Remi Rampin " ]; - sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb"; - inherit dependencies buildDependencies features; - }; - aho_corasick_0_6_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.6.6"; - authors = [ "Andrew Gallant " ]; - sha256 = "0ap5lv1q6ylmzq70bjgg66dsa6p9926gwv2q4z0chfjnii8hczq8"; - libName = "aho_corasick"; - crateBin = [ { name = "aho-corasick-dot"; path = "src/main.rs"; } ]; - inherit dependencies buildDependencies features; - }; - ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.11.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; - sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; - inherit dependencies buildDependencies features; - }; - arrayvec_0_4_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "arrayvec"; - version = "0.4.7"; - authors = [ "bluss" ]; - sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4"; - inherit dependencies buildDependencies features; - }; - ascii_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ascii"; - version = "0.7.1"; - authors = [ "Thomas Bahn " "Torbjørn Birch Moltu " "Simon Sapin " ]; - sha256 = "0fy9rh316vcc4v0k8d1p2gi3a3wpiwj5bm2mw0yqzs8xvz6yd1ax"; - inherit dependencies buildDependencies features; - }; - assert_cli_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "assert_cli"; - version = "0.6.3"; - authors = [ "Pascal Hertleif " "Ed Page " ]; - sha256 = "1yx4phpiqvs83gin33hnqcl30dsp3imzvfbahmp4qqpmpp5hzgcv"; - crateBin = [ { name = "assert_fixture"; } ]; - inherit dependencies buildDependencies features; - }; - atty_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "atty"; - version = "0.2.11"; - authors = [ "softprops " ]; - sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20"; - inherit dependencies buildDependencies features; - }; - backtrace_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace"; - version = "0.3.9"; - authors = [ "Alex Crichton " "The Rust Project Developers" ]; - sha256 = "137pjkcn89b7fqk78w65ggj92pynmf1hkr1sjz53aga4b50lkmwm"; - inherit dependencies buildDependencies features; - }; - backtrace_sys_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace-sys"; - version = "0.1.23"; - authors = [ "Alex Crichton " ]; - sha256 = "0sx7h7bl5j5dj4hlk7bcf8fwbhrxrvq2hfpy70vw2140gnlrl9dw"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - base64_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "base64"; - version = "0.9.2"; - authors = [ "Alice Maz " "Marshall Pierce " ]; - sha256 = "0g4xxl8jhwjhvr69qlxdmbzd521xcn5j67lhkr20nh7ajvl6k0l1"; - inherit dependencies buildDependencies features; - }; - bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.9.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; - inherit dependencies buildDependencies features; - }; - bitflags_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "1.0.3"; - authors = [ "The Rust Project Developers" ]; - sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw"; - inherit dependencies buildDependencies features; - }; - build_const_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "build_const"; - version = "0.2.1"; - authors = [ "Garrett Berg " ]; - sha256 = "15249xzi3qlm72p4glxgavwyq70fx2sp4df6ii0sdlrixrrp77pl"; - inherit dependencies buildDependencies features; - }; - byteorder_1_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "byteorder"; - version = "1.2.4"; - authors = [ "Andrew Gallant " ]; - sha256 = "095xbm5bi23fkbfb97kg81x02dymfmd2kp5nl93rvw6dar2kpwyw"; - inherit dependencies buildDependencies features; - }; - bytes_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bytes"; - version = "0.4.9"; - authors = [ "Carl Lerche " ]; - sha256 = "1jiqc94j85la9vs165vqpf6s1sah8n3ivnhsfapcjrvbhjawi6i6"; - inherit dependencies buildDependencies features; - }; - cargo_edit_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cargo-edit"; - version = "0.3.0"; - authors = [ "Without Boats " "Pascal Hertleif " "Sebastian Garrido " "Jonas Platte " "Benjamin Gill " "Andronik Ordian " ]; - sha256 = "1zyf52x82slh27s6bzc6pmmbgp7cfr1xpmsp7i3zy0nd1p4gd13f"; - crateBin = [ { name = "cargo-add"; path = "src/bin/add/main.rs"; } { name = "cargo-rm"; path = "src/bin/rm/main.rs"; } { name = "cargo-upgrade"; path = "src/bin/upgrade/main.rs"; } ]; - inherit dependencies buildDependencies features; - }; - cargo_metadata_0_5_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cargo_metadata"; - version = "0.5.8"; - authors = [ "Oliver Schneider " ]; - sha256 = "0vkkvpxmspkx80iq6vlrh8972g1b9f8qb92qy75daz43x16qnbd2"; - inherit dependencies buildDependencies features; - }; - cc_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cc"; - version = "1.0.18"; - authors = [ "Alex Crichton " ]; - sha256 = "0wcnpa54qvm5921wwrrkn8cwxd5y0p5f4gb1qgyh5imii7rdhpjx"; - inherit dependencies buildDependencies features; - }; - cfg_if_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cfg-if"; - version = "0.1.4"; - authors = [ "Alex Crichton " ]; - sha256 = "0n5baxk53dvqjymzwynq55wb805b24390qx1n16zi8fjzq90j7k4"; - inherit dependencies buildDependencies features; - }; - chrono_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "chrono"; - version = "0.4.5"; - authors = [ "Kang Seonghoon " "Brandon W Maister " ]; - sha256 = "0v3gpbkaxjsskil0si321bak9p0k1sfz43cx9p50kvx0s5p3x0yr"; - inherit dependencies buildDependencies features; - }; - colored_1_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "colored"; - version = "1.6.1"; - authors = [ "Thomas Wickham " ]; - sha256 = "0n3ja64sdiafp751nyq97c8rvrn8xqw036461i7q4n47yiqxn8rw"; - inherit dependencies buildDependencies features; - }; - combine_3_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "combine"; - version = "3.3.6"; - authors = [ "Markus Westerlind " ]; - sha256 = "1wzxpn0ipz1n7d9ygcc8rh9a59lk4mh2jq5asxa7cgqgdzbhicys"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "core-foundation"; - version = "0.2.3"; - authors = [ "The Servo Project Developers" ]; - sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm"; - inherit dependencies buildDependencies features; - }; - core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "core-foundation-sys"; - version = "0.2.3"; - authors = [ "The Servo Project Developers" ]; - sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - crc_1_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "crc"; - version = "1.8.1"; - authors = [ "Rui Hu " ]; - sha256 = "00m9jjqrddp3bqyanvyxv0hf6s56bx1wy51vcdcxg4n2jdhg109s"; - inherit dependencies buildDependencies features; - }; - crossbeam_deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "crossbeam-deque"; - version = "0.3.1"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "1km0mavyp9ddwb7k7kcdmyryi3bwxf0nmr6jqcpyjzvzmxjlkqap"; - inherit dependencies buildDependencies features; - }; - crossbeam_epoch_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "crossbeam-epoch"; - version = "0.4.3"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "18xfgi7h9aq4lqqrqzy366xg885z1hlkbhvycl2i3zhkhkvadhv3"; - inherit dependencies buildDependencies features; - }; - crossbeam_utils_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "crossbeam-utils"; - version = "0.3.2"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "1byx31nkxl48la58571h40ssk94faky26jwz15w40v2gba3v4fql"; - inherit dependencies buildDependencies features; - }; - difference_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "difference"; - version = "2.0.0"; - authors = [ "Johann Hofmann " ]; - sha256 = "1rk24wxxkhhw8drhda229dfy2nb64vvcz0ras6lq7va6wswlrc49"; - crateBin = [ { name = "difference"; } ]; - inherit dependencies buildDependencies features; - }; - docopt_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "docopt"; - version = "1.0.0"; - authors = [ "Andrew Gallant " ]; - sha256 = "009xdzqzyrx0yq390vbjbr6m9s8pyazq5r6gf7bchygy9r4p40hr"; - crateBin = [ { name = "docopt-wordlist"; path = "src/wordlist.rs"; } ]; - inherit dependencies buildDependencies features; - }; - dtoa_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dtoa"; - version = "0.4.3"; - authors = [ "David Tolnay " ]; - sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8"; - inherit dependencies buildDependencies features; - }; - either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "either"; - version = "1.5.0"; - authors = [ "bluss" ]; - sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; - inherit dependencies buildDependencies features; - }; - encoding_rs_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "encoding_rs"; - version = "0.7.2"; - authors = [ "Henri Sivonen " ]; - sha256 = "1c23bi3q4qmi2ci8g7p5j4b4i5abyggvyg6hkl7w4p4r527c9g3q"; - inherit dependencies buildDependencies features; - }; - env_proxy_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "env_proxy"; - version = "0.2.0"; - authors = [ "Ivan Nejgebauer " ]; - sha256 = "178vn5agzxbq6a7pgpkvaf74ilsqk8d010r4qbbf88l9cs2g8qz2"; - inherit dependencies buildDependencies features; - }; - environment_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "environment"; - version = "0.1.1"; - authors = [ "Freyskeyd " ]; - sha256 = "1dx1xi9851lvigfic05j9r2d5rf71v9b4bg2mh7jj6z6qccfq8nb"; - inherit dependencies buildDependencies features; - }; - error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "error-chain"; - version = "0.11.0"; - authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; - sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; - inherit dependencies buildDependencies features; - }; - failure_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "failure"; - version = "0.1.1"; - authors = [ "Without Boats " ]; - sha256 = "0gf9cmkm9kc163sszgjksqp5pcgj689lnf2104nn4h4is18nhigk"; - inherit dependencies buildDependencies features; - }; - failure_derive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "failure_derive"; - version = "0.1.1"; - authors = [ "Without Boats " ]; - sha256 = "1w895q4pbyx3rwnhgjwfcayk9ghbi166wc1c3553qh8zkbz52k8i"; - procMacro = true; - inherit dependencies buildDependencies features; - }; - foreign_types_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "foreign-types"; - version = "0.3.2"; - authors = [ "Steven Fackler " ]; - sha256 = "105n8sp2djb1s5lzrw04p7ss3dchr5qa3canmynx396nh3vwm2p8"; - inherit dependencies buildDependencies features; - }; - foreign_types_shared_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "foreign-types-shared"; - version = "0.1.1"; - authors = [ "Steven Fackler " ]; - sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon"; - version = "0.3.3"; - authors = [ "Raph Levien " ]; - sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon-sys"; - version = "0.3.3"; - authors = [ "Raph Levien " ]; - sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; - inherit dependencies buildDependencies features; - }; - futures_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "futures"; - version = "0.1.23"; - authors = [ "Alex Crichton " ]; - sha256 = "075s7sv1iqzf2r3lvb4hk81k5c9xzfcyb8q92h2s35fnypxyqd21"; - inherit dependencies buildDependencies features; - }; - futures_cpupool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "futures-cpupool"; - version = "0.1.8"; - authors = [ "Alex Crichton " ]; - sha256 = "0ficd31n5ljiixy6x0vjglhq4fp0v1p4qzxm3v6ymsrb3z080l5c"; - inherit dependencies buildDependencies features; - }; - httparse_1_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "httparse"; - version = "1.3.2"; - authors = [ "Sean McArthur " ]; - sha256 = "1mm10m2hv1inxzzvm85s6fdmwl9a3q9vik0nzh5qrx2hx5x8fcwl"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - hyper_0_11_27_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hyper"; - version = "0.11.27"; - authors = [ "Sean McArthur " ]; - sha256 = "0q5as4lhvh31bzk4qm7j84snrmxyxyaqk040rfk72b42dn98mryi"; - inherit dependencies buildDependencies features; - }; - hyper_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hyper-tls"; - version = "0.1.4"; - authors = [ "Sean McArthur " ]; - sha256 = "1242mxvkgkm936fcsfcmmwwb5blclf0xld4d6gqzbvhlfc9yhnl8"; - inherit dependencies buildDependencies features; - }; - idna_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "idna"; - version = "0.1.5"; - authors = [ "The rust-url developers" ]; - sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy"; - inherit dependencies buildDependencies features; - }; - iovec_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "iovec"; - version = "0.1.2"; - authors = [ "Carl Lerche " ]; - sha256 = "0vjymmb7wj4v4kza5jjn48fcdb85j3k37y7msjl3ifz0p9yiyp2r"; - inherit dependencies buildDependencies features; - }; - itoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itoa"; - version = "0.4.2"; - authors = [ "David Tolnay " ]; - sha256 = "193a744yd74rmk13hl8xvd9p2hqhdkyf8xkvi1mxm5s10bby0h8v"; - inherit dependencies buildDependencies features; - }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian " ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "language-tags"; - version = "0.2.2"; - authors = [ "Pyfisch " ]; - sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy"; - inherit dependencies buildDependencies features; - }; - lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "0.2.11"; - authors = [ "Marvin Löbel " ]; - sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; - inherit dependencies buildDependencies features; - }; - lazy_static_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "1.0.2"; - authors = [ "Marvin Löbel " ]; - sha256 = "0ix4dmy6zb4v3m75l4alg84fk06y145z52z9pyysc9labw2x5r3r"; - inherit dependencies buildDependencies features; - }; - lazycell_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazycell"; - version = "0.6.0"; - authors = [ "Alex Crichton " "Nikita Pekin " ]; - sha256 = "1ax148clinbvp6alxcih8s5i2bg3mc5mi69n3hvzvzbwlm6k532r"; - inherit dependencies buildDependencies features; - }; - libc_0_2_42_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.42"; - authors = [ "The Rust Project Developers" ]; - sha256 = "064v49hz1zpl081w8c4vwikrkhaxp06y4i9l7x7wx6bjpwp19pjx"; - inherit dependencies buildDependencies features; - }; - libflate_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libflate"; - version = "0.1.16"; - authors = [ "Takeru Ohta " ]; - sha256 = "0l15g61h10bznxsjirwq9c43w17mjpqx6wz0357agskardkdh14n"; - inherit dependencies buildDependencies features; - }; - linked_hash_map_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "linked-hash-map"; - version = "0.5.1"; - authors = [ "Stepan Koltsov " "Andrew Paseltiner " ]; - sha256 = "1f29c7j53z7w5v0g115yii9dmmbsahr93ak375g48vi75v3p4030"; - inherit dependencies buildDependencies features; - }; - log_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "log"; - version = "0.3.9"; - authors = [ "The Rust Project Developers" ]; - sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2"; - inherit dependencies buildDependencies features; - }; - log_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "log"; - version = "0.4.3"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1gdmwrbm7s18zcdz4lcdhz975m4gwhi854c7j1rvj1gsr8aca250"; - inherit dependencies buildDependencies features; - }; - matches_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "matches"; - version = "0.1.7"; - authors = [ "Simon Sapin " ]; - sha256 = "0zx9gi5flyzkh9nx52fyc3k2zz08b9ww1c4yndlfrw72kr8m7yfy"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "2.0.1"; - authors = [ "Andrew Gallant " "bluss" ]; - sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; - inherit dependencies buildDependencies features; - }; - memoffset_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memoffset"; - version = "0.2.1"; - authors = [ "Gilad Naaman " ]; - sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf"; - inherit dependencies buildDependencies features; - }; - mime_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "mime"; - version = "0.3.8"; - authors = [ "Sean McArthur " ]; - sha256 = "1577adg9zvkd1qdb2nqqg1ryap33p5r4qsw01n9pw162xpisqjm3"; - inherit dependencies buildDependencies features; - }; - mime_guess_2_0_0_alpha_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "mime_guess"; - version = "2.0.0-alpha.6"; - authors = [ "Austin Bonander " ]; - sha256 = "1k2mdq43gi2qr63b7m5zs624rfi40ysk33cay49jlhq97jwnk9db"; - inherit dependencies buildDependencies features; - }; - mio_0_6_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "mio"; - version = "0.6.15"; - authors = [ "Carl Lerche " ]; - sha256 = "0a93wxsmkh8x38wxivhn6qdj08pj9f0j3y46p4wv3xclbq8i4aaa"; - inherit dependencies buildDependencies features; - }; - miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "miow"; - version = "0.2.1"; - authors = [ "Alex Crichton " ]; - sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0"; - inherit dependencies buildDependencies features; - }; - native_tls_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "native-tls"; - version = "0.1.5"; - authors = [ "Steven Fackler " ]; - sha256 = "11f75qmbny5pnn6zp0vlvadrvc9ph9qsxiyn4n6q02xyd93pxxlf"; - inherit dependencies buildDependencies features; - }; - net2_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "net2"; - version = "0.2.33"; - authors = [ "Alex Crichton " ]; - sha256 = "1qnmajafgybj5wyxz9iffa8x5wgbwd2znfklmhqj7vl6lw1m65mq"; - inherit dependencies buildDependencies features; - }; - nodrop_0_1_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "nodrop"; - version = "0.1.12"; - authors = [ "bluss" ]; - sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d"; - inherit dependencies buildDependencies features; - }; - num_integer_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-integer"; - version = "0.1.39"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1f42ls46cghs13qfzgbd7syib2zc6m7hlmv1qlar6c9mdxapvvbg"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - num_traits_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.2.5"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0ql203ca6lzppksy4fsfnpz3kq96vwlwvyn3ahvnd9g6k9f5ncj0"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - num_cpus_1_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num_cpus"; - version = "1.8.0"; - authors = [ "Sean McArthur " ]; - sha256 = "1y6qnd9r8ga6y8mvlabdrr73nc8cshjjlzbvnanzyj9b8zzkfwk2"; - inherit dependencies buildDependencies features; - }; - openssl_0_9_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "openssl"; - version = "0.9.24"; - authors = [ "Steven Fackler " ]; - sha256 = "0wzm3c11g3ndaqyzq36mcdcm1q4a8pmsyi33ibybhjz28g2z0f79"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - openssl_sys_0_9_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "openssl-sys"; - version = "0.9.33"; - authors = [ "Alex Crichton " "Steven Fackler " ]; - sha256 = "1q5f7ykkxgniwjrqifx1ssrqjzcf8fi4fzh770xrbyp8n6v14qr6"; - build = "build/main.rs"; - inherit dependencies buildDependencies features; - }; - pad_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pad"; - version = "0.1.5"; - authors = [ "Ben S " ]; - sha256 = "081qzwl58r1rn5b7m5pvy2xyfk4amm59f3i1gf95417s71gd4j53"; - inherit dependencies buildDependencies features; - }; - percent_encoding_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "percent-encoding"; - version = "1.0.1"; - authors = [ "The rust-url developers" ]; - sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - phf_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf"; - version = "0.7.22"; - authors = [ "Steven Fackler " ]; - sha256 = "0b58l863rhmqyqsfj2d89nmdzc21g9yvvvq1m4c3a615zpcykb3i"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - phf_codegen_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_codegen"; - version = "0.7.22"; - authors = [ "Steven Fackler " ]; - sha256 = "0k8yx4gr9m6cfrvh21s6bhnh1azz13j4xih88bvm06r6blfl89fs"; - inherit dependencies buildDependencies features; - }; - phf_generator_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_generator"; - version = "0.7.22"; - authors = [ "Steven Fackler " ]; - sha256 = "093gla320qb6rbk8z7wqqxl79zrh874sa7sxir31q2p7mrw4b70k"; - inherit dependencies buildDependencies features; - }; - phf_shared_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_shared"; - version = "0.7.22"; - authors = [ "Steven Fackler " ]; - sha256 = "0ij9flicfi0ab5vpzdwbizpdyxhk891qxa8nxsqlv4sg4abqang6"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.12"; - authors = [ "Alex Crichton " ]; - sha256 = "0k343rlyv9qmplxwxn8clzkyx1zbplhnvm0psjl6s111fjqmgsgh"; - inherit dependencies buildDependencies features; - }; - pretty_assertions_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pretty_assertions"; - version = "0.5.1"; - authors = [ "Colin Kiegel " "Florent Fayolle " ]; - sha256 = "0vlfprmgch79bvnp02mr8ham8wld0yrx29nbx6sv1srf5djzplj1"; - inherit dependencies buildDependencies features; - }; - proc_macro2_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "proc-macro2"; - version = "0.4.9"; - authors = [ "Alex Crichton " ]; - sha256 = "1qmfx3z2xvsgwsqqkhri339i4spk5wkxf5y4j8sg47ggig2y00rh"; - inherit dependencies buildDependencies features; - }; - quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quote"; - version = "0.3.15"; - authors = [ "David Tolnay " ]; - sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; - inherit dependencies buildDependencies features; - }; - quote_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quote"; - version = "0.6.4"; - authors = [ "David Tolnay " ]; - sha256 = "1x3sxi9vpn4sayj4lbi0wh483b4iphwfsfkkk2gj3z89sqw3wkwg"; - inherit dependencies buildDependencies features; - }; - rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.4.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; - inherit dependencies buildDependencies features; - }; - redox_syscall_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.40"; - authors = [ "Jeremy Soller " ]; - sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611"; - libName = "syscall"; - inherit dependencies buildDependencies features; - }; - redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_termios"; - version = "0.1.1"; - authors = [ "Jeremy Soller " ]; - sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - regex_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex"; - version = "1.0.3"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0ksq2bc2g0xhrkpzzfr8l2vidw6c04mwgynwjbwcx7shfrwgw0lx"; - inherit dependencies buildDependencies features; - }; - regex_syntax_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.6.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "109426mj7nhwr6szdzbcvn1a8g5zy52f9maqxjd9agm8wg87ylyw"; - inherit dependencies buildDependencies features; - }; - relay_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "relay"; - version = "0.1.1"; - authors = [ "Sean McArthur " ]; - sha256 = "16csfaslbmj25iaxs88p8wcfh2zfpkh9isg9adid0nxjxvknh07r"; - inherit dependencies buildDependencies features; - }; - remove_dir_all_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "remove_dir_all"; - version = "0.5.1"; - authors = [ "Aaronepower " ]; - sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7"; - inherit dependencies buildDependencies features; - }; - reqwest_0_8_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "reqwest"; - version = "0.8.7"; - authors = [ "Sean McArthur " ]; - sha256 = "1wfc77jir16xcjcdjn988f8bpaldd0la1gf1piphfxydp8i7gr56"; - inherit dependencies buildDependencies features; - }; - rustc_demangle_0_1_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc-demangle"; - version = "0.1.9"; - authors = [ "Alex Crichton " ]; - sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax"; - inherit dependencies buildDependencies features; - }; - safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "safemem"; - version = "0.2.0"; - authors = [ "Austin Bonander " ]; - sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm"; - inherit dependencies buildDependencies features; - }; - schannel_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "schannel"; - version = "0.1.13"; - authors = [ "Steven Fackler " "Steffen Butzer " ]; - sha256 = "033zavvq2k6z5akk38vzaglzbxzljaixgmhj9am27nr21dgaj6b3"; - inherit dependencies buildDependencies features; - }; - scoped_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "scoped-tls"; - version = "0.1.2"; - authors = [ "Alex Crichton " ]; - sha256 = "0nblksgki698cqsclsnd6f1pq4yy34350dn2slaah9dlmx9z5xla"; - inherit dependencies buildDependencies features; - }; - scopeguard_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "scopeguard"; - version = "0.3.3"; - authors = [ "bluss" ]; - sha256 = "0i1l013csrqzfz6c68pr5pi01hg5v5yahq8fsdmaxy6p8ygsjf3r"; - inherit dependencies buildDependencies features; - }; - security_framework_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "security-framework"; - version = "0.1.16"; - authors = [ "Steven Fackler " ]; - sha256 = "1kxczsaj8gz4922jl5af2gkxh71rasb6khaf3dp7ldlnw9qf2sbm"; - inherit dependencies buildDependencies features; - }; - security_framework_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "security-framework-sys"; - version = "0.1.16"; - authors = [ "Steven Fackler " ]; - sha256 = "0ai2pivdr5fyc7czbkpcrwap0imyy0r8ndarrl3n5kiv0jha1js3"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - semver_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver"; - version = "0.9.0"; - authors = [ "Steve Klabnik " "The Rust Project Developers" ]; - sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63"; - inherit dependencies buildDependencies features; - }; - semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver-parser"; - version = "0.7.0"; - authors = [ "Steve Klabnik " ]; - sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; - inherit dependencies buildDependencies features; - }; - serde_1_0_70_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "1.0.70"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1z1gyjf5rrs1k3j1civfzqjqs790651bwf8m31bw2pagclhnazs4"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - serde_derive_1_0_75_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.75"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "15v35aj079qg4dqhs8wjyinqifxgbkw8zf4sk44h43q3xha6znqy"; - procMacro = true; - inherit dependencies buildDependencies features; - }; - serde_json_1_0_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_json"; - version = "1.0.24"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1wvvc3y0202my2p00ah8ygl1794nspar9pf39fz1525jd6m6k8a1"; - inherit dependencies buildDependencies features; - }; - serde_urlencoded_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_urlencoded"; - version = "0.5.2"; - authors = [ "Anthony Ramine " ]; - sha256 = "0m5pigng0665qrk4ii1z84pb4lchbsswhgb863yglljskmm056m0"; - inherit dependencies buildDependencies features; - }; - siphasher_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "siphasher"; - version = "0.2.3"; - authors = [ "Frank Denis " ]; - sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw"; - inherit dependencies buildDependencies features; - }; - slab_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "slab"; - version = "0.4.0"; - authors = [ "Carl Lerche " ]; - sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0"; - inherit dependencies buildDependencies features; - }; - strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.7.0"; - authors = [ "Danny Guo " ]; - sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; - inherit dependencies buildDependencies features; - }; - syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "syn"; - version = "0.11.11"; - authors = [ "David Tolnay " ]; - sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; - inherit dependencies buildDependencies features; - }; - syn_0_14_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "syn"; - version = "0.14.5"; - authors = [ "David Tolnay " ]; - sha256 = "0b3xx5aa1shaz2i8mrvc7pmrj5lq2n6gmxyv2h1d7637gdky9smg"; - inherit dependencies buildDependencies features; - }; - synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "synom"; - version = "0.11.3"; - authors = [ "David Tolnay " ]; - sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; - inherit dependencies buildDependencies features; - }; - synstructure_0_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "synstructure"; - version = "0.6.1"; - authors = [ "Michael Layzell " ]; - sha256 = "1xnyw58va9zcqi4vvpnmpllacdj2a0mvy0cbd698izmr4qs92xlk"; - inherit dependencies buildDependencies features; - }; - tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tempdir"; - version = "0.3.7"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; - inherit dependencies buildDependencies features; - }; - termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termcolor"; - version = "0.3.6"; - authors = [ "Andrew Gallant " ]; - sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z"; - inherit dependencies buildDependencies features; - }; - termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termion"; - version = "1.5.1"; - authors = [ "ticki " "gycos " "IGI-111 " ]; - sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; - inherit dependencies buildDependencies features; - }; - thread_local_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.6"; - authors = [ "Amanieu d'Antras " ]; - sha256 = "02rksdwjmz2pw9bmgbb4c0bgkbq5z6nvg510sq1s6y2j1gam0c7i"; - inherit dependencies buildDependencies features; - }; - time_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "time"; - version = "0.1.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m"; - inherit dependencies buildDependencies features; - }; - tokio_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio"; - version = "0.1.7"; - authors = [ "Carl Lerche " ]; - sha256 = "0d5fj90wk05m5vbd924irg1pl1d4fn86jjw5napzanh6vbwsnr66"; - inherit dependencies buildDependencies features; - }; - tokio_codec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-codec"; - version = "0.1.0"; - authors = [ "Carl Lerche " "Bryan Burgers " ]; - sha256 = "0347ygccbj05yn9krjk4ifcy5xbv41xk7yyi9cl2cnxrc285xnm7"; - inherit dependencies buildDependencies features; - }; - tokio_core_0_1_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-core"; - version = "0.1.17"; - authors = [ "Carl Lerche " ]; - sha256 = "1j6c5q3aakvb1hjx4r95xwl5ms8rp19k4qsr6v6ngwbvr6f9z6rs"; - inherit dependencies buildDependencies features; - }; - tokio_executor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-executor"; - version = "0.1.2"; - authors = [ "Carl Lerche " ]; - sha256 = "1y4mwqjw438x6jskigz1knvfbpbinxfv6h43s60w6wdb80xmyg48"; - inherit dependencies buildDependencies features; - }; - tokio_fs_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-fs"; - version = "0.1.2"; - authors = [ "Carl Lerche " ]; - sha256 = "18rxwslv2hdmij6alpqfcm8aywcd28vw12s826ajgvkskh8jsdh2"; - inherit dependencies buildDependencies features; - }; - tokio_io_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-io"; - version = "0.1.7"; - authors = [ "Carl Lerche " ]; - sha256 = "08r46b5lp7929agwal1iaabdhfv309wyvd6cld1g39x5ml8x7hp2"; - inherit dependencies buildDependencies features; - }; - tokio_reactor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-reactor"; - version = "0.1.2"; - authors = [ "Carl Lerche " ]; - sha256 = "11yx7fvyv1c5h097lspfrim1r67axl8y8m22y5mgny8nhly56s4m"; - inherit dependencies buildDependencies features; - }; - tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-service"; - version = "0.1.0"; - authors = [ "Carl Lerche " ]; - sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih"; - inherit dependencies buildDependencies features; - }; - tokio_tcp_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-tcp"; - version = "0.1.0"; - authors = [ "Carl Lerche " ]; - sha256 = "19cyajkqvvbn3qqnak0qzivdq6amfjymbc30k7bbqhx4y1pcgqvh"; - inherit dependencies buildDependencies features; - }; - tokio_threadpool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-threadpool"; - version = "0.1.5"; - authors = [ "Carl Lerche " ]; - sha256 = "04nzjdjlir33s0z5nh3vh2h4v3vb1rwzv45jdjridrk92rqpb2vc"; - inherit dependencies buildDependencies features; - }; - tokio_timer_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-timer"; - version = "0.2.4"; - authors = [ "Carl Lerche " ]; - sha256 = "0imv1k4g583hh61qkh6mpx06ik9accyl4582vq0z61rr484050gi"; - inherit dependencies buildDependencies features; - }; - tokio_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-tls"; - version = "0.1.4"; - authors = [ "Carl Lerche " "Alex Crichton " ]; - sha256 = "07rwv3q6jbg65ln1ahzb4g648l8lcn4hvc0ax3r12bnsi1py7agp"; - inherit dependencies buildDependencies features; - }; - tokio_udp_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-udp"; - version = "0.1.1"; - authors = [ "Carl Lerche " ]; - sha256 = "1zsq3bny959dq7cnhdjrlaglrdcm63zn82jpkjs6nrrcfhb9l6z9"; - inherit dependencies buildDependencies features; - }; - toml_edit_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "toml_edit"; - version = "0.1.3"; - authors = [ "Andronik Ordian " ]; - sha256 = "0g5v5d141phzjk2crrgb0xcm65ysw76a01y75y597cmrg9ic6bjm"; - inherit dependencies buildDependencies features; - }; - try_lock_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "try-lock"; - version = "0.1.0"; - authors = [ "Sean McArthur " ]; - sha256 = "0kfrqrb2xkjig54s3qfy80dpldknr19p3rmp0n82yk5929j879k3"; - inherit dependencies buildDependencies features; - }; - ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ucd-util"; - version = "0.1.1"; - authors = [ "Andrew Gallant " ]; - sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; - inherit dependencies buildDependencies features; - }; - unicase_1_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicase"; - version = "1.4.2"; - authors = [ "Sean McArthur " ]; - sha256 = "0rbnhw2mnhcwrij3vczp0sl8zdfmvf2dlh8hly81kj7132kfj0mf"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - unicase_2_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicase"; - version = "2.1.0"; - authors = [ "Sean McArthur " ]; - sha256 = "1zzn16hh8fdx5pnbbnl32q8m2mh4vpd1jm9pdcv969ik83dw4byp"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-bidi"; - version = "0.3.4"; - authors = [ "The Servo Project Developers" ]; - sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; - libName = "unicode_bidi"; - inherit dependencies buildDependencies features; - }; - unicode_normalization_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-normalization"; - version = "0.1.7"; - authors = [ "kwantam " ]; - sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.5"; - authors = [ "kwantam " ]; - sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; - inherit dependencies buildDependencies features; - }; - unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.0.4"; - authors = [ "erick.tryzelaar " "kwantam " ]; - sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; - inherit dependencies buildDependencies features; - }; - unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.1.0"; - authors = [ "erick.tryzelaar " "kwantam " ]; - sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; - inherit dependencies buildDependencies features; - }; - unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unreachable"; - version = "1.0.0"; - authors = [ "Jonathan Reem " ]; - sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; - inherit dependencies buildDependencies features; - }; - url_1_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "url"; - version = "1.7.1"; - authors = [ "The rust-url developers" ]; - sha256 = "1l36pbvlwdnh3zqz4wp5n6jg332wkis9pi2g3vy12xr8k4nfyk8i"; - inherit dependencies buildDependencies features; - }; - utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "utf8-ranges"; - version = "1.0.0"; - authors = [ "Andrew Gallant " ]; - sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; - inherit dependencies buildDependencies features; - }; - uuid_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "uuid"; - version = "0.6.5"; - authors = [ "Ashley Mannix" "Christopher Armstrong" "Dylan DPC" "Hunar Roop Kahlon" ]; - sha256 = "1jy15m4yxxwma0jsy070garhbgfprky23i77rawjkk75vqhnnhlf"; - inherit dependencies buildDependencies features; - }; - vcpkg_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vcpkg"; - version = "0.2.4"; - authors = [ "Jim McGrath " ]; - sha256 = "0xgk5axv1qhj4rfn2rca7768wnvzihccnajkgc6im8ndsx371nml"; - inherit dependencies buildDependencies features; - }; - version_check_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "version_check"; - version = "0.1.4"; - authors = [ "Sergio Benitez " ]; - sha256 = "1ghi6bw2qsj53x2vyprs883dbrq8cjzmshlamjsxvmwd2zp13bck"; - inherit dependencies buildDependencies features; - }; - void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "void"; - version = "1.0.2"; - authors = [ "Jonathan Reem " ]; - sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; - inherit dependencies buildDependencies features; - }; - want_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "want"; - version = "0.0.4"; - authors = [ "Sean McArthur " ]; - sha256 = "1l1qy4pvg5q71nrzfjldw9xzqhhgicj4slly1bal89hr2aaibpy0"; - inherit dependencies buildDependencies features; - }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - authors = [ "Peter Atashian " ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - inherit dependencies buildDependencies features; - }; - winapi_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.3.5"; - authors = [ "Peter Atashian " ]; - sha256 = "0cfdsxa5yf832r5i2z7dhdvnryyvhfp3nb32gpcaq502zgjdm3w6"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - authors = [ "Peter Atashian " ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - inherit dependencies buildDependencies features; - }; - winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian " ]; - sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian " ]; - sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wincolor"; - version = "0.1.6"; - authors = [ "Andrew Gallant " ]; - sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47"; - inherit dependencies buildDependencies features; - }; - ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ws2_32-sys"; - version = "0.2.1"; - authors = [ "Peter Atashian " ]; - sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc"; - libName = "ws2_32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - adler32_1_0_3 = { features?(adler32_1_0_3_features {}) }: adler32_1_0_3_ {}; - adler32_1_0_3_features = f: updateFeatures f (rec { - adler32_1_0_3.default = (f.adler32_1_0_3.default or true); - }) []; - aho_corasick_0_6_6 = { features?(aho_corasick_0_6_6_features {}) }: aho_corasick_0_6_6_ { - dependencies = mapFeatures features ([ memchr_2_0_1 ]); - }; - aho_corasick_0_6_6_features = f: updateFeatures f (rec { - aho_corasick_0_6_6.default = (f.aho_corasick_0_6_6.default or true); - memchr_2_0_1.default = true; - }) [ memchr_2_0_1_features ]; - ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - }; - ansi_term_0_11_0_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); - winapi_0_3_5.consoleapi = true; - winapi_0_3_5.default = true; - winapi_0_3_5.errhandlingapi = true; - winapi_0_3_5.processenv = true; - }) [ winapi_0_3_5_features ]; - arrayvec_0_4_7 = { features?(arrayvec_0_4_7_features {}) }: arrayvec_0_4_7_ { - dependencies = mapFeatures features ([ nodrop_0_1_12 ]); - features = mkFeatures (features.arrayvec_0_4_7 or {}); - }; - arrayvec_0_4_7_features = f: updateFeatures f (rec { - arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or true); - arrayvec_0_4_7.serde = - (f.arrayvec_0_4_7.serde or false) || - (f.arrayvec_0_4_7.serde-1 or false) || - (arrayvec_0_4_7.serde-1 or false); - arrayvec_0_4_7.std = - (f.arrayvec_0_4_7.std or false) || - (f.arrayvec_0_4_7.default or false) || - (arrayvec_0_4_7.default or false); - nodrop_0_1_12.default = (f.nodrop_0_1_12.default or false); - }) [ nodrop_0_1_12_features ]; - ascii_0_7_1 = { features?(ascii_0_7_1_features {}) }: ascii_0_7_1_ { - features = mkFeatures (features.ascii_0_7_1 or {}); - }; - ascii_0_7_1_features = f: updateFeatures f (rec { - ascii_0_7_1.default = (f.ascii_0_7_1.default or true); - }) []; - assert_cli_0_6_3 = { features?(assert_cli_0_6_3_features {}) }: assert_cli_0_6_3_ { - dependencies = mapFeatures features ([ colored_1_6_1 difference_2_0_0 environment_0_1_1 failure_0_1_1 failure_derive_0_1_1 serde_json_1_0_24 ]); - }; - assert_cli_0_6_3_features = f: updateFeatures f (rec { - assert_cli_0_6_3.default = (f.assert_cli_0_6_3.default or true); - colored_1_6_1.default = true; - difference_2_0_0.default = true; - environment_0_1_1.default = true; - failure_0_1_1.default = true; - failure_derive_0_1_1.default = true; - serde_json_1_0_24.default = true; - }) [ colored_1_6_1_features difference_2_0_0_features environment_0_1_1_features failure_0_1_1_features failure_derive_0_1_1_features serde_json_1_0_24_features ]; - atty_0_2_11 = { features?(atty_0_2_11_features {}) }: atty_0_2_11_ { - dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - }; - atty_0_2_11_features = f: updateFeatures f (rec { - atty_0_2_11.default = (f.atty_0_2_11.default or true); - libc_0_2_42.default = (f.libc_0_2_42.default or false); - termion_1_5_1.default = true; - winapi_0_3_5.consoleapi = true; - winapi_0_3_5.default = true; - winapi_0_3_5.minwinbase = true; - winapi_0_3_5.minwindef = true; - winapi_0_3_5.processenv = true; - winapi_0_3_5.winbase = true; - }) [ termion_1_5_1_features libc_0_2_42_features winapi_0_3_5_features ]; - backtrace_0_3_9 = { features?(backtrace_0_3_9_features {}) }: backtrace_0_3_9_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 rustc_demangle_0_1_9 ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_9.backtrace-sys or false then [ backtrace_sys_0_1_23 ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_9.winapi or false then [ winapi_0_3_5 ] else [])) else []); - features = mkFeatures (features.backtrace_0_3_9 or {}); - }; - backtrace_0_3_9_features = f: updateFeatures f (rec { - backtrace_0_3_9.addr2line = - (f.backtrace_0_3_9.addr2line or false) || - (f.backtrace_0_3_9.gimli-symbolize or false) || - (backtrace_0_3_9.gimli-symbolize or false); - backtrace_0_3_9.backtrace-sys = - (f.backtrace_0_3_9.backtrace-sys or false) || - (f.backtrace_0_3_9.libbacktrace or false) || - (backtrace_0_3_9.libbacktrace or false); - backtrace_0_3_9.coresymbolication = - (f.backtrace_0_3_9.coresymbolication or false) || - (f.backtrace_0_3_9.default or false) || - (backtrace_0_3_9.default or false); - backtrace_0_3_9.dbghelp = - (f.backtrace_0_3_9.dbghelp or false) || - (f.backtrace_0_3_9.default or false) || - (backtrace_0_3_9.default or false); - backtrace_0_3_9.default = (f.backtrace_0_3_9.default or true); - backtrace_0_3_9.dladdr = - (f.backtrace_0_3_9.dladdr or false) || - (f.backtrace_0_3_9.default or false) || - (backtrace_0_3_9.default or false); - backtrace_0_3_9.findshlibs = - (f.backtrace_0_3_9.findshlibs or false) || - (f.backtrace_0_3_9.gimli-symbolize or false) || - (backtrace_0_3_9.gimli-symbolize or false); - backtrace_0_3_9.gimli = - (f.backtrace_0_3_9.gimli or false) || - (f.backtrace_0_3_9.gimli-symbolize or false) || - (backtrace_0_3_9.gimli-symbolize or false); - backtrace_0_3_9.libbacktrace = - (f.backtrace_0_3_9.libbacktrace or false) || - (f.backtrace_0_3_9.default or false) || - (backtrace_0_3_9.default or false); - backtrace_0_3_9.libunwind = - (f.backtrace_0_3_9.libunwind or false) || - (f.backtrace_0_3_9.default or false) || - (backtrace_0_3_9.default or false); - backtrace_0_3_9.memmap = - (f.backtrace_0_3_9.memmap or false) || - (f.backtrace_0_3_9.gimli-symbolize or false) || - (backtrace_0_3_9.gimli-symbolize or false); - backtrace_0_3_9.object = - (f.backtrace_0_3_9.object or false) || - (f.backtrace_0_3_9.gimli-symbolize or false) || - (backtrace_0_3_9.gimli-symbolize or false); - backtrace_0_3_9.rustc-serialize = - (f.backtrace_0_3_9.rustc-serialize or false) || - (f.backtrace_0_3_9.serialize-rustc or false) || - (backtrace_0_3_9.serialize-rustc or false); - backtrace_0_3_9.serde = - (f.backtrace_0_3_9.serde or false) || - (f.backtrace_0_3_9.serialize-serde or false) || - (backtrace_0_3_9.serialize-serde or false); - backtrace_0_3_9.serde_derive = - (f.backtrace_0_3_9.serde_derive or false) || - (f.backtrace_0_3_9.serialize-serde or false) || - (backtrace_0_3_9.serialize-serde or false); - backtrace_0_3_9.winapi = - (f.backtrace_0_3_9.winapi or false) || - (f.backtrace_0_3_9.dbghelp or false) || - (backtrace_0_3_9.dbghelp or false); - backtrace_sys_0_1_23.default = true; - cfg_if_0_1_4.default = true; - libc_0_2_42.default = true; - rustc_demangle_0_1_9.default = true; - winapi_0_3_5.dbghelp = true; - winapi_0_3_5.default = true; - winapi_0_3_5.minwindef = true; - winapi_0_3_5.processthreadsapi = true; - winapi_0_3_5.std = true; - winapi_0_3_5.winnt = true; - }) [ cfg_if_0_1_4_features rustc_demangle_0_1_9_features backtrace_sys_0_1_23_features libc_0_2_42_features winapi_0_3_5_features ]; - backtrace_sys_0_1_23 = { features?(backtrace_sys_0_1_23_features {}) }: backtrace_sys_0_1_23_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]); - buildDependencies = mapFeatures features ([ cc_1_0_18 ]); - }; - backtrace_sys_0_1_23_features = f: updateFeatures f (rec { - backtrace_sys_0_1_23.default = (f.backtrace_sys_0_1_23.default or true); - cc_1_0_18.default = true; - libc_0_2_42.default = true; - }) [ libc_0_2_42_features cc_1_0_18_features ]; - base64_0_9_2 = { features?(base64_0_9_2_features {}) }: base64_0_9_2_ { - dependencies = mapFeatures features ([ byteorder_1_2_4 safemem_0_2_0 ]); - }; - base64_0_9_2_features = f: updateFeatures f (rec { - base64_0_9_2.default = (f.base64_0_9_2.default or true); - byteorder_1_2_4.default = true; - safemem_0_2_0.default = true; - }) [ byteorder_1_2_4_features safemem_0_2_0_features ]; - bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { - features = mkFeatures (features.bitflags_0_9_1 or {}); - }; - bitflags_0_9_1_features = f: updateFeatures f (rec { - bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); - bitflags_0_9_1.example_generated = - (f.bitflags_0_9_1.example_generated or false) || - (f.bitflags_0_9_1.default or false) || - (bitflags_0_9_1.default or false); - }) []; - bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ { - features = mkFeatures (features.bitflags_1_0_3 or {}); - }; - bitflags_1_0_3_features = f: updateFeatures f (rec { - bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true); - }) []; - build_const_0_2_1 = { features?(build_const_0_2_1_features {}) }: build_const_0_2_1_ { - features = mkFeatures (features.build_const_0_2_1 or {}); - }; - build_const_0_2_1_features = f: updateFeatures f (rec { - build_const_0_2_1.default = (f.build_const_0_2_1.default or true); - build_const_0_2_1.std = - (f.build_const_0_2_1.std or false) || - (f.build_const_0_2_1.default or false) || - (build_const_0_2_1.default or false); - }) []; - byteorder_1_2_4 = { features?(byteorder_1_2_4_features {}) }: byteorder_1_2_4_ { - features = mkFeatures (features.byteorder_1_2_4 or {}); - }; - byteorder_1_2_4_features = f: updateFeatures f (rec { - byteorder_1_2_4.default = (f.byteorder_1_2_4.default or true); - byteorder_1_2_4.std = - (f.byteorder_1_2_4.std or false) || - (f.byteorder_1_2_4.default or false) || - (byteorder_1_2_4.default or false); - }) []; - bytes_0_4_9 = { features?(bytes_0_4_9_features {}) }: bytes_0_4_9_ { - dependencies = mapFeatures features ([ byteorder_1_2_4 iovec_0_1_2 ]); - features = mkFeatures (features.bytes_0_4_9 or {}); - }; - bytes_0_4_9_features = f: updateFeatures f (rec { - byteorder_1_2_4.default = true; - byteorder_1_2_4.i128 = - (f.byteorder_1_2_4.i128 or false) || - (bytes_0_4_9.i128 or false) || - (f.bytes_0_4_9.i128 or false); - bytes_0_4_9.default = (f.bytes_0_4_9.default or true); - iovec_0_1_2.default = true; - }) [ byteorder_1_2_4_features iovec_0_1_2_features ]; - cargo_edit_0_3_0 = { features?(cargo_edit_0_3_0_features {}) }: cargo_edit_0_3_0_ { - dependencies = mapFeatures features ([ atty_0_2_11 cargo_metadata_0_5_8 docopt_1_0_0 env_proxy_0_2_0 error_chain_0_11_0 pad_0_1_5 regex_1_0_3 reqwest_0_8_7 semver_0_9_0 serde_1_0_70 serde_derive_1_0_75 serde_json_1_0_24 termcolor_0_3_6 toml_edit_0_1_3 ]); - features = mkFeatures (features.cargo_edit_0_3_0 or {}); - }; - cargo_edit_0_3_0_features = f: updateFeatures f (rec { - atty_0_2_11.default = true; - cargo_edit_0_3_0.add = - (f.cargo_edit_0_3_0.add or false) || - (f.cargo_edit_0_3_0.default or false) || - (cargo_edit_0_3_0.default or false); - cargo_edit_0_3_0.default = (f.cargo_edit_0_3_0.default or true); - cargo_edit_0_3_0.rm = - (f.cargo_edit_0_3_0.rm or false) || - (f.cargo_edit_0_3_0.default or false) || - (cargo_edit_0_3_0.default or false); - cargo_edit_0_3_0.upgrade = - (f.cargo_edit_0_3_0.upgrade or false) || - (f.cargo_edit_0_3_0.default or false) || - (cargo_edit_0_3_0.default or false); - cargo_metadata_0_5_8.default = true; - docopt_1_0_0.default = true; - env_proxy_0_2_0.default = true; - error_chain_0_11_0.default = true; - pad_0_1_5.default = true; - regex_1_0_3.default = true; - reqwest_0_8_7.default = true; - semver_0_9_0.default = true; - semver_0_9_0.serde = true; - serde_1_0_70.default = true; - serde_derive_1_0_75.default = true; - serde_json_1_0_24.default = true; - termcolor_0_3_6.default = true; - toml_edit_0_1_3.default = true; - }) [ atty_0_2_11_features cargo_metadata_0_5_8_features docopt_1_0_0_features env_proxy_0_2_0_features error_chain_0_11_0_features pad_0_1_5_features regex_1_0_3_features reqwest_0_8_7_features semver_0_9_0_features serde_1_0_70_features serde_derive_1_0_75_features serde_json_1_0_24_features termcolor_0_3_6_features toml_edit_0_1_3_features ]; - cargo_metadata_0_5_8 = { features?(cargo_metadata_0_5_8_features {}) }: cargo_metadata_0_5_8_ { - dependencies = mapFeatures features ([ error_chain_0_11_0 semver_0_9_0 serde_1_0_70 serde_derive_1_0_75 serde_json_1_0_24 ]); - features = mkFeatures (features.cargo_metadata_0_5_8 or {}); - }; - cargo_metadata_0_5_8_features = f: updateFeatures f (rec { - cargo_metadata_0_5_8.backtrace = - (f.cargo_metadata_0_5_8.backtrace or false) || - (f.cargo_metadata_0_5_8.default or false) || - (cargo_metadata_0_5_8.default or false); - cargo_metadata_0_5_8.default = (f.cargo_metadata_0_5_8.default or true); - error_chain_0_11_0.backtrace = - (f.error_chain_0_11_0.backtrace or false) || - (cargo_metadata_0_5_8.backtrace or false) || - (f.cargo_metadata_0_5_8.backtrace or false); - error_chain_0_11_0.default = (f.error_chain_0_11_0.default or false); - semver_0_9_0.default = true; - semver_0_9_0.serde = true; - serde_1_0_70.default = true; - serde_derive_1_0_75.default = true; - serde_json_1_0_24.default = true; - }) [ error_chain_0_11_0_features semver_0_9_0_features serde_1_0_70_features serde_derive_1_0_75_features serde_json_1_0_24_features ]; - cc_1_0_18 = { features?(cc_1_0_18_features {}) }: cc_1_0_18_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.cc_1_0_18 or {}); - }; - cc_1_0_18_features = f: updateFeatures f (rec { - cc_1_0_18.default = (f.cc_1_0_18.default or true); - cc_1_0_18.rayon = - (f.cc_1_0_18.rayon or false) || - (f.cc_1_0_18.parallel or false) || - (cc_1_0_18.parallel or false); - }) []; - cfg_if_0_1_4 = { features?(cfg_if_0_1_4_features {}) }: cfg_if_0_1_4_ {}; - cfg_if_0_1_4_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = (f.cfg_if_0_1_4.default or true); - }) []; - chrono_0_4_5 = { features?(chrono_0_4_5_features {}) }: chrono_0_4_5_ { - dependencies = mapFeatures features ([ num_integer_0_1_39 num_traits_0_2_5 ] - ++ (if features.chrono_0_4_5.time or false then [ time_0_1_40 ] else [])); - features = mkFeatures (features.chrono_0_4_5 or {}); - }; - chrono_0_4_5_features = f: updateFeatures f (rec { - chrono_0_4_5.clock = - (f.chrono_0_4_5.clock or false) || - (f.chrono_0_4_5.default or false) || - (chrono_0_4_5.default or false); - chrono_0_4_5.default = (f.chrono_0_4_5.default or true); - chrono_0_4_5.time = - (f.chrono_0_4_5.time or false) || - (f.chrono_0_4_5.clock or false) || - (chrono_0_4_5.clock or false); - num_integer_0_1_39.default = (f.num_integer_0_1_39.default or false); - num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false); - time_0_1_40.default = true; - }) [ num_integer_0_1_39_features num_traits_0_2_5_features time_0_1_40_features ]; - colored_1_6_1 = { features?(colored_1_6_1_features {}) }: colored_1_6_1_ { - dependencies = mapFeatures features ([ lazy_static_1_0_2 ]); - features = mkFeatures (features.colored_1_6_1 or {}); - }; - colored_1_6_1_features = f: updateFeatures f (rec { - colored_1_6_1.default = (f.colored_1_6_1.default or true); - lazy_static_1_0_2.default = true; - }) [ lazy_static_1_0_2_features ]; - combine_3_3_6 = { features?(combine_3_3_6_features {}) }: combine_3_3_6_ { - dependencies = mapFeatures features ([ ascii_0_7_1 byteorder_1_2_4 either_1_5_0 memchr_2_0_1 unreachable_1_0_0 ]); - features = mkFeatures (features.combine_3_3_6 or {}); - }; - combine_3_3_6_features = f: updateFeatures f (rec { - ascii_0_7_1.default = true; - byteorder_1_2_4.default = true; - combine_3_3_6.default = (f.combine_3_3_6.default or true); - combine_3_3_6.regex = - (f.combine_3_3_6.regex or false) || - (f.combine_3_3_6.doc or false) || - (combine_3_3_6.doc or false); - combine_3_3_6.std = - (f.combine_3_3_6.std or false) || - (f.combine_3_3_6.default or false) || - (combine_3_3_6.default or false); - either_1_5_0.default = true; - memchr_2_0_1.default = (f.memchr_2_0_1.default or false); - memchr_2_0_1.use_std = - (f.memchr_2_0_1.use_std or false) || - (combine_3_3_6.std or false) || - (f.combine_3_3_6.std or false); - unreachable_1_0_0.default = true; - }) [ ascii_0_7_1_features byteorder_1_2_4_features either_1_5_0_features memchr_2_0_1_features unreachable_1_0_0_features ]; - core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ { - dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]); - }; - core_foundation_0_2_3_features = f: updateFeatures f (rec { - core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true); - core_foundation_sys_0_2_3.default = true; - libc_0_2_42.default = true; - }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ]; - core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]); - }; - core_foundation_sys_0_2_3_features = f: updateFeatures f (rec { - core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true); - libc_0_2_42.default = true; - }) [ libc_0_2_42_features ]; - crc_1_8_1 = { features?(crc_1_8_1_features {}) }: crc_1_8_1_ { - buildDependencies = mapFeatures features ([ build_const_0_2_1 ]); - features = mkFeatures (features.crc_1_8_1 or {}); - }; - crc_1_8_1_features = f: updateFeatures f (rec { - build_const_0_2_1.default = true; - crc_1_8_1.default = (f.crc_1_8_1.default or true); - crc_1_8_1.std = - (f.crc_1_8_1.std or false) || - (f.crc_1_8_1.default or false) || - (crc_1_8_1.default or false); - }) [ build_const_0_2_1_features ]; - crossbeam_deque_0_3_1 = { features?(crossbeam_deque_0_3_1_features {}) }: crossbeam_deque_0_3_1_ { - dependencies = mapFeatures features ([ crossbeam_epoch_0_4_3 crossbeam_utils_0_3_2 ]); - }; - crossbeam_deque_0_3_1_features = f: updateFeatures f (rec { - crossbeam_deque_0_3_1.default = (f.crossbeam_deque_0_3_1.default or true); - crossbeam_epoch_0_4_3.default = true; - crossbeam_utils_0_3_2.default = true; - }) [ crossbeam_epoch_0_4_3_features crossbeam_utils_0_3_2_features ]; - crossbeam_epoch_0_4_3 = { features?(crossbeam_epoch_0_4_3_features {}) }: crossbeam_epoch_0_4_3_ { - dependencies = mapFeatures features ([ arrayvec_0_4_7 cfg_if_0_1_4 crossbeam_utils_0_3_2 memoffset_0_2_1 scopeguard_0_3_3 ] - ++ (if features.crossbeam_epoch_0_4_3.lazy_static or false then [ lazy_static_1_0_2 ] else [])); - features = mkFeatures (features.crossbeam_epoch_0_4_3 or {}); - }; - crossbeam_epoch_0_4_3_features = f: updateFeatures f (rec { - arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or false); - arrayvec_0_4_7.use_union = - (f.arrayvec_0_4_7.use_union or false) || - (crossbeam_epoch_0_4_3.nightly or false) || - (f.crossbeam_epoch_0_4_3.nightly or false); - cfg_if_0_1_4.default = true; - crossbeam_epoch_0_4_3.default = (f.crossbeam_epoch_0_4_3.default or true); - crossbeam_epoch_0_4_3.lazy_static = - (f.crossbeam_epoch_0_4_3.lazy_static or false) || - (f.crossbeam_epoch_0_4_3.use_std or false) || - (crossbeam_epoch_0_4_3.use_std or false); - crossbeam_epoch_0_4_3.use_std = - (f.crossbeam_epoch_0_4_3.use_std or false) || - (f.crossbeam_epoch_0_4_3.default or false) || - (crossbeam_epoch_0_4_3.default or false); - crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or false); - crossbeam_utils_0_3_2.use_std = - (f.crossbeam_utils_0_3_2.use_std or false) || - (crossbeam_epoch_0_4_3.use_std or false) || - (f.crossbeam_epoch_0_4_3.use_std or false); - lazy_static_1_0_2.default = true; - memoffset_0_2_1.default = true; - scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or false); - }) [ arrayvec_0_4_7_features cfg_if_0_1_4_features crossbeam_utils_0_3_2_features lazy_static_1_0_2_features memoffset_0_2_1_features scopeguard_0_3_3_features ]; - crossbeam_utils_0_3_2 = { features?(crossbeam_utils_0_3_2_features {}) }: crossbeam_utils_0_3_2_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); - features = mkFeatures (features.crossbeam_utils_0_3_2 or {}); - }; - crossbeam_utils_0_3_2_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or true); - crossbeam_utils_0_3_2.use_std = - (f.crossbeam_utils_0_3_2.use_std or false) || - (f.crossbeam_utils_0_3_2.default or false) || - (crossbeam_utils_0_3_2.default or false); - }) [ cfg_if_0_1_4_features ]; - difference_2_0_0 = { features?(difference_2_0_0_features {}) }: difference_2_0_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.difference_2_0_0 or {}); - }; - difference_2_0_0_features = f: updateFeatures f (rec { - difference_2_0_0.default = (f.difference_2_0_0.default or true); - difference_2_0_0.getopts = - (f.difference_2_0_0.getopts or false) || - (f.difference_2_0_0.bin or false) || - (difference_2_0_0.bin or false); - }) []; - docopt_1_0_0 = { features?(docopt_1_0_0_features {}) }: docopt_1_0_0_ { - dependencies = mapFeatures features ([ lazy_static_1_0_2 regex_1_0_3 serde_1_0_70 serde_derive_1_0_75 strsim_0_7_0 ]); - }; - docopt_1_0_0_features = f: updateFeatures f (rec { - docopt_1_0_0.default = (f.docopt_1_0_0.default or true); - lazy_static_1_0_2.default = true; - regex_1_0_3.default = true; - serde_1_0_70.default = true; - serde_derive_1_0_75.default = true; - strsim_0_7_0.default = true; - }) [ lazy_static_1_0_2_features regex_1_0_3_features serde_1_0_70_features serde_derive_1_0_75_features strsim_0_7_0_features ]; - dtoa_0_4_3 = { features?(dtoa_0_4_3_features {}) }: dtoa_0_4_3_ {}; - dtoa_0_4_3_features = f: updateFeatures f (rec { - dtoa_0_4_3.default = (f.dtoa_0_4_3.default or true); - }) []; - either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.either_1_5_0 or {}); - }; - either_1_5_0_features = f: updateFeatures f (rec { - either_1_5_0.default = (f.either_1_5_0.default or true); - either_1_5_0.use_std = - (f.either_1_5_0.use_std or false) || - (f.either_1_5_0.default or false) || - (either_1_5_0.default or false); - }) []; - encoding_rs_0_7_2 = { features?(encoding_rs_0_7_2_features {}) }: encoding_rs_0_7_2_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); - features = mkFeatures (features.encoding_rs_0_7_2 or {}); - }; - encoding_rs_0_7_2_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - encoding_rs_0_7_2.default = (f.encoding_rs_0_7_2.default or true); - encoding_rs_0_7_2.simd = - (f.encoding_rs_0_7_2.simd or false) || - (f.encoding_rs_0_7_2.simd-accel or false) || - (encoding_rs_0_7_2.simd-accel or false); - }) [ cfg_if_0_1_4_features ]; - env_proxy_0_2_0 = { features?(env_proxy_0_2_0_features {}) }: env_proxy_0_2_0_ { - dependencies = mapFeatures features ([ log_0_3_9 url_1_7_1 ]); - }; - env_proxy_0_2_0_features = f: updateFeatures f (rec { - env_proxy_0_2_0.default = (f.env_proxy_0_2_0.default or true); - log_0_3_9.default = true; - url_1_7_1.default = true; - }) [ log_0_3_9_features url_1_7_1_features ]; - environment_0_1_1 = { features?(environment_0_1_1_features {}) }: environment_0_1_1_ {}; - environment_0_1_1_features = f: updateFeatures f (rec { - environment_0_1_1.default = (f.environment_0_1_1.default or true); - }) []; - error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ { - dependencies = mapFeatures features ([ ] - ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_9 ] else [])); - features = mkFeatures (features.error_chain_0_11_0 or {}); - }; - error_chain_0_11_0_features = f: updateFeatures f (rec { - backtrace_0_3_9.default = true; - error_chain_0_11_0.backtrace = - (f.error_chain_0_11_0.backtrace or false) || - (f.error_chain_0_11_0.default or false) || - (error_chain_0_11_0.default or false); - error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true); - error_chain_0_11_0.example_generated = - (f.error_chain_0_11_0.example_generated or false) || - (f.error_chain_0_11_0.default or false) || - (error_chain_0_11_0.default or false); - }) [ backtrace_0_3_9_features ]; - failure_0_1_1 = { features?(failure_0_1_1_features {}) }: failure_0_1_1_ { - dependencies = mapFeatures features ([ ] - ++ (if features.failure_0_1_1.backtrace or false then [ backtrace_0_3_9 ] else []) - ++ (if features.failure_0_1_1.failure_derive or false then [ failure_derive_0_1_1 ] else [])); - features = mkFeatures (features.failure_0_1_1 or {}); - }; - failure_0_1_1_features = f: updateFeatures f (rec { - backtrace_0_3_9.default = true; - failure_0_1_1.backtrace = - (f.failure_0_1_1.backtrace or false) || - (f.failure_0_1_1.std or false) || - (failure_0_1_1.std or false); - failure_0_1_1.default = (f.failure_0_1_1.default or true); - failure_0_1_1.derive = - (f.failure_0_1_1.derive or false) || - (f.failure_0_1_1.default or false) || - (failure_0_1_1.default or false); - failure_0_1_1.failure_derive = - (f.failure_0_1_1.failure_derive or false) || - (f.failure_0_1_1.derive or false) || - (failure_0_1_1.derive or false); - failure_0_1_1.std = - (f.failure_0_1_1.std or false) || - (f.failure_0_1_1.default or false) || - (failure_0_1_1.default or false); - failure_derive_0_1_1.default = true; - }) [ backtrace_0_3_9_features failure_derive_0_1_1_features ]; - failure_derive_0_1_1 = { features?(failure_derive_0_1_1_features {}) }: failure_derive_0_1_1_ { - dependencies = mapFeatures features ([ quote_0_3_15 syn_0_11_11 synstructure_0_6_1 ]); - features = mkFeatures (features.failure_derive_0_1_1 or {}); - }; - failure_derive_0_1_1_features = f: updateFeatures f (rec { - failure_derive_0_1_1.default = (f.failure_derive_0_1_1.default or true); - failure_derive_0_1_1.std = - (f.failure_derive_0_1_1.std or false) || - (f.failure_derive_0_1_1.default or false) || - (failure_derive_0_1_1.default or false); - quote_0_3_15.default = true; - syn_0_11_11.default = true; - synstructure_0_6_1.default = true; - }) [ quote_0_3_15_features syn_0_11_11_features synstructure_0_6_1_features ]; - foreign_types_0_3_2 = { features?(foreign_types_0_3_2_features {}) }: foreign_types_0_3_2_ { - dependencies = mapFeatures features ([ foreign_types_shared_0_1_1 ]); - }; - foreign_types_0_3_2_features = f: updateFeatures f (rec { - foreign_types_0_3_2.default = (f.foreign_types_0_3_2.default or true); - foreign_types_shared_0_1_1.default = true; - }) [ foreign_types_shared_0_1_1_features ]; - foreign_types_shared_0_1_1 = { features?(foreign_types_shared_0_1_1_features {}) }: foreign_types_shared_0_1_1_ {}; - foreign_types_shared_0_1_1_features = f: updateFeatures f (rec { - foreign_types_shared_0_1_1.default = (f.foreign_types_shared_0_1_1.default or true); - }) []; - fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { - dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]); - }; - fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { - bitflags_1_0_3.default = true; - fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); - fuchsia_zircon_sys_0_3_3.default = true; - }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ]; - fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; - fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { - fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); - }) []; - futures_0_1_23 = { features?(futures_0_1_23_features {}) }: futures_0_1_23_ { - features = mkFeatures (features.futures_0_1_23 or {}); - }; - futures_0_1_23_features = f: updateFeatures f (rec { - futures_0_1_23.default = (f.futures_0_1_23.default or true); - futures_0_1_23.use_std = - (f.futures_0_1_23.use_std or false) || - (f.futures_0_1_23.default or false) || - (futures_0_1_23.default or false); - futures_0_1_23.with-deprecated = - (f.futures_0_1_23.with-deprecated or false) || - (f.futures_0_1_23.default or false) || - (futures_0_1_23.default or false); - }) []; - futures_cpupool_0_1_8 = { features?(futures_cpupool_0_1_8_features {}) }: futures_cpupool_0_1_8_ { - dependencies = mapFeatures features ([ futures_0_1_23 num_cpus_1_8_0 ]); - features = mkFeatures (features.futures_cpupool_0_1_8 or {}); - }; - futures_cpupool_0_1_8_features = f: updateFeatures f (rec { - futures_0_1_23.default = (f.futures_0_1_23.default or false); - futures_0_1_23.use_std = true; - futures_0_1_23.with-deprecated = - (f.futures_0_1_23.with-deprecated or false) || - (futures_cpupool_0_1_8.with-deprecated or false) || - (f.futures_cpupool_0_1_8.with-deprecated or false); - futures_cpupool_0_1_8.default = (f.futures_cpupool_0_1_8.default or true); - futures_cpupool_0_1_8.with-deprecated = - (f.futures_cpupool_0_1_8.with-deprecated or false) || - (f.futures_cpupool_0_1_8.default or false) || - (futures_cpupool_0_1_8.default or false); - num_cpus_1_8_0.default = true; - }) [ futures_0_1_23_features num_cpus_1_8_0_features ]; - httparse_1_3_2 = { features?(httparse_1_3_2_features {}) }: httparse_1_3_2_ { - features = mkFeatures (features.httparse_1_3_2 or {}); - }; - httparse_1_3_2_features = f: updateFeatures f (rec { - httparse_1_3_2.default = (f.httparse_1_3_2.default or true); - httparse_1_3_2.std = - (f.httparse_1_3_2.std or false) || - (f.httparse_1_3_2.default or false) || - (httparse_1_3_2.default or false); - }) []; - hyper_0_11_27 = { features?(hyper_0_11_27_features {}) }: hyper_0_11_27_ { - dependencies = mapFeatures features ([ base64_0_9_2 bytes_0_4_9 futures_0_1_23 futures_cpupool_0_1_8 httparse_1_3_2 iovec_0_1_2 language_tags_0_2_2 log_0_4_3 mime_0_3_8 net2_0_2_33 percent_encoding_1_0_1 relay_0_1_1 time_0_1_40 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 unicase_2_1_0 want_0_0_4 ]); - features = mkFeatures (features.hyper_0_11_27 or {}); - }; - hyper_0_11_27_features = f: updateFeatures f (rec { - base64_0_9_2.default = true; - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - futures_cpupool_0_1_8.default = true; - httparse_1_3_2.default = true; - hyper_0_11_27.default = (f.hyper_0_11_27.default or true); - hyper_0_11_27.http = - (f.hyper_0_11_27.http or false) || - (f.hyper_0_11_27.compat or false) || - (hyper_0_11_27.compat or false); - hyper_0_11_27.server-proto = - (f.hyper_0_11_27.server-proto or false) || - (f.hyper_0_11_27.default or false) || - (hyper_0_11_27.default or false); - hyper_0_11_27.tokio-proto = - (f.hyper_0_11_27.tokio-proto or false) || - (f.hyper_0_11_27.server-proto or false) || - (hyper_0_11_27.server-proto or false); - iovec_0_1_2.default = true; - language_tags_0_2_2.default = true; - log_0_4_3.default = true; - mime_0_3_8.default = true; - net2_0_2_33.default = true; - percent_encoding_1_0_1.default = true; - relay_0_1_1.default = true; - time_0_1_40.default = true; - tokio_core_0_1_17.default = true; - tokio_io_0_1_7.default = true; - tokio_service_0_1_0.default = true; - unicase_2_1_0.default = true; - want_0_0_4.default = true; - }) [ base64_0_9_2_features bytes_0_4_9_features futures_0_1_23_features futures_cpupool_0_1_8_features httparse_1_3_2_features iovec_0_1_2_features language_tags_0_2_2_features log_0_4_3_features mime_0_3_8_features net2_0_2_33_features percent_encoding_1_0_1_features relay_0_1_1_features time_0_1_40_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features unicase_2_1_0_features want_0_0_4_features ]; - hyper_tls_0_1_4 = { features?(hyper_tls_0_1_4_features {}) }: hyper_tls_0_1_4_ { - dependencies = mapFeatures features ([ futures_0_1_23 hyper_0_11_27 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 tokio_tls_0_1_4 ]); - }; - hyper_tls_0_1_4_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - hyper_0_11_27.default = (f.hyper_0_11_27.default or false); - hyper_tls_0_1_4.default = (f.hyper_tls_0_1_4.default or true); - native_tls_0_1_5.default = true; - tokio_core_0_1_17.default = true; - tokio_io_0_1_7.default = true; - tokio_service_0_1_0.default = true; - tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or false); - }) [ futures_0_1_23_features hyper_0_11_27_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features tokio_tls_0_1_4_features ]; - idna_0_1_5 = { features?(idna_0_1_5_features {}) }: idna_0_1_5_ { - dependencies = mapFeatures features ([ matches_0_1_7 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]); - }; - idna_0_1_5_features = f: updateFeatures f (rec { - idna_0_1_5.default = (f.idna_0_1_5.default or true); - matches_0_1_7.default = true; - unicode_bidi_0_3_4.default = true; - unicode_normalization_0_1_7.default = true; - }) [ matches_0_1_7_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ]; - iovec_0_1_2 = { features?(iovec_0_1_2_features {}) }: iovec_0_1_2_ { - dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []); - }; - iovec_0_1_2_features = f: updateFeatures f (rec { - iovec_0_1_2.default = (f.iovec_0_1_2.default or true); - libc_0_2_42.default = true; - winapi_0_2_8.default = true; - }) [ libc_0_2_42_features winapi_0_2_8_features ]; - itoa_0_4_2 = { features?(itoa_0_4_2_features {}) }: itoa_0_4_2_ { - features = mkFeatures (features.itoa_0_4_2 or {}); - }; - itoa_0_4_2_features = f: updateFeatures f (rec { - itoa_0_4_2.default = (f.itoa_0_4_2.default or true); - itoa_0_4_2.std = - (f.itoa_0_4_2.std or false) || - (f.itoa_0_4_2.default or false) || - (itoa_0_4_2.default or false); - }) []; - kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.language_tags_0_2_2 or {}); - }; - language_tags_0_2_2_features = f: updateFeatures f (rec { - language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true); - language_tags_0_2_2.heapsize = - (f.language_tags_0_2_2.heapsize or false) || - (f.language_tags_0_2_2.heap_size or false) || - (language_tags_0_2_2.heap_size or false); - language_tags_0_2_2.heapsize_plugin = - (f.language_tags_0_2_2.heapsize_plugin or false) || - (f.language_tags_0_2_2.heap_size or false) || - (language_tags_0_2_2.heap_size or false); - }) []; - lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_0_2_11 or {}); - }; - lazy_static_0_2_11_features = f: updateFeatures f (rec { - lazy_static_0_2_11.compiletest_rs = - (f.lazy_static_0_2_11.compiletest_rs or false) || - (f.lazy_static_0_2_11.compiletest or false) || - (lazy_static_0_2_11.compiletest or false); - lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true); - lazy_static_0_2_11.nightly = - (f.lazy_static_0_2_11.nightly or false) || - (f.lazy_static_0_2_11.spin_no_std or false) || - (lazy_static_0_2_11.spin_no_std or false); - lazy_static_0_2_11.spin = - (f.lazy_static_0_2_11.spin or false) || - (f.lazy_static_0_2_11.spin_no_std or false) || - (lazy_static_0_2_11.spin_no_std or false); - }) []; - lazy_static_1_0_2 = { features?(lazy_static_1_0_2_features {}) }: lazy_static_1_0_2_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_1_0_2 or {}); - }; - lazy_static_1_0_2_features = f: updateFeatures f (rec { - lazy_static_1_0_2.default = (f.lazy_static_1_0_2.default or true); - lazy_static_1_0_2.nightly = - (f.lazy_static_1_0_2.nightly or false) || - (f.lazy_static_1_0_2.spin_no_std or false) || - (lazy_static_1_0_2.spin_no_std or false); - lazy_static_1_0_2.spin = - (f.lazy_static_1_0_2.spin or false) || - (f.lazy_static_1_0_2.spin_no_std or false) || - (lazy_static_1_0_2.spin_no_std or false); - }) []; - lazycell_0_6_0 = { features?(lazycell_0_6_0_features {}) }: lazycell_0_6_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazycell_0_6_0 or {}); - }; - lazycell_0_6_0_features = f: updateFeatures f (rec { - lazycell_0_6_0.clippy = - (f.lazycell_0_6_0.clippy or false) || - (f.lazycell_0_6_0.nightly-testing or false) || - (lazycell_0_6_0.nightly-testing or false); - lazycell_0_6_0.default = (f.lazycell_0_6_0.default or true); - lazycell_0_6_0.nightly = - (f.lazycell_0_6_0.nightly or false) || - (f.lazycell_0_6_0.nightly-testing or false) || - (lazycell_0_6_0.nightly-testing or false); - }) []; - libc_0_2_42 = { features?(libc_0_2_42_features {}) }: libc_0_2_42_ { - features = mkFeatures (features.libc_0_2_42 or {}); - }; - libc_0_2_42_features = f: updateFeatures f (rec { - libc_0_2_42.default = (f.libc_0_2_42.default or true); - libc_0_2_42.use_std = - (f.libc_0_2_42.use_std or false) || - (f.libc_0_2_42.default or false) || - (libc_0_2_42.default or false); - }) []; - libflate_0_1_16 = { features?(libflate_0_1_16_features {}) }: libflate_0_1_16_ { - dependencies = mapFeatures features ([ adler32_1_0_3 byteorder_1_2_4 crc_1_8_1 ]); - }; - libflate_0_1_16_features = f: updateFeatures f (rec { - adler32_1_0_3.default = true; - byteorder_1_2_4.default = true; - crc_1_8_1.default = true; - libflate_0_1_16.default = (f.libflate_0_1_16.default or true); - }) [ adler32_1_0_3_features byteorder_1_2_4_features crc_1_8_1_features ]; - linked_hash_map_0_5_1 = { features?(linked_hash_map_0_5_1_features {}) }: linked_hash_map_0_5_1_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.linked_hash_map_0_5_1 or {}); - }; - linked_hash_map_0_5_1_features = f: updateFeatures f (rec { - linked_hash_map_0_5_1.default = (f.linked_hash_map_0_5_1.default or true); - linked_hash_map_0_5_1.heapsize = - (f.linked_hash_map_0_5_1.heapsize or false) || - (f.linked_hash_map_0_5_1.heapsize_impl or false) || - (linked_hash_map_0_5_1.heapsize_impl or false); - linked_hash_map_0_5_1.serde = - (f.linked_hash_map_0_5_1.serde or false) || - (f.linked_hash_map_0_5_1.serde_impl or false) || - (linked_hash_map_0_5_1.serde_impl or false); - linked_hash_map_0_5_1.serde_test = - (f.linked_hash_map_0_5_1.serde_test or false) || - (f.linked_hash_map_0_5_1.serde_impl or false) || - (linked_hash_map_0_5_1.serde_impl or false); - }) []; - log_0_3_9 = { features?(log_0_3_9_features {}) }: log_0_3_9_ { - dependencies = mapFeatures features ([ log_0_4_3 ]); - features = mkFeatures (features.log_0_3_9 or {}); - }; - log_0_3_9_features = f: updateFeatures f (rec { - log_0_3_9.default = (f.log_0_3_9.default or true); - log_0_3_9.use_std = - (f.log_0_3_9.use_std or false) || - (f.log_0_3_9.default or false) || - (log_0_3_9.default or false); - log_0_4_3.default = true; - log_0_4_3.max_level_debug = - (f.log_0_4_3.max_level_debug or false) || - (log_0_3_9.max_level_debug or false) || - (f.log_0_3_9.max_level_debug or false); - log_0_4_3.max_level_error = - (f.log_0_4_3.max_level_error or false) || - (log_0_3_9.max_level_error or false) || - (f.log_0_3_9.max_level_error or false); - log_0_4_3.max_level_info = - (f.log_0_4_3.max_level_info or false) || - (log_0_3_9.max_level_info or false) || - (f.log_0_3_9.max_level_info or false); - log_0_4_3.max_level_off = - (f.log_0_4_3.max_level_off or false) || - (log_0_3_9.max_level_off or false) || - (f.log_0_3_9.max_level_off or false); - log_0_4_3.max_level_trace = - (f.log_0_4_3.max_level_trace or false) || - (log_0_3_9.max_level_trace or false) || - (f.log_0_3_9.max_level_trace or false); - log_0_4_3.max_level_warn = - (f.log_0_4_3.max_level_warn or false) || - (log_0_3_9.max_level_warn or false) || - (f.log_0_3_9.max_level_warn or false); - log_0_4_3.release_max_level_debug = - (f.log_0_4_3.release_max_level_debug or false) || - (log_0_3_9.release_max_level_debug or false) || - (f.log_0_3_9.release_max_level_debug or false); - log_0_4_3.release_max_level_error = - (f.log_0_4_3.release_max_level_error or false) || - (log_0_3_9.release_max_level_error or false) || - (f.log_0_3_9.release_max_level_error or false); - log_0_4_3.release_max_level_info = - (f.log_0_4_3.release_max_level_info or false) || - (log_0_3_9.release_max_level_info or false) || - (f.log_0_3_9.release_max_level_info or false); - log_0_4_3.release_max_level_off = - (f.log_0_4_3.release_max_level_off or false) || - (log_0_3_9.release_max_level_off or false) || - (f.log_0_3_9.release_max_level_off or false); - log_0_4_3.release_max_level_trace = - (f.log_0_4_3.release_max_level_trace or false) || - (log_0_3_9.release_max_level_trace or false) || - (f.log_0_3_9.release_max_level_trace or false); - log_0_4_3.release_max_level_warn = - (f.log_0_4_3.release_max_level_warn or false) || - (log_0_3_9.release_max_level_warn or false) || - (f.log_0_3_9.release_max_level_warn or false); - log_0_4_3.std = - (f.log_0_4_3.std or false) || - (log_0_3_9.use_std or false) || - (f.log_0_3_9.use_std or false); - }) [ log_0_4_3_features ]; - log_0_4_3 = { features?(log_0_4_3_features {}) }: log_0_4_3_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); - features = mkFeatures (features.log_0_4_3 or {}); - }; - log_0_4_3_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - log_0_4_3.default = (f.log_0_4_3.default or true); - }) [ cfg_if_0_1_4_features ]; - matches_0_1_7 = { features?(matches_0_1_7_features {}) }: matches_0_1_7_ {}; - matches_0_1_7_features = f: updateFeatures f (rec { - matches_0_1_7.default = (f.matches_0_1_7.default or true); - }) []; - memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { - dependencies = mapFeatures features ([ ] - ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_42 ] else [])); - features = mkFeatures (features.memchr_2_0_1 or {}); - }; - memchr_2_0_1_features = f: updateFeatures f (rec { - libc_0_2_42.default = (f.libc_0_2_42.default or false); - libc_0_2_42.use_std = - (f.libc_0_2_42.use_std or false) || - (memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.use_std or false); - memchr_2_0_1.default = (f.memchr_2_0_1.default or true); - memchr_2_0_1.libc = - (f.memchr_2_0_1.libc or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false) || - (f.memchr_2_0_1.use_std or false) || - (memchr_2_0_1.use_std or false); - memchr_2_0_1.use_std = - (f.memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false); - }) [ libc_0_2_42_features ]; - memoffset_0_2_1 = { features?(memoffset_0_2_1_features {}) }: memoffset_0_2_1_ {}; - memoffset_0_2_1_features = f: updateFeatures f (rec { - memoffset_0_2_1.default = (f.memoffset_0_2_1.default or true); - }) []; - mime_0_3_8 = { features?(mime_0_3_8_features {}) }: mime_0_3_8_ { - dependencies = mapFeatures features ([ unicase_2_1_0 ]); - }; - mime_0_3_8_features = f: updateFeatures f (rec { - mime_0_3_8.default = (f.mime_0_3_8.default or true); - unicase_2_1_0.default = true; - }) [ unicase_2_1_0_features ]; - mime_guess_2_0_0_alpha_6 = { features?(mime_guess_2_0_0_alpha_6_features {}) }: mime_guess_2_0_0_alpha_6_ { - dependencies = mapFeatures features ([ mime_0_3_8 phf_0_7_22 unicase_1_4_2 ]); - buildDependencies = mapFeatures features ([ phf_codegen_0_7_22 unicase_1_4_2 ]); - features = mkFeatures (features.mime_guess_2_0_0_alpha_6 or {}); - }; - mime_guess_2_0_0_alpha_6_features = f: updateFeatures f (rec { - mime_0_3_8.default = true; - mime_guess_2_0_0_alpha_6.default = (f.mime_guess_2_0_0_alpha_6.default or true); - phf_0_7_22.default = true; - phf_0_7_22.unicase = true; - phf_codegen_0_7_22.default = true; - unicase_1_4_2.default = true; - }) [ mime_0_3_8_features phf_0_7_22_features unicase_1_4_2_features phf_codegen_0_7_22_features unicase_1_4_2_features ]; - mio_0_6_15 = { features?(mio_0_6_15_features {}) }: mio_0_6_15_ { - dependencies = mapFeatures features ([ iovec_0_1_2 lazycell_0_6_0 log_0_4_3 net2_0_2_33 slab_0_4_0 ]) - ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 fuchsia_zircon_sys_0_3_3 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []); - features = mkFeatures (features.mio_0_6_15 or {}); - }; - mio_0_6_15_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - fuchsia_zircon_sys_0_3_3.default = true; - iovec_0_1_2.default = true; - kernel32_sys_0_2_2.default = true; - lazycell_0_6_0.default = true; - libc_0_2_42.default = true; - log_0_4_3.default = true; - mio_0_6_15.default = (f.mio_0_6_15.default or true); - mio_0_6_15.with-deprecated = - (f.mio_0_6_15.with-deprecated or false) || - (f.mio_0_6_15.default or false) || - (mio_0_6_15.default or false); - miow_0_2_1.default = true; - net2_0_2_33.default = true; - slab_0_4_0.default = true; - winapi_0_2_8.default = true; - }) [ iovec_0_1_2_features lazycell_0_6_0_features log_0_4_3_features net2_0_2_33_features slab_0_4_0_features fuchsia_zircon_0_3_3_features fuchsia_zircon_sys_0_3_3_features libc_0_2_42_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ]; - miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ { - dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_33 winapi_0_2_8 ws2_32_sys_0_2_1 ]); - }; - miow_0_2_1_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = true; - miow_0_2_1.default = (f.miow_0_2_1.default or true); - net2_0_2_33.default = (f.net2_0_2_33.default or false); - winapi_0_2_8.default = true; - ws2_32_sys_0_2_1.default = true; - }) [ kernel32_sys_0_2_2_features net2_0_2_33_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ]; - native_tls_0_1_5 = { features?(native_tls_0_1_5_features {}) }: native_tls_0_1_5_ { - dependencies = mapFeatures features ([ lazy_static_0_2_11 ]) - ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ libc_0_2_42 security_framework_0_1_16 security_framework_sys_0_1_16 tempdir_0_3_7 ]) else []) - ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then mapFeatures features ([ openssl_0_9_24 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_13 ]) else []); - }; - native_tls_0_1_5_features = f: updateFeatures f (rec { - lazy_static_0_2_11.default = true; - libc_0_2_42.default = true; - native_tls_0_1_5.default = (f.native_tls_0_1_5.default or true); - openssl_0_9_24.default = true; - schannel_0_1_13.default = true; - security_framework_0_1_16.OSX_10_8 = true; - security_framework_0_1_16.default = true; - security_framework_sys_0_1_16.default = true; - tempdir_0_3_7.default = true; - }) [ lazy_static_0_2_11_features libc_0_2_42_features security_framework_0_1_16_features security_framework_sys_0_1_16_features tempdir_0_3_7_features openssl_0_9_24_features schannel_0_1_13_features ]; - net2_0_2_33 = { features?(net2_0_2_33_features {}) }: net2_0_2_33_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ]) - ++ (if kernel == "redox" || (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - features = mkFeatures (features.net2_0_2_33 or {}); - }; - net2_0_2_33_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - libc_0_2_42.default = true; - net2_0_2_33.default = (f.net2_0_2_33.default or true); - net2_0_2_33.duration = - (f.net2_0_2_33.duration or false) || - (f.net2_0_2_33.default or false) || - (net2_0_2_33.default or false); - winapi_0_3_5.default = true; - winapi_0_3_5.handleapi = true; - winapi_0_3_5.winsock2 = true; - winapi_0_3_5.ws2def = true; - winapi_0_3_5.ws2ipdef = true; - winapi_0_3_5.ws2tcpip = true; - }) [ cfg_if_0_1_4_features libc_0_2_42_features winapi_0_3_5_features ]; - nodrop_0_1_12 = { features?(nodrop_0_1_12_features {}) }: nodrop_0_1_12_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.nodrop_0_1_12 or {}); - }; - nodrop_0_1_12_features = f: updateFeatures f (rec { - nodrop_0_1_12.default = (f.nodrop_0_1_12.default or true); - nodrop_0_1_12.nodrop-union = - (f.nodrop_0_1_12.nodrop-union or false) || - (f.nodrop_0_1_12.use_union or false) || - (nodrop_0_1_12.use_union or false); - nodrop_0_1_12.std = - (f.nodrop_0_1_12.std or false) || - (f.nodrop_0_1_12.default or false) || - (nodrop_0_1_12.default or false); - }) []; - num_integer_0_1_39 = { features?(num_integer_0_1_39_features {}) }: num_integer_0_1_39_ { - dependencies = mapFeatures features ([ num_traits_0_2_5 ]); - features = mkFeatures (features.num_integer_0_1_39 or {}); - }; - num_integer_0_1_39_features = f: updateFeatures f (rec { - num_integer_0_1_39.default = (f.num_integer_0_1_39.default or true); - num_integer_0_1_39.std = - (f.num_integer_0_1_39.std or false) || - (f.num_integer_0_1_39.default or false) || - (num_integer_0_1_39.default or false); - num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false); - num_traits_0_2_5.i128 = - (f.num_traits_0_2_5.i128 or false) || - (num_integer_0_1_39.i128 or false) || - (f.num_integer_0_1_39.i128 or false); - num_traits_0_2_5.std = - (f.num_traits_0_2_5.std or false) || - (num_integer_0_1_39.std or false) || - (f.num_integer_0_1_39.std or false); - }) [ num_traits_0_2_5_features ]; - num_traits_0_2_5 = { features?(num_traits_0_2_5_features {}) }: num_traits_0_2_5_ { - features = mkFeatures (features.num_traits_0_2_5 or {}); - }; - num_traits_0_2_5_features = f: updateFeatures f (rec { - num_traits_0_2_5.default = (f.num_traits_0_2_5.default or true); - num_traits_0_2_5.std = - (f.num_traits_0_2_5.std or false) || - (f.num_traits_0_2_5.default or false) || - (num_traits_0_2_5.default or false); - }) []; - num_cpus_1_8_0 = { features?(num_cpus_1_8_0_features {}) }: num_cpus_1_8_0_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]); - }; - num_cpus_1_8_0_features = f: updateFeatures f (rec { - libc_0_2_42.default = true; - num_cpus_1_8_0.default = (f.num_cpus_1_8_0.default or true); - }) [ libc_0_2_42_features ]; - openssl_0_9_24 = { features?(openssl_0_9_24_features {}) }: openssl_0_9_24_ { - dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_3_2 lazy_static_1_0_2 libc_0_2_42 openssl_sys_0_9_33 ]); - features = mkFeatures (features.openssl_0_9_24 or {}); - }; - openssl_0_9_24_features = f: updateFeatures f (rec { - bitflags_0_9_1.default = true; - foreign_types_0_3_2.default = true; - lazy_static_1_0_2.default = true; - libc_0_2_42.default = true; - openssl_0_9_24.default = (f.openssl_0_9_24.default or true); - openssl_sys_0_9_33.default = true; - }) [ bitflags_0_9_1_features foreign_types_0_3_2_features lazy_static_1_0_2_features libc_0_2_42_features openssl_sys_0_9_33_features ]; - openssl_sys_0_9_33 = { features?(openssl_sys_0_9_33_features {}) }: openssl_sys_0_9_33_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]) - ++ (if abi == "msvc" then mapFeatures features ([]) else []); - buildDependencies = mapFeatures features ([ cc_1_0_18 pkg_config_0_3_12 ]); - }; - openssl_sys_0_9_33_features = f: updateFeatures f (rec { - cc_1_0_18.default = true; - libc_0_2_42.default = true; - openssl_sys_0_9_33.default = (f.openssl_sys_0_9_33.default or true); - pkg_config_0_3_12.default = true; - }) [ libc_0_2_42_features cc_1_0_18_features pkg_config_0_3_12_features ]; - pad_0_1_5 = { features?(pad_0_1_5_features {}) }: pad_0_1_5_ { - dependencies = mapFeatures features ([ unicode_width_0_1_5 ]); - }; - pad_0_1_5_features = f: updateFeatures f (rec { - pad_0_1_5.default = (f.pad_0_1_5.default or true); - unicode_width_0_1_5.default = true; - }) [ unicode_width_0_1_5_features ]; - percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {}; - percent_encoding_1_0_1_features = f: updateFeatures f (rec { - percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true); - }) []; - phf_0_7_22 = { features?(phf_0_7_22_features {}) }: phf_0_7_22_ { - dependencies = mapFeatures features ([ phf_shared_0_7_22 ]); - features = mkFeatures (features.phf_0_7_22 or {}); - }; - phf_0_7_22_features = f: updateFeatures f (rec { - phf_0_7_22.default = (f.phf_0_7_22.default or true); - phf_shared_0_7_22.core = - (f.phf_shared_0_7_22.core or false) || - (phf_0_7_22.core or false) || - (f.phf_0_7_22.core or false); - phf_shared_0_7_22.default = true; - phf_shared_0_7_22.unicase = - (f.phf_shared_0_7_22.unicase or false) || - (phf_0_7_22.unicase or false) || - (f.phf_0_7_22.unicase or false); - }) [ phf_shared_0_7_22_features ]; - phf_codegen_0_7_22 = { features?(phf_codegen_0_7_22_features {}) }: phf_codegen_0_7_22_ { - dependencies = mapFeatures features ([ phf_generator_0_7_22 phf_shared_0_7_22 ]); - }; - phf_codegen_0_7_22_features = f: updateFeatures f (rec { - phf_codegen_0_7_22.default = (f.phf_codegen_0_7_22.default or true); - phf_generator_0_7_22.default = true; - phf_shared_0_7_22.default = true; - }) [ phf_generator_0_7_22_features phf_shared_0_7_22_features ]; - phf_generator_0_7_22 = { features?(phf_generator_0_7_22_features {}) }: phf_generator_0_7_22_ { - dependencies = mapFeatures features ([ phf_shared_0_7_22 rand_0_4_2 ]); - }; - phf_generator_0_7_22_features = f: updateFeatures f (rec { - phf_generator_0_7_22.default = (f.phf_generator_0_7_22.default or true); - phf_shared_0_7_22.default = true; - rand_0_4_2.default = true; - }) [ phf_shared_0_7_22_features rand_0_4_2_features ]; - phf_shared_0_7_22 = { features?(phf_shared_0_7_22_features {}) }: phf_shared_0_7_22_ { - dependencies = mapFeatures features ([ siphasher_0_2_3 ] - ++ (if features.phf_shared_0_7_22.unicase or false then [ unicase_1_4_2 ] else [])); - features = mkFeatures (features.phf_shared_0_7_22 or {}); - }; - phf_shared_0_7_22_features = f: updateFeatures f (rec { - phf_shared_0_7_22.default = (f.phf_shared_0_7_22.default or true); - siphasher_0_2_3.default = true; - unicase_1_4_2.default = true; - }) [ siphasher_0_2_3_features unicase_1_4_2_features ]; - pkg_config_0_3_12 = { features?(pkg_config_0_3_12_features {}) }: pkg_config_0_3_12_ {}; - pkg_config_0_3_12_features = f: updateFeatures f (rec { - pkg_config_0_3_12.default = (f.pkg_config_0_3_12.default or true); - }) []; - pretty_assertions_0_5_1 = { features?(pretty_assertions_0_5_1_features {}) }: pretty_assertions_0_5_1_ { - dependencies = mapFeatures features ([ ansi_term_0_11_0 difference_2_0_0 ]); - }; - pretty_assertions_0_5_1_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = true; - difference_2_0_0.default = true; - pretty_assertions_0_5_1.default = (f.pretty_assertions_0_5_1.default or true); - }) [ ansi_term_0_11_0_features difference_2_0_0_features ]; - proc_macro2_0_4_9 = { features?(proc_macro2_0_4_9_features {}) }: proc_macro2_0_4_9_ { - dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]); - features = mkFeatures (features.proc_macro2_0_4_9 or {}); - }; - proc_macro2_0_4_9_features = f: updateFeatures f (rec { - proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or true); - proc_macro2_0_4_9.proc-macro = - (f.proc_macro2_0_4_9.proc-macro or false) || - (f.proc_macro2_0_4_9.default or false) || - (proc_macro2_0_4_9.default or false) || - (f.proc_macro2_0_4_9.nightly or false) || - (proc_macro2_0_4_9.nightly or false); - unicode_xid_0_1_0.default = true; - }) [ unicode_xid_0_1_0_features ]; - quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {}; - quote_0_3_15_features = f: updateFeatures f (rec { - quote_0_3_15.default = (f.quote_0_3_15.default or true); - }) []; - quote_0_6_4 = { features?(quote_0_6_4_features {}) }: quote_0_6_4_ { - dependencies = mapFeatures features ([ proc_macro2_0_4_9 ]); - features = mkFeatures (features.quote_0_6_4 or {}); - }; - quote_0_6_4_features = f: updateFeatures f (rec { - proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or false); - proc_macro2_0_4_9.proc-macro = - (f.proc_macro2_0_4_9.proc-macro or false) || - (quote_0_6_4.proc-macro or false) || - (f.quote_0_6_4.proc-macro or false); - quote_0_6_4.default = (f.quote_0_6_4.default or true); - quote_0_6_4.proc-macro = - (f.quote_0_6_4.proc-macro or false) || - (f.quote_0_6_4.default or false) || - (quote_0_6_4.default or false); - }) [ proc_macro2_0_4_9_features ]; - rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { - dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_42 ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - features = mkFeatures (features.rand_0_4_2 or {}); - }; - rand_0_4_2_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - libc_0_2_42.default = true; - rand_0_4_2.default = (f.rand_0_4_2.default or true); - rand_0_4_2.i128_support = - (f.rand_0_4_2.i128_support or false) || - (f.rand_0_4_2.nightly or false) || - (rand_0_4_2.nightly or false); - rand_0_4_2.libc = - (f.rand_0_4_2.libc or false) || - (f.rand_0_4_2.std or false) || - (rand_0_4_2.std or false); - rand_0_4_2.std = - (f.rand_0_4_2.std or false) || - (f.rand_0_4_2.default or false) || - (rand_0_4_2.default or false); - winapi_0_3_5.default = true; - winapi_0_3_5.minwindef = true; - winapi_0_3_5.ntsecapi = true; - winapi_0_3_5.profileapi = true; - winapi_0_3_5.winnt = true; - }) [ fuchsia_zircon_0_3_3_features libc_0_2_42_features winapi_0_3_5_features ]; - redox_syscall_0_1_40 = { features?(redox_syscall_0_1_40_features {}) }: redox_syscall_0_1_40_ {}; - redox_syscall_0_1_40_features = f: updateFeatures f (rec { - redox_syscall_0_1_40.default = (f.redox_syscall_0_1_40.default or true); - }) []; - redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { - dependencies = mapFeatures features ([ redox_syscall_0_1_40 ]); - }; - redox_termios_0_1_1_features = f: updateFeatures f (rec { - redox_syscall_0_1_40.default = true; - redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); - }) [ redox_syscall_0_1_40_features ]; - regex_1_0_3 = { features?(regex_1_0_3_features {}) }: regex_1_0_3_ { - dependencies = mapFeatures features ([ aho_corasick_0_6_6 memchr_2_0_1 regex_syntax_0_6_2 thread_local_0_3_6 utf8_ranges_1_0_0 ]); - features = mkFeatures (features.regex_1_0_3 or {}); - }; - regex_1_0_3_features = f: updateFeatures f (rec { - aho_corasick_0_6_6.default = true; - memchr_2_0_1.default = true; - regex_1_0_3.default = (f.regex_1_0_3.default or true); - regex_1_0_3.pattern = - (f.regex_1_0_3.pattern or false) || - (f.regex_1_0_3.unstable or false) || - (regex_1_0_3.unstable or false); - regex_1_0_3.use_std = - (f.regex_1_0_3.use_std or false) || - (f.regex_1_0_3.default or false) || - (regex_1_0_3.default or false); - regex_syntax_0_6_2.default = true; - thread_local_0_3_6.default = true; - utf8_ranges_1_0_0.default = true; - }) [ aho_corasick_0_6_6_features memchr_2_0_1_features regex_syntax_0_6_2_features thread_local_0_3_6_features utf8_ranges_1_0_0_features ]; - regex_syntax_0_6_2 = { features?(regex_syntax_0_6_2_features {}) }: regex_syntax_0_6_2_ { - dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); - }; - regex_syntax_0_6_2_features = f: updateFeatures f (rec { - regex_syntax_0_6_2.default = (f.regex_syntax_0_6_2.default or true); - ucd_util_0_1_1.default = true; - }) [ ucd_util_0_1_1_features ]; - relay_0_1_1 = { features?(relay_0_1_1_features {}) }: relay_0_1_1_ { - dependencies = mapFeatures features ([ futures_0_1_23 ]); - }; - relay_0_1_1_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - relay_0_1_1.default = (f.relay_0_1_1.default or true); - }) [ futures_0_1_23_features ]; - remove_dir_all_0_5_1 = { features?(remove_dir_all_0_5_1_features {}) }: remove_dir_all_0_5_1_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - }; - remove_dir_all_0_5_1_features = f: updateFeatures f (rec { - remove_dir_all_0_5_1.default = (f.remove_dir_all_0_5_1.default or true); - winapi_0_3_5.default = true; - winapi_0_3_5.errhandlingapi = true; - winapi_0_3_5.fileapi = true; - winapi_0_3_5.std = true; - winapi_0_3_5.winbase = true; - winapi_0_3_5.winerror = true; - }) [ winapi_0_3_5_features ]; - reqwest_0_8_7 = { features?(reqwest_0_8_7_features {}) }: reqwest_0_8_7_ { - dependencies = mapFeatures features ([ bytes_0_4_9 encoding_rs_0_7_2 futures_0_1_23 hyper_0_11_27 hyper_tls_0_1_4 libflate_0_1_16 log_0_4_3 mime_guess_2_0_0_alpha_6 native_tls_0_1_5 serde_1_0_70 serde_json_1_0_24 serde_urlencoded_0_5_2 tokio_core_0_1_17 tokio_io_0_1_7 tokio_tls_0_1_4 url_1_7_1 uuid_0_6_5 ]); - features = mkFeatures (features.reqwest_0_8_7 or {}); - }; - reqwest_0_8_7_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - encoding_rs_0_7_2.default = true; - futures_0_1_23.default = true; - hyper_0_11_27.default = (f.hyper_0_11_27.default or false); - hyper_tls_0_1_4.default = true; - libflate_0_1_16.default = true; - log_0_4_3.default = true; - mime_guess_2_0_0_alpha_6.default = true; - native_tls_0_1_5.default = true; - reqwest_0_8_7.default = (f.reqwest_0_8_7.default or true); - serde_1_0_70.default = true; - serde_json_1_0_24.default = true; - serde_urlencoded_0_5_2.default = true; - tokio_core_0_1_17.default = true; - tokio_io_0_1_7.default = true; - tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or false); - url_1_7_1.default = true; - uuid_0_6_5.default = true; - uuid_0_6_5.v4 = true; - }) [ bytes_0_4_9_features encoding_rs_0_7_2_features futures_0_1_23_features hyper_0_11_27_features hyper_tls_0_1_4_features libflate_0_1_16_features log_0_4_3_features mime_guess_2_0_0_alpha_6_features native_tls_0_1_5_features serde_1_0_70_features serde_json_1_0_24_features serde_urlencoded_0_5_2_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_tls_0_1_4_features url_1_7_1_features uuid_0_6_5_features ]; - rustc_demangle_0_1_9 = { features?(rustc_demangle_0_1_9_features {}) }: rustc_demangle_0_1_9_ {}; - rustc_demangle_0_1_9_features = f: updateFeatures f (rec { - rustc_demangle_0_1_9.default = (f.rustc_demangle_0_1_9.default or true); - }) []; - safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {}; - safemem_0_2_0_features = f: updateFeatures f (rec { - safemem_0_2_0.default = (f.safemem_0_2_0.default or true); - }) []; - schannel_0_1_13 = { features?(schannel_0_1_13_features {}) }: schannel_0_1_13_ { - dependencies = mapFeatures features ([ lazy_static_1_0_2 winapi_0_3_5 ]); - }; - schannel_0_1_13_features = f: updateFeatures f (rec { - lazy_static_1_0_2.default = true; - schannel_0_1_13.default = (f.schannel_0_1_13.default or true); - winapi_0_3_5.default = true; - winapi_0_3_5.lmcons = true; - winapi_0_3_5.minschannel = true; - winapi_0_3_5.schannel = true; - winapi_0_3_5.securitybaseapi = true; - winapi_0_3_5.sysinfoapi = true; - winapi_0_3_5.timezoneapi = true; - winapi_0_3_5.winbase = true; - winapi_0_3_5.wincrypt = true; - winapi_0_3_5.winerror = true; - }) [ lazy_static_1_0_2_features winapi_0_3_5_features ]; - scoped_tls_0_1_2 = { features?(scoped_tls_0_1_2_features {}) }: scoped_tls_0_1_2_ { - features = mkFeatures (features.scoped_tls_0_1_2 or {}); - }; - scoped_tls_0_1_2_features = f: updateFeatures f (rec { - scoped_tls_0_1_2.default = (f.scoped_tls_0_1_2.default or true); - }) []; - scopeguard_0_3_3 = { features?(scopeguard_0_3_3_features {}) }: scopeguard_0_3_3_ { - features = mkFeatures (features.scopeguard_0_3_3 or {}); - }; - scopeguard_0_3_3_features = f: updateFeatures f (rec { - scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or true); - scopeguard_0_3_3.use_std = - (f.scopeguard_0_3_3.use_std or false) || - (f.scopeguard_0_3_3.default or false) || - (scopeguard_0_3_3.default or false); - }) []; - security_framework_0_1_16 = { features?(security_framework_0_1_16_features {}) }: security_framework_0_1_16_ { - dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_42 security_framework_sys_0_1_16 ]); - features = mkFeatures (features.security_framework_0_1_16 or {}); - }; - security_framework_0_1_16_features = f: updateFeatures f (rec { - core_foundation_0_2_3.default = true; - core_foundation_sys_0_2_3.default = true; - libc_0_2_42.default = true; - security_framework_0_1_16.OSX_10_10 = - (f.security_framework_0_1_16.OSX_10_10 or false) || - (f.security_framework_0_1_16.OSX_10_11 or false) || - (security_framework_0_1_16.OSX_10_11 or false); - security_framework_0_1_16.OSX_10_11 = - (f.security_framework_0_1_16.OSX_10_11 or false) || - (f.security_framework_0_1_16.OSX_10_12 or false) || - (security_framework_0_1_16.OSX_10_12 or false); - security_framework_0_1_16.OSX_10_8 = - (f.security_framework_0_1_16.OSX_10_8 or false) || - (f.security_framework_0_1_16.OSX_10_9 or false) || - (security_framework_0_1_16.OSX_10_9 or false); - security_framework_0_1_16.OSX_10_9 = - (f.security_framework_0_1_16.OSX_10_9 or false) || - (f.security_framework_0_1_16.OSX_10_10 or false) || - (security_framework_0_1_16.OSX_10_10 or false); - security_framework_0_1_16.default = (f.security_framework_0_1_16.default or true); - security_framework_sys_0_1_16.OSX_10_10 = - (f.security_framework_sys_0_1_16.OSX_10_10 or false) || - (security_framework_0_1_16.OSX_10_10 or false) || - (f.security_framework_0_1_16.OSX_10_10 or false); - security_framework_sys_0_1_16.OSX_10_11 = - (f.security_framework_sys_0_1_16.OSX_10_11 or false) || - (security_framework_0_1_16.OSX_10_11 or false) || - (f.security_framework_0_1_16.OSX_10_11 or false) || - (security_framework_0_1_16.OSX_10_12 or false) || - (f.security_framework_0_1_16.OSX_10_12 or false); - security_framework_sys_0_1_16.OSX_10_8 = - (f.security_framework_sys_0_1_16.OSX_10_8 or false) || - (security_framework_0_1_16.OSX_10_8 or false) || - (f.security_framework_0_1_16.OSX_10_8 or false); - security_framework_sys_0_1_16.OSX_10_9 = - (f.security_framework_sys_0_1_16.OSX_10_9 or false) || - (security_framework_0_1_16.OSX_10_9 or false) || - (f.security_framework_0_1_16.OSX_10_9 or false); - security_framework_sys_0_1_16.default = true; - }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_42_features security_framework_sys_0_1_16_features ]; - security_framework_sys_0_1_16 = { features?(security_framework_sys_0_1_16_features {}) }: security_framework_sys_0_1_16_ { - dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]); - features = mkFeatures (features.security_framework_sys_0_1_16 or {}); - }; - security_framework_sys_0_1_16_features = f: updateFeatures f (rec { - core_foundation_sys_0_2_3.default = true; - libc_0_2_42.default = true; - security_framework_sys_0_1_16.OSX_10_10 = - (f.security_framework_sys_0_1_16.OSX_10_10 or false) || - (f.security_framework_sys_0_1_16.OSX_10_11 or false) || - (security_framework_sys_0_1_16.OSX_10_11 or false); - security_framework_sys_0_1_16.OSX_10_11 = - (f.security_framework_sys_0_1_16.OSX_10_11 or false) || - (f.security_framework_sys_0_1_16.OSX_10_12 or false) || - (security_framework_sys_0_1_16.OSX_10_12 or false); - security_framework_sys_0_1_16.OSX_10_8 = - (f.security_framework_sys_0_1_16.OSX_10_8 or false) || - (f.security_framework_sys_0_1_16.OSX_10_9 or false) || - (security_framework_sys_0_1_16.OSX_10_9 or false); - security_framework_sys_0_1_16.OSX_10_9 = - (f.security_framework_sys_0_1_16.OSX_10_9 or false) || - (f.security_framework_sys_0_1_16.OSX_10_10 or false) || - (security_framework_sys_0_1_16.OSX_10_10 or false); - security_framework_sys_0_1_16.default = (f.security_framework_sys_0_1_16.default or true); - }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ]; - semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ { - dependencies = mapFeatures features ([ semver_parser_0_7_0 ] - ++ (if features.semver_0_9_0.serde or false then [ serde_1_0_70 ] else [])); - features = mkFeatures (features.semver_0_9_0 or {}); - }; - semver_0_9_0_features = f: updateFeatures f (rec { - semver_0_9_0.default = (f.semver_0_9_0.default or true); - semver_0_9_0.serde = - (f.semver_0_9_0.serde or false) || - (f.semver_0_9_0.ci or false) || - (semver_0_9_0.ci or false); - semver_parser_0_7_0.default = true; - serde_1_0_70.default = true; - }) [ semver_parser_0_7_0_features serde_1_0_70_features ]; - semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; - semver_parser_0_7_0_features = f: updateFeatures f (rec { - semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); - }) []; - serde_1_0_70 = { features?(serde_1_0_70_features {}) }: serde_1_0_70_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_70 or {}); - }; - serde_1_0_70_features = f: updateFeatures f (rec { - serde_1_0_70.default = (f.serde_1_0_70.default or true); - serde_1_0_70.serde_derive = - (f.serde_1_0_70.serde_derive or false) || - (f.serde_1_0_70.derive or false) || - (serde_1_0_70.derive or false); - serde_1_0_70.std = - (f.serde_1_0_70.std or false) || - (f.serde_1_0_70.default or false) || - (serde_1_0_70.default or false); - serde_1_0_70.unstable = - (f.serde_1_0_70.unstable or false) || - (f.serde_1_0_70.alloc or false) || - (serde_1_0_70.alloc or false); - }) []; - serde_derive_1_0_75 = { features?(serde_derive_1_0_75_features {}) }: serde_derive_1_0_75_ { - dependencies = mapFeatures features ([ proc_macro2_0_4_9 quote_0_6_4 syn_0_14_5 ]); - features = mkFeatures (features.serde_derive_1_0_75 or {}); - }; - serde_derive_1_0_75_features = f: updateFeatures f (rec { - proc_macro2_0_4_9.default = true; - quote_0_6_4.default = true; - serde_derive_1_0_75.default = (f.serde_derive_1_0_75.default or true); - syn_0_14_5.default = true; - syn_0_14_5.visit = true; - }) [ proc_macro2_0_4_9_features quote_0_6_4_features syn_0_14_5_features ]; - serde_json_1_0_24 = { features?(serde_json_1_0_24_features {}) }: serde_json_1_0_24_ { - dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 ]); - features = mkFeatures (features.serde_json_1_0_24 or {}); - }; - serde_json_1_0_24_features = f: updateFeatures f (rec { - dtoa_0_4_3.default = true; - itoa_0_4_2.default = true; - serde_1_0_70.default = true; - serde_json_1_0_24.default = (f.serde_json_1_0_24.default or true); - serde_json_1_0_24.indexmap = - (f.serde_json_1_0_24.indexmap or false) || - (f.serde_json_1_0_24.preserve_order or false) || - (serde_json_1_0_24.preserve_order or false); - }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features ]; - serde_urlencoded_0_5_2 = { features?(serde_urlencoded_0_5_2_features {}) }: serde_urlencoded_0_5_2_ { - dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 url_1_7_1 ]); - }; - serde_urlencoded_0_5_2_features = f: updateFeatures f (rec { - dtoa_0_4_3.default = true; - itoa_0_4_2.default = true; - serde_1_0_70.default = true; - serde_urlencoded_0_5_2.default = (f.serde_urlencoded_0_5_2.default or true); - url_1_7_1.default = true; - }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features url_1_7_1_features ]; - siphasher_0_2_3 = { features?(siphasher_0_2_3_features {}) }: siphasher_0_2_3_ {}; - siphasher_0_2_3_features = f: updateFeatures f (rec { - siphasher_0_2_3.default = (f.siphasher_0_2_3.default or true); - }) []; - slab_0_4_0 = { features?(slab_0_4_0_features {}) }: slab_0_4_0_ {}; - slab_0_4_0_features = f: updateFeatures f (rec { - slab_0_4_0.default = (f.slab_0_4_0.default or true); - }) []; - strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; - strsim_0_7_0_features = f: updateFeatures f (rec { - strsim_0_7_0.default = (f.strsim_0_7_0.default or true); - }) []; - syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ { - dependencies = mapFeatures features ([ ] - ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else []) - ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else []) - ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else [])); - features = mkFeatures (features.syn_0_11_11 or {}); - }; - syn_0_11_11_features = f: updateFeatures f (rec { - quote_0_3_15.default = true; - syn_0_11_11.default = (f.syn_0_11_11.default or true); - syn_0_11_11.parsing = - (f.syn_0_11_11.parsing or false) || - (f.syn_0_11_11.default or false) || - (syn_0_11_11.default or false); - syn_0_11_11.printing = - (f.syn_0_11_11.printing or false) || - (f.syn_0_11_11.default or false) || - (syn_0_11_11.default or false); - syn_0_11_11.quote = - (f.syn_0_11_11.quote or false) || - (f.syn_0_11_11.printing or false) || - (syn_0_11_11.printing or false); - syn_0_11_11.synom = - (f.syn_0_11_11.synom or false) || - (f.syn_0_11_11.parsing or false) || - (syn_0_11_11.parsing or false); - syn_0_11_11.unicode-xid = - (f.syn_0_11_11.unicode-xid or false) || - (f.syn_0_11_11.parsing or false) || - (syn_0_11_11.parsing or false); - synom_0_11_3.default = true; - unicode_xid_0_0_4.default = true; - }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; - syn_0_14_5 = { features?(syn_0_14_5_features {}) }: syn_0_14_5_ { - dependencies = mapFeatures features ([ proc_macro2_0_4_9 unicode_xid_0_1_0 ] - ++ (if features.syn_0_14_5.quote or false then [ quote_0_6_4 ] else [])); - features = mkFeatures (features.syn_0_14_5 or {}); - }; - syn_0_14_5_features = f: updateFeatures f (rec { - proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or false); - proc_macro2_0_4_9.proc-macro = - (f.proc_macro2_0_4_9.proc-macro or false) || - (syn_0_14_5.proc-macro or false) || - (f.syn_0_14_5.proc-macro or false); - quote_0_6_4.default = (f.quote_0_6_4.default or false); - quote_0_6_4.proc-macro = - (f.quote_0_6_4.proc-macro or false) || - (syn_0_14_5.proc-macro or false) || - (f.syn_0_14_5.proc-macro or false); - syn_0_14_5.clone-impls = - (f.syn_0_14_5.clone-impls or false) || - (f.syn_0_14_5.default or false) || - (syn_0_14_5.default or false); - syn_0_14_5.default = (f.syn_0_14_5.default or true); - syn_0_14_5.derive = - (f.syn_0_14_5.derive or false) || - (f.syn_0_14_5.default or false) || - (syn_0_14_5.default or false); - syn_0_14_5.parsing = - (f.syn_0_14_5.parsing or false) || - (f.syn_0_14_5.default or false) || - (syn_0_14_5.default or false); - syn_0_14_5.printing = - (f.syn_0_14_5.printing or false) || - (f.syn_0_14_5.default or false) || - (syn_0_14_5.default or false); - syn_0_14_5.proc-macro = - (f.syn_0_14_5.proc-macro or false) || - (f.syn_0_14_5.default or false) || - (syn_0_14_5.default or false); - syn_0_14_5.quote = - (f.syn_0_14_5.quote or false) || - (f.syn_0_14_5.printing or false) || - (syn_0_14_5.printing or false); - unicode_xid_0_1_0.default = true; - }) [ proc_macro2_0_4_9_features quote_0_6_4_features unicode_xid_0_1_0_features ]; - synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ { - dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]); - }; - synom_0_11_3_features = f: updateFeatures f (rec { - synom_0_11_3.default = (f.synom_0_11_3.default or true); - unicode_xid_0_0_4.default = true; - }) [ unicode_xid_0_0_4_features ]; - synstructure_0_6_1 = { features?(synstructure_0_6_1_features {}) }: synstructure_0_6_1_ { - dependencies = mapFeatures features ([ quote_0_3_15 syn_0_11_11 ]); - features = mkFeatures (features.synstructure_0_6_1 or {}); - }; - synstructure_0_6_1_features = f: updateFeatures f (rec { - quote_0_3_15.default = true; - syn_0_11_11.default = true; - syn_0_11_11.visit = true; - synstructure_0_6_1.default = (f.synstructure_0_6_1.default or true); - }) [ quote_0_3_15_features syn_0_11_11_features ]; - tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ { - dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_1 ]); - }; - tempdir_0_3_7_features = f: updateFeatures f (rec { - rand_0_4_2.default = true; - remove_dir_all_0_5_1.default = true; - tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); - }) [ rand_0_4_2_features remove_dir_all_0_5_1_features ]; - termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []); - }; - termcolor_0_3_6_features = f: updateFeatures f (rec { - termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true); - wincolor_0_1_6.default = true; - }) [ wincolor_0_1_6_features ]; - termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { - dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 redox_termios_0_1_1 ]) else []); - }; - termion_1_5_1_features = f: updateFeatures f (rec { - libc_0_2_42.default = true; - redox_syscall_0_1_40.default = true; - redox_termios_0_1_1.default = true; - termion_1_5_1.default = (f.termion_1_5_1.default or true); - }) [ libc_0_2_42_features redox_syscall_0_1_40_features redox_termios_0_1_1_features ]; - thread_local_0_3_6 = { features?(thread_local_0_3_6_features {}) }: thread_local_0_3_6_ { - dependencies = mapFeatures features ([ lazy_static_1_0_2 ]); - }; - thread_local_0_3_6_features = f: updateFeatures f (rec { - lazy_static_1_0_2.default = true; - thread_local_0_3_6.default = (f.thread_local_0_3_6.default or true); - }) [ lazy_static_1_0_2_features ]; - time_0_1_40 = { features?(time_0_1_40_features {}) }: time_0_1_40_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - }; - time_0_1_40_features = f: updateFeatures f (rec { - libc_0_2_42.default = true; - redox_syscall_0_1_40.default = true; - time_0_1_40.default = (f.time_0_1_40.default or true); - winapi_0_3_5.default = true; - winapi_0_3_5.minwinbase = true; - winapi_0_3_5.minwindef = true; - winapi_0_3_5.ntdef = true; - winapi_0_3_5.profileapi = true; - winapi_0_3_5.std = true; - winapi_0_3_5.sysinfoapi = true; - winapi_0_3_5.timezoneapi = true; - }) [ libc_0_2_42_features redox_syscall_0_1_40_features winapi_0_3_5_features ]; - tokio_0_1_7 = { features?(tokio_0_1_7_features {}) }: tokio_0_1_7_ { - dependencies = mapFeatures features ([ futures_0_1_23 mio_0_6_15 tokio_executor_0_1_2 tokio_fs_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_tcp_0_1_0 tokio_threadpool_0_1_5 tokio_timer_0_2_4 tokio_udp_0_1_1 ]); - }; - tokio_0_1_7_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - mio_0_6_15.default = true; - tokio_0_1_7.default = (f.tokio_0_1_7.default or true); - tokio_executor_0_1_2.default = true; - tokio_fs_0_1_2.default = true; - tokio_io_0_1_7.default = true; - tokio_reactor_0_1_2.default = true; - tokio_tcp_0_1_0.default = true; - tokio_threadpool_0_1_5.default = true; - tokio_timer_0_2_4.default = true; - tokio_udp_0_1_1.default = true; - }) [ futures_0_1_23_features mio_0_6_15_features tokio_executor_0_1_2_features tokio_fs_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_tcp_0_1_0_features tokio_threadpool_0_1_5_features tokio_timer_0_2_4_features tokio_udp_0_1_1_features ]; - tokio_codec_0_1_0 = { features?(tokio_codec_0_1_0_features {}) }: tokio_codec_0_1_0_ { - dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 tokio_io_0_1_7 ]); - }; - tokio_codec_0_1_0_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - tokio_codec_0_1_0.default = (f.tokio_codec_0_1_0.default or true); - tokio_io_0_1_7.default = true; - }) [ bytes_0_4_9_features futures_0_1_23_features tokio_io_0_1_7_features ]; - tokio_core_0_1_17 = { features?(tokio_core_0_1_17_features {}) }: tokio_core_0_1_17_ { - dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 log_0_4_3 mio_0_6_15 scoped_tls_0_1_2 tokio_0_1_7 tokio_executor_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_timer_0_2_4 ]); - }; - tokio_core_0_1_17_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - iovec_0_1_2.default = true; - log_0_4_3.default = true; - mio_0_6_15.default = true; - scoped_tls_0_1_2.default = true; - tokio_0_1_7.default = true; - tokio_core_0_1_17.default = (f.tokio_core_0_1_17.default or true); - tokio_executor_0_1_2.default = true; - tokio_io_0_1_7.default = true; - tokio_reactor_0_1_2.default = true; - tokio_timer_0_2_4.default = true; - }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features log_0_4_3_features mio_0_6_15_features scoped_tls_0_1_2_features tokio_0_1_7_features tokio_executor_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_timer_0_2_4_features ]; - tokio_executor_0_1_2 = { features?(tokio_executor_0_1_2_features {}) }: tokio_executor_0_1_2_ { - dependencies = mapFeatures features ([ futures_0_1_23 ]); - features = mkFeatures (features.tokio_executor_0_1_2 or {}); - }; - tokio_executor_0_1_2_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - tokio_executor_0_1_2.default = (f.tokio_executor_0_1_2.default or true); - tokio_executor_0_1_2.futures2 = - (f.tokio_executor_0_1_2.futures2 or false) || - (f.tokio_executor_0_1_2.unstable-futures or false) || - (tokio_executor_0_1_2.unstable-futures or false); - }) [ futures_0_1_23_features ]; - tokio_fs_0_1_2 = { features?(tokio_fs_0_1_2_features {}) }: tokio_fs_0_1_2_ { - dependencies = mapFeatures features ([ futures_0_1_23 tokio_io_0_1_7 tokio_threadpool_0_1_5 ]); - }; - tokio_fs_0_1_2_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - tokio_fs_0_1_2.default = (f.tokio_fs_0_1_2.default or true); - tokio_io_0_1_7.default = true; - tokio_threadpool_0_1_5.default = true; - }) [ futures_0_1_23_features tokio_io_0_1_7_features tokio_threadpool_0_1_5_features ]; - tokio_io_0_1_7 = { features?(tokio_io_0_1_7_features {}) }: tokio_io_0_1_7_ { - dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 ]); - }; - tokio_io_0_1_7_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - log_0_4_3.default = true; - tokio_io_0_1_7.default = (f.tokio_io_0_1_7.default or true); - }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features ]; - tokio_reactor_0_1_2 = { features?(tokio_reactor_0_1_2_features {}) }: tokio_reactor_0_1_2_ { - dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 mio_0_6_15 slab_0_4_0 tokio_executor_0_1_2 tokio_io_0_1_7 ]); - }; - tokio_reactor_0_1_2_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - log_0_4_3.default = true; - mio_0_6_15.default = true; - slab_0_4_0.default = true; - tokio_executor_0_1_2.default = true; - tokio_io_0_1_7.default = true; - tokio_reactor_0_1_2.default = (f.tokio_reactor_0_1_2.default or true); - }) [ futures_0_1_23_features log_0_4_3_features mio_0_6_15_features slab_0_4_0_features tokio_executor_0_1_2_features tokio_io_0_1_7_features ]; - tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ { - dependencies = mapFeatures features ([ futures_0_1_23 ]); - }; - tokio_service_0_1_0_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true); - }) [ futures_0_1_23_features ]; - tokio_tcp_0_1_0 = { features?(tokio_tcp_0_1_0_features {}) }: tokio_tcp_0_1_0_ { - dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 mio_0_6_15 tokio_io_0_1_7 tokio_reactor_0_1_2 ]); - features = mkFeatures (features.tokio_tcp_0_1_0 or {}); - }; - tokio_tcp_0_1_0_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - iovec_0_1_2.default = true; - mio_0_6_15.default = true; - tokio_io_0_1_7.default = true; - tokio_reactor_0_1_2.default = true; - tokio_tcp_0_1_0.default = (f.tokio_tcp_0_1_0.default or true); - tokio_tcp_0_1_0.futures2 = - (f.tokio_tcp_0_1_0.futures2 or false) || - (f.tokio_tcp_0_1_0.unstable-futures or false) || - (tokio_tcp_0_1_0.unstable-futures or false); - }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features mio_0_6_15_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ]; - tokio_threadpool_0_1_5 = { features?(tokio_threadpool_0_1_5_features {}) }: tokio_threadpool_0_1_5_ { - dependencies = mapFeatures features ([ crossbeam_deque_0_3_1 futures_0_1_23 log_0_4_3 num_cpus_1_8_0 rand_0_4_2 tokio_executor_0_1_2 ]); - }; - tokio_threadpool_0_1_5_features = f: updateFeatures f (rec { - crossbeam_deque_0_3_1.default = true; - futures_0_1_23.default = true; - log_0_4_3.default = true; - num_cpus_1_8_0.default = true; - rand_0_4_2.default = true; - tokio_executor_0_1_2.default = true; - tokio_threadpool_0_1_5.default = (f.tokio_threadpool_0_1_5.default or true); - }) [ crossbeam_deque_0_3_1_features futures_0_1_23_features log_0_4_3_features num_cpus_1_8_0_features rand_0_4_2_features tokio_executor_0_1_2_features ]; - tokio_timer_0_2_4 = { features?(tokio_timer_0_2_4_features {}) }: tokio_timer_0_2_4_ { - dependencies = mapFeatures features ([ futures_0_1_23 tokio_executor_0_1_2 ]); - }; - tokio_timer_0_2_4_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - tokio_executor_0_1_2.default = true; - tokio_timer_0_2_4.default = (f.tokio_timer_0_2_4.default or true); - }) [ futures_0_1_23_features tokio_executor_0_1_2_features ]; - tokio_tls_0_1_4 = { features?(tokio_tls_0_1_4_features {}) }: tokio_tls_0_1_4_ { - dependencies = mapFeatures features ([ futures_0_1_23 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 ]) - ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else []) - ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else []) - ++ (if kernel == "windows" then mapFeatures features ([]) else []); - }; - tokio_tls_0_1_4_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - native_tls_0_1_5.default = true; - tokio_core_0_1_17.default = true; - tokio_io_0_1_7.default = true; - tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or true); - }) [ futures_0_1_23_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features ]; - tokio_udp_0_1_1 = { features?(tokio_udp_0_1_1_features {}) }: tokio_udp_0_1_1_ { - dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 mio_0_6_15 tokio_codec_0_1_0 tokio_io_0_1_7 tokio_reactor_0_1_2 ]); - }; - tokio_udp_0_1_1_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - log_0_4_3.default = true; - mio_0_6_15.default = true; - tokio_codec_0_1_0.default = true; - tokio_io_0_1_7.default = true; - tokio_reactor_0_1_2.default = true; - tokio_udp_0_1_1.default = (f.tokio_udp_0_1_1.default or true); - }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features mio_0_6_15_features tokio_codec_0_1_0_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ]; - toml_edit_0_1_3 = { features?(toml_edit_0_1_3_features {}) }: toml_edit_0_1_3_ { - dependencies = mapFeatures features ([ chrono_0_4_5 combine_3_3_6 linked_hash_map_0_5_1 ]); - features = mkFeatures (features.toml_edit_0_1_3 or {}); - }; - toml_edit_0_1_3_features = f: updateFeatures f (rec { - chrono_0_4_5.default = true; - combine_3_3_6.default = true; - linked_hash_map_0_5_1.default = true; - toml_edit_0_1_3.default = (f.toml_edit_0_1_3.default or true); - }) [ chrono_0_4_5_features combine_3_3_6_features linked_hash_map_0_5_1_features ]; - try_lock_0_1_0 = { features?(try_lock_0_1_0_features {}) }: try_lock_0_1_0_ {}; - try_lock_0_1_0_features = f: updateFeatures f (rec { - try_lock_0_1_0.default = (f.try_lock_0_1_0.default or true); - }) []; - ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; - ucd_util_0_1_1_features = f: updateFeatures f (rec { - ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); - }) []; - unicase_1_4_2 = { features?(unicase_1_4_2_features {}) }: unicase_1_4_2_ { - dependencies = mapFeatures features ([]); - buildDependencies = mapFeatures features ([ version_check_0_1_4 ]); - features = mkFeatures (features.unicase_1_4_2 or {}); - }; - unicase_1_4_2_features = f: updateFeatures f (rec { - unicase_1_4_2.default = (f.unicase_1_4_2.default or true); - unicase_1_4_2.heapsize = - (f.unicase_1_4_2.heapsize or false) || - (f.unicase_1_4_2.heap_size or false) || - (unicase_1_4_2.heap_size or false); - unicase_1_4_2.heapsize_plugin = - (f.unicase_1_4_2.heapsize_plugin or false) || - (f.unicase_1_4_2.heap_size or false) || - (unicase_1_4_2.heap_size or false); - version_check_0_1_4.default = true; - }) [ version_check_0_1_4_features ]; - unicase_2_1_0 = { features?(unicase_2_1_0_features {}) }: unicase_2_1_0_ { - buildDependencies = mapFeatures features ([ version_check_0_1_4 ]); - features = mkFeatures (features.unicase_2_1_0 or {}); - }; - unicase_2_1_0_features = f: updateFeatures f (rec { - unicase_2_1_0.default = (f.unicase_2_1_0.default or true); - version_check_0_1_4.default = true; - }) [ version_check_0_1_4_features ]; - unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ { - dependencies = mapFeatures features ([ matches_0_1_7 ]); - features = mkFeatures (features.unicode_bidi_0_3_4 or {}); - }; - unicode_bidi_0_3_4_features = f: updateFeatures f (rec { - matches_0_1_7.default = true; - unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true); - unicode_bidi_0_3_4.flame = - (f.unicode_bidi_0_3_4.flame or false) || - (f.unicode_bidi_0_3_4.flame_it or false) || - (unicode_bidi_0_3_4.flame_it or false); - unicode_bidi_0_3_4.flamer = - (f.unicode_bidi_0_3_4.flamer or false) || - (f.unicode_bidi_0_3_4.flame_it or false) || - (unicode_bidi_0_3_4.flame_it or false); - unicode_bidi_0_3_4.serde = - (f.unicode_bidi_0_3_4.serde or false) || - (f.unicode_bidi_0_3_4.with_serde or false) || - (unicode_bidi_0_3_4.with_serde or false); - }) [ matches_0_1_7_features ]; - unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {}; - unicode_normalization_0_1_7_features = f: updateFeatures f (rec { - unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true); - }) []; - unicode_width_0_1_5 = { features?(unicode_width_0_1_5_features {}) }: unicode_width_0_1_5_ { - features = mkFeatures (features.unicode_width_0_1_5 or {}); - }; - unicode_width_0_1_5_features = f: updateFeatures f (rec { - unicode_width_0_1_5.default = (f.unicode_width_0_1_5.default or true); - }) []; - unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ { - features = mkFeatures (features.unicode_xid_0_0_4 or {}); - }; - unicode_xid_0_0_4_features = f: updateFeatures f (rec { - unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true); - }) []; - unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { - features = mkFeatures (features.unicode_xid_0_1_0 or {}); - }; - unicode_xid_0_1_0_features = f: updateFeatures f (rec { - unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); - }) []; - unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { - dependencies = mapFeatures features ([ void_1_0_2 ]); - }; - unreachable_1_0_0_features = f: updateFeatures f (rec { - unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); - void_1_0_2.default = (f.void_1_0_2.default or false); - }) [ void_1_0_2_features ]; - url_1_7_1 = { features?(url_1_7_1_features {}) }: url_1_7_1_ { - dependencies = mapFeatures features ([ idna_0_1_5 matches_0_1_7 percent_encoding_1_0_1 ]); - features = mkFeatures (features.url_1_7_1 or {}); - }; - url_1_7_1_features = f: updateFeatures f (rec { - idna_0_1_5.default = true; - matches_0_1_7.default = true; - percent_encoding_1_0_1.default = true; - url_1_7_1.default = (f.url_1_7_1.default or true); - url_1_7_1.encoding = - (f.url_1_7_1.encoding or false) || - (f.url_1_7_1.query_encoding or false) || - (url_1_7_1.query_encoding or false); - url_1_7_1.heapsize = - (f.url_1_7_1.heapsize or false) || - (f.url_1_7_1.heap_size or false) || - (url_1_7_1.heap_size or false); - }) [ idna_0_1_5_features matches_0_1_7_features percent_encoding_1_0_1_features ]; - utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; - utf8_ranges_1_0_0_features = f: updateFeatures f (rec { - utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); - }) []; - uuid_0_6_5 = { features?(uuid_0_6_5_features {}) }: uuid_0_6_5_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ] - ++ (if features.uuid_0_6_5.rand or false then [ rand_0_4_2 ] else [])); - features = mkFeatures (features.uuid_0_6_5 or {}); - }; - uuid_0_6_5_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - rand_0_4_2.default = true; - uuid_0_6_5.byteorder = - (f.uuid_0_6_5.byteorder or false) || - (f.uuid_0_6_5.u128 or false) || - (uuid_0_6_5.u128 or false); - uuid_0_6_5.default = (f.uuid_0_6_5.default or true); - uuid_0_6_5.md5 = - (f.uuid_0_6_5.md5 or false) || - (f.uuid_0_6_5.v3 or false) || - (uuid_0_6_5.v3 or false); - uuid_0_6_5.nightly = - (f.uuid_0_6_5.nightly or false) || - (f.uuid_0_6_5.const_fn or false) || - (uuid_0_6_5.const_fn or false); - uuid_0_6_5.rand = - (f.uuid_0_6_5.rand or false) || - (f.uuid_0_6_5.v3 or false) || - (uuid_0_6_5.v3 or false) || - (f.uuid_0_6_5.v4 or false) || - (uuid_0_6_5.v4 or false) || - (f.uuid_0_6_5.v5 or false) || - (uuid_0_6_5.v5 or false); - uuid_0_6_5.sha1 = - (f.uuid_0_6_5.sha1 or false) || - (f.uuid_0_6_5.v5 or false) || - (uuid_0_6_5.v5 or false); - uuid_0_6_5.std = - (f.uuid_0_6_5.std or false) || - (f.uuid_0_6_5.default or false) || - (uuid_0_6_5.default or false) || - (f.uuid_0_6_5.use_std or false) || - (uuid_0_6_5.use_std or false); - }) [ cfg_if_0_1_4_features rand_0_4_2_features ]; - vcpkg_0_2_4 = { features?(vcpkg_0_2_4_features {}) }: vcpkg_0_2_4_ {}; - vcpkg_0_2_4_features = f: updateFeatures f (rec { - vcpkg_0_2_4.default = (f.vcpkg_0_2_4.default or true); - }) []; - version_check_0_1_4 = { features?(version_check_0_1_4_features {}) }: version_check_0_1_4_ {}; - version_check_0_1_4_features = f: updateFeatures f (rec { - version_check_0_1_4.default = (f.version_check_0_1_4.default or true); - }) []; - void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { - features = mkFeatures (features.void_1_0_2 or {}); - }; - void_1_0_2_features = f: updateFeatures f (rec { - void_1_0_2.default = (f.void_1_0_2.default or true); - void_1_0_2.std = - (f.void_1_0_2.std or false) || - (f.void_1_0_2.default or false) || - (void_1_0_2.default or false); - }) []; - want_0_0_4 = { features?(want_0_0_4_features {}) }: want_0_0_4_ { - dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 try_lock_0_1_0 ]); - }; - want_0_0_4_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - log_0_4_3.default = true; - try_lock_0_1_0.default = true; - want_0_0_4.default = (f.want_0_0_4.default or true); - }) [ futures_0_1_23_features log_0_4_3_features try_lock_0_1_0_features ]; - winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { - winapi_0_2_8.default = (f.winapi_0_2_8.default or true); - }) []; - winapi_0_3_5 = { features?(winapi_0_3_5_features {}) }: winapi_0_3_5_ { - dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) - ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); - features = mkFeatures (features.winapi_0_3_5 or {}); - }; - winapi_0_3_5_features = f: updateFeatures f (rec { - winapi_0_3_5.default = (f.winapi_0_3_5.default or true); - winapi_i686_pc_windows_gnu_0_4_0.default = true; - winapi_x86_64_pc_windows_gnu_0_4_0.default = true; - }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; - winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { - winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); - }) []; - winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; - winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { - winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); - }) []; - winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; - winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { - winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); - }) []; - wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ { - dependencies = mapFeatures features ([ winapi_0_3_5 ]); - }; - wincolor_0_1_6_features = f: updateFeatures f (rec { - winapi_0_3_5.consoleapi = true; - winapi_0_3_5.default = true; - winapi_0_3_5.minwindef = true; - winapi_0_3_5.processenv = true; - winapi_0_3_5.winbase = true; - winapi_0_3_5.wincon = true; - wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true); - }) [ winapi_0_3_5_features ]; - ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - ws2_32_sys_0_2_1_features = f: updateFeatures f (rec { - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true); - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; -} diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 19c08541ea60..916dd26a6ab0 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -1,28 +1,25 @@ -{ stdenv, lib, buildPlatform, fetchgit, fetchFromGitHub, darwin -, buildRustCrate, defaultCrateOverrides }: +{ stdenv, lib, darwin, rustPlatform, fetchFromGitHub }: -((import ./Cargo.nix { inherit lib buildPlatform buildRustCrate fetchgit; }).cargo_edit {}).override { - crateOverrides = defaultCrateOverrides // { - cargo-edit = attrs: rec { - name = "cargo-edit-${version}"; - version = "0.3.0"; +rustPlatform.buildRustPackage rec { + name = "cargo-edit-${version}"; + version = "0.3.0"; - src = fetchFromGitHub { - owner = "killercup"; - repo = "cargo-edit"; - rev = "v${version}"; - sha256 = "0ngxyzqy5pfc0fqbvqw7kd40jhqzp67qvpzvh3yggk9yxa1jzsp0"; - }; + src = fetchFromGitHub { + owner = "killercup"; + repo = "cargo-edit"; + rev = "v${version}"; + sha256 = "0ngxyzqy5pfc0fqbvqw7kd40jhqzp67qvpzvh3yggk9yxa1jzsp0"; + }; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + cargoSha256 = "1j7fqswdx6f2i5wr0pdavdvcv18j1l27a8ighr75p7f54apa27l8"; - meta = with stdenv.lib; { - description = "A utility for managing cargo dependencies from the command line"; - homepage = https://github.com/killercup/cargo-edit; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ gerschtli jb55 ]; - platforms = platforms.all; - }; - }; + propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + meta = with lib; { + description = "A utility for managing cargo dependencies from the command line"; + homepage = https://github.com/killercup/cargo-edit; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ gerschtli jb55 ]; + platforms = platforms.all; }; } From 48abf865bc8f7a95143f7a95e2d62b0add243684 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 11 Sep 2018 13:57:45 +0200 Subject: [PATCH 473/600] tor: 0.3.3.9 -> 0.3.4.8 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index bb49e478910d..338afb7b3e17 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -14,11 +14,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.3.9"; + name = "tor-0.3.4.8"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "0vyf5z0dn5jghp2qjp076aq62lsz9g32qv9jiqf08skf096nnd45"; + sha256 = "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2"; }; outputs = [ "out" "geoip" ]; From e2bdf5ea3b55039ad056a92866064ae7c7c4de2e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 12 Aug 2018 23:07:24 +0200 Subject: [PATCH 474/600] zsh-history-substring-search: init at 1.0.1 --- .../zsh-history-substring-search/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/shells/zsh/zsh-history-substring-search/default.nix diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/shells/zsh/zsh-history-substring-search/default.nix new file mode 100644 index 000000000000..26866f830dbc --- /dev/null +++ b/pkgs/shells/zsh/zsh-history-substring-search/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, zsh }: + +stdenv.mkDerivation rec { + name = "zsh-history-substring-search-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "zsh-users"; + repo = "zsh-history-substring-search"; + rev = "v${version}"; + sha256 = "0lgmq1xcccnz5cf7vl0r0qj351hwclx9p80cl0qczxry4r2g5qaz"; + }; + + installPhase = '' + install -D zsh-history-substring-search.zsh \ + "$out/share/zsh-history-substring-search/zsh-history-substring-search.zsh" + ''; + + meta = with lib; { + description = "Fish shell history-substring-search for Zsh"; + homepage = https://github.com/zsh-users/zsh-history-substring-search; + license = licenses.bsd3; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80721d63914e..9c8c791ea249 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6209,6 +6209,8 @@ with pkgs; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; + zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; + zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; From 5efede93d2707b0b4a28366f6f13ae053a3447e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 10 Sep 2018 01:47:41 -0300 Subject: [PATCH 475/600] deepin-image-viewer: init at 1.2.23 --- .../deepin/deepin-image-viewer/default.nix | 51 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-image-viewer/default.nix diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix new file mode 100644 index 000000000000..0ba2e306110a --- /dev/null +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, + qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw, + libexif +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-image-viewer"; + version = "1.2.23"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1n1b3j65in6v7q5bxgkiam8qy56kjn9prld3sjrbc2mqzff8sm3q"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + qttools + ]; + + buildInputs = [ + qtsvg + qtx11extras + dtkcore + dtkwidget + qt5integration + freeimage + libraw + libexif + ]; + + postPatch = '' + patchShebangs . + sed -i qimage-plugins/freeimage/freeimage.pro \ + qimage-plugins/libraw/libraw.pro \ + -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," + sed -i viewer/com.deepin.ImageViewer.service \ + -e "s,/usr,$out," + ''; + + meta = with stdenv.lib; { + description = "Image Viewer for Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/deepin-image-viewer; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index d2e5536a74aa..f85d51b2072d 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -9,6 +9,7 @@ let deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; deepin-icon-theme = callPackage ./deepin-icon-theme { }; + deepin-image-viewer = callPackage ./deepin-image-viewer { }; deepin-menu = callPackage ./deepin-menu { }; deepin-mutter = callPackage ./deepin-mutter { }; deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; From 66f610597848f887f4b73fa66dde6965aac80d0b Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 11 Sep 2018 15:42:15 +0200 Subject: [PATCH 476/600] nixos/doc: Add stable pre-release warning (#46473) --- nixos/doc/manual/installation/upgrading.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index 85e5082575d3..69668b1d4bd6 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -52,10 +52,13 @@ To see what channels are available, go to - . (Note that the URIs of the + . (Note that the URIs of the various channels redirect to a directory that contains the channel’s latest - version and includes ISO images and VirtualBox appliances.) + version and includes ISO images and VirtualBox appliances.) Please note that + during the release process, channels that are not yet released will be + present here as well. See the Getting NixOS page + to find the newest + supported stable release. When you first install NixOS, you’re automatically subscribed to the NixOS From 28ef51244acf83e86e8f46b9b325138ff4d2b784 Mon Sep 17 00:00:00 2001 From: leenaars Date: Tue, 11 Sep 2018 15:52:46 +0200 Subject: [PATCH 477/600] pdftag: init at 1.0.3 (#45666) --- pkgs/tools/graphics/pdftag/default.nix | 31 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/graphics/pdftag/default.nix diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix new file mode 100644 index 000000000000..6f492a3ccc5d --- /dev/null +++ b/pkgs/tools/graphics/pdftag/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pkgconfig, meson, vala, ninja +, gtk3, poppler, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "pdftag"; + name = "${pname}-${version}"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "arrufat"; + repo = pname; + rev = version; + sha256 = "17zk42h0n33b4p8fqlq2riqwcdi8y9m5n0ccydnk6a4x8rli97b3"; + }; + + nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook ]; + buildInputs = [ gtk3 poppler vala ]; + + patchPhase = ''substituteInPlace meson.build \ + --replace "install_dir: '/usr" "install_dir: '$out" + ''; + + preInstall = "mkdir -p $out/share/licenses/${pname}"; + + meta = with stdenv.lib; { + description = "Edit metadata found in PDFs"; + license = licenses.gpl3; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80721d63914e..92d1a47d2fef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4594,6 +4594,8 @@ with pkgs; pdfcrack = callPackage ../tools/security/pdfcrack { }; + pdftag = callPackage ../tools/graphics/pdftag { }; + pdf2svg = callPackage ../tools/graphics/pdf2svg { }; fmodex = callPackage ../games/zandronum/fmod.nix { }; From c44504410ba5a3bd76a99e7907533779c2b17694 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 26 Aug 2018 14:09:30 +0300 Subject: [PATCH 478/600] pythonPackages.eth-hash: init at 0.1.14 --- .../python-modules/eth-hash/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/eth-hash/default.nix diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix new file mode 100644 index 000000000000..ce5fce1b1cba --- /dev/null +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -0,0 +1,45 @@ +{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto, + pycryptodome }: + +buildPythonPackage rec { + pname = "eth-hash"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xpiz0wrxxj11ki9yapvsibl25qnki90bl3d39nqascg14nw17a9"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ pysha3 pycrypto pycryptodome ]; + + # setuptools-markdown uses pypandoc which is broken at the moment + preConfigure = '' + substituteInPlace setup.py --replace \'setuptools-markdown\' "" + ''; + + # Run tests separately because we don't want to run tests on tests/backends/ + # but only on its selected subdirectories. Also, the directories under + # tests/backends/ must be run separately because they have identically named + # test files so pytest would raise errors because of that. + # + # Also, tests in tests/core/test_import.py are broken so just ignore them: + # https://github.com/ethereum/eth-hash/issues/25 + # There is a pull request to fix the tests: + # https://github.com/ethereum/eth-hash/pull/26 + checkPhase = '' + pytest tests/backends/pycryptodome/ + pytest tests/backends/pysha3/ + # pytest tests/core/ + ''; + + disabled = pythonOlder "3.5"; + + meta = { + description = "The Ethereum hashing function keccak256"; + homepage = https://github.com/ethereum/eth-hash; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 157f45f3f2a9..1f55ead0053f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1655,6 +1655,8 @@ in { envs = callPackage ../development/python-modules/envs { }; + eth-hash = callPackage ../development/python-modules/eth-hash { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; From 8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46 Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sat, 8 Sep 2018 15:04:12 +0200 Subject: [PATCH 479/600] Fixes the lldpd service failing to start Backports a patch that will be included in later upstream versions. The patch removes a call to /bin/mkdir. --- pkgs/tools/networking/lldpd/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 02e4672a1aee..81456c1b852d 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, removeReferencesTo , libevent, readline, net_snmp }: stdenv.mkDerivation rec { @@ -10,6 +10,16 @@ stdenv.mkDerivation rec { sha256 = "0lgiappbjm95r1m0xyxb6gzz4izcjixknbzq3s7pbqbsmhm642s5"; }; + patches = [ + # Fixes #44507: The service fails to start due to a /bin/mkdir call. + # Should be included in the upstream release after 1.0.1. + # Please remove this patch when updating and ensure the NixOS service starts. + (fetchpatch { + url = "https://github.com/vincentbernat/lldpd/commit/90a50860ebdcdeb5b7dc85790b18bed23c97ec32.patch"; + sha256 = "005i4ldc4mfzfmvbnid6849ax2i93mx8nkyf8vjv8k73bfpdza8z"; + }) + ]; + configureFlags = [ "--localstatedir=/var" "--enable-pie" From 84a0dc8191e555eff83d3e23acf70ad6c23fb05f Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 11 Sep 2018 20:33:25 +0200 Subject: [PATCH 480/600] qutebrowser: Fix patching of standarddir.py The original patch was broken since https://github.com/qutebrowser/qutebrowser/commit/a85e19a5e1ae6792159fe0922ee5ba57815df132 because an `APPNAME` variable was introduced there. --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index a3b6c0364169..b4932ee0f1b9 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -58,7 +58,7 @@ in python3Packages.buildPythonApplication rec { ]; postPatch = '' - sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py + sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py '' + lib.optionalString withPdfReader '' sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; From 2f15843601d1792157a5afebf738bc993b339b7f Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Tue, 11 Sep 2018 14:54:57 +0200 Subject: [PATCH 481/600] linphone: fix build of gtk ui --- .../networking/instant-messengers/linphone/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 1b257ea61dce..510472a73aaa 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; }; + cmakeFlags = "-DENABLE_GTK_UI=ON"; + + postPatch = '' + touch coreapi/liblinphone_gitversion.h + ''; + buildInputs = [ readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip From b6bfbafe5eab64faac9da8190996e916b242673a Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Tue, 11 Sep 2018 17:29:13 +0200 Subject: [PATCH 482/600] linphone: add withGui option --- .../networking/instant-messengers/linphone/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 510472a73aaa..4282e99a712e 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -4,6 +4,7 @@ , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake , libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl , python, graphviz, belcard +, withGui ? true }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; }; - cmakeFlags = "-DENABLE_GTK_UI=ON"; + cmakeFlags = stdenv.lib.optional withGui [ "-DENABLE_GTK_UI=ON" ]; postPatch = '' touch coreapi/liblinphone_gitversion.h From f61279e45bff6633d5d378e30c4304fbbb279ed3 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 11 Sep 2018 21:01:13 +0200 Subject: [PATCH 483/600] perl-TestRunCmdLine: disable tests on darwin /cc ZHF #45961 --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2ec4efed8863..714dba45aa2f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15664,6 +15664,7 @@ let }; buildInputs = [ TestRun TestTrap ]; propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ]; + doCheck = !stdenv.isDarwin; meta = { homepage = http://web-cpan.berlios.de/modules/Test-Run/; description = "Analyze tests from the command line using Test::Run"; From ffde15da8efcd272edaa864e1b0d8dd72e82fc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Sep 2018 20:54:17 +0100 Subject: [PATCH 484/600] cargo-edit: add pkgconfig/openssl on non-darwin --- pkgs/tools/package-management/cargo-edit/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 916dd26a6ab0..c0c1d19bfb62 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, darwin, rustPlatform, fetchFromGitHub }: +{ stdenv, lib, darwin +, rustPlatform, fetchFromGitHub +, openssl, pkgconfig }: rustPlatform.buildRustPackage rec { name = "cargo-edit-${version}"; @@ -13,6 +15,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1j7fqswdx6f2i5wr0pdavdvcv18j1l27a8ighr75p7f54apa27l8"; + nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig; + buildInputs = lib.optional (!stdenv.isDarwin) openssl; propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { From cea6bbfe752d74e9ac9410be0b0a2f4c221c3bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Sep 2018 21:05:50 +0100 Subject: [PATCH 485/600] cargo-edit: disable impure check --- pkgs/tools/package-management/cargo-edit/default.nix | 2 ++ .../cargo-edit/disable-network-based-test.patch | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index c0c1d19bfb62..e2cc49a3e99a 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -19,6 +19,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional (!stdenv.isDarwin) openssl; propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + patches = [ ./disable-network-based-test.patch ]; + meta = with lib; { description = "A utility for managing cargo dependencies from the command line"; homepage = https://github.com/killercup/cargo-edit; diff --git a/pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch b/pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch new file mode 100644 index 000000000000..d1044a7fc539 --- /dev/null +++ b/pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch @@ -0,0 +1,10 @@ +--- cargo-edit.org/tests/cargo-upgrade.rs 2018-09-11 20:59:04.609532299 +0100 ++++ cargo-edit/tests/cargo-upgrade.rs 2018-09-11 20:59:50.829435331 +0100 +@@ -302,6 +302,7 @@ + } + + #[test] ++#[ignore] // requires network + fn upgrade_prints_messages() { + let (_tmpdir, manifest) = clone_out_test("tests/fixtures/upgrade/Cargo.toml.source"); + From 027b9beb583935a734c3d81dbf09862af3ee8293 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 11 Sep 2018 17:14:12 -0400 Subject: [PATCH 486/600] fixup! merge: fixing changes with nixpkgs since pull-request --- pkgs/development/python-modules/distributed/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index d909a6993a04..987b64439a53 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -50,6 +50,9 @@ buildPythonPackage rec { py.test distributed -m "not avoid-travis" -r s --timeout-method=thread --timeout=0 --durations=20 --ignore="distributed/cli/tests" ''; + # when tested random tests would fail and not repeatably + doCheck = false; + meta = { description = "Distributed computation in Python."; homepage = http://distributed.readthedocs.io/en/latest/; From d7e3dbef6603b398c6b4b3c248b1b1d3bd8949fb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 11 Sep 2018 03:14:35 -0400 Subject: [PATCH 487/600] glibc: Use lib.enableFeature and friends --- pkgs/development/libraries/glibc/common.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 1eecfa902790..424b212b39d3 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -110,18 +110,13 @@ stdenv.mkDerivation ({ "--enable-obsolete-rpc" "--sysconfdir=/etc" "--enable-stackguard-randomization" - (if withLinuxHeaders - then "--with-headers=${linuxHeaders}/include" - else "--without-headers") - (if profilingLibraries - then "--enable-profile" - else "--disable-profile") + (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") + (lib.enableFeature profilingLibraries "profile") ] ++ lib.optionals withLinuxHeaders [ "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - (if stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft" - then "--without-fp" - else "--with-fp") + (lib.flip lib.withFeature "fp" + (stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft")) "--with-__thread" ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [ "--host=arm-linux-gnueabi" From 147246e53e235d5b17106b893966a869b5b60bae Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:18:44 +0200 Subject: [PATCH 488/600] cfdg: add license --- pkgs/tools/graphics/cfdg/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index a4d49edcb447..c65d1302dcaf 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; homepage = https://contextfreeart.org/; + license = licenses.gpl2; downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page"; }; } From 46d1166b80610e9d6609d910e03fa12981731e09 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Sep 2018 23:22:17 +0200 Subject: [PATCH 489/600] pants: fix build (#46545) See https://hydra.nixos.org/build/80727495 `pants' works with requests==2.19 to build successfully and `nixpkgs' currently uses `requests==2.19.1`. Patching the version constraint in `setup.py' accordingly fixes the problem. Addresses #45960 --- pkgs/development/tools/build-managers/pants/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 1ad52f327e15..02bf9c23cbac 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -17,6 +17,7 @@ in buildPythonApplication rec { prePatch = '' sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py + substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.20,>=2.5.0" ''; # Unnecessary, and causes some really weird behavior around .class files, which From 85c1a851dcb57897bdd48abc12ad8e4bcf0926c6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:22:22 +0200 Subject: [PATCH 490/600] cuneiform: add license + homepage --- pkgs/tools/graphics/cuneiform/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index cc899ab104f9..9fcb7ba404d0 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -24,9 +24,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { description = "Multi-language OCR system"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [raskin]; + homepage = https://launchpad.net/cuneiform-linux; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; }; } From 2ccbd8bab5f722e91b9cce91191fac3a4f9ec311 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:24:19 +0200 Subject: [PATCH 491/600] editres: add license --- pkgs/tools/graphics/editres/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index b8f32c33a530..cb83e02689cf 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { homepage = https://cgit.freedesktop.org/xorg/app/editres/; description = "A dynamic resource editor for X Toolkit applications"; - - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = platforms.linux; }; } From 984a41fe9438f7e81e43ef6264d994071297faf9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:25:43 +0200 Subject: [PATCH 492/600] exif: add liceses, update homepage --- pkgs/tools/graphics/exif/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index d6ec68ba3cc5..83fec1287a6b 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libexif popt libintl ]; - meta = { - homepage = http://libexif.sourceforge.net/; + meta = with stdenv.lib; { + homepage = https://libexif.github.io; description = "A utility to read and manipulate EXIF data in digital photographs"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl21; }; } From 5e57452bf88c95421601e5cc13edcdafab511510 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:27:01 +0200 Subject: [PATCH 493/600] qrencode: add license --- pkgs/tools/graphics/qrencode/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index 8e186399d638..7c5aed9b4e23 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { homepage = https://fukuchi.org/works/qrencode/; description = "QR code encoder"; platforms = platforms.all; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ yegortimoshenko ]; }; } From 65f41e1bc0394dfe14d9541aa9a88ea67ff65260 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Sep 2018 14:27:47 -0700 Subject: [PATCH 494/600] avfs: 1.0.5 -> 1.0.6 (#46306) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/avfs/versions --- pkgs/tools/filesystems/avfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 3f596947f883..5c44ef239630 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "avfs-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; - sha256 = "0xh1wpd8z3m5jmmv24fg4pvqhpnhygs2385qn5473hwk84gnpkp5"; + sha256 = "1hz39f7p5vw647xqk161v3nh88qnd599av6nfidpmkh1d9vkl6jc"; }; nativeBuildInputs = [ pkgconfig ]; From 93f08451dd20b0f1bcb21f6a79dc6e52ae345215 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Sep 2018 14:28:55 -0700 Subject: [PATCH 495/600] adapta-gtk-theme: 3.94.0.92 -> 3.94.0.132 (#46302) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 0410af974f61..09fc7a4b4475 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.94.0.92"; + version = "3.94.0.132"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "18gdsk07954wxsgr8i9kkpc8p6wvdr039lszz8hcplf2134bmb96"; + sha256 = "11j4mpbw8x2vg0w740v8q3rnwannw2zhp60aj8kirqlgz76lbadl"; }; preferLocalBuild = true; From 7d5cd978c4c88c67851d169a3fc8167556568f03 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:31:27 +0200 Subject: [PATCH 496/600] cloud-utils: add license --- pkgs/tools/misc/cloud-utils/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index fd6df64e5e76..bda8ebcf3b0e 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -30,5 +30,8 @@ stdenv.mkDerivation rec { dontBuild = true; - meta.platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + platforms = platforms.unix; + license = licenses.gpl3; + }; } From 3bb64d88500eb8bd35b4a5e2dc7ea471d13df5f5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:32:49 +0200 Subject: [PATCH 497/600] desktop-file-utils: add license --- pkgs/tools/misc/desktop-file-utils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index a6280ff4008a..70bc34954b2c 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl2; }; } From 67731671949c5f9db88e8a8ed9c6361c8414b245 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:34:10 +0200 Subject: [PATCH 498/600] ent: add license --- pkgs/tools/misc/ent/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index f4354ad2416c..d4f69340d0ae 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -21,9 +21,10 @@ stdenv.mkDerivation rec { cp ent $out/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "Pseudorandom Number Sequence Test Program"; homepage = http://www.fourmilab.ch/random/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.publicDomain; }; } From a1bd1839e11c86cdf4546fa1890342568bd7d7b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Sep 2018 14:37:16 -0700 Subject: [PATCH 499/600] appstream-glib: 0.7.10 -> 0.7.12 (#46297) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/appstream-glib/versions --- pkgs/development/libraries/appstream-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 48dfe9ad894e..39b3d6aba6bd 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -4,7 +4,7 @@ , libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.10"; + name = "appstream-glib-0.7.12"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "1m4gww09id7hwzh4hri1y3hp7p0mdrf6fk9f924r2w66hlsdil0d"; + sha256 = "0kqhm3j0nmf9pp9mpykzs2hg3nr6126ibrq1ap21hpasnq4rzlax"; }; nativeBuildInputs = [ From 8955ec6c735f3000b00b45fb2c696b92f4d5c3c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Sep 2018 14:38:42 -0700 Subject: [PATCH 500/600] debootstrap: 1.0.107 -> 1.0.108 (#46294) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debootstrap/versions --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index a11e8a44de92..4e8eb0411d1a 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.107"; + version = "1.0.108"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1gq5r4fa0hrq4c69l2s0ygnfyvr90k2wqaq15s869hayhnssx4g1"; + sha256 = "1zfp6i6mskgx3b186sbd1443031h9z01yfqgynhl848faknv4h9f"; }; buildInputs = [ dpkg gettext gawk perl wget ]; From bc9b55c57c9aac66d04b7e64fceb1017e754dbd2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:40:43 +0200 Subject: [PATCH 501/600] kt: add license --- pkgs/tools/misc/kt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index eb0f78e787ab..be0ceda511c4 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -18,5 +18,6 @@ buildGoPackage rec { homepage = https://github.com/fgeller/kt; maintainers = with maintainers; [ utdemir ]; platforms = with platforms; unix; + license = licenses.mit; }; } From 92b36b62b74d86aeb526b117fba9816654473d28 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:44:44 +0200 Subject: [PATCH 502/600] mdbtools: add license + homepage --- pkgs/tools/misc/mdbtools/default.nix | 6 ++++-- pkgs/tools/misc/mdbtools/git.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index acb3bd9d3773..d251bee71d96 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation { sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c ''; - meta = { + meta = with stdenv.lib; { description = ".mdb (MS Access) format tools"; - platforms = stdenv.lib.platforms.unix; + homepage = http://mdbtools.sourceforge.net; + platforms = platforms.unix; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 2116815ed0c3..b275002e1105 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -26,8 +26,10 @@ stdenv.mkDerivation { sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c ''; - meta = { + meta = with stdenv.lib; { description = ".mdb (MS Access) format tools"; - platforms = stdenv.lib.platforms.linux; + homepage = http://mdbtools.sourceforge.net; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; }; } From 921f792aca23912e801a98346e83c23740597b16 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:49:22 +0200 Subject: [PATCH 503/600] rkflashtool: add license --- pkgs/tools/misc/rkflashtool/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix index ff606c6b72bb..fb55b15bbd55 100644 --- a/pkgs/tools/misc/rkflashtool/default.nix +++ b/pkgs/tools/misc/rkflashtool/default.nix @@ -24,10 +24,11 @@ stdenv.mkDerivation rec { cp rkunpack rkcrc rkflashtool rkparameters rkparametersblock rkunsign rkmisc $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/rkflashtool/; description = "Tools for flashing Rockchip devices"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = platforms.linux; + maintainers = [ maintainers.viric ]; + license = licenses.bsd2; }; } From 55c0f5167f8f5fb1e02f79397aa6e8953a50e6a1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:51:16 +0200 Subject: [PATCH 504/600] xvfb-run: add license` --- pkgs/tools/misc/xvfb-run/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index c4cfc00308e9..bfc2a03e6cb8 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]} ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.gpl2; }; } From c3bffc172d9f13a8fb35cc753592b81c699f61f0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Sep 2018 23:54:23 +0200 Subject: [PATCH 505/600] dar: add license --- pkgs/tools/backup/dar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 86f8619f101e..b870c08d755f 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dar.linux.free.fr; description = "Disk ARchiver, allows backing up files into indexed archives"; - maintainers = with maintainers; [ ]; + license = licenses.gpl2; platforms = platforms.unix; }; } From 2164e39eaa943d1e5c7a6d729c143f16d5cf291e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 00:11:12 +0200 Subject: [PATCH 506/600] aria2: fix darwin build (#46548) Not released yet, see https://github.com/aria2/aria2/issues/1198 /cc ZHF #45961 --- pkgs/tools/networking/aria2/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 028691229e3b..873aa66c4212 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook , openssl, c-ares, libxml2, sqlite, zlib, libssh2 , cppunit , Security @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "0hwqnjyszasr6049vr5mn48slb48v5kw39cbpbxa68ggmhj9bw6m"; }; + patches = [ + # Remove with 1.35.0. + (fetchpatch { + url = https://github.com/aria2/aria2/commit/e8e04d6f22a507e8374651d3d2343cd9fb986993.patch; + sha256 = "1v27nqbsdjgg3ga4n0v9daq21m3cmdpy7d08kp32200pzag87f4y"; + }) + ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ From a25dcb66077310067ca1b59b2f38046bee752b0a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 12 Sep 2018 01:23:36 +0200 Subject: [PATCH 507/600] python3Packages.pyowm: fix python3 build (#46549) See https://hydra.nixos.org/build/80714323 Version 2.9 requires `geojson==2.x'. To allow 2.4, the constraint required some patching using `substituteInPlace'. Addresses #45960 --- pkgs/development/python-modules/pyowm/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 58a8dee155a8..c853965469a9 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests, geojson }: buildPythonPackage rec { pname = "pyowm"; @@ -9,11 +9,13 @@ buildPythonPackage rec { sha256 = "ed175873823a2fedb48e453505c974ca39f3f75006ef1af54fdbcf72e6796849"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests geojson ]; # This may actually break the package. postPatch = '' - substituteInPlace setup.py --replace "requests>=2.18.2,<2.19" "requests" + substituteInPlace setup.py \ + --replace "requests>=2.18.2,<2.19" "requests" \ + --replace "geojson>=2.3.0,<2.4" "geojson<2.5,>=2.3.0" ''; # No tests in archive From 99dad9d7f01429f03054d45da8a6468fca0f8793 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 11 Sep 2018 23:51:25 +0200 Subject: [PATCH 508/600] python.pkgs.requests-file: init at 1.4.3 --- .../python-modules/requests-file/default.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/requests-file/default.nix diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix new file mode 100644 index 000000000000..fac222176519 --- /dev/null +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchPypi, buildPythonPackage, requests, six }: + +buildPythonPackage rec { + pname = "requests-file"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yp2jaxg3v86pia0q512dg3hz6s9y5vzdivsgrba1kds05ial14g"; + }; + + propagatedBuildInputs = [ requests six ]; + + meta = { + homepage = https://github.com/dashea/requests-file; + description = "Transport adapter for fetching file:// URLs with the requests python library"; + license = lib.licenses.asl20; + }; + +} From e281f0e68631af7c1ff6e20f1b84683a117b016d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 11 Sep 2018 23:51:50 +0200 Subject: [PATCH 509/600] python.pkgs.tldextract: init at 2.2.0 --- .../python-modules/tldextract/default.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/tldextract/default.nix diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix new file mode 100644 index 000000000000..4e494244d314 --- /dev/null +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage +, requests, requests-file, idna, pytest +, responses +}: + +buildPythonPackage rec { + pname = "tldextract"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d5s8v6kpsgazyahflhji1cfdcf89rv7l7z55v774bhzvcjp2y99"; + }; + + propagatedBuildInputs = [ requests requests-file idna ]; + checkInputs = [ pytest responses ]; + + meta = { + homepage = https://github.com/john-kurkowski/tldextract; + description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List."; + license = lib.licenses.bsd3; + }; + +} From 75b2058aff6bfa56024439edfc7edaf5c3e7a551 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 12 Sep 2018 01:26:25 +0200 Subject: [PATCH 510/600] python.pkgs.pyreadability: init at 0.4.0 --- .../python-modules/pyreadability/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/pyreadability/default.nix diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/pkgs/development/python-modules/pyreadability/default.nix new file mode 100644 index 000000000000..a95074b906e3 --- /dev/null +++ b/pkgs/development/python-modules/pyreadability/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, buildPythonPackage +, requests, chardet, cssselect, lxml +, pytest +}: + +buildPythonPackage rec { + pname = "PyReadability"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k6fq416pdmjcdqh6gdxl0y0k8kj1zlpzwp5574xsvsha18p2zpn"; + }; + + propagatedBuildInputs = [ requests chardet cssselect lxml ]; + + # ModuleNotFoundError: No module named 'tests' + doCheck = false; + + meta = { + homepage = https://github.com/hyperlinkapp/python-readability; + description = "fast python port of arc90's readability tool, updated to match latest readability.js!"; + license = lib.licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ca55835abf6..ed12cf2e17be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2000,6 +2000,8 @@ in { requests-cache = callPackage ../development/python-modules/requests-cache { }; + requests-file = callPackage ../development/python-modules/requests-file { }; + requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; @@ -11141,6 +11143,8 @@ in { }; }); + pyreadability = callPackage ../development/python-modules/pyreadability { }; + pyscss = buildPythonPackage rec { name = "pyScss-${version}"; version = "1.3.5"; @@ -17071,6 +17075,8 @@ EOF textacy = callPackage ../development/python-modules/textacy { }; + tldextract = callPackage ../development/python-modules/tldextract { }; + pyemd = callPackage ../development/python-modules/pyemd { }; pulp = callPackage ../development/python-modules/pulp { }; From dca577a36c4f90cf31de804ce9fb4e6a1aab259e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 12 Sep 2018 01:42:17 +0200 Subject: [PATCH 511/600] python.pkgs.pykeepass: init at 3.0.2 --- .../python-modules/pykeepass/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/pykeepass/default.nix diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix new file mode 100644 index 000000000000..68c35ed0df12 --- /dev/null +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, buildPythonPackage +, lxml, pycryptodome, construct +, argon2_cffi, dateutil, enum34 +}: + +buildPythonPackage rec { + pname = "pykeepass"; + version = "3.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kfnh42nimsbdpwpny2c9df82b2n4fb5fagh54ck06f3x483vd90"; + }; + + propagatedBuildInputs = [ + lxml pycryptodome construct + argon2_cffi dateutil enum34 + ]; + + meta = { + homepage = https://github.com/pschmitt/pykeepass; + description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; + license = lib.licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed12cf2e17be..54384028abde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -467,6 +467,8 @@ in { pykerberos = callPackage ../development/python-modules/pykerberos { }; + pykeepass = callPackage ../development/python-modules/pykeepass { }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; From d117e3ccd8f8e3944d3e2777c06626e5c834a0e1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 12 Sep 2018 03:18:37 +0200 Subject: [PATCH 512/600] python.pkgs.construct: 2.8.16 -> 2.9.45 --- .../python-modules/construct/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 680f6e02cd01..f8e739f0bc7d 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,23 +1,26 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, six, pytest, arrow +}: buildPythonPackage rec { - pname = "construct"; - version = "2.8.16"; - name = pname + "-" + version; + pname = "construct"; + version = "2.9.45"; src = fetchFromGitHub { - owner = "construct"; - repo = "construct"; - rev = "v${version}"; - sha256 = "0lzz1dy419n254qccch7yx4nkpwd0fsyjhnsnaf6ysgwzqxxv63j"; + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0ig66xrzswpkhhmw123p2nvr15a9lxz54a1fmycfdh09327c1d3y"; }; propagatedBuildInputs = [ six ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest arrow ]; + # TODO: figure out missing dependencies + doCheck = false; checkPhase = '' - py.test -k 'not test_numpy' tests + py.test -k 'not test_numpy and not test_gallery' tests ''; meta = with stdenv.lib; { From cf2603f144b86201635867c7e19f41fd965b382c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 12 Sep 2018 02:41:03 +0200 Subject: [PATCH 513/600] qutebrowser: patch all python scripts --- .../browsers/qutebrowser/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index b4932ee0f1b9..b71eea791550 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -55,6 +55,9 @@ in python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs + # scripts and userscripts libs + tldextract beautifulsoup4 + pyreadability pykeepass stem ]; postPatch = '' @@ -81,15 +84,15 @@ in python3Packages.buildPythonApplication rec { "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" # Install scripts - sed -i "s,/usr/bin/qutebrowser,$out/bin/qutebrowser,g" scripts/open_url_in_instance.sh - install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/open_url_in_instance.sh + sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh + install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f) install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* - # Install and patch python scripts + # Patch python scripts buildPythonPath "$out $propagatedBuildInputs" - for i in importer dictcli keytester utils; do - install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/$i.py - patchPythonScript "$out/share/qutebrowser/scripts/$i.py" + scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/) + for i in $scripts; do + patchPythonScript "$i" done ''; @@ -97,10 +100,10 @@ in python3Packages.buildPythonApplication rec { wrapProgram $out/bin/qutebrowser --add-flags "--backend webkit" ''; - meta = { - homepage = https://github.com/The-Compiler/qutebrowser; + meta = with stdenv.lib; { + homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jagajaga rnhmjoj ]; }; } From 5dc1796a6f87ff0a8adf1694bf47ec95755147ff Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Wed, 12 Sep 2018 11:40:04 +0800 Subject: [PATCH 514/600] vaultenv: 0.5.3 -> 0.8.0 --- .../tools/haskell/vaultenv/default.nix | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index b607cc5604cd..6bf5e9be7bf2 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -1,28 +1,35 @@ -{ mkDerivation, fetchzip, async, base, bytestring, hpack, http-conduit -, lens, lens-aeson, optparse-applicative, retry, stdenv, text, unix -, unordered-containers, utf8-string +{ mkDerivation, async, base, bytestring, connection, containers +, directory, hpack, hspec, hspec-discover, hspec-expectations +, http-client, http-conduit, lens, lens-aeson, megaparsec, mtl +, optparse-applicative, parser-combinators, retry, stdenv, text +, unix, unordered-containers, utf8-string, fetchzip }: - mkDerivation rec { pname = "vaultenv"; - version = "0.5.3"; + version = "0.8.0"; src = fetchzip { url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz"; - sha256 = "1kxq2pp8l8xf7xwjyd9cwyi7z192013s6psq5fk8jrkkhrk8z3li"; + sha256 = "04hrwyy7gsybdwljrks4ym3pshqk1i43f8wpirjx7b0dfjgsd2l5"; }; buildTools = [ hpack ]; - preConfigure = "hpack ."; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - async base bytestring http-conduit lens lens-aeson - optparse-applicative retry text unix unordered-containers - utf8-string + async base bytestring connection containers http-client + http-conduit lens lens-aeson megaparsec mtl optparse-applicative + parser-combinators retry text unix unordered-containers utf8-string ]; - homepage = "https://github.com/channable/vaultenv"; + testHaskellDepends = [ + async base bytestring connection containers directory hspec + hspec-discover hspec-expectations http-client http-conduit lens + lens-aeson megaparsec mtl optparse-applicative parser-combinators + retry text unix unordered-containers utf8-string + ]; + preConfigure = "hpack"; + homepage = "https://github.com/channable/vaultenv#readme"; description = "Runs processes with secrets from HashiCorp Vault"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ lnl7 ]; From 541a13ca0ae42dbdea9369c585b51b23b5a660b3 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 26 Aug 2018 14:11:02 +0300 Subject: [PATCH 515/600] pythonPackages.eth-typing: init at 1.1.0 --- .../python-modules/eth-typing/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/eth-typing/default.nix diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix new file mode 100644 index 000000000000..070923c83855 --- /dev/null +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, pytest }: + +buildPythonPackage rec { + pname = "eth-typing"; + version = "1.3.0"; + + # Tests are missing from the PyPI source tarball so let's use GitHub + # https://github.com/ethereum/eth-typing/issues/8 + src = fetchFromGitHub { + owner = "ethereum"; + repo = pname; + rev = "v${version}"; + sha256 = "0703z7vlsfa3dvgcq22f9rzmj0svyp2a8wc7h73d0aac28ydhpv9"; + }; + + # setuptools-markdown uses pypandoc which is broken at the moment + preConfigure = '' + substituteInPlace setup.py --replace \'setuptools-markdown\' "" + ''; + + disabled = pythonOlder "3.5"; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest . + ''; + + meta = { + description = "Common type annotations for Ethereum Python packages"; + homepage = https://github.com/ethereum/eth-typing; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f55ead0053f..a2419d74b1a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1657,6 +1657,8 @@ in { eth-hash = callPackage ../development/python-modules/eth-hash { }; + eth-typing = callPackage ../development/python-modules/eth-typing { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; From 9f8e6148c5da6101bd534c3d68549ab00946b441 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 26 Aug 2018 14:12:06 +0300 Subject: [PATCH 516/600] pythonPackages.eth-utils: init at 1.2.0 --- .../python-modules/eth-utils/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/eth-utils/default.nix diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix new file mode 100644 index 000000000000..cae3f34f0c9f --- /dev/null +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchFromGitHub, buildPythonPackage, pytest, eth-hash, eth-typing, + cytoolz, hypothesis }: + +buildPythonPackage rec { + pname = "eth-utils"; + version = "1.2.1"; + + # Tests are missing from the PyPI source tarball so let's use GitHub + # https://github.com/ethereum/eth-utils/issues/130 + src = fetchFromGitHub { + owner = "ethereum"; + repo = pname; + rev = "v${version}"; + sha256 = "0g8f5vdjh7qd8kgsqqd9qkm6m79rx3w9yp0rf9vpdsv3xfzrkh1w"; + }; + + checkInputs = [ pytest hypothesis ]; + propagatedBuildInputs = [ eth-hash eth-typing cytoolz ]; + + # setuptools-markdown uses pypandoc which is broken at the moment + preConfigure = '' + substituteInPlace setup.py --replace \'setuptools-markdown\' "" + ''; + + checkPhase = '' + pytest . + ''; + + meta = { + description = "Common utility functions for codebases which interact with ethereum"; + homepage = https://github.com/ethereum/eth-utils; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2419d74b1a2..e74d264d6028 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1659,6 +1659,8 @@ in { eth-typing = callPackage ../development/python-modules/eth-typing { }; + eth-utils = callPackage ../development/python-modules/eth-utils { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; From f053daf36ceb956e19a78115e4abdf46058fec25 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 26 Aug 2018 14:13:24 +0300 Subject: [PATCH 517/600] pythonPackages.rlp: fix build --- pkgs/development/python-modules/rlp/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index 77ada95b3019..150234a3dd29 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest, hypothesis, eth-utils }: buildPythonPackage rec { pname = "rlp"; @@ -9,8 +9,18 @@ buildPythonPackage rec { sha256 = "040fb5172fa23d27953a886c40cac989fc031d0629db934b5a9edcd2fb28df1e"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ ]; + checkInputs = [ pytest hypothesis ]; + propagatedBuildInputs = [ eth-utils ]; + + # setuptools-markdown uses pypandoc which is broken at the moment + preConfigure = '' + substituteInPlace setup.py --replace \'setuptools-markdown\' "" + substituteInPlace setup.py --replace "long_description_markdown_filename='README.md'," "" + ''; + + checkPhase = '' + pytest . + ''; meta = { description = "A package for encoding and decoding data in and from Recursive Length Prefix notation"; From 38e86a8f1e7d58ba494a83242ccd580e890741a6 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 26 Aug 2018 15:15:27 +0300 Subject: [PATCH 518/600] pythonPackages.python-u2flib-host: init at 3.0.3 --- .../python-u2flib-host/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/python-u2flib-host/default.nix diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix new file mode 100644 index 000000000000..38785d813138 --- /dev/null +++ b/pkgs/development/python-modules/python-u2flib-host/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchPypi, buildPythonPackage, requests, hidapi }: + +buildPythonPackage rec { + pname = "python-u2flib-host"; + version = "3.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "02pwafd5kyjpc310ys0pgnd0adff1laz18naxxwsfrllqafqnrxb"; + }; + + propagatedBuildInputs = [ requests hidapi ]; + + # Tests fail: "ValueError: underlying buffer has been detached" + doCheck = false; + + meta = with stdenv.lib; { + description = "Python based U2F host library"; + homepage = https://github.com/Yubico/python-u2flib-host; + license = licenses.bsd2; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e74d264d6028..db8d8fc463cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16244,6 +16244,8 @@ EOF potr = callPackage ../development/python-modules/potr {}; + python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; + pluggy = callPackage ../development/python-modules/pluggy {}; xcffib = callPackage ../development/python-modules/xcffib {}; From 5c9db2f02fba343bcc60fa0c8418495756f6ac1f Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 26 Aug 2018 15:16:08 +0300 Subject: [PATCH 519/600] pythonPackages.ledgerblue: fix build inputs --- pkgs/development/python-modules/ledgerblue/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 4f6c2a96c566..d324afcc647a 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage, hidapi -, pycrypto, pillow, protobuf, future, ecpy +, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex }: buildPythonPackage rec { @@ -11,7 +11,12 @@ buildPythonPackage rec { sha256 = "3969b3c375c0f3fb60ff1645621ebf2f39fb697a53851620705f27ed7b283097"; }; - buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ]; + propagatedBuildInputs = [ + hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex + ]; + + # No tests + doCheck = false; meta = with stdenv.lib; { description = "Python library to communicate with Ledger Blue/Nano S"; From c9bf7f67b9ce3e62a40119f8fcb353c67b4268c2 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 26 Aug 2018 15:43:42 +0300 Subject: [PATCH 520/600] pythonPackage.pymsgbox: init at 1.0.6 --- .../python-modules/pymsgbox/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pymsgbox/default.nix diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix new file mode 100644 index 000000000000..38cc411f54df --- /dev/null +++ b/pkgs/development/python-modules/pymsgbox/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, tkinter }: + +buildPythonPackage rec { + pname = "PyMsgBox"; + version = "1.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kmd00w7p6maiyqpqqb2j8m6v2gh9c0h5i198pa02bc1c1m1321q"; + extension = "zip"; + }; + + propagatedBuildInputs = [ tkinter ]; + + # Finding tests fails + doCheck = false; + + meta = with stdenv.lib; { + description = "A simple, cross-platform, pure Python module for JavaScript-like message boxes"; + homepage = https://github.com/asweigart/PyMsgBox; + license = licenses.bsd3; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db8d8fc463cc..e718fbd33230 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -469,6 +469,8 @@ in { pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; + pymsgbox = callPackage ../development/python-modules/pymsgbox { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pyparser = callPackage ../development/python-modules/pyparser { }; From 80b64a2e049a9cb3b722de8520af4cfb08fef52a Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 26 Aug 2018 15:44:16 +0300 Subject: [PATCH 521/600] pythonPackage.backports-shutil-which: init at 3.5.1 --- .../backports-shutil-which/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/backports-shutil-which/default.nix diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix new file mode 100644 index 000000000000..69a80b530d64 --- /dev/null +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "backports.shutil_which"; + version = "3.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "16sa3adkf71862cb9pk747pw80a2f1v5m915ijb4fgj309xrlhyx"; + }; + + # Tests fail: "ValueError: underlying buffer has been detached" + doCheck = false; + + meta = with stdenv.lib; { + description = "Backport of shutil.which from Python 3.3"; + homepage = https://github.com/minrk/backports.shutil_which; + license = licenses.psfl; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e718fbd33230..537a1773e54e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -216,6 +216,8 @@ in { backports_csv = callPackage ../development/python-modules/backports_csv {}; + backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; + bap = callPackage ../development/python-modules/bap { bap = pkgs.ocamlPackages.bap; }; From d0ce8834ae3b47ed01482eecb93d1e5e38f7ee01 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 26 Aug 2018 15:44:38 +0300 Subject: [PATCH 522/600] pythonPackages.libagent: fix propagatedBuildInputs --- .../python-modules/libagent/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 950a0dd5ba6f..f70d538bb8d0 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa -, semver, keepkey, trezor, mnemonic, ledgerblue, unidecode, mock, pytest -}: +{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, + unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, + pythondaemon, pymsgbox }: buildPythonPackage rec { pname = "libagent"; @@ -11,12 +11,8 @@ buildPythonPackage rec { sha256 = "55af1ad2a6c95aef1fc5588c2002c9e54edbb14e248776b64d00628235ceda3e"; }; - buildInputs = [ - ed25519 ecdsa semver keepkey - trezor mnemonic ledgerblue - ]; - - propagatedBuildInputs = [ unidecode ]; + propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse + pythondaemon pymsgbox ecdsa ed25519 mnemonic semver ]; checkInputs = [ mock pytest ]; From 8d4afa5f2ef0fbdf042069ac71479bba1104bbc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Aug 2018 10:35:54 +0100 Subject: [PATCH 523/600] pythonPackage.backports-shutil-which: enable tests --- .../python-modules/backports-shutil-which/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix index 69a80b530d64..9900f86567e0 100644 --- a/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "backports.shutil_which"; @@ -9,8 +9,11 @@ buildPythonPackage rec { sha256 = "16sa3adkf71862cb9pk747pw80a2f1v5m915ijb4fgj309xrlhyx"; }; - # Tests fail: "ValueError: underlying buffer has been detached" - doCheck = false; + checkInputs = [ pytest ]; + + checkPhase = '' + py.test test + ''; meta = with stdenv.lib; { description = "Backport of shutil.which from Python 3.3"; From 508e353fd42dd6d2310fe7ba7eb7abad18c5ae2c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 12 Sep 2018 02:25:31 -0400 Subject: [PATCH 524/600] eolie: 0.9.35 -> 0.9.36 --- .../networking/browsers/eolie/default.nix | 42 +++++++++++-------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 8d7f4e6cc703..91c5f697132c 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,45 +1,53 @@ -{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook -, desktop-file-utils, gobjectIntrospection, python36Packages -, gnome3, gst_all_1, gtkspell3, hunspell }: +{ stdenv, fetchgit, meson, ninja, pkgconfig +, python3, gtk3, libsecret, gst_all_1, webkitgtk +, glib-networking, gtkspell3, hunspell, desktop-file-utils +, gobjectIntrospection, wrapGAppsHook }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { name = "eolie-${version}"; - version = "0.9.35"; + version = "0.9.36"; + + format = "other"; + doCheck = false; src = fetchgit { url = "https://gitlab.gnome.org/World/eolie"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0x3p1fgx1fhrnr7vkkpnl34401r6k6xg2mrjff7ncb1k57q522k7"; + sha256 = "1pqs6lddkj7nvxdwf0yncwdcr7683mpvx3912vn7b1f2q2zkp1fv"; }; - nativeBuildInputs = with python36Packages; [ + nativeBuildInputs = [ desktop-file-utils gobjectIntrospection meson ninja pkgconfig wrapGAppsHook - wrapPython ]; - buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [ - glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret - ]) ++ (with gst_all_1; [ - gst-libav gst-plugins-base gst-plugins-ugly gstreamer - ]); + buildInputs = with gst_all_1; [ + glib-networking + gst-libav + gst-plugins-base + gst-plugins-ugly + gstreamer + gtk3 + gtkspell3 + hunspell + libsecret + webkitgtk + ]; - pythonPath = with python36Packages; [ + pythonPath = with python3.pkgs; [ beautifulsoup4 pycairo pygobject3 python-dateutil ]; - postFixup = "wrapPythonPrograms"; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file + chmod +x meson_post_install.py patchShebangs meson_post_install.py ''; From 4daba543aa9ce1769cff961df3757c743b783ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 12 Sep 2018 07:45:44 +0100 Subject: [PATCH 525/600] vimPlugins: updates --- pkgs/misc/vim-plugins/generated.nix | 46 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 88a91824ea06..905de1b5b8ab 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -43,12 +43,12 @@ }; ale = buildVimPluginFrom2Nix { - name = "ale-2018-09-10"; + name = "ale-2018-09-11"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "99e9417ef901824200040c6a2d3e84f2e0ff4b8e"; - sha256 = "1y7yp1wyghhgvmylkbdi3wbvqcw026mfaajhgna53xd3fl7z3bgd"; + rev = "78af99c2566ef8fed443ce253e0de9323b9e5043"; + sha256 = "0c0bcr5x73fzfmsx65pc4f9j7d9m2z6wq81nyqnn81g3ws96axih"; }; }; @@ -334,12 +334,12 @@ }; denite-nvim = buildVimPluginFrom2Nix { - name = "denite-nvim-2018-09-05"; + name = "denite-nvim-2018-09-11"; src = fetchFromGitHub { owner = "shougo"; repo = "denite.nvim"; - rev = "2771c7ae323c2a24341e0f6a83b81f1a1559df0c"; - sha256 = "07gmrsn815i91wzw9d326kwlph9bqcli75dzg6c8gl0r5vib2v5b"; + rev = "0fdbdfb154a84bd76deb51ad5159c52779bbe110"; + sha256 = "0qc6b731g66rbpcss6dss9ak5npdg52pb7v11mc07f534fksqrpj"; }; }; @@ -529,12 +529,12 @@ }; fzf-vim = buildVimPluginFrom2Nix { - name = "fzf-vim-2018-09-07"; + name = "fzf-vim-2018-09-12"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "8fa84e0fdf97842d94caee8d50584836edf5b509"; - sha256 = "0di5xmd3i9m034npr6zc1f793jcj1vsy95wdyhpf55b6hclm7bbd"; + rev = "c3954d294a0f6c4fb5a46a1839cd42ec26767dea"; + sha256 = "0pipa7vgx4vkaysyf195yphggxj5kki66yksfvdvw6yxiicap1ml"; }; }; @@ -849,12 +849,12 @@ }; neomake = buildVimPluginFrom2Nix { - name = "neomake-2018-09-09"; + name = "neomake-2018-09-11"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "11c6797b258dfe1c0b4ee8536f2bb961003a3f76"; - sha256 = "0lsrz6m29ghhz57m1ay2v26i0838czhmm6a06yfy39dy99sa02il"; + rev = "f5d411eb9598b0e82187431a49598f3dce1f9484"; + sha256 = "1v2ggn8bm0mp6bjyiqf9ria8jmqs4risqdwhcbj77l95ka3znx9z"; }; }; @@ -913,8 +913,8 @@ src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "15d06b676dfcd92ac9a0bc375668d127f9822539"; - sha256 = "1v1w4yg6mgmz0q00in0y46wcmcgh6gxx8szws5cmvwv43d5c18qs"; + rev = "b3804dcd71471505048c8a75f301539fc2dce081"; + sha256 = "0waa6hw9jqxy1jxcm0bx53n0cpindin9jdd5s6jh7310psqpwi1x"; }; }; @@ -1969,12 +1969,12 @@ }; vim-ghost = buildVimPluginFrom2Nix { - name = "vim-ghost-2018-08-23"; + name = "vim-ghost-2018-09-12"; src = fetchFromGitHub { owner = "raghur"; repo = "vim-ghost"; - rev = "666a76c0783270eeb1ac1e0027df6f801a067bfd"; - sha256 = "1c5jyipcj4hi703dcdim1123p2yp4h67ci4f9kgaz9h65lmz4xn5"; + rev = "4e06bc238d23e6eb245a766105c62344a132b3f4"; + sha256 = "1n5m7xbv4i0bwdqm39n9j6brbjayk4cpq38sqqbvgh3lia7nkbpv"; }; }; @@ -2019,12 +2019,12 @@ }; vim-go = buildVimPluginFrom2Nix { - name = "vim-go-2018-09-10"; + name = "vim-go-2018-09-11"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "5b9058e1232786c682be79b8a00510d3bd63eba9"; - sha256 = "14jcjdq48cnpdvp6k2lanr1chvkgky7xnz8zbcqhw2ma27zy16jf"; + rev = "925447051422b471490a85bcb196a27c4625b225"; + sha256 = "0g41i22hr0iq1mpbv0cpzc9h6mwhncn3jv6ydhvbpvjpg8yd3wxg"; }; }; @@ -2720,12 +2720,12 @@ }; vim-snippets = buildVimPluginFrom2Nix { - name = "vim-snippets-2018-09-03"; + name = "vim-snippets-2018-09-11"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "1a08e283d48b4a1ada1fbcc7c363ee040aeec0c9"; - sha256 = "0ska56i77dd2n2c428c9hsl2zskyag41xfsl5dg00dyjv4amvnin"; + rev = "225647b65522b7421a22f138b9b0a10833d39551"; + sha256 = "1ngdv1rsaa0w742k4bb942x0pd7pmjh7nghkiiv1hl8cryrwhix5"; }; }; From ac415ca68e1ff86ea52a9ca53ca451067070a315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 12 Sep 2018 07:51:03 +0100 Subject: [PATCH 526/600] vimPlugins: do not pick up aliases from nixpkgs --- pkgs/misc/vim-plugins/default.nix | 17 ++-- pkgs/misc/vim-plugins/generated.nix | 132 ++++++++++++++-------------- pkgs/misc/vim-plugins/update.py | 1 + 3 files changed, 76 insertions(+), 74 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 4507b1125df8..3287c4714be8 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -334,7 +334,7 @@ self = generated // (with generated; { }) // lib.optionalAttrs (config.allowAliases or true) (with self; { # aliases airline = vim-airline; - a-vim = alternative; # backwards compat, added 2018-09-10 + alternative = a-vim; # backwards compat, added 2014-10-21 bats = bats-vim; calendar = calendar-vim; coffee-script = vim-coffee-script; @@ -343,8 +343,9 @@ self = generated // (with generated; { solarized = vim-colors-solarized; colors-solarized = vim-colors-solarized; caw = caw-vim; - Colour_Sampler_Pack = colorsamplerpack; - command-t = command_T; # backwards compat, added 2018-09-10 + colorsamplerpack = Colour_Sampler_Pack; + Colour_Sampler_Pack = Colour-Sampler-Pack; + command_T = command-t; # backwards compat, added 2014-10-18 commentary = vim-commentary; committia = committia-vim; concealedyank = concealedyank-vim; @@ -381,7 +382,7 @@ self = generated // (with generated; { latex-live-preview = vim-latex-live-preview; maktaba = vim-maktaba; multiple-cursors = vim-multiple-cursors; - neco-ghc = necoGhc; # backwards compat, added 2018-09-10 + necoGhc = neco-ghc; # backwards compat, added 2014-10-18 neocomplete = neocomplete-vim; neoinclude = neoinclude-vim; neomru = neomru-vim; @@ -426,12 +427,12 @@ self = generated // (with generated; { vim-addon-vim2nix = vim2nix; vimproc = vimproc-vim; vimshell = vimshell-vim; - vim-vinegar = vinegar; # backwards compat, added 2018-09-10 - vim-watchdogs = watchdogs; # backwards compat, added 2018-09-10 + vinegar = vim-vinegar; + watchdogs = vim-watchdogs; WebAPI = webapi-vim; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 - YankRing-vim = yankring; - Yankring = yankring; + yankring = YankRing-vim; + Yankring = YankRing-vim; YouCompleteMe = youcompleteme; xterm-color-table = xterm-color-table-vim; zeavim = zeavim-vim; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 905de1b5b8ab..c488c7fe0692 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2,6 +2,16 @@ { buildVimPluginFrom2Nix, fetchFromGitHub }: { + a-vim = buildVimPluginFrom2Nix { + name = "a-vim-2010-11-06"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "a.vim"; + rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; + sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; + }; + }; + ack-vim = buildVimPluginFrom2Nix { name = "ack-vim-2018-02-27"; src = fetchFromGitHub { @@ -62,16 +72,6 @@ }; }; - alternative = buildVimPluginFrom2Nix { - name = "alternative-2010-11-06"; - src = fetchFromGitHub { - owner = "vim-scripts"; - repo = "a.vim"; - rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; - sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; - }; - }; - argtextobj-vim = buildVimPluginFrom2Nix { name = "argtextobj-vim-2010-10-18"; src = fetchFromGitHub { @@ -182,8 +182,8 @@ }; }; - colorsamplerpack = buildVimPluginFrom2Nix { - name = "colorsamplerpack-2012-11-30"; + Colour-Sampler-Pack = buildVimPluginFrom2Nix { + name = "Colour-Sampler-Pack-2012-11-30"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "Colour-Sampler-Pack"; @@ -192,8 +192,8 @@ }; }; - command_T = buildVimPluginFrom2Nix { - name = "command_T-2017-11-17"; + command-t = buildVimPluginFrom2Nix { + name = "command-t-2017-11-17"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; @@ -293,16 +293,6 @@ }; }; - ctrlp-vim = buildVimPluginFrom2Nix { - name = "ctrlp-vim-2018-06-28"; - src = fetchFromGitHub { - owner = "ctrlpvim"; - repo = "ctrlp.vim"; - rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989"; - sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk"; - }; - }; - ctrlp-z = buildVimPluginFrom2Nix { name = "ctrlp-z-2015-10-17"; src = fetchFromGitHub { @@ -313,6 +303,16 @@ }; }; + ctrlp-vim = buildVimPluginFrom2Nix { + name = "ctrlp-vim-2018-06-28"; + src = fetchFromGitHub { + owner = "ctrlpvim"; + repo = "ctrlp.vim"; + rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989"; + sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk"; + }; + }; + denite-extra = buildVimPluginFrom2Nix { name = "denite-extra-2018-08-13"; src = fetchFromGitHub { @@ -396,16 +396,6 @@ }; }; - deoplete-nvim = buildVimPluginFrom2Nix { - name = "deoplete-nvim-2018-09-02"; - src = fetchFromGitHub { - owner = "shougo"; - repo = "deoplete.nvim"; - rev = "8c2117b966a7f05091cd49609f8ee3641f260997"; - sha256 = "0pklmb89g3hqxilv0546c21yjav26frsxb5g24ma49pii8lmzgjg"; - }; - }; - deoplete-rust = buildVimPluginFrom2Nix { name = "deoplete-rust-2017-07-18"; src = fetchFromGitHub { @@ -426,6 +416,16 @@ }; }; + deoplete-nvim = buildVimPluginFrom2Nix { + name = "deoplete-nvim-2018-09-02"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "deoplete.nvim"; + rev = "8c2117b966a7f05091cd49609f8ee3641f260997"; + sha256 = "0pklmb89g3hqxilv0546c21yjav26frsxb5g24ma49pii8lmzgjg"; + }; + }; + dhall-vim = buildVimPluginFrom2Nix { name = "dhall-vim-2018-07-30"; src = fetchFromGitHub { @@ -778,6 +778,16 @@ }; }; + neco-ghc = buildVimPluginFrom2Nix { + name = "neco-ghc-2018-05-13"; + src = fetchFromGitHub { + owner = "eagletmt"; + repo = "neco-ghc"; + rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; + sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; + }; + }; + neco-look = buildVimPluginFrom2Nix { name = "neco-look-2018-01-21"; src = fetchFromGitHub { @@ -808,16 +818,6 @@ }; }; - necoGhc = buildVimPluginFrom2Nix { - name = "necoGhc-2018-05-13"; - src = fetchFromGitHub { - owner = "eagletmt"; - repo = "neco-ghc"; - rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; - sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; - }; - }; - neocomplete-vim = buildVimPluginFrom2Nix { name = "neocomplete-vim-2018-03-28"; src = fetchFromGitHub { @@ -2909,6 +2909,16 @@ }; }; + vim-vinegar = buildVimPluginFrom2Nix { + name = "vim-vinegar-2018-08-06"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-vinegar"; + rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296"; + sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf"; + }; + }; + vim-visualstar = buildVimPluginFrom2Nix { name = "vim-visualstar-2015-08-27"; src = fetchFromGitHub { @@ -2929,6 +2939,16 @@ }; }; + vim-watchdogs = buildVimPluginFrom2Nix { + name = "vim-watchdogs-2017-12-03"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "vim-watchdogs"; + rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; + sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; + }; + }; + vim-wordy = buildVimPluginFrom2Nix { name = "vim-wordy-2018-03-10"; src = fetchFromGitHub { @@ -3039,16 +3059,6 @@ }; }; - vinegar = buildVimPluginFrom2Nix { - name = "vinegar-2018-08-06"; - src = fetchFromGitHub { - owner = "tpope"; - repo = "vim-vinegar"; - rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296"; - sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf"; - }; - }; - vundle = buildVimPluginFrom2Nix { name = "vundle-2018-02-03"; src = fetchFromGitHub { @@ -3059,16 +3069,6 @@ }; }; - watchdogs = buildVimPluginFrom2Nix { - name = "watchdogs-2017-12-03"; - src = fetchFromGitHub { - owner = "osyo-manga"; - repo = "vim-watchdogs"; - rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; - sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; - }; - }; - webapi-vim = buildVimPluginFrom2Nix { name = "webapi-vim-2018-03-14"; src = fetchFromGitHub { @@ -3109,8 +3109,8 @@ }; }; - yankring = buildVimPluginFrom2Nix { - name = "yankring-2015-07-29"; + YankRing-vim = buildVimPluginFrom2Nix { + name = "YankRing-vim-2015-07-29"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "YankRing.vim"; diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index c19b439493c6..210f68d7d599 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -139,6 +139,7 @@ def prefetch_plugin(user: str, repo_name: str, cache: "Cache") -> Plugin: has_submodules = repo.has_submodules() cached_plugin = cache[commit] if cached_plugin is not None: + cached_plugin.name = repo_name cached_plugin.date = date return cached_plugin From c4a621d4a60e350b5cf0f73db6d2f5500ee361c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 12 Sep 2018 07:51:48 +0100 Subject: [PATCH 527/600] vimPlugins: run update script in empty environment --- pkgs/misc/vim-plugins/update.py | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index 210f68d7d599..8128c12bce68 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -20,8 +20,9 @@ import xml.etree.ElementTree as ET from datetime import datetime from multiprocessing.dummy import Pool from pathlib import Path -from typing import Dict, List, Optional, Tuple, Union +from typing import Dict, List, Optional, Tuple, Union, Any from urllib.parse import urljoin, urlparse +from tempfile import NamedTemporaryFile ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" ATOM_LINK = "{http://www.w3.org/2005/Atom}link" @@ -110,7 +111,7 @@ class Plugin: return copy -GET_PLUGINS = """(with import {}; +GET_PLUGINS = """(with import {}; let hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; getChecksum = name: value: @@ -123,8 +124,24 @@ let in lib.filterAttrs (n: v: v != null) checksums)""" +class CleanEnvironment(object): + def __enter__(self) -> None: + self.old_environ = os.environ.copy() + local_pkgs = str(ROOT.joinpath("../../..")) + os.environ["NIX_PATH"] = f"localpkgs={local_pkgs}" + self.empty_config = NamedTemporaryFile() + self.empty_config.write(b"{}") + self.empty_config.flush() + os.environ["NIXPKGS_CONFIG"] = self.empty_config.name + + def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None: + os.environ.update(self.old_environ) + self.empty_config.close() + + def get_current_plugins() -> List[Plugin]: - out = subprocess.check_output(["nix", "eval", "--json", GET_PLUGINS]) + with CleanEnvironment(): + out = subprocess.check_output(["nix", "eval", "--json", GET_PLUGINS]) data = json.loads(out) plugins = [] for name, attr in data.items(): From 6400d4b4aa74b5a7506b9f39f1fe256cca9887fb Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Wed, 12 Sep 2018 10:00:44 +0300 Subject: [PATCH 528/600] syncthing: 0.14.48 -> 0.14.50 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 25d482fd9b06..b7bad13a30d8 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, patches ? [], postInstall ? "" }: stdenv.mkDerivation rec { - version = "0.14.48"; + version = "0.14.50"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "10jls0z3y081fq097xarplzv5sz076ibhawzm65bq695f6s5sdzw"; + sha256 = "10lilw20mq1zshysb9zrszcpl4slyyxvnbxfqk04nhz0b1gmm9ri"; }; inherit patches; From e4393102e673f990521dc109dfd4f27ceca9e437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 12 Sep 2018 01:09:52 +0100 Subject: [PATCH 529/600] python-jsonrpc-server: init at 0.0.1 --- .../python-jsonrpc-server/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/python-jsonrpc-server/default.nix diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix new file mode 100644 index 000000000000..508f18e6da00 --- /dev/null +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +, pytest, mock, pytestcov, coverage +, future, futures +}: + +buildPythonPackage rec { + pname = "python-jsonrpc-server"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "palantir"; + repo = "python-jsonrpc-server"; + rev = version; + sha256 = "0p5dj1hxx3yz8vjk59dcp3h6ci1hrjkbzf9lr3vviy0xw327409k"; + }; + + checkInputs = [ + pytest mock pytestcov coverage + ]; + + checkPhase = '' + pytest + ''; + + propagatedBuildInputs = [ future ] + ++ stdenv.lib.optional (pythonOlder "3.2") futures; + + meta = with stdenv.lib; { + homepage = https://github.com/palantir/python-jsonrpc-server; + description = "A Python 2 and 3 asynchronous JSON RPC server"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ca55835abf6..614ee48b82b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10837,6 +10837,8 @@ in { python-language-server = callPackage ../development/python-modules/python-language-server {}; + python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server {}; + pyls-black = callPackage ../development/python-modules/pyls-black {}; pyls-isort = callPackage ../development/python-modules/pyls-isort {}; From 63668d33b208790ce91e0ec53e263dd18bb5aba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 12 Sep 2018 01:10:11 +0100 Subject: [PATCH 530/600] python-language-server: 0.19.0 -> 0.21.2 --- .../python-modules/python-language-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 800c9eba2abb..56c00fa11a9f 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 -, configparser, futures, future, jedi, pluggy +, configparser, futures, future, jedi, pluggy, python-jsonrpc-server , pytest, mock, pytestcov, coverage , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] @@ -20,13 +20,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.19.0"; + version = "0.21.2"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "0glnhnjmsnnh1vs73n9dglknfkhcgp03nkjbpz0phh1jlqrkrwm6"; + sha256 = "11fvrpv1kymj2fzh8fhys4qk1xc64j1rbdrz252awyab7b3509i7"; }; # The tests require all the providers, disable otherwise. @@ -43,7 +43,7 @@ buildPythonPackage rec { HOME=$TEMPDIR pytest ''; - propagatedBuildInputs = [ jedi pluggy future ] + propagatedBuildInputs = [ jedi pluggy future python-jsonrpc-server ] ++ stdenv.lib.optional (withProvider "autopep8") autopep8 ++ stdenv.lib.optional (withProvider "mccabe") mccabe ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle From f8a158c3466bb013e776e590871da9f1869667f7 Mon Sep 17 00:00:00 2001 From: Alex Biehl Date: Tue, 19 Jun 2018 13:18:41 +0200 Subject: [PATCH 531/600] Haskell builder: Use $abi/$libname as --libsubdir --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 1b33954662db..a0dd2a305f89 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -134,7 +134,7 @@ let buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags); defaultConfigureFlags = [ - "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" + "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$abi/\\$libname" (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}") (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") "--with-gcc=$CC" # Clang won't work without that extra information. From 88ce4f5e8a2706c28bde0794932cba17cb816286 Mon Sep 17 00:00:00 2001 From: Alexander Biehl Date: Mon, 27 Aug 2018 15:50:37 +0200 Subject: [PATCH 532/600] More conservative SCC tagging for Haskell libraries `all-functions` corresponds to `-fprof-auto` which places an SCC on every binding. It is well known that SCCs hinder GHC from doing its optimization magic and really slows down profiled code to a point where the profiling reports are completely skewed towards things that were completely optimized away in production settings. Concretely this shows up with things like lenses which do not carry runtime overhead when properly simplified. `exported-functions` corresponds to GHCs `-fprof-auto-exported` which doesn't put SCCs on `INLINE`d code and in turn doesn't influence simplification of this basic but important stuff. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a0dd2a305f89..cdbf119af8c4 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -26,7 +26,7 @@ in , editedCabalFile ? null , enableLibraryProfiling ? true , enableExecutableProfiling ? false -, profilingDetail ? "all-functions" +, profilingDetail ? "exported-functions" # TODO enable shared libs for cross-compiling , enableSharedExecutables ? false , enableSharedLibraries ? (ghc.enableShared or false) From 3c1af1254474e031e79b7c2a9ecd81cbaff231f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 29 Aug 2018 19:27:18 +0200 Subject: [PATCH 533/600] LTS Haskell 12.9 --- .../configuration-hackage2nix.yaml | 159 +++++++++--------- 1 file changed, 80 insertions(+), 79 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4a26fcbffc17..7b827664cdab 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: default-package-overrides: # Newer versions require contravariant-1.5.*, which many builds refuse at the moment. - base-compat-batteries ==0.10.1 - # LTS Haskell 12.7 + # LTS Haskell 12.9 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -63,7 +63,7 @@ default-package-overrides: - aeson-compat ==0.3.8 - aeson-diff ==1.1.0.5 - aeson-extra ==0.4.1.1 - - aeson-generic-compat ==0.0.1.2 + - aeson-generic-compat ==0.0.1.3 - aeson-iproute ==0.2 - aeson-picker ==0.1.0.4 - aeson-pretty ==0.8.7 @@ -81,7 +81,7 @@ default-package-overrides: - Allure ==0.8.3.0 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 - - alsa-pcm ==0.6.1 + - alsa-pcm ==0.6.1.1 - alsa-seq ==0.6.0.7 - alternative-vector ==0.0.0 - alternators ==1.0.0.0 @@ -183,7 +183,7 @@ default-package-overrides: - api-field-json-th ==0.1.0.2 - appar ==0.1.4 - apply-refact ==0.5.0.0 - - apportionment ==0.0.0.2 + - apportionment ==0.0.0.3 - approximate ==0.3.1 - app-settings ==0.2.0.11 - arithmoi ==0.7.0.0 @@ -241,7 +241,7 @@ default-package-overrides: - bcrypt ==0.0.11 - beam-core ==0.7.2.2 - beam-migrate ==0.3.2.1 - - bench ==1.0.11 + - bench ==1.0.12 - bencode ==0.6.0.0 - between ==0.11.0.0 - bhoogle ==0.1.3.5 @@ -306,7 +306,7 @@ default-package-overrides: - brick ==0.37.2 - brittany ==0.11.0.0 - broadcast-chan ==0.1.1 - - bsb-http-chunked ==0.0.0.2 + - bsb-http-chunked ==0.0.0.3 - bson ==0.3.2.6 - bson-lens ==0.1.1 - btrfs ==0.1.2.3 @@ -337,7 +337,7 @@ default-package-overrides: - cachix ==0.1.1 - cachix-api ==0.1.0.1 - cairo ==0.13.5.0 - - calendar-recycling ==0.0 + - calendar-recycling ==0.0.0.1 - call-stack ==0.1.0 - capataz ==0.2.0.0 - carray ==0.1.6.8 @@ -400,7 +400,7 @@ default-package-overrides: - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.0 - ClustalParser ==1.2.3 - - cmark-gfm ==0.1.4 + - cmark-gfm ==0.1.5 - cmdargs ==0.10.20 - code-builder ==0.1.3 - codec ==0.2.1 @@ -413,8 +413,8 @@ default-package-overrides: - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.4 - - combinatorial ==0.1 - - comfort-graph ==0.0.3 + - combinatorial ==0.1.0.1 + - comfort-graph ==0.0.3.1 - commutative ==0.0.1.4 - comonad ==5.0.4 - compactmap ==0.1.4.2.1 @@ -426,7 +426,7 @@ default-package-overrides: - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 - - composition-prelude ==1.5.0.8 + - composition-prelude ==1.5.3.1 - compressed ==3.11 - concise ==0.1.0.1 - concurrency ==1.6.0.0 @@ -470,7 +470,7 @@ default-package-overrides: - cpu ==0.1.2 - cpuinfo ==0.1.0.1 - cql ==4.0.1 - - cql-io ==1.0.1 + - cql-io ==1.0.1.1 - credential-store ==0.1.2 - criterion ==1.4.1.0 - criterion-measurement ==0.1.1.0 @@ -497,9 +497,9 @@ default-package-overrides: - crypto-random ==0.0.9 - crypto-random-api ==0.2.0 - crypt-sha512 ==0 - - csg ==0.1.0.4 + - csg ==0.1.0.5 - csp ==1.4.0 - - css-syntax ==0.0.7 + - css-syntax ==0.0.8 - css-text ==0.1.3.0 - csv ==0.1.2 - ctrie ==0.2 @@ -514,9 +514,9 @@ default-package-overrides: - cyclotomic ==0.5.1 - czipwith ==1.0.1.0 - darcs ==2.14.1 - - data-accessor ==0.2.2.7 + - data-accessor ==0.2.2.8 - data-accessor-mtl ==0.2.0.4 - - data-accessor-template ==0.2.1.15 + - data-accessor-template ==0.2.1.16 - data-accessor-transformers ==0.2.1.7 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 @@ -553,7 +553,7 @@ default-package-overrides: - dawg-ord ==0.5.1.0 - dbcleaner ==0.1.3 - dbus ==1.0.1 - - debian-build ==0.10.1.1 + - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 - Decimal ==0.5.1 @@ -569,9 +569,9 @@ default-package-overrides: - detour-via-sci ==1.0.0 - df1 ==0.1.1 - dhall ==1.15.1 - - dhall-bash ==1.0.14 - - dhall-json ==1.2.2 - - dhall-text ==1.0.11 + - dhall-bash ==1.0.15 + - dhall-json ==1.2.3 + - dhall-text ==1.0.12 - di ==1.0.1 - diagrams ==1.4 - diagrams-builder ==0.8.0.3 @@ -624,7 +624,7 @@ default-package-overrides: - DRBG ==0.5.5 - drifter ==0.2.3 - drifter-postgresql ==0.2.1 - - dsp ==0.2.4 + - dsp ==0.2.4.1 - dual-tree ==0.2.2 - dublincore-xml-conduit ==0.1.0.2 - dunai ==0.4.0.0 @@ -671,7 +671,7 @@ default-package-overrides: - errors-ext ==0.4.2 - error-util ==0.0.1.2 - ersatz ==0.4.4 - - etc ==0.4.0.3 + - etc ==0.4.1.0 - event ==0.1.4 - eventful-core ==0.2.0 - eventful-memory ==0.2.0 @@ -699,7 +699,7 @@ default-package-overrides: - extensible-exceptions ==0.1.1.4 - extra ==1.6.9 - extractable-singleton ==0.0.1 - - extrapolate ==0.3.1 + - extrapolate ==0.3.3 - facts ==0.0.1.0 - fail ==4.9.0.0 - farmhash ==0.1.0.5 @@ -726,8 +726,8 @@ default-package-overrides: - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 + - Fin ==0.2.5.0 - fin ==0.0.1 - - Fin ==0.2.3.0 - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - fingertree ==0.1.4.1 @@ -747,6 +747,7 @@ default-package-overrides: - fmlist ==0.9.2 - fn ==0.3.0.2 - focus ==0.1.5.2 + - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.7 - fold-debounce-conduit ==0.2.0.1 - foldl ==1.4.3 @@ -807,7 +808,7 @@ default-package-overrides: - genvalidity-path ==0.3.0.2 - genvalidity-property ==0.2.1.0 - genvalidity-scientific ==0.2.0.1 - - genvalidity-text ==0.5.0.2 + - genvalidity-text ==0.5.1.0 - genvalidity-time ==0.2.1.0 - genvalidity-unordered-containers ==0.2.0.3 - genvalidity-uuid ==0.1.0.2 @@ -860,7 +861,7 @@ default-package-overrides: - gloss-rendering ==1.12.0.0 - GLURaw ==2.0.0.4 - GLUT ==2.7.0.14 - - gnuplot ==0.5.5.2 + - gnuplot ==0.5.5.3 - goggles ==0.3.2 - google-oauth2-jwt ==0.3.0 - gpolyline ==0.1.0.1 @@ -890,7 +891,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.9 + - hapistrano ==0.3.5.10 - happstack-server ==7.5.1.1 - happy ==1.19.9 - hasbolt ==0.1.3.0 @@ -944,7 +945,7 @@ default-package-overrides: - hebrew-time ==0.1.1 - hedgehog ==0.6 - hedgehog-corpus ==0.1.0 - - hedis ==0.10.3 + - hedis ==0.10.4 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.2 @@ -981,7 +982,7 @@ default-package-overrides: - hopfli ==0.2.2.1 - hostname ==1.0 - hostname-validate ==1.0.0 - - hourglass ==0.2.11 + - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.8.0.2 - hpack ==0.28.2 @@ -1001,7 +1002,7 @@ default-package-overrides: - HSet ==0.0.1 - hset ==2.2.0 - hsexif ==0.6.1.5 - - hs-functors ==0.1.2.0 + - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==1.6 @@ -1079,7 +1080,7 @@ default-package-overrides: - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.6.2.9 + - hw-prim ==0.6.2.14 - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.3.2.1 - hw-string-parse ==0.0.0.4 @@ -1131,7 +1132,7 @@ default-package-overrides: - intern ==0.9.2 - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.0 - - interpolation ==0.1.0.2 + - interpolation ==0.1.0.3 - IntervalMap ==0.6.0.0 - intervals ==0.8.1 - intro ==0.3.2.0 @@ -1163,7 +1164,7 @@ default-package-overrides: - iterable ==3.0 - ixset-typed ==0.4 - ix-shapable ==0.1.0 - - jack ==0.7.1.3 + - jack ==0.7.1.4 - jmacro ==0.6.15 - jmacro-rpc ==0.3.3 - jmacro-rpc-snap ==0.3 @@ -1175,7 +1176,7 @@ default-package-overrides: - json ==0.9.2 - json-feed ==1.0.3 - json-rpc-client ==0.2.5.0 - - json-rpc-generic ==0.2.1.4 + - json-rpc-generic ==0.2.1.5 - json-rpc-server ==0.2.6.0 - json-schema ==0.7.4.2 - JuicyPixels ==3.2.9.5 @@ -1210,18 +1211,18 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - language-puppet ==1.3.20 + - language-puppet ==1.3.20.1 - lapack-carray ==0.0.2 - lapack-ffi ==0.0.2 - - lapack-ffi-tools ==0.1.0.1 + - lapack-ffi-tools ==0.1.1 - large-hashable ==0.1.0.4 - largeword ==1.2.5 - - latex ==0.1.0.3 + - latex ==0.1.0.4 - lattices ==1.7.1.1 - lawful ==0.1.0.0 - lazyio ==0.1.0.4 - lca ==0.3.1 - - leancheck ==0.7.1 + - leancheck ==0.7.3 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.2 - lens ==4.16.1 @@ -1325,10 +1326,10 @@ default-package-overrides: - microlens ==0.4.9.1 - microlens-aeson ==2.3.0 - microlens-contra ==0.1.0.1 - - microlens-ghc ==0.4.9 + - microlens-ghc ==0.4.9.1 - microlens-mtl ==0.1.11.1 - microlens-platform ==0.3.10 - - microlens-th ==0.4.2.1 + - microlens-th ==0.4.2.2 - microspec ==0.1.0.0 - microstache ==1.0.1.1 - midi ==0.2.2.2 @@ -1463,7 +1464,7 @@ default-package-overrides: - nsis ==0.3.2 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - - numeric-prelude ==0.4.3 + - numeric-prelude ==0.4.3.1 - numhask ==0.2.3.1 - numhask-prelude ==0.1.0.1 - numhask-range ==0.2.3.1 @@ -1491,7 +1492,7 @@ default-package-overrides: - oo-prototypes ==0.1.0.0 - OpenAL ==1.7.0.4 - open-browser ==0.2.1.0 - - openexr-write ==0.1.0.1 + - openexr-write ==0.1.0.2 - OpenGL ==3.0.2.2 - OpenGLRaw ==3.3.1.0 - openpgp-asciiarmor ==0.1.1 @@ -1552,10 +1553,10 @@ default-package-overrides: - persistent ==2.8.2 - persistent-iproute ==0.2.3 - persistent-mysql ==2.8.1 - - persistent-mysql-haskell ==0.4.1 + - persistent-mysql-haskell ==0.4.2 - persistent-postgresql ==2.8.2.0 - persistent-refs ==0.4 - - persistent-sqlite ==2.8.1.2 + - persistent-sqlite ==2.8.2 - persistent-template ==2.5.4 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 @@ -1594,7 +1595,7 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 - - pooled-io ==0.0.2.1 + - pooled-io ==0.0.2.2 - portable-lines ==0.1 - postgresql-binary ==0.12.1.1 - postgresql-libpq ==0.9.4.1 @@ -1628,9 +1629,9 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.6.3.0 - prim-uniq ==0.1.0.1 - - probability ==0.2.5.1 + - probability ==0.2.5.2 - process-extras ==0.7.4 - - product-isomorphic ==0.0.3.2 + - product-isomorphic ==0.0.3.3 - product-profunctors ==0.10.0.0 - profiterole ==0.1 - profunctors ==5.2.2 @@ -1643,14 +1644,14 @@ default-package-overrides: - protobuf-simple ==0.1.0.5 - protocol-buffers ==2.4.11 - protocol-buffers-descriptor ==2.4.11 - - protocol-radius ==0.0.1.0 + - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.0.1.0 - proto-lens ==0.3.1.0 - - proto-lens-arbitrary ==0.1.2.1 - - proto-lens-combinators ==0.1.0.10 - - proto-lens-optparse ==0.1.1.1 + - proto-lens-arbitrary ==0.1.2.2 + - proto-lens-combinators ==0.1.0.11 + - proto-lens-optparse ==0.1.1.2 - proto-lens-protobuf-types ==0.3.0.1 - - proto-lens-protoc ==0.3.1.0 + - proto-lens-protoc ==0.3.1.2 - protolude ==0.2.2 - proxied ==0.3 - psql-helpers ==0.1.0.0 @@ -1743,7 +1744,7 @@ default-package-overrides: - rest-stringmap ==0.2.0.7 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.6.3 + - retry ==0.7.7.0 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - rhine ==0.4.0.1 @@ -1776,8 +1777,8 @@ default-package-overrides: - sandman ==0.2.0.1 - say ==0.1.0.1 - sbp ==2.3.17 - - scalendar ==1.2.0 - SCalendar ==1.1.0 + - scalendar ==1.2.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1826,7 +1827,7 @@ default-package-overrides: - servant-lucid ==0.8.1 - servant-mock ==0.8.4 - servant-pandoc ==0.5.0.0 - - servant-ruby ==0.8.0.1 + - servant-ruby ==0.8.0.2 - servant-server ==0.14.1 - servant-static-th ==0.2.2.0 - servant-streaming ==0.3.0.0 @@ -1845,7 +1846,7 @@ default-package-overrides: - ses-html ==0.4.0.0 - set-cover ==0.0.9 - setenv ==0.1.1.3 - - setlocale ==1.0.0.6 + - setlocale ==1.0.0.8 - sexp-grammar ==2.0.1 - SHA ==1.6.4.4 - shake ==0.16.4 @@ -1873,8 +1874,8 @@ default-package-overrides: - siphash ==1.0.3 - size-based ==0.1.1.0 - skein ==1.0.9.4 - - skylighting ==0.7.2 - - skylighting-core ==0.7.2 + - skylighting ==0.7.3 + - skylighting-core ==0.7.3 - slack-web ==0.2.0.6 - slave-thread ==1.0.2 - smallcheck ==1.1.5 @@ -1898,7 +1899,7 @@ default-package-overrides: - sparkle ==0.7.4 - sparse-linear-algebra ==0.3.1 - special-values ==0.1.0.0 - - speculate ==0.3.2 + - speculate ==0.3.5 - speculation ==1.5.0.3 - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 @@ -1994,7 +1995,7 @@ default-package-overrides: - tao ==1.0.0 - tao-example ==1.0.0 - tar ==0.5.1.0 - - tar-conduit ==0.2.3.1 + - tar-conduit ==0.2.5 - tardis ==0.4.1.0 - tasty ==1.1.0.3 - tasty-ant-xml ==1.1.4 @@ -2033,11 +2034,11 @@ default-package-overrides: - texmath ==0.11.0.1 - text ==1.2.3.0 - text-binary ==0.2.1.1 - - text-builder ==0.5.3.1 + - text-builder ==0.5.4.3 - text-conversions ==0.3.0 - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - - text-ldap ==0.1.1.12 + - text-ldap ==0.1.1.13 - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 @@ -2050,12 +2051,12 @@ default-package-overrides: - tfp ==1.0.0.2 - tf-random ==0.5 - th-abstraction ==0.2.8.0 - - th-data-compat ==0.0.2.6 + - th-data-compat ==0.0.2.7 - th-desugar ==1.8 - these ==0.7.4 - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - - th-lift ==0.7.10 + - th-lift ==0.7.11 - th-lift-instances ==0.1.11 - th-nowq ==0.1.0.2 - th-orphans ==0.13.6 @@ -2065,7 +2066,7 @@ default-package-overrides: - threads ==0.5.1.6 - threads-extras ==0.1.0.2 - threepenny-gui ==0.8.2.4 - - th-reify-compat ==0.0.1.4 + - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.8 - throttle-io-stream ==0.2.0.1 - through-text ==0.1.0.0 @@ -2078,7 +2079,7 @@ default-package-overrides: - timeit ==2.0 - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - - time-locale-compat ==0.1.1.4 + - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-parsers ==0.1.2.0 - timerep ==2.0.0.2 @@ -2155,10 +2156,10 @@ default-package-overrides: - universe-reverse-instances ==1.0 - universum ==1.2.0 - unix-bytestring ==0.3.7.3 - - unix-compat ==0.5.0.1 + - unix-compat ==0.5.1 - unix-time ==0.3.8 - - unliftio ==0.2.7.0 - - unliftio-core ==0.1.1.0 + - unliftio ==0.2.7.1 + - unliftio-core ==0.1.2.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.9.0 - unordered-intmap ==0.1.1 @@ -2172,7 +2173,7 @@ default-package-overrides: - users-test ==0.5.0.1 - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - - util ==0.1.10.1 + - util ==0.1.11.0 - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 @@ -2181,18 +2182,18 @@ default-package-overrides: - validity-aeson ==0.2.0.2 - validity-bytestring ==0.3.0.2 - validity-containers ==0.3.1.0 - - validity-path ==0.3.0.1 - - validity-scientific ==0.2.0.1 - - validity-text ==0.3.0.1 - - validity-time ==0.2.0.1 - - validity-unordered-containers ==0.2.0.1 - - validity-uuid ==0.1.0.1 - - validity-vector ==0.2.0.1 + - validity-path ==0.3.0.2 + - validity-scientific ==0.2.0.2 + - validity-text ==0.3.1.0 + - validity-time ==0.2.0.2 + - validity-unordered-containers ==0.2.0.2 + - validity-uuid ==0.1.0.2 + - validity-vector ==0.2.0.2 - valor ==0.1.0.0 - vault ==0.3.1.2 - vec ==0.1 - vector ==0.12.0.1 - - vector-algorithms ==0.7.0.1 + - vector-algorithms ==0.7.0.4 - vector-binary-instances ==0.2.4 - vector-buffer ==0.4.1 - vector-builder ==0.3.6 @@ -2220,7 +2221,7 @@ default-package-overrides: - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.24.1 + - wai-extra ==3.0.24.2 - wai-handler-launch ==3.0.2.4 - wai-logger ==2.3.2 - wai-middleware-caching ==0.1.0.2 From 1b1cb6305c9bc5c1e1eb2cc0b275b79048dbd7b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2018 02:31:07 +0200 Subject: [PATCH 534/600] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.11-9-gb3613cb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/3869e8d54128882292705ca508ade7d32a5f7176. --- .../haskell-modules/hackage-packages.nix | 3887 ++++++++++------- 1 file changed, 2404 insertions(+), 1483 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c1fb70ee2e6e..dc2e2abed6ab 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2440,18 +2440,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_2_2_0_1" = callPackage + "Cabal_2_4_0_0" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, binary , bytestring, containers, deepseq, Diff, directory, filepath , integer-logarithms, mtl, optparse-applicative, parsec, pretty , process, QuickCheck, tagged, tar, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, text, time, transformers - , tree-diff, unix + , tasty-hunit, tasty-quickcheck, temporary, text, time + , transformers, tree-diff, unix }: mkDerivation { pname = "Cabal"; - version = "2.2.0.1"; - sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82"; + version = "2.4.0.0"; + sha256 = "1zz0vadgr8vn2x7fzv4hcip1mcvxah50sx6zzrxhn9c1lw0l0cgl"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -2461,7 +2461,7 @@ self: { array base base-compat base-orphans bytestring containers deepseq Diff directory filepath integer-logarithms optparse-applicative pretty process QuickCheck tagged tar tasty tasty-golden tasty-hunit - tasty-quickcheck text tree-diff + tasty-quickcheck temporary text tree-diff ]; doCheck = false; description = "A framework for packaging Haskell software"; @@ -5391,17 +5391,6 @@ self: { }) {}; "Fin" = callPackage - ({ mkDerivation, base, natural-induction, peano }: - mkDerivation { - pname = "Fin"; - version = "0.2.3.0"; - sha256 = "1cjsp6i1ak2icjmg0xrprn2xminz35mxb4dj1nsvjvs2qqgjvl1g"; - libraryHaskellDepends = [ base natural-induction peano ]; - description = "Finite totally-ordered sets"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Fin_0_2_5_0" = callPackage ({ mkDerivation, alg, base, foldable1, natural-induction, peano }: mkDerivation { pname = "Fin"; @@ -5412,7 +5401,6 @@ self: { ]; description = "Finite totally-ordered sets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Finance-Quote-Yahoo" = callPackage @@ -5768,27 +5756,30 @@ self: { }) {}; "Frames" = callPackage - ({ mkDerivation, base, contravariant, criterion, deepseq, directory - , discrimination, ghc-prim, hashable, hspec, htoml, HUnit, pipes - , pipes-bytestring, pipes-group, pipes-parse, pipes-safe - , pipes-text, pretty, primitive, readable, regex-applicative - , template-haskell, temporary, text, transformers - , unordered-containers, vector, vinyl + ({ mkDerivation, attoparsec, base, bytestring, containers + , contravariant, criterion, deepseq, directory, discrimination + , foldl, ghc-prim, hashable, hspec, htoml, HUnit, lens, pipes + , pipes-bytestring, pipes-group, pipes-parse, pipes-safe, pretty + , primitive, readable, regex-applicative, template-haskell + , temporary, text, transformers, unordered-containers, vector + , vector-th-unbox, vinyl }: mkDerivation { pname = "Frames"; - version = "0.4.0"; - sha256 = "06yh8vl3s5543nxhndjd2wsbclka4in4nsbjqzbpcg9g8s8x3z20"; + version = "0.5.0"; + sha256 = "0dd2gqgxjhy23a9xhz62gzashjqmcv34gkcys4wz9l6y2fk1a5xl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base contravariant deepseq discrimination ghc-prim hashable pipes - pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text - primitive readable template-haskell text transformers vector vinyl + base bytestring containers contravariant deepseq discrimination + ghc-prim hashable pipes pipes-bytestring pipes-group pipes-parse + pipes-safe primitive readable template-haskell text transformers + vector vector-th-unbox vinyl ]; testHaskellDepends = [ - base directory hspec htoml HUnit pipes pretty regex-applicative - template-haskell temporary text unordered-containers vinyl + attoparsec base directory foldl hspec htoml HUnit lens pipes pretty + regex-applicative template-haskell temporary text + unordered-containers vinyl ]; benchmarkHaskellDepends = [ base criterion pipes transformers ]; description = "Data frames For working with tabular data files"; @@ -5804,8 +5795,8 @@ self: { }: mkDerivation { pname = "Frames-beam"; - version = "0.1.0.1"; - sha256 = "12n3pyr88ihgkfwynhvjx3m9fr1fbznpkgx9ihf7mqar9d8wnywj"; + version = "0.2.0.0"; + sha256 = "1fzd41zwx5zmbysk49z2r9ga11z8c0vqqfvb4zgbcm3ivhkn48yi"; libraryHaskellDepends = [ base beam-core beam-migrate beam-postgres bytestring conduit Frames generics-sop monad-control postgresql-simple process scientific @@ -9852,6 +9843,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_4_15" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.4.15"; + sha256 = "0idmak6d8mpbxphyq9hkxkmby2wnzhc1phywlgm0zw6q47pwxgff"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -10175,8 +10181,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.3.0"; - sha256 = "0dz0ar75nd04l1cbca7iz9laqv24mach7ajr4k5ibl2717kczkpa"; + version = "0.3.1"; + sha256 = "06240z3nbjkf0rgwhvajjw28lckgpsfz5nbzzdqyfzgyg2r4wdcn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12838,8 +12844,10 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "NameGenerator"; - version = "0.0.1"; - sha256 = "1zzc944xdfxlqld6fnn6fiqrd9rs2cdzqv5jc8jx7azbvspq6y9f"; + version = "0.0.2"; + sha256 = "1rnn3i9rvb9z7iqd0hx730gv3n5hc1gbsdqsa0hlq3qxffg3sr8x"; + revision = "1"; + editedCabalFile = "01ma6068mnwn9f7jpa5g8kkl7lyhl5wnpw9ad44zz9gki1mrw37i"; libraryHaskellDepends = [ base containers random ]; description = "A name generator written in Haskell"; license = stdenv.lib.licenses.gpl3; @@ -14549,12 +14557,12 @@ self: { }) {}; "Prelude" = callPackage - ({ mkDerivation, base-noprelude }: + ({ mkDerivation, base }: mkDerivation { pname = "Prelude"; - version = "0.1.0.0"; - sha256 = "0wcacpbqphb635pblqzbv44fhjwdnv0l90zr5i6c8x7mymqpcixj"; - libraryHaskellDepends = [ base-noprelude ]; + version = "0.1.0.1"; + sha256 = "14p4jkhzdh618r7gvj6dd4w1zj4b032g4nx43bihnnaf2dqyppy6"; + libraryHaskellDepends = [ base ]; description = "A Prelude module replacement"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -14936,6 +14944,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_12_1" = callPackage + ({ mkDerivation, base, containers, deepseq, erf, process, random + , template-haskell, tf-random, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.12.1"; + sha256 = "1xq2cmz1yr63a2f6yz5v6majd0wqagx13xrk4b3xa7y9nbpxixag"; + libraryHaskellDepends = [ + base containers deepseq erf random template-haskell tf-random + transformers + ]; + testHaskellDepends = [ base deepseq process ]; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -14980,6 +15006,8 @@ self: { pname = "QuickPlot"; version = "0.1.0.1"; sha256 = "1d9zllxl8vyjmb9m9kdgrv9v9hwnspyiqhjnb5ds5kmby6r4r1h2"; + revision = "1"; + editedCabalFile = "0ykvkbrf5mavrk9jdl5w01dldwi3x2dwg89hiin95vi8ay0r02gq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -15711,8 +15739,8 @@ self: { ({ mkDerivation, base, Cabal, SDL, SDL_gfx }: mkDerivation { pname = "SDL-gfx"; - version = "0.6.2.0"; - sha256 = "1y49wzy71ns7gwczmwvrx8d026y5nabqzvh8ymxxcy3brhay0shr"; + version = "0.7.0.0"; + sha256 = "1pmhbgdp4f9nz9mpxckx0mrhphccqsfcwfpflxmph5gx4mxk4xb2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; @@ -18072,10 +18100,10 @@ self: { ({ mkDerivation, base, base-orphans }: mkDerivation { pname = "TypeCompose"; - version = "0.9.12"; - sha256 = "1qikwd8cq7pywz5j86hwc21ak15a3w5jrhyzmsrr30izr4n2q61s"; - revision = "1"; - editedCabalFile = "0j27xdfim7a6a16v834n3jdp1j7bsr3yn19bnfwni3xsvrc732q3"; + version = "0.9.13"; + sha256 = "0cmlldr665mzi0jsb567pn6qbqxr6cyq9ky3mfh1sfls5yhwr5hc"; + revision = "2"; + editedCabalFile = "026h1zgp7fj8ccq8rpzcq0s4wdbw2v7fskcj73n40mfhv0gx26y0"; libraryHaskellDepends = [ base base-orphans ]; description = "Type composition classes & instances"; license = stdenv.lib.licenses.bsd3; @@ -21738,17 +21766,6 @@ self: { }) {}; "aeson-generic-compat" = callPackage - ({ mkDerivation, aeson, base }: - mkDerivation { - pname = "aeson-generic-compat"; - version = "0.0.1.2"; - sha256 = "08h4r8ni7i9x0fqx5gizv6fpwrq84lv8m4c3w6g2hirs0iscw233"; - libraryHaskellDepends = [ aeson base ]; - description = "Compatible generic class names of Aeson"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-generic-compat_0_0_1_3" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { pname = "aeson-generic-compat"; @@ -21757,7 +21774,6 @@ self: { libraryHaskellDepends = [ aeson base ]; description = "Compatible generic class names of Aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-injector" = callPackage @@ -21768,8 +21784,8 @@ self: { }: mkDerivation { pname = "aeson-injector"; - version = "1.1.0.0"; - sha256 = "1dkl7sgzi9hzc86a27wfch7p33sj1h8zh7xsah3fbqjbz4y8z9wf"; + version = "1.1.1.0"; + sha256 = "04hg0vdrfb7x6qxwcifsayc6z5vhc1l96ahvswg8q5wddc00ypzp"; libraryHaskellDepends = [ aeson base bifunctors deepseq hashable lens servant-docs swagger2 text unordered-containers @@ -23385,8 +23401,8 @@ self: { }: mkDerivation { pname = "alsa-pcm"; - version = "0.6.1"; - sha256 = "0pafjds9xrhzwv3xz9qcknm9f2plz3bvqqjlznss1alhgf7pcga5"; + version = "0.6.1.1"; + sha256 = "1mllr9nbm3qb837zgvd6mrpr6f8i272wflv0a45rrpsq50zgcj33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26708,6 +26724,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-terminal_0_8_1" = callPackage + ({ mkDerivation, base, colour }: + mkDerivation { + pname = "ansi-terminal"; + version = "0.8.1"; + sha256 = "1fm489l5mnlyb6bidq7vxz5asvhshmxz38f0lijgj0z7yyzqpwwy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base colour ]; + description = "Simple ANSI terminal support, with Windows compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, hspec, linebreak, split, terminal-size, timers-tick @@ -27168,15 +27198,15 @@ self: { }) {}; "apecs" = callPackage - ({ mkDerivation, async, base, containers, criterion, linear, mtl - , QuickCheck, template-haskell, vector + ({ mkDerivation, base, containers, criterion, linear, mtl + , QuickCheck, stm, template-haskell, vector }: mkDerivation { pname = "apecs"; - version = "0.4.1.1"; - sha256 = "0ybw09hpjfjm22bza74n57aarv6nhwf5zi27q7q7a6yf5jpa5ccg"; + version = "0.5.0.0"; + sha256 = "11ya44z5lk2vk0pwz1m8ygr0x6gkf7xhwiy0k28s5kd65vlpx6bw"; libraryHaskellDepends = [ - async base containers mtl template-haskell vector + base containers mtl stm template-haskell vector ]; testHaskellDepends = [ base containers criterion linear QuickCheck vector @@ -27729,13 +27759,13 @@ self: { }) {}; "appendmap" = callPackage - ({ mkDerivation, base, containers, hspec }: + ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { pname = "appendmap"; - version = "0.1.3"; - sha256 = "1jssrwbsk0z9y4ialw9ly7vc95jrc64dr1idycwz1spgvn03adp6"; + version = "0.1.5"; + sha256 = "03mr60hgb5593s9vhc5890xwd2pdyismfkvnvw5hxhq26wda5grd"; libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers hspec ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; description = "Map with a Semigroup and Monoid instances delegating to Semigroup of the elements"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -27895,8 +27925,8 @@ self: { ({ mkDerivation, base, containers, utility-ht }: mkDerivation { pname = "apportionment"; - version = "0.0.0.2"; - sha256 = "0azqr4c1zz19rba2gg2w31w38jslvjxgi1qh58qx60fvzxj9ab9m"; + version = "0.0.0.3"; + sha256 = "062v4a1ip7zy20b03z1jajqy2ylx5fl74p7px54b1vajf6vx0wcg"; libraryHaskellDepends = [ base containers utility-ht ]; description = "Round a set of numbers while maintaining its sum"; license = stdenv.lib.licenses.bsd3; @@ -28762,16 +28792,17 @@ self: { "ascii" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , hashable, text + , hashable, semigroups, text }: mkDerivation { pname = "ascii"; - version = "0.0.4.1"; - sha256 = "1xpw2n3gskndg74ilrq8zngawlvc3mbsji3nx2aprar96hdlpvpv"; + version = "0.0.5.1"; + sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn"; libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive hashable text + base blaze-builder bytestring case-insensitive hashable semigroups + text ]; - description = "Type-safe, bytestring-based ASCII values. (deprecated)"; + description = "Type-safe, bytestring-based ASCII values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28845,8 +28876,8 @@ self: { }: mkDerivation { pname = "ascii-string"; - version = "1.0.1"; - sha256 = "0br053njgnfqwgmk7zz0fayiyycqq3sw8kxjpb2s9wx17arnq5kz"; + version = "1.0.1.3"; + sha256 = "1m11ms0x5di5qbckh2n7vnqqh94wv9p6zzynglg4ngijqhn4qjls"; libraryHaskellDepends = [ base bytestring cereal deepseq deferred-folds foldl hashable primitive primitive-extras @@ -29367,6 +29398,8 @@ self: { pname = "async"; version = "2.2.1"; sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg"; + revision = "1"; + editedCabalFile = "0lg8c3iixm7vjjq2nydkqswj78i4iyx2k83hgs12z829yj196y31"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -29935,19 +29968,20 @@ self: { "ats-format" = callPackage ({ mkDerivation, ansi-wl-pprint, base, Cabal, cli-setup, directory - , file-embed, htoml-megaparsec, language-ats, optparse-applicative - , process, text, unordered-containers + , file-embed, filepath, htoml-megaparsec, language-ats, megaparsec + , optparse-applicative, process, text, unordered-containers }: mkDerivation { pname = "ats-format"; - version = "0.2.0.28"; - sha256 = "0s538j8v0n8sdfi9pbykk2avbi3vg35iw2c9h6vmiyy3zszflqc4"; + version = "0.2.0.29"; + sha256 = "02zk3qbg2h14wc5x7sizllgj39zprgx63j8rbf2lk9nd3yiqc4va"; isLibrary = false; isExecutable = true; - setupHaskellDepends = [ base Cabal cli-setup ]; + setupHaskellDepends = [ base Cabal cli-setup filepath ]; executableHaskellDepends = [ ansi-wl-pprint base directory file-embed htoml-megaparsec - language-ats optparse-applicative process text unordered-containers + language-ats megaparsec optparse-applicative process text + unordered-containers ]; description = "A source-code formatter for ATS"; license = stdenv.lib.licenses.bsd3; @@ -30540,15 +30574,15 @@ self: { }) {}; "aur" = callPackage - ({ mkDerivation, aeson, base, http-client, http-client-tls, servant - , servant-client, tasty, tasty-hunit, text + ({ mkDerivation, aeson, base, errors, http-client, http-client-tls + , servant, servant-client, tasty, tasty-hunit, text }: mkDerivation { pname = "aur"; - version = "6.0.0.1"; - sha256 = "1ip97gnny26h5ayq7x0yx4afls3nhd1kfhqz3l3bsjq7fvkn8jx0"; + version = "6.1.0"; + sha256 = "1wgff9vbp8sxqa0hyd6ifkld6yly20qijm15dfk72wpcsia86jx6"; libraryHaskellDepends = [ - aeson base http-client servant servant-client text + aeson base errors http-client servant servant-client text ]; testHaskellDepends = [ base http-client http-client-tls tasty tasty-hunit @@ -30575,6 +30609,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aura" = callPackage + ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, array + , async, aur, base, base-prelude, bytestring, compactable + , containers, directory, errors, filepath, freer-simple + , generic-lens, http-client, http-client-tls, http-types + , language-bash, megaparsec, microlens, microlens-ghc, mtl + , mwc-random, network-uri, non-empty-containers + , optparse-applicative, paths, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, semigroupoids, stm, tasty + , tasty-hunit, text, throttled, time, transformers, typed-process + , versions, witherable + }: + mkDerivation { + pname = "aura"; + version = "2.0.0"; + sha256 = "1k53r44kxy7p23nsjbx12mvn7nkl8j3h9fzy4v3dxyqkd4jz0996"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty algebraic-graphs array async aur base + base-prelude bytestring compactable containers directory errors + filepath freer-simple generic-lens http-client http-types + language-bash megaparsec microlens microlens-ghc mtl mwc-random + network-uri non-empty-containers paths pretty-simple prettyprinter + prettyprinter-ansi-terminal semigroupoids stm text throttled time + transformers typed-process versions witherable + ]; + executableHaskellDepends = [ + base base-prelude bytestring containers errors freer-simple + http-client http-client-tls language-bash microlens + non-empty-containers optparse-applicative paths pretty-simple + prettyprinter prettyprinter-ansi-terminal text transformers + typed-process versions + ]; + testHaskellDepends = [ + base base-prelude bytestring containers errors freer-simple + http-client language-bash megaparsec microlens non-empty-containers + paths pretty-simple prettyprinter prettyprinter-ansi-terminal tasty + tasty-hunit text transformers typed-process versions + ]; + description = "A secure package manager for Arch Linux and the AUR, written in Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "authenticate" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, containers, http-conduit, http-types @@ -30710,6 +30788,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "autoexporter_1_1_11" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "autoexporter"; + version = "1.1.11"; + sha256 = "17d1a2fns4b3gw8cggg9yq1fxvkyr859s3y22i9lviz6x7hd8dvn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ base Cabal directory filepath ]; + description = "Automatically re-export modules"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "autom" = callPackage ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss , JuicyPixels, random, vector @@ -31037,6 +31130,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avro_0_3_5_1" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, binary + , bytestring, containers, data-binary-ieee754, directory, entropy + , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib + , QuickCheck, scientific, semigroups, tagged, template-haskell + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "avro"; + version = "0.3.5.1"; + sha256 = "147w9a30z2vxjf8lsmf4vy0p9dvc8c3lla45b42sinr9916m61f8"; + libraryHaskellDepends = [ + aeson array base base16-bytestring binary bytestring containers + data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific + semigroups tagged template-haskell text unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base base16-bytestring binary bytestring containers + directory entropy extra fail hashable hspec lens lens-aeson mtl + pure-zlib QuickCheck scientific semigroups tagged template-haskell + text transformers unordered-containers vector + ]; + description = "Avro serialization support for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avwx" = callPackage ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative , parsers, pretty-show, text @@ -32370,8 +32490,8 @@ self: { }: mkDerivation { pname = "barbies"; - version = "0.1.3.1"; - sha256 = "0jddnjygqmcczhg2s1ifqgmbd1liqrkhnza4bmcplwmqkg4bkbr5"; + version = "0.1.4.0"; + sha256 = "03ndlns5kmk3v0n153m7r5v91f8pwzi8fazhanjv1paxadwscada"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "Classes for working with types that can change clothes"; @@ -33145,8 +33265,8 @@ self: { }: mkDerivation { pname = "battleship-combinatorics"; - version = "0.0.0.1"; - sha256 = "00zr3798y5h640rdhls4xkaqmj6n90qnxglq7bq8bvxl68a8ibxd"; + version = "0.0.0.2"; + sha256 = "1vja3z9xna06cyb3xlx2p7z4drbglbyahr8fs3337phynv2h0v0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33653,23 +33773,6 @@ self: { }) {}; "bench" = callPackage - ({ mkDerivation, base, criterion, optparse-applicative, process - , silently, text, turtle - }: - mkDerivation { - pname = "bench"; - version = "1.0.11"; - sha256 = "15rv999kajlmhvd1cajcn8vir3r950c1v2njyywpqaz6anm6ykm8"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base criterion optparse-applicative process silently text turtle - ]; - description = "Command-line benchmark tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bench_1_0_12" = callPackage ({ mkDerivation, base, criterion, optparse-applicative, process , silently, text, turtle }: @@ -33684,7 +33787,6 @@ self: { ]; description = "Command-line benchmark tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bench-graph" = callPackage @@ -33897,22 +33999,24 @@ self: { }) {}; "betris" = callPackage - ({ mkDerivation, base, containers, lens, linear, random, stm - , stm-chans, vty + ({ mkDerivation, base, containers, lens, linear + , optparse-applicative, random, stm, time-units, vty }: mkDerivation { pname = "betris"; - version = "0.1.0.0"; - sha256 = "1qn326s4xydvvgmrhqi48cc2pl9b3mp7swc82qk59gj7cx4dx222"; + version = "0.1.1.1"; + sha256 = "0ggmy2rwwsgq54j29b2a5dkafalww0nrzz89j08wf3gsg90g9p9i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers lens linear random stm stm-chans vty + base containers lens linear optparse-applicative random stm + time-units vty ]; executableHaskellDepends = [ - base containers lens linear random stm stm-chans vty + base containers lens linear optparse-applicative random stm + time-units vty ]; - description = "Braille friendly vertical version of tetris"; + description = "A horizontal version of tetris for braille users"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -35403,8 +35507,8 @@ self: { ({ mkDerivation, base, monetdb-mapi }: mkDerivation { pname = "bindings-monetdb-mapi"; - version = "0.1.0.0"; - sha256 = "12i1sn508m0vcm6d34l32h8x77ik63l64ix4vmn6c91jbhgakvv3"; + version = "0.1.0.1"; + sha256 = "0ghl73n679y5srg4b2jwy6xgnd4lbv7wad8k133k6c7k70zq89hl"; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ monetdb-mapi ]; description = "Low-level bindings for the MonetDB API (mapi)"; @@ -35700,8 +35804,8 @@ self: { }: mkDerivation { pname = "bins"; - version = "0.1.1.0"; - sha256 = "067df9dpb7kvn7v9y2mw0y3zb4jmxas27yd3ybrb9h94f9j8p9jk"; + version = "0.1.1.1"; + sha256 = "1v585ppm5g424jn2bkq7ydsdd6bds7gak53288vn4vclnw2rswr8"; libraryHaskellDepends = [ base containers finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise math-functions profunctors reflection @@ -35819,8 +35923,8 @@ self: { }: mkDerivation { pname = "biohazard"; - version = "1.0.3"; - sha256 = "19pk2c52w300jxcnrxlnvc6m8qr4jj19vwppdz37c9nppm6q2252"; + version = "1.0.4"; + sha256 = "1gj5xr0b9s2zifknm10bynkh0gvsi0gmw2sa3zcp1if17ixndv2c"; libraryHaskellDepends = [ async attoparsec base base-prelude bytestring containers exceptions hashable primitive stm text transformers unix unordered-containers @@ -37719,23 +37823,26 @@ self: { "board-games" = callPackage ({ mkDerivation, array, base, cgi, containers, html, httpd-shed - , network-uri, QuickCheck, random, transformers, utility-ht + , network-uri, non-empty, QuickCheck, random, transformers + , utility-ht }: mkDerivation { pname = "board-games"; - version = "0.1.0.6"; - sha256 = "0qry0kacwaiwdcc2wxz08qimvzj9y0vmyc0cc5yq1lyx1sx6wghp"; + version = "0.2"; + sha256 = "1plgnwlpx0bw0wjwd0dxbh616vy37frclwir692x1fr2lq85y98c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base cgi containers html random transformers utility-ht + array base cgi containers html non-empty random transformers + utility-ht ]; executableHaskellDepends = [ - array base cgi containers html httpd-shed network-uri random - transformers utility-ht + array base cgi containers html httpd-shed network-uri non-empty + random transformers utility-ht ]; testHaskellDepends = [ - array base containers QuickCheck random transformers utility-ht + array base containers non-empty QuickCheck random transformers + utility-ht ]; description = "Three games for inclusion in a web server"; license = "GPL"; @@ -38071,8 +38178,8 @@ self: { }: mkDerivation { pname = "boolector"; - version = "0.0.0.4"; - sha256 = "0f5yfkkgarwkbdkxkjj8fsd7fgq683qjxyv88wqk724dx6wv3yn7"; + version = "0.0.0.5"; + sha256 = "0wgz2x8jwv5zwh9g7jpvl1q6inyvhjlh4jf3983r3zxr3k2jmxq5"; libraryHaskellDepends = [ base containers directory mtl temporary ]; @@ -38568,8 +38675,8 @@ self: { }: mkDerivation { pname = "brainheck"; - version = "0.1.0.9"; - sha256 = "0wmkkamgzassvc63wrk7bmm3ljq056zbxqbgs223454iswk35hc8"; + version = "0.1.0.10"; + sha256 = "10j3wncbdgxz2cb1v6sm6dr7z8jdh7xax8dwsj151sgxjw5n35xm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38666,7 +38773,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_40" = callPackage + "brick_0_41_1" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, QuickCheck, stm, template-haskell, text @@ -38674,8 +38781,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.40"; - sha256 = "12bd0acbczcrr7mlpfrpjm9qq2ll2rbmgskpdw6lfaxz1iz75cad"; + version = "0.41.1"; + sha256 = "1sgxw18n3261gz0yfpig3p9vi84b2rlrsdkmvn5az26qrwrycqfd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38979,12 +39086,22 @@ self: { }) {}; "bsb-http-chunked" = callPackage - ({ mkDerivation, base, bytestring, bytestring-builder }: + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , bytestring-builder, deepseq, doctest, gauge, hedgehog, semigroups + , tasty, tasty-hedgehog, tasty-hunit + }: mkDerivation { pname = "bsb-http-chunked"; - version = "0.0.0.2"; - sha256 = "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8"; + version = "0.0.0.3"; + sha256 = "181bmywrb6w3v4hljn6lxiqb0ql1imngsm4sma7i792y6m9p05j4"; libraryHaskellDepends = [ base bytestring bytestring-builder ]; + testHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder doctest + hedgehog tasty tasty-hedgehog tasty-hunit + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring deepseq gauge semigroups + ]; description = "Chunked HTTP transfer encoding for bytestring builders"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -39311,23 +39428,24 @@ self: { "bugsnag-haskell" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring - , case-insensitive, doctest, hspec, http-client, http-client-tls - , http-conduit, http-types, iproute, network, parsec - , template-haskell, text, th-lift-instances, time, ua-parser, wai + , case-insensitive, containers, doctest, Glob, hspec, http-client + , http-client-tls, http-conduit, http-types, iproute, network + , parsec, template-haskell, text, th-lift-instances, time + , ua-parser, unliftio, wai }: mkDerivation { pname = "bugsnag-haskell"; - version = "0.0.1.3"; - sha256 = "07z2gw0p6cswzr22378z07jdyrww56mby3bfdlc7gxarxyfzsf9f"; + version = "0.0.2.0"; + sha256 = "0jkcfgs6ln3pcq5c0pz170wwphkx27ya2xj7li1avph5j5q42dxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring case-insensitive http-client http-client-tls - http-conduit http-types iproute network parsec template-haskell - text th-lift-instances time ua-parser wai + aeson base bytestring case-insensitive containers Glob http-client + http-client-tls http-conduit http-types iproute network parsec + template-haskell text th-lift-instances time ua-parser wai ]; testHaskellDepends = [ - aeson aeson-qq base doctest hspec text time + aeson aeson-qq base doctest hspec text time unliftio ]; description = "Bugsnag error reporter for Haskell"; license = stdenv.lib.licenses.mit; @@ -40011,13 +40129,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bytestring-encoding" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text + }: + mkDerivation { + pname = "bytestring-encoding"; + version = "0.1.0.0"; + sha256 = "05pjx59xxpi27j3qfh2cwy9ibfdsc7g0zcsfkdhsj33yxpls363d"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-th text + ]; + description = "ByteString ↔ Text converter based on GHC.IO.Encoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytestring-encodings" = callPackage ({ mkDerivation, base, bytestring, gauge, ghc-prim, hedgehog, text }: mkDerivation { pname = "bytestring-encodings"; - version = "0.2.0.1"; - sha256 = "0qjqbffp4fa7a95mfsgzhibqblxrxl4qa8kb0yhyb8c1r47r5nn7"; + version = "0.2.0.2"; + sha256 = "1x239ihnxxmbfcpm9v79snpdafhammqdsm19pdlnrg02m0ia59pn"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring hedgehog ]; benchmarkHaskellDepends = [ base bytestring gauge text ]; @@ -40202,6 +40337,8 @@ self: { pname = "bytestring-strict-builder"; version = "0.4.5.1"; sha256 = "17n6ll8k26312fgxbhws1yrswvy5dbsgyf57qksnj0akdssysy8q"; + revision = "1"; + editedCabalFile = "1snn8qb17maa76zji75i4yfz9x8ci16xp6zwg6kgwb33lf06imnd"; libraryHaskellDepends = [ base base-prelude bytestring semigroups ]; @@ -40795,8 +40932,8 @@ self: { pname = "cabal-doctest"; version = "1.0.6"; sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"; - revision = "1"; - editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld"; + revision = "2"; + editedCabalFile = "1kbiwqm4fxrsdpcqijdq98h8wzmxydcvxd03f1z8dliqzyqsbd60"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for doctests running"; license = stdenv.lib.licenses.bsd3; @@ -42112,8 +42249,8 @@ self: { ({ mkDerivation, base, containers, html, old-time, utility-ht }: mkDerivation { pname = "calendar-recycling"; - version = "0.0"; - sha256 = "0qvrxq3pgbbska0mqw9wk7wpsiln0i8rbdxnj4jfiv5vpp2n4gm3"; + version = "0.0.0.1"; + sha256 = "0afmnii65axpqk3x50wj1d17942m1kyhwka3bn78ylxy9z7rrlwc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -42459,8 +42596,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.1.0.0"; - sha256 = "14my9py7vjvxq51cd7sys8bxzyvwm2196qwjp2027daqbh7975vl"; + version = "0.2.0.0"; + sha256 = "06frfg1dl2cxbksy07pp9njfdgmyamyywd9wn2izpgixpxhv6d7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43568,8 +43705,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.4.6"; - sha256 = "1wyf6bz87b83lxcdbm84db7ziv3ggb3zbj4qd2cvfc7m4wr9a0v6"; + version = "0.4.7"; + sha256 = "13jrmlci29hdx0mxs4lzd9xdrdn9qga4891p49nhfpfiz4gch6xs"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -44839,26 +44976,26 @@ self: { , directory, file-embed, filepath, github, hlint, hspec , hspec-megaparsec, interpolatedstring-perl6, megaparsec , monad-parallel, optparse-applicative, process, QuickCheck - , quickcheck-text, range, temporary, text + , quickcheck-text, temporary, text }: mkDerivation { pname = "checkmate"; - version = "0.3.2"; - sha256 = "1s79cpi5hzfb59705i6gdvicczvddsbikcwwqx22v3yfyakbbxww"; + version = "0.4.0"; + sha256 = "0l5d1wf9pbji0h8qsqhqliv3kvzc6xcryq5zvps375pk8r5l2lvb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers diff-parse directory filepath github megaparsec - monad-parallel range text + monad-parallel text ]; executableHaskellDepends = [ base diff-parse directory filepath megaparsec optparse-applicative - process range text + process text ]; testHaskellDepends = [ base bytestring diff-parse directory file-embed filepath hlint hspec hspec-megaparsec interpolatedstring-perl6 megaparsec - QuickCheck quickcheck-text range temporary text + QuickCheck quickcheck-text temporary text ]; description = "Generate checklists relevant to a given patch"; license = stdenv.lib.licenses.agpl3; @@ -47450,23 +47587,6 @@ self: { }) {}; "cmark-gfm" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cheapskate - , criterion, discount, HUnit, markdown, sundown, text - }: - mkDerivation { - pname = "cmark-gfm"; - version = "0.1.4"; - sha256 = "0jjcl7pfack8aksx34m1f80ll0y62ba1fyzdn77xbs2rvlvjzw0m"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - benchmarkHaskellDepends = [ - base blaze-html cheapskate criterion discount markdown sundown text - ]; - description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark-gfm_0_1_5" = callPackage ({ mkDerivation, base, blaze-html, bytestring, cheapskate , criterion, discount, HUnit, markdown, sundown, text }: @@ -47481,7 +47601,6 @@ self: { ]; description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-highlight" = callPackage @@ -48271,6 +48390,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "collapse-duplication" = callPackage + ({ mkDerivation, base, bytestring, bytestring-show, cassava + , containers, hierarchical-clustering, lens, optparse-generic + , split + }: + mkDerivation { + pname = "collapse-duplication"; + version = "0.4.0.1"; + sha256 = "0azfyayvlw6vmgim98rsmgz5gx2dmwnbk9dwmm23781wdbm448a5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bytestring-show cassava containers + hierarchical-clustering lens + ]; + executableHaskellDepends = [ + base bytestring cassava containers lens optparse-generic split + ]; + description = "Collapse the duplication output into clones and return their frequencies"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "collapse-util" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48770,10 +48911,8 @@ self: { }: mkDerivation { pname = "combinatorial"; - version = "0.1"; - sha256 = "1a5l4iixjhvqca8dvwkx3zvlaimp6ggr3fcm7vk7r77rv6n6svh9"; - revision = "1"; - editedCabalFile = "1bqcg04w48dqk4n1n36j9ykajrmwqdd4qpcjjjfhzvm83z5ypsh7"; + version = "0.1.0.1"; + sha256 = "0w6vjs2pg2dffbq1dbs1dygnxk8nppzhkq3bgrg3ydfdzra7imn4"; libraryHaskellDepends = [ array base containers transformers utility-ht ]; @@ -48844,8 +48983,8 @@ self: { }: mkDerivation { pname = "comfort-graph"; - version = "0.0.3"; - sha256 = "11s3ag5skk07vs4h6xl20hbmlrbxqcwrj54wfpz2fk73347prmmr"; + version = "0.0.3.1"; + sha256 = "0qmmz3z9dgjb41rj6g81ppxaj4jswqnnb8bqn2s1dd6hf6cih9n9"; libraryHaskellDepends = [ base containers QuickCheck semigroups transformers utility-ht ]; @@ -49025,6 +49164,8 @@ self: { pname = "comonad-extras"; version = "4.0"; sha256 = "0irlx6rbp0cq5njxssm5a21mv7v5yccchfpn7h9hzr9fgyaxsr62"; + revision = "1"; + editedCabalFile = "1bmhdmncfbv80qgmykn67f4jkwbgags4ypaqibnzz849hpmibfj1"; libraryHaskellDepends = [ array base comonad containers distributive semigroupoids transformers @@ -49085,6 +49226,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "compact-list" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "compact-list"; + version = "0.1.0"; + sha256 = "0mg2s7mm908gy5j958abmiylfc05fs4y08dcjz4805ayi9cb1qqd"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base ]; + description = "An append only list in a compact region"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compact-map" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers }: mkDerivation { @@ -49628,19 +49781,19 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.5.0.8"; - sha256 = "1pgpjmb5pnnil98h6xrr9vmxxn8hgh20k9gjzm3jqzmx0l6dyspc"; + version = "1.5.3.1"; + sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; }) {}; - "composition-prelude_1_5_3_1" = callPackage + "composition-prelude_2_0_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.5.3.1"; - sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d"; + version = "2.0.0.0"; + sha256 = "0kz0jr5pfy6d1pm8sbxzrp0h7bnaljspggmzz382p6xp4npr6pg5"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -50067,6 +50220,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "concurrency-benchmarks" = callPackage + ({ mkDerivation, async, base, bench-graph, bytestring, Chart + , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics + , mtl, random, split, streamly, text, transformers, typed-process + }: + mkDerivation { + pname = "concurrency-benchmarks"; + version = "0.1.0"; + sha256 = "1qsn726ic2v7mxm7f05n1vlpcvn0xwys2yj0vn243fsmw3075gzi"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bench-graph bytestring Chart Chart-diagrams csv directory + getopt-generics split text transformers typed-process + ]; + benchmarkHaskellDepends = [ + async base deepseq gauge mtl random streamly transformers + ]; + description = "Benchmarks to compare concurrency APIs"; + license = stdenv.lib.licenses.mit; + }) {}; + "concurrent-barrier" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -50116,8 +50291,8 @@ self: { }: mkDerivation { pname = "concurrent-dns-cache"; - version = "0.1.1"; - sha256 = "0q6mffxkdag9impmd69nfqvjhpmnb3wy88aqfnlb7q476g84yjkx"; + version = "0.1.2"; + sha256 = "1hczxqvlnp5nxcx3mdpv9cm7mv66823jhyw9pibfklpy94syiz5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50550,6 +50725,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-concurrent-map" = callPackage + ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl + , resourcet, say, unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "conduit-concurrent-map"; + version = "0.1.1"; + sha256 = "0rn7sry51xiz00hrs2vvqff18lnmmzyadrd858g1ixga76f44z2j"; + libraryHaskellDepends = [ + base conduit containers mtl resourcet unliftio unliftio-core vector + ]; + testHaskellDepends = [ base conduit hspec HUnit say ]; + description = "Concurrent, order-preserving mapping Conduit"; + license = stdenv.lib.licenses.mit; + }) {}; + "conduit-connection" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, HUnit , network, resourcet, test-framework, test-framework-hunit @@ -51541,8 +51732,8 @@ self: { ({ mkDerivation, base, constraints, template-haskell }: mkDerivation { pname = "constraints-extras"; - version = "0.1.0.1"; - sha256 = "12m6z1va1idbqnl7syljgk8hy82vm0lymf262331jmhjb744awpz"; + version = "0.2.0.0"; + sha256 = "0id5xaij014vabzkbnl54h8km667vk1mz8dk27kdzfa5vg6pj8j8"; libraryHaskellDepends = [ base constraints template-haskell ]; description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; @@ -51639,8 +51830,8 @@ self: { ({ mkDerivation, base, containers, convert, lens, text, vector }: mkDerivation { pname = "container"; - version = "1.1.2"; - sha256 = "1i2zf7hn5pg0dmgq93w0i2v3vjsdryn6895za6mzfpdk7vyxsxsj"; + version = "1.1.5"; + sha256 = "1hh3ahw1vfmws1hyyl6blqyxaz4qcip0h0d80ia8pb6b1gfbvxsm"; libraryHaskellDepends = [ base containers convert lens text vector ]; @@ -51823,12 +52014,12 @@ self: { }) {}; "contiguous" = callPackage - ({ mkDerivation, base, primitive }: + ({ mkDerivation, base, deepseq, primitive }: mkDerivation { pname = "contiguous"; - version = "0.2.0.0"; - sha256 = "1cm6syjrql90m54hsinyknfjhspj47ikskq3fv408bl4sx3gk2kl"; - libraryHaskellDepends = [ base primitive ]; + version = "0.3.0.0"; + sha256 = "15v53w85f8bxnnrjsj46nfnjshf91b8sld76jcqffzj5nfjxkv28"; + libraryHaskellDepends = [ base deepseq primitive ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -51838,8 +52029,8 @@ self: { ({ mkDerivation, base, contiguous, primitive }: mkDerivation { pname = "contiguous-checked"; - version = "0.2.0.0"; - sha256 = "0cb7cankkmn8nb7v6fy4ykcglfd4sd5nc916lg1nyj7fjr5v7y4l"; + version = "0.3.0.0"; + sha256 = "144v6c9w0x9a43z1wpfgrq8k5h3d9nnrdxx87wcrkfcprcghdy7b"; libraryHaskellDepends = [ base contiguous primitive ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -53145,8 +53336,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.6.0"; - sha256 = "1c2hhdny9nn10rgaray827fqc3wq02pv8pf853cy865dl6zdihpb"; + version = "3.6.1"; + sha256 = "04hvb1z483gh7mb5q1mvsiym8jg29512wnrfdssl8y9c90qhk2sp"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -53242,34 +53433,6 @@ self: { }) {}; "cql-io" = callPackage - ({ mkDerivation, async, auto-update, base, bytestring, containers - , cql, cryptohash, data-default-class, Decimal, exceptions - , hashable, HsOpenSSL, iproute, lens, monad-control, mtl - , mwc-random, network, raw-strings-qq, retry, semigroups, stm - , tasty, tasty-hunit, text, time, tinylog, transformers - , transformers-base, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "cql-io"; - version = "1.0.1"; - sha256 = "06imd6cjfh7jnr8s0d2pqlg82w9h0s81xpyjir6hci61al6yfx5q"; - libraryHaskellDepends = [ - async auto-update base bytestring containers cql cryptohash - data-default-class exceptions hashable HsOpenSSL iproute lens - monad-control mtl mwc-random network retry semigroups stm text time - tinylog transformers transformers-base unordered-containers uuid - vector - ]; - testHaskellDepends = [ - base containers cql Decimal iproute mtl raw-strings-qq tasty - tasty-hunit text time tinylog uuid - ]; - description = "Cassandra CQL client"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cql-io_1_0_1_1" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptohash, data-default-class, Decimal, exceptions , hashable, HsOpenSSL, iproute, lens, monad-control, mtl @@ -53490,18 +53653,18 @@ self: { }) {crack = null;}; "crackNum" = callPackage - ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }: + ({ mkDerivation, base, FloatingHex, ieee754, reinterpret-cast }: mkDerivation { pname = "crackNum"; - version = "2.1"; - sha256 = "10z192nd9ik4ry0bjmkdpyvys75h3xz106588z8m1ix7caf1208a"; + version = "2.2"; + sha256 = "15327p12jql90j5z02nfzx5fivp7zsbznkg1i79iby59n3njfv40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base data-binary-ieee754 FloatingHex ieee754 + base FloatingHex ieee754 reinterpret-cast ]; executableHaskellDepends = [ - base data-binary-ieee754 FloatingHex ieee754 + base FloatingHex ieee754 reinterpret-cast ]; description = "Crack various integer, floating-point data formats"; license = stdenv.lib.licenses.bsd3; @@ -54929,38 +55092,6 @@ self: { }) {}; "csg" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , criterion, doctest, doctest-driver-gen, gloss, gloss-raster - , QuickCheck, simple-vec3, strict, system-filepath, tasty - , tasty-hunit, tasty-quickcheck, transformers, turtle, vector - }: - mkDerivation { - pname = "csg"; - version = "0.1.0.4"; - sha256 = "1dril9ayqng04s6jnh28r8by604kkygbjiblp2c4px0bqvz3g5cx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers QuickCheck simple-vec3 strict - transformers - ]; - executableHaskellDepends = [ - base gloss gloss-raster QuickCheck simple-vec3 strict - system-filepath turtle - ]; - testHaskellDepends = [ - base bytestring doctest doctest-driver-gen simple-vec3 tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base criterion simple-vec3 strict vector - ]; - description = "Analytical CSG (Constructive Solid Geometry) library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "csg_0_1_0_5" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , criterion, doctest, doctest-driver-gen, gloss, gloss-raster , QuickCheck, simple-vec3, strict, system-filepath, tasty @@ -55144,24 +55275,6 @@ self: { }) {}; "css-syntax" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, directory, hspec - , scientific, text - }: - mkDerivation { - pname = "css-syntax"; - version = "0.0.7"; - sha256 = "0r30rnwpmzvwbhj9di5rvbsigfn1w325c700hvjyw826x53ivz13"; - libraryHaskellDepends = [ - attoparsec base bytestring scientific text - ]; - testHaskellDepends = [ - attoparsec base bytestring directory hspec scientific text - ]; - description = "This package implments a parser for the CSS syntax"; - license = stdenv.lib.licenses.mit; - }) {}; - - "css-syntax_0_0_8" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, hspec , scientific, text }: @@ -55177,7 +55290,6 @@ self: { ]; description = "This package implments a parser for the CSS syntax"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "css-text" = callPackage @@ -56556,8 +56668,8 @@ self: { ({ mkDerivation, array, base, containers, transformers }: mkDerivation { pname = "data-accessor"; - version = "0.2.2.7"; - sha256 = "1vf2g1gac3rm32g97rl0fll51m88q7ry4m6khnl5j47qsmx24r9l"; + version = "0.2.2.8"; + sha256 = "1fq4gygxbz0bd0mzgvc1sl3m4gjnsv8nbgpnmdpa29zj5lb9agxc"; libraryHaskellDepends = [ array base containers transformers ]; description = "Utilities for accessing and manipulating fields of records"; license = stdenv.lib.licenses.bsd3; @@ -56619,8 +56731,8 @@ self: { }: mkDerivation { pname = "data-accessor-template"; - version = "0.2.1.15"; - sha256 = "0vxs6d6xv2lsxz81msgh5l91pvxma9gif69csi23nxq2xxapyaw0"; + version = "0.2.1.16"; + sha256 = "15gd6xlrq5ica514m5rdcz2dl8bibdmbsmnc98ddhx491c9g5rwk"; libraryHaskellDepends = [ base data-accessor template-haskell utility-ht ]; @@ -59320,24 +59432,6 @@ self: { }) {}; "debian-build" = callPackage - ({ mkDerivation, base, directory, filepath, process, split - , transformers - }: - mkDerivation { - pname = "debian-build"; - version = "0.10.1.1"; - sha256 = "0dv5fs0kp8qmrldly6cj0fkvab7infplii0ay23p1pbx6qjakrnk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory filepath process split transformers - ]; - executableHaskellDepends = [ base filepath transformers ]; - description = "Debian package build sequence tools"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "debian-build_0_10_1_2" = callPackage ({ mkDerivation, base, directory, filepath, process, split , transformers }: @@ -59353,7 +59447,6 @@ self: { executableHaskellDepends = [ base filepath transformers ]; description = "Debian package build sequence tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debug" = callPackage @@ -59776,8 +59869,10 @@ self: { }: mkDerivation { pname = "deferred-folds"; - version = "0.6.12"; - sha256 = "1gvbm0dkmvjjz5wwg2a5p2ahyd2imz1g751sr8k536hnd377xzy8"; + version = "0.9.1"; + sha256 = "1s1zz1yq97f3ivm68d8rv75v87li2003qk7w4n9s4nrx118llv6f"; + revision = "1"; + editedCabalFile = "0k4jh84a5mivx2wcwpdr9clbfx61j45ijbd8p82cdp77j35nz1gc"; libraryHaskellDepends = [ base bytestring containers foldl primitive transformers ]; @@ -60623,8 +60718,8 @@ self: { }: mkDerivation { pname = "descriptive"; - version = "0.9.4"; - sha256 = "0bxskc4q6jzpvifnhh6zl77xic0fbni8abf9lipfr1xzarbwcpkr"; + version = "0.9.5"; + sha256 = "0y5693zm2kvqjilybbmrcv1g6n6x2p6zjgi0k0axjw1sdhh1g237"; libraryHaskellDepends = [ aeson base bifunctors containers mtl scientific text transformers vector @@ -60808,14 +60903,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "df1_0_2" = callPackage + "df1_0_3" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , QuickCheck, tasty, tasty-quickcheck, text, time }: mkDerivation { pname = "df1"; - version = "0.2"; - sha256 = "11sd9d6izb3jrxxr27h058lajjij1p5wfsgg0pshjziqc9l426zs"; + version = "0.3"; + sha256 = "1qiy2xxri3vdqhy78ccan7phrlfdkb2ndvrj8grlhbzycmai64i3"; libraryHaskellDepends = [ attoparsec base bytestring containers text time ]; @@ -60948,37 +61043,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_16_1" = callPackage + "dhall_1_17_0" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive - , containers, contravariant, criterion, cryptonite, deepseq, Diff - , directory, doctest, exceptions, filepath, haskeline, http-client - , http-client-tls, insert-ordered-containers, lens-family-core - , megaparsec, memory, mockery, mtl, optparse-applicative, parsers - , prettyprinter, prettyprinter-ansi-terminal, repline, scientific - , tasty, tasty-hunit, template-haskell, text, transformers + , cborg, containers, contravariant, criterion, cryptonite, deepseq + , Diff, directory, doctest, exceptions, filepath, hashable + , haskeline, http-client, http-client-tls + , insert-ordered-containers, lens-family-core, megaparsec, memory + , mockery, mtl, optparse-applicative, parsers, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances + , repline, scientific, serialise, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, transformers , unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.16.1"; - sha256 = "1mf0x42f1gq8y6518hm1p8j8ca9dgh3nwbw2lfilddk1difrm9h2"; + version = "1.17.0"; + sha256 = "14a74zqsnv00hbv19lhmv78xzl36qnsznmncnzq7jji2aslgwad0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base bytestring case-insensitive containers + ansi-terminal base bytestring case-insensitive cborg containers contravariant cryptonite Diff directory exceptions filepath - haskeline http-client http-client-tls insert-ordered-containers - lens-family-core megaparsec memory mtl optparse-applicative parsers - prettyprinter prettyprinter-ansi-terminal repline scientific + hashable haskeline http-client http-client-tls + insert-ordered-containers lens-family-core megaparsec memory mtl + optparse-applicative parsers prettyprinter + prettyprinter-ansi-terminal repline scientific serialise template-haskell text transformers unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base deepseq directory doctest filepath insert-ordered-containers - mockery prettyprinter tasty tasty-hunit text vector + base containers deepseq directory doctest filepath hashable + insert-ordered-containers mockery prettyprinter QuickCheck + quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck + text transformers vector ]; benchmarkHaskellDepends = [ - base containers criterion directory text + base bytestring containers criterion directory serialise text ]; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; @@ -60992,10 +61092,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.14"; - sha256 = "1zxqlmnhq8lrwxiqz7hlqln7wf14mlz78s018yqy3hpzmy3aa84d"; - revision = "1"; - editedCabalFile = "1ih8w5q0gnys02hv7hnjxxapfqw4gqmd9xfxn7a05cg2gb30mapr"; + version = "1.0.15"; + sha256 = "15xgfglxy5bac93i83pp4pc78yfcwq6ys9vpak9kmklsbr08ynq4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61029,15 +61127,13 @@ self: { "dhall-json" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall - , insert-ordered-containers, optparse-applicative, text - , unordered-containers, yaml + , insert-ordered-containers, optparse-applicative, tasty + , tasty-hunit, text, unordered-containers, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.2.2"; - sha256 = "13vap0x53c9i2cyggh3riq8fza46c2d9rqmbxmsjvsawxz2jfm9d"; - revision = "1"; - editedCabalFile = "0vkn5kivqjl640f4ifjgy3mgmlqhz8ir48n04lklr4mra7z95qw2"; + version = "1.2.3"; + sha256 = "1npw5x49jrijq6lby5ipnywqvbq67znmbsrfhnk0pi9pz4kixjw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61048,6 +61144,7 @@ self: { aeson aeson-pretty base bytestring dhall optparse-applicative text yaml ]; + testHaskellDepends = [ aeson base dhall tasty tasty-hunit text ]; description = "Compile Dhall to JSON or YAML"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -61078,10 +61175,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.5"; - sha256 = "1j0b7w8ydhz5fq7jmajz35j8bw2xmr1v0pbl4yfkc2gv8djmiw6y"; - revision = "1"; - editedCabalFile = "1k9mb8fm5vxm7asqawvv103y63i81n84py42w7hh72rk3wp3xcnk"; + version = "1.1.6"; + sha256 = "0pchanzgcag6z7fywqm09xj29n0pfxd2ya2ky64aapykq038jxbs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61099,10 +61194,8 @@ self: { ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.11"; - sha256 = "0zbsr5mchcm3713y6dbdj1vlak5rb6f13p6a8ah7f3kcihdpx0b1"; - revision = "1"; - editedCabalFile = "0lrp1aknia3y4cz87vh14ns3f273lbca09ssz138wlf3266ka613"; + version = "1.0.12"; + sha256 = "1k68s83cqlwgivliag9n2vhin385k08f8vd506dcbix5farv9dp6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -61177,14 +61270,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "di_1_1" = callPackage + "di_1_1_1" = callPackage ({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle , di-monad, exceptions }: mkDerivation { pname = "di"; - version = "1.1"; - sha256 = "1akwhznnnwb9y4rbb4kys2vvwzdmpxdccrnrh65s5c1pw3w517n5"; + version = "1.1.1"; + sha256 = "0ibbhc0mnf4qwz90hgxnyd2vc6n86qqnyiahcr30lxknvqmbnskk"; libraryHaskellDepends = [ base containers df1 di-core di-df1 di-handle di-monad exceptions ]; @@ -61468,6 +61561,8 @@ self: { pname = "diagrams-core"; version = "1.4.1.1"; sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1"; + revision = "1"; + editedCabalFile = "0qf0b27lx8w16x85rr4zf3sf4qzkywyi04incv3667054v7y8m25"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -62377,21 +62472,21 @@ self: { }) {}; "digit" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, papa, parsec + ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, parsec , parsers, pretty, scientific, semigroupoids, semigroups, tasty , tasty-hedgehog, tasty-hspec, tasty-hunit, template-haskell, text }: mkDerivation { pname = "digit"; - version = "0.6"; - sha256 = "13cm8xk3szfcyfdzp108rzwkvwwws34bpla2viyqcr0sivmzdck8"; + version = "0.7"; + sha256 = "0451nlmf2ggg1dy82qkdxqlg4lgnsvkrxl3qrcjr5dzmi2ghk3ql"; libraryHaskellDepends = [ - base lens papa parsers scientific semigroupoids semigroups + base lens parsers scientific semigroupoids semigroups template-haskell ]; testHaskellDepends = [ - ansi-wl-pprint base hedgehog lens papa parsec parsers pretty tasty - tasty-hedgehog tasty-hspec tasty-hunit text + ansi-wl-pprint base hedgehog lens parsec parsers pretty semigroups + tasty tasty-hedgehog tasty-hspec tasty-hunit text ]; description = "A data-type representing digits 0-9 and other combinations"; license = stdenv.lib.licenses.bsd3; @@ -64271,6 +64366,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "do-notation" = callPackage + ({ mkDerivation, base, indexed }: + mkDerivation { + pname = "do-notation"; + version = "0.1.0.1"; + sha256 = "1ab32s7vjna1zkyvild62jsf9zkqls1bz3zp0fzfn0ykrv3045l8"; + libraryHaskellDepends = [ base indexed ]; + testHaskellDepends = [ base indexed ]; + description = "Generalize do-notation to work on monads and indexed monads simultaneously"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "doc-review" = callPackage ({ mkDerivation, base, base64-bytestring, binary, bytestring , containers, directory, feed, filepath, haskell98, heist, hexpat @@ -65558,8 +65665,8 @@ self: { ({ mkDerivation, array, base, containers, QuickCheck, random }: mkDerivation { pname = "dsp"; - version = "0.2.4"; - sha256 = "0bwvb2axzv19lmv61ifvpmp3kpyzn62vi87agkyyjaip3psxzr7y"; + version = "0.2.4.1"; + sha256 = "0b748v9v9i7kw2djnb9a89yjw0nhwhb5sfml3x6ajydjhx79a8ik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers random ]; @@ -66620,8 +66727,8 @@ self: { }: mkDerivation { pname = "ec2-unikernel"; - version = "0.9.2"; - sha256 = "02nydjp2l686wx42a5dndhj3dxi5q73lx9628lhdan1alhim4j31"; + version = "0.9.8"; + sha256 = "137rq45d0d7ap77wlgiqp5sd2r0jwxkaw4mvxmj1lyi8yc52mxbg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66880,8 +66987,8 @@ self: { }: mkDerivation { pname = "edges"; - version = "0.11.0.1"; - sha256 = "12bs1wlfhhq5cqb0xan34jvdpx1asr3rb2d2yiafxqpngwvd7nh8"; + version = "0.11.0.3"; + sha256 = "02735ky371hvxxxkgal7lzg6v8cmq5s115j6qx459lwj8p42az77"; libraryHaskellDepends = [ base cereal cereal-data-dword cereal-vector contravariant data-dword deepseq deferred-folds foldl hashable monad-par pointed @@ -66915,8 +67022,8 @@ self: { }: mkDerivation { pname = "edit"; - version = "1.0.0.0"; - sha256 = "0p93j90f40ckg5n9d8hnsbd5qsi00c28cpdrczgihk81hjgflnkd"; + version = "1.0.1.0"; + sha256 = "0114fcb1cpfrvn01vqq4wcharny0ri412a3gsy888g739k61a4gj"; libraryHaskellDepends = [ base comonad deepseq QuickCheck transformers ]; @@ -67333,6 +67440,8 @@ self: { pname = "either"; version = "5.0.1"; sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc"; + revision = "1"; + editedCabalFile = "1kf0dy6nki64kkmjw8214jz3n086g1pghfm26f012b6qv0iakzca"; libraryHaskellDepends = [ base bifunctors mtl profunctors semigroupoids semigroups ]; @@ -68668,8 +68777,8 @@ self: { }: mkDerivation { pname = "engine-io-wai"; - version = "1.0.8"; - sha256 = "0mph6pg3j81kwwl73dn5hdbw3mndfxi2wqdgwb727znh058xh7zb"; + version = "1.0.9"; + sha256 = "1zdin34gfi2059n1wjfxs4i2kfc0r53f3wpwhjd0fbp0as56h94s"; libraryHaskellDepends = [ attoparsec base bytestring either engine-io http-types mtl text transformers transformers-compat unordered-containers wai @@ -69805,16 +69914,16 @@ self: { }) {}; "etc" = callPackage - ({ mkDerivation, aeson, base, hashable, rio, tasty, tasty-hunit - , text, typed-process, unliftio + ({ mkDerivation, aeson, base, rio, tasty, tasty-hunit + , template-haskell, text, typed-process, unliftio }: mkDerivation { pname = "etc"; - version = "0.4.0.3"; - sha256 = "0xnm5mvrd0409kcrxp6ls92z5fvq959pghf67pqmj4a84k1dwkw3"; + version = "0.4.1.0"; + sha256 = "1j17g8jij4y782vwpx7b52fv9nwv4v4mygk2hbq6vihzkbrdbd31"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base hashable rio text typed-process unliftio + aeson base rio template-haskell text typed-process unliftio ]; testHaskellDepends = [ aeson base rio tasty tasty-hunit ]; description = "Declarative configuration spec for Haskell projects"; @@ -70157,10 +70266,8 @@ self: { }: mkDerivation { pname = "euler-tour-tree"; - version = "0.1.0.1"; - sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4"; - revision = "1"; - editedCabalFile = "033v38mr81pr81gb5wksi7bgpm1wrvcgck893dk1ymq4w6ifa2m6"; + version = "0.1.1.0"; + sha256 = "166gbinlf0ay8y2clzjzf5b2x489hcr1gzj8w5qk341z01f8pckh"; libraryHaskellDepends = [ base containers fingertree mtl parser-combinators transformers Unique @@ -70631,6 +70738,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eventstore_1_1_6" = callPackage + ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring + , cereal, clock, connection, containers, dns, dotnet-timespan + , ekg-core, exceptions, fast-logger, hashable, http-client + , interpolate, lifted-async, lifted-base, machines, monad-control + , monad-logger, mono-traversable, mtl, protobuf, random + , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec + , tasty-hunit, text, time, transformers-base, unordered-containers + , uuid + }: + mkDerivation { + pname = "eventstore"; + version = "1.1.6"; + sha256 = "00bdkklwrabxvbr725hkdsc1a2fdr50gdwryn7spmsqxmqgzv96w"; + libraryHaskellDepends = [ + aeson array base bifunctors bytestring cereal clock connection + containers dns dotnet-timespan ekg-core exceptions fast-logger + hashable http-client interpolate lifted-async lifted-base machines + monad-control monad-logger mono-traversable mtl protobuf random + safe-exceptions semigroups stm stm-chans text time + transformers-base unordered-containers uuid + ]; + testHaskellDepends = [ + aeson async base bytestring cereal connection containers + dotnet-timespan exceptions fast-logger hashable lifted-async + lifted-base monad-control mono-traversable protobuf safe-exceptions + semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time + transformers-base unordered-containers uuid + ]; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -70875,8 +71017,8 @@ self: { pname = "exceptions"; version = "0.10.0"; sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y"; - revision = "1"; - editedCabalFile = "1ydvmhi9bj7b1md3wd4l2z2lccgyjgv3ha8milmy2l4lad9xh6xy"; + revision = "2"; + editedCabalFile = "0aiihbjfrlmxzw9q8idvr6mihhs7kbx9s3w1vj8x3pz27p0ncq7g"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -71194,6 +71336,8 @@ self: { pname = "exitcode"; version = "0.1.0.1"; sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5"; + revision = "1"; + editedCabalFile = "0p2kmkgqbfcf5za5n210a6ra6758dkmkwvs516aj3y895na6j14z"; libraryHaskellDepends = [ base lens mmorph mtl semigroupoids semigroups transformers ]; @@ -71682,8 +71826,8 @@ self: { }: mkDerivation { pname = "extensible-effects"; - version = "3.1.0.0"; - sha256 = "0p4vk4k6922ar853zb85jm4si7y1qdr1wkx4pwfd613a5ar23440"; + version = "3.1.0.1"; + sha256 = "1znqhcx5y4mpkbib18nma2c6bw4wxyxlxg3s8kafdalrx61rdhy3"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base doctest HUnit monad-control QuickCheck silently test-framework @@ -71842,8 +71986,8 @@ self: { ({ mkDerivation, base, leancheck, speculate, template-haskell }: mkDerivation { pname = "extrapolate"; - version = "0.3.1"; - sha256 = "1hz03mdascy4jvqhyrqqmb1py3pb03g4z3if05z2cbdxgbgsbbn4"; + version = "0.3.3"; + sha256 = "1mc14d9wcrvrd2fkzjxc5gvy7s33p875qj97bdaacdjv5hmg5zr2"; libraryHaskellDepends = [ base leancheck speculate template-haskell ]; @@ -71852,21 +71996,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extrapolate_0_3_2" = callPackage - ({ mkDerivation, base, leancheck, speculate, template-haskell }: - mkDerivation { - pname = "extrapolate"; - version = "0.3.2"; - sha256 = "1scfcjqz1q9pv37rvygbpdwx8j22469f5p2vf5ay68hd62d592gj"; - libraryHaskellDepends = [ - base leancheck speculate template-haskell - ]; - testHaskellDepends = [ base leancheck speculate ]; - description = "generalize counter-examples of test properties"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ez-couch" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit @@ -72228,8 +72357,8 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.0.9"; - sha256 = "1kpki7j8kz9xzzg8gl8l5g7wgq0v2s7r2lhr0mb4m67bkq61zmrs"; + version = "0.6.1.1"; + sha256 = "0adnngx0bqbrcsxkgpdfb60p4jhvx0b8ls37g94q6cx9s0n3cmb8"; libraryHaskellDepends = [ base composition-prelude gmpint ]; testHaskellDepends = [ arithmoi base combinat-compat hspec QuickCheck @@ -73618,8 +73747,8 @@ self: { ({ mkDerivation, base, fftw }: mkDerivation { pname = "fftwRaw"; - version = "0.1.0.1"; - sha256 = "1ka58mkn30mrhma7l5cshilhaif4r2jqxqpm6rvmscrvnrjq3nyz"; + version = "0.1.0.2"; + sha256 = "1690x5vllqba39srbp7q3gl2rv30wq941sx4z89fh89axwgp9629"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ fftw ]; description = "Low level bindings to FFTW"; @@ -74755,6 +74884,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fixed-vector_1_2_0_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: + mkDerivation { + pname = "fixed-vector"; + version = "1.2.0.0"; + sha256 = "19846sgjlsv7qy9nm9l4p2wdms5kvx6y9wm5ffz1hw7h77qy8ryw"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ base doctest filemanip primitive ]; + description = "Generic vectors with statically known size"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fixed-vector-binary" = callPackage ({ mkDerivation, base, binary, fixed-vector, tasty , tasty-quickcheck @@ -75486,6 +75628,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "flow_1_0_15" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: + mkDerivation { + pname = "flow"; + version = "1.0.15"; + sha256 = "1i3rhjjl8w9xmvckz0qrlbg7jfdz6v5w5cgmhs8xqjys5ssmla2y"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck template-haskell ]; + description = "Write more understandable Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flow-er" = callPackage ({ mkDerivation, base, doctest, flow, QuickCheck }: mkDerivation { @@ -76058,6 +76213,8 @@ self: { pname = "foldl"; version = "1.4.3"; sha256 = "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk"; + revision = "1"; + editedCabalFile = "043axkgbjwvzlh5il1cmrb36svri3v0zja00iym9p0vm9gldh81c"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids semigroups text @@ -76068,6 +76225,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foldl_1_4_4" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, hashable, mwc-random, primitive + , profunctors, semigroupoids, semigroups, text, transformers + , unordered-containers, vector, vector-builder + }: + mkDerivation { + pname = "foldl"; + version = "1.4.4"; + sha256 = "0dy8dhpys2bq6pn0m6klsykk4mfxi6q8hr8gqbfcvqk6g4i5wyn7"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable + mwc-random primitive profunctors semigroupoids semigroups text + transformers unordered-containers vector vector-builder + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldl-incremental" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , foldl, histogram-fill, mwc-random, pipes, QuickCheck, tasty @@ -80775,24 +80953,6 @@ self: { }) {}; "genvalidity-text" = callPackage - ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec - , QuickCheck, text, validity, validity-text - }: - mkDerivation { - pname = "genvalidity-text"; - version = "0.5.0.2"; - sha256 = "1d955278y5522a5aji1i662iynkjn7g88af9myvg6q5b4nig5cqx"; - libraryHaskellDepends = [ - array base genvalidity QuickCheck text validity validity-text - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec QuickCheck text - ]; - description = "GenValidity support for Text"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-text_0_5_1_0" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text }: @@ -80808,7 +80968,6 @@ self: { ]; description = "GenValidity support for Text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-time" = callPackage @@ -81023,20 +81182,21 @@ self: { }) {}; "geojson" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , filepath, hlint, lens, QuickCheck, semigroups, template-haskell - , text, transformers, validation, vector + ({ mkDerivation, aeson, base, bytestring, hlint, lens, scientific + , semigroups, tasty, tasty-hspec, tasty-quickcheck, text + , transformers, validation, vector }: mkDerivation { pname = "geojson"; - version = "1.3.1"; - sha256 = "0qcngx6dszpqrjsbfvqjgdn2qs3vyv112dwva5kbmwfpg5665xml"; + version = "1.3.3"; + sha256 = "17ra6kb2bgz9ydhqhgp00wmpd3dqxqgc89wifnn3qqk0rqwsqilz"; libraryHaskellDepends = [ - aeson base lens semigroups text transformers validation vector + aeson base lens scientific semigroups text transformers validation + vector ]; testHaskellDepends = [ - base bytestring directory doctest filepath hlint QuickCheck - template-haskell + aeson base bytestring hlint tasty tasty-hspec tasty-quickcheck text + validation ]; description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; @@ -82372,6 +82532,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_7_1" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.7.1"; + sha256 = "06n37dv51i2905v8nwwv1ilm0zlx6zblrkfic1mp491ws2sijdx7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base cmdargs directory extra filepath process time + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -82929,8 +83116,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.15"; - sha256 = "09h4ilyg85d9b20chqf6fp6zqvxcclqn9i8s02bqw86cq7s19cq4"; + version = "1.0.16"; + sha256 = "0yygachni7ybb14sj8fqlb831154i1v4b7wn2z1qva6yx1h9gr3l"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -83068,6 +83255,41 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtk3 = pkgs.gnome3.gtk;}; + "gi-gtk-declarative" = callPackage + ({ mkDerivation, base, gi-gobject, gi-gtk, haskell-gi + , haskell-gi-base, haskell-gi-overloading, mtl, text + , unordered-containers + }: + mkDerivation { + pname = "gi-gtk-declarative"; + version = "0.1.0"; + sha256 = "1yqvqbhlgbpq5s77fvqi8f644i059gg64xdkgwr4ka6zdz4fhiaf"; + libraryHaskellDepends = [ + base gi-gobject gi-gtk haskell-gi haskell-gi-base + haskell-gi-overloading mtl text unordered-containers + ]; + description = "Declarative GTK+ programming in Haskell"; + license = stdenv.lib.licenses.mpl20; + }) {}; + + "gi-gtk-declarative-app-simple" = callPackage + ({ mkDerivation, async, base, gi-gdk, gi-glib, gi-gobject, gi-gtk + , gi-gtk-declarative, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pipes, pipes-concurrency, text + }: + mkDerivation { + pname = "gi-gtk-declarative-app-simple"; + version = "0.1.0"; + sha256 = "157xhfixlf545qzk9v4sav6817fdznxk0kwiin59xn9d3ldp71ak"; + libraryHaskellDepends = [ + async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative + haskell-gi haskell-gi-base haskell-gi-overloading pipes + pipes-concurrency text + ]; + description = "Declarative GTK+ programming in Haskell in the style of [Pux](https://github.com/alexmingoia/purescript-pux)."; + license = stdenv.lib.licenses.mpl20; + }) {}; + "gi-gtk-hs" = callPackage ({ mkDerivation, base, base-compat, containers, gi-gdk , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl @@ -84472,23 +84694,20 @@ self: { "gitlib-libgit2" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , containers, directory, exceptions, fast-logger, filepath, gitlib - , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit - , lifted-async, lifted-base, mmorph, monad-control, monad-loops - , mtl, resourcet, stm, stm-conduit, tagged, template-haskell, text - , text-icu, time, transformers, transformers-base + , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit, mmorph + , monad-loops, mtl, resourcet, stm, stm-conduit, tagged + , template-haskell, text, text-icu, time, transformers + , transformers-base, unliftio, unliftio-core }: mkDerivation { pname = "gitlib-libgit2"; - version = "3.1.1"; - sha256 = "1fv8r2w0fd9m7chrccmf5kw0pr2v0k2r2l0d782galdvq7mhca7w"; - revision = "1"; - editedCabalFile = "0v510c4sd6zwwf6mbc6gfv5sin91ckw4v6c844wrfksi9gdq3shm"; + version = "3.1.2"; + sha256 = "1nj9f2qmjxb5k9b23wfyz290pgb01hnzrswbamwb7am9bnkk250b"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators containers directory - exceptions fast-logger filepath gitlib hlibgit2 lifted-async - lifted-base mmorph monad-control monad-loops mtl resourcet stm - stm-conduit tagged template-haskell text text-icu time transformers - transformers-base + exceptions fast-logger filepath gitlib hlibgit2 mmorph monad-loops + mtl resourcet stm stm-conduit tagged template-haskell text text-icu + time transformers transformers-base unliftio unliftio-core ]; testHaskellDepends = [ base exceptions gitlib gitlib-test hspec hspec-expectations HUnit @@ -84544,17 +84763,17 @@ self: { "gitlib-test" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , exceptions, gitlib, hspec, hspec-expectations, HUnit - , monad-control, tagged, text, time, transformers + , exceptions, gitlib, hspec, hspec-expectations, HUnit, tagged + , text, time, transformers, unliftio-core }: mkDerivation { pname = "gitlib-test"; - version = "3.1.0.3"; - sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py"; + version = "3.1.1"; + sha256 = "1h8kqqj298bb0bj7w4rw18jf3bz0h1rqdg8fngmp4p35c1k1kjzi"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators exceptions gitlib hspec - hspec-expectations HUnit monad-control tagged text time - transformers + hspec-expectations HUnit tagged text time transformers + unliftio-core ]; description = "Test library for confirming gitlib backend compliance"; license = stdenv.lib.licenses.mit; @@ -85053,6 +85272,8 @@ self: { pname = "glirc"; version = "2.28"; sha256 = "17z3lhb7ngvp0678ry5zk0jl7pmjhzypk2l6x9mp43m427ick1nk"; + revision = "1"; + editedCabalFile = "142909apkky5z443qifchd2cm1dakw2zpbcfyxpvpi7crzhq0h1d"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -85076,8 +85297,8 @@ self: { }: mkDerivation { pname = "gll"; - version = "0.4.0.11"; - sha256 = "0vxi750q11q1ggf0s2yyjpr47fmpfvmqm5mjdh6i4z6bf5vlhfd8"; + version = "0.4.0.12"; + sha256 = "1ls01s36ixik53c0fyr9sy3bhyh2kfn0yjkh3mp8izgw6l8aydwr"; libraryHaskellDepends = [ array base containers pretty random-strings regex-applicative text time TypeCompose @@ -85306,6 +85527,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-export" = callPackage + ({ mkDerivation, base, GLFW-b, gloss, gloss-rendering, GLUT + , JuicyPixels, OpenGLRaw, vector + }: + mkDerivation { + pname = "gloss-export"; + version = "0.1.0.0"; + sha256 = "0m5k8zr90wqh6sjgn5c3mrpffwkq8g42qji8ss77l97a2hcv50dq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base GLFW-b gloss-rendering GLUT JuicyPixels OpenGLRaw vector + ]; + executableHaskellDepends = [ base gloss ]; + testHaskellDepends = [ base ]; + description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image"; + license = stdenv.lib.licenses.mit; + }) {}; + "gloss-game" = callPackage ({ mkDerivation, base, gloss, gloss-juicy }: mkDerivation { @@ -85322,8 +85562,10 @@ self: { }: mkDerivation { pname = "gloss-juicy"; - version = "0.2.2"; - sha256 = "1w1y8aijdf4ba80rq5i2456xh1yyix4wcfagy102xsyvcldlggpv"; + version = "0.2.3"; + sha256 = "0px0i6fvicmsgvp7sl7g37y3163s1i2fm5xcq5b1ar9smwv25gq3"; + revision = "1"; + editedCabalFile = "09cbz0854v2dsmv24l40rmx4bq7ic436m4xingw93gvw4fawlfqc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85731,8 +85973,8 @@ self: { }: mkDerivation { pname = "gnuplot"; - version = "0.5.5.2"; - sha256 = "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn"; + version = "0.5.5.3"; + sha256 = "0105ajc5szgrh091x5fxdcydc96rdh75gg2snyfr2y2rhf120x2g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -88117,6 +88359,8 @@ self: { pname = "grapefruit-frp"; version = "0.1.0.7"; sha256 = "132jd2dxj964paz6dcyb6sx25dkv271rl2fgw05c7zawrrfnrkxs"; + revision = "1"; + editedCabalFile = "14qhyvsf7r04fwm1jwl41gdijx0vrqz7lsqy50hmzpcwixr92013"; libraryHaskellDepends = [ arrows base containers fingertree semigroups TypeCompose ]; @@ -88145,6 +88389,8 @@ self: { pname = "grapefruit-ui"; version = "0.1.0.7"; sha256 = "1r2wpn982z33s0p6fgdgslgv9ixanb2pysy71j20cfp1xzh13hdj"; + revision = "1"; + editedCabalFile = "0s61spgkw2h12g1wks5zxhrzpqqnmmxcw5kbirblyfl4p59pxpns"; libraryHaskellDepends = [ arrows base colour containers fraction grapefruit-frp grapefruit-records @@ -88163,6 +88409,8 @@ self: { pname = "grapefruit-ui-gtk"; version = "0.1.0.7"; sha256 = "0ix6dilj3xv2cvihwq8cfykr8i1yq9w1bn86248r5bg5vhfn4g28"; + revision = "1"; + editedCabalFile = "0ahjd2sxh12hr8slz6vkc5gn2wr1h9dgq8q3kc9jq5xjzr66cgbk"; libraryHaskellDepends = [ base colour containers fraction glib grapefruit-frp grapefruit-records grapefruit-ui gtk3 transformers @@ -88862,8 +89110,8 @@ self: { }: mkDerivation { pname = "greenclip"; - version = "3.1.1"; - sha256 = "1axh1q7kcvcnhn4rl704i4gcix5yn5v0sb3bdgjk4vgkd7fv8chw"; + version = "3.2.0"; + sha256 = "09ygvyrczxqsp2plwmwx021wmbq2vln9i4b5iaj0j26j7prykikq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89000,6 +89248,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell-core_0_1_2_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, QuickCheck, scientific + , semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.2.3"; + sha256 = "026lipvhc4kjcmf1d604f6m71b3hrrkaafdvymmn1fsxa360dw0s"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text @@ -89211,8 +89481,8 @@ self: { }: mkDerivation { pname = "groundhog"; - version = "0.8.0.1"; - sha256 = "0qrv2rpw1nqn28j6mcmwn0sjmfsfg5gj68sq5dcydh247q1acp5r"; + version = "0.9.0"; + sha256 = "09d0n91cd0bvmrik4ail2svbh7l8vp5va0344jzvy1g2ancy0yj0"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring containers monad-control mtl resourcet safe-exceptions scientific @@ -89273,8 +89543,8 @@ self: { }: mkDerivation { pname = "groundhog-mysql"; - version = "0.8.0.1"; - sha256 = "0h4sckj7hrhlnrfa9639kr9id8rf11ragadsj9rxils1vn4cn35r"; + version = "0.9.0"; + sha256 = "0n3zcvb1qh5jdfrzgiamaf51fvkhgabsl07asy7wcdp0hb8rxdkq"; libraryHaskellDepends = [ base bytestring containers groundhog monad-control monad-logger mysql mysql-simple resource-pool resourcet text time transformers @@ -89292,8 +89562,8 @@ self: { }: mkDerivation { pname = "groundhog-postgresql"; - version = "0.8.0.3"; - sha256 = "0iz21awiblzir01r6p77qnlvqsb8j87x5y11g1q2spnafzj4wlpl"; + version = "0.9.0"; + sha256 = "0r756ccnrwzwl6x9fkrvyws8l00sp9jjqlj5n42jkw7nwwx3i8gy"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers groundhog monad-control postgresql-libpq postgresql-simple resource-pool @@ -89311,8 +89581,8 @@ self: { }: mkDerivation { pname = "groundhog-sqlite"; - version = "0.8.0.1"; - sha256 = "1y6cfnyrrq61vv793crfb7yd21yn0gqmx7j7c9sg8665l34wq2jp"; + version = "0.9.0"; + sha256 = "06985myr96dc7f6hkkm9nihvvl2c19wdl1bn3nfvyj78yvz8ryxb"; libraryHaskellDepends = [ base bytestring containers direct-sqlite groundhog monad-control resource-pool resourcet text transformers unordered-containers @@ -89328,8 +89598,8 @@ self: { }: mkDerivation { pname = "groundhog-th"; - version = "0.8.0.2"; - sha256 = "13rxdmnbmsivp608xclkvjnab0dzhzyqc8zjrpm7ml9d5yc8v596"; + version = "0.9.0"; + sha256 = "1wwfgyak5kdhnn6i07y114q063ryg9w3sngh0c2fh2addh5xrqay"; libraryHaskellDepends = [ aeson base bytestring containers groundhog template-haskell text time unordered-containers yaml @@ -89463,6 +89733,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "grpc-api-etcd" = callPackage + ({ mkDerivation, base, proto-lens, proto-lens-protoc }: + mkDerivation { + pname = "grpc-api-etcd"; + version = "0.1.0.1"; + sha256 = "0sr9nsk207ap1psf4mypzjbpbppxwmbbcv6z07dxpv1dwzs6dnyf"; + libraryHaskellDepends = [ base proto-lens proto-lens-protoc ]; + description = "Generated messages and instances for etcd gRPC"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "grpc-etcd-client" = callPackage + ({ mkDerivation, base, bytestring, data-default-class + , grpc-api-etcd, http2-client, http2-client-grpc, lens, network + , proto-lens, proto-lens-protoc + }: + mkDerivation { + pname = "grpc-etcd-client"; + version = "0.1.1.0"; + sha256 = "01x5463h4xc04k3rax10zz7safa65g331jb9ksikjyrbk11rlpl1"; + libraryHaskellDepends = [ + base bytestring data-default-class grpc-api-etcd http2-client + http2-client-grpc lens network proto-lens proto-lens-protoc + ]; + description = "gRPC client for etcd"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gruff" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , FTGL, gtk, gtkglext, mtl, old-locale, OpenGL, OpenGLRaw, parallel @@ -89688,6 +89986,25 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtk2 = pkgs.gnome2.gtk;}; + "gtk_0_15_0" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers + , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text + }: + mkDerivation { + pname = "gtk"; + version = "0.15.0"; + sha256 = "110lawhnd00acllfjhimcq59wxsrl2xs68mam6wmqfc43wan5f5k"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ + array base bytestring cairo containers gio glib mtl pango text + ]; + libraryPkgconfigDepends = [ gtk2 ]; + description = "Binding to the Gtk+ graphical user interface library"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {gtk2 = pkgs.gnome2.gtk;}; + "gtk-helpers" = callPackage ({ mkDerivation, array, base, gio, glib, gtk, mtl, process , template-haskell @@ -90021,6 +90338,27 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; + "gtk3_0_15_0" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers + , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text + }: + mkDerivation { + pname = "gtk3"; + version = "0.15.0"; + sha256 = "1q6ysw00gjaaali18iz111zqzkjiblzg7cfg6ckvzf93mg0w6g0c"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ + array base bytestring cairo containers gio glib mtl pango text + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Binding to the Gtk+ 3 graphical user interface library"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gtk3-mac-integration" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib , gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl @@ -92020,8 +92358,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.11.2"; - sha256 = "0xfhghpy0jmgmlyzc6plcg3nq26afbwp36bjjdc156rcwzsm9qyx"; + version = "1.12.0"; + sha256 = "0i3d3kydbna29wvaahwg9mkhykzrbnk6lg62mcbak78z24l1zmzl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92649,8 +92987,8 @@ self: { }: mkDerivation { pname = "hakyll-dir-list"; - version = "1.0.0.2"; - sha256 = "0irkfnwbzhchvjsfzndb6i3w76gnwik9fq3fhi3qg3jc7l0cgi76"; + version = "1.0.0.4"; + sha256 = "0n7cfamaan0yyrpdfqmjbbgv7cg172hp4zs16zf52l90xdq253h9"; libraryHaskellDepends = [ base containers data-default filepath hakyll ]; @@ -93396,34 +93734,6 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; - version = "0.3.5.9"; - sha256 = "1jyzjj9m6vj9rlpvadaxnfxxl8ynrn8jp9xzyp3kwkzyv6cdi1ha"; - revision = "2"; - editedCabalFile = "1gfs133dm21jwv48v4wlr1dbr993fz49b9lviaahkymlv1d3j8gd"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_5_10" = callPackage ({ mkDerivation, aeson, async, base, directory, filepath , formatting, gitrev, hspec, mtl, optparse-applicative, path , path-io, process, stm, temporary, time, transformers, yaml @@ -93447,7 +93757,6 @@ self: { ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -95913,7 +96222,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_7_0_0" = callPackage + "haskell-lsp_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec , lens, mtl, network-uri, parsec, sorted-list, stm, text, time @@ -95921,10 +96230,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.7.0.0"; - sha256 = "1v67yj0ndd5wra2rnmdqcamivml82yn4lwhnm04nz6spsq2mqgkv"; - revision = "1"; - editedCabalFile = "1j33y61hwarfm5p54b682sd3rfhxf82lchr1jnnvv1h8xs56ryln"; + version = "0.8.0.0"; + sha256 = "04mihj4538pys6v4m3dwijfzcpsv52jizm416rnnwc88gr8q6wkk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95983,15 +96290,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_7_0_0" = callPackage + "haskell-lsp-types_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath , hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.7.0.0"; - sha256 = "1iisadmi3v3wshpwi5cbn2p8p4qr9rh5xnlbhjymzxhj9k09cmcb"; + version = "0.8.0.0"; + sha256 = "11dm7v9rvfig6m40m0np7cs5cfaawwpw67c445dz15vls5pri71n"; libraryHaskellDepends = [ aeson base bytestring data-default filepath hashable lens network-uri scientific text unordered-containers @@ -98292,8 +98599,8 @@ self: { }: mkDerivation { pname = "hasmin"; - version = "1.0.2"; - sha256 = "13cblc4jcn88w00rsb72dqhiy18mfph388407vm3k6kbg5zxg1d9"; + version = "1.0.2.1"; + sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98349,6 +98656,8 @@ self: { pname = "hasql"; version = "1.3.0.3"; sha256 = "01vl4p67yhcm8cmbmajgyd7ggj3p5f6350f8sky8kv3dn31wg6ji"; + revision = "2"; + editedCabalFile = "14063k0dald0i2cqk70kdja1df587vn8vrzgw3rb62nxwycr0r9b"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder contravariant contravariant-extras data-default-class dlist @@ -99057,6 +99366,8 @@ self: { pname = "haxl"; version = "2.0.1.0"; sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd"; + revision = "1"; + editedCabalFile = "04k5q5hvnbw1shrb8pqw3nwsylpb78fi802xzfq2gcmrnl6hy58p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99964,6 +100275,8 @@ self: { pname = "hdirect"; version = "0.21.0"; sha256 = "1v7yx9k0kib6527k49hf3s4jvdda7a0wgv09qhyjk6lyriyi3ny2"; + revision = "1"; + editedCabalFile = "19h5zsxl8knbvkbyv7z0an5hdibi2xslbva5cmck9h5wgc9m874n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base haskell98 pretty ]; @@ -100205,6 +100518,58 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heatitup" = callPackage + ({ mkDerivation, base, bytestring, bytestring-show, cassava, colour + , containers, diagrams-core, diagrams-html5, diagrams-lib + , diagrams-pgf, diagrams-rasterific, diagrams-svg, edit-distance + , fasta, lens, optparse-applicative, pipes, pipes-bytestring + , pipes-csv, safe, string-similarity, stringsearch, suffixtree + , vector + }: + mkDerivation { + pname = "heatitup"; + version = "0.5.3.3"; + sha256 = "1bqindh91i4ra67516nl0c5i98fgm9bwsjy7vv0qjzmfqk3bqp84"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bytestring-show cassava colour containers + diagrams-lib edit-distance fasta lens pipes pipes-bytestring + pipes-csv safe string-similarity stringsearch suffixtree vector + ]; + executableHaskellDepends = [ + base bytestring colour containers diagrams-core diagrams-html5 + diagrams-lib diagrams-pgf diagrams-rasterific diagrams-svg fasta + lens optparse-applicative pipes pipes-bytestring pipes-csv safe + vector + ]; + description = "Find and annotate ITDs"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "heatitup-complete" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers, fasta + , foldl, lens, optparse-applicative, pipes, pipes-text, safe, text + , text-show, turtle, vector + }: + mkDerivation { + pname = "heatitup-complete"; + version = "0.5.3.3"; + sha256 = "1djs5hni6s4mzs4fniamfz6k7590l34mgvd1d2kglmdpb5m22pcz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cassava containers fasta foldl lens safe text + text-show turtle vector + ]; + executableHaskellDepends = [ + base bytestring cassava containers fasta foldl optparse-applicative + pipes pipes-text safe text turtle vector + ]; + description = "Find and annotate ITDs with assembly or read pair joining"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "heatshrink" = callPackage ({ mkDerivation, base, bytestring, c2hs, cereal, pcre-heavy, tasty , tasty-golden, tasty-hunit, text @@ -100452,31 +100817,6 @@ self: { }) {}; "hedis" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri - , resource-pool, scanner, slave-thread, stm, test-framework - , test-framework-hunit, text, time, tls, unordered-containers - , vector - }: - mkDerivation { - pname = "hedis"; - version = "0.10.3"; - sha256 = "0wapsg0amlmzayphchng67ih3ivp0mk3vgi8x1mzrkd1xrlgav3v"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq errors HTTP mtl - network network-uri resource-pool scanner stm text time tls - unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring doctest HUnit mtl slave-thread stm - test-framework test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedis_0_10_4" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, slave-thread, stm, test-framework @@ -100499,7 +100839,6 @@ self: { benchmarkHaskellDepends = [ base mtl time ]; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -101980,10 +102319,8 @@ self: { }: mkDerivation { pname = "hformat"; - version = "0.3.3.0"; - sha256 = "0g9kjfssaksjj3cp0qiwk7v85yy3sb2ryhjnlrdznhm3mnkvp35j"; - revision = "1"; - editedCabalFile = "00924yrjyzy3v5l13f03v1qw45ra2600f98r9bgswjqrrn87m79i"; + version = "0.3.3.1"; + sha256 = "0wx7qlhdzd8rl2d351hvxzwlyz9yxza625fklp2p66x7khfxlbih"; libraryHaskellDepends = [ ansi-terminal base base-unicode-symbols text ]; @@ -102243,18 +102580,18 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart , Chart-cairo, Chart-diagrams, colour, composition-prelude , data-binary-ieee754, data-default, directory, filepath, hspec - , lens, monad-loops + , lens, monad-loops, spherical }: mkDerivation { pname = "hgis"; - version = "1.0.0.2"; - sha256 = "1z730c48pvi6ylb0pjzx2x9jnd03aadpmsx3psrlf2vp0bvm6ims"; + version = "1.0.0.3"; + sha256 = "00s87mna6lxr1q3275jg7ya17qhksr9bmfg2nw9mgadb05j6h2v8"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring Chart Chart-cairo Chart-diagrams colour composition-prelude data-binary-ieee754 - data-default directory filepath lens monad-loops + data-default directory filepath lens monad-loops spherical ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec spherical ]; doHaddock = false; description = "Library and for GIS with Haskell"; license = stdenv.lib.licenses.bsd3; @@ -106162,8 +106499,8 @@ self: { pname = "hookup"; version = "0.2.2"; sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf"; - revision = "1"; - editedCabalFile = "1ag338856kxlywgcizqij566iaqicv4jb3kmd017k7qflq8vmwb3"; + revision = "2"; + editedCabalFile = "12x7h7yg0x9gqv9yj2snp3k221yzyphm1l7aixkz1szxp1pndfgy"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -106392,8 +106729,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.5.1"; - sha256 = "1hnaxv3vg46a9iqszi3dfjj5kd3gqiagrxz28hi2wvvcpc8zpadn"; + version = "0.5.2"; + sha256 = "0ifk7ja1nynbgcf7q8v2dl4sn5ivif9rbd2d7pjp9lx43di9axfc"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; @@ -106665,25 +107002,6 @@ self: { }) {}; "hourglass" = callPackage - ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale - , tasty, tasty-hunit, tasty-quickcheck, time - }: - mkDerivation { - pname = "hourglass"; - version = "0.2.11"; - sha256 = "0lag9sgj7ndrbfmab6jhszlv413agg0zzaj5r9f2fmf07wqbp9hq"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ - base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time - ]; - benchmarkHaskellDepends = [ - base bytestring deepseq gauge mtl old-locale time - ]; - description = "simple performant time related library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hourglass_0_2_12" = callPackage ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale , tasty, tasty-hunit, tasty-quickcheck, time }: @@ -106700,7 +107018,6 @@ self: { ]; description = "simple performant time related library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hourglass-fuzzy-parsing" = callPackage @@ -106909,7 +107226,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hpack_0_29_7" = callPackage + "hpack_0_30_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , http-client, http-client-tls, http-types, HUnit, infer-license @@ -106919,8 +107236,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.29.7"; - sha256 = "07a9dar92qmgxfkf783rlwpkl49f242ygd50wrc22g4xllgrm2y9"; + version = "0.30.0"; + sha256 = "042lsw0pm5ljfd9vap0r1a8xcvfzyswp5rd495v0grdhxmpbqkyx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107726,8 +108043,8 @@ self: { }: mkDerivation { pname = "hriemann"; - version = "0.3.3.0"; - sha256 = "0apji56rwh1did67z9z0bcy5r9k2m6rrfkiv18rp4mbd863skg25"; + version = "0.3.3.1"; + sha256 = "0a2pljkqjvx88cssq24yq8h06md864fvvr77ka0nnmk3znyddn9f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108016,17 +108333,6 @@ self: { }) {inherit (pkgs) fltk; fltk_images = null;}; "hs-functors" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "hs-functors"; - version = "0.1.2.0"; - sha256 = "0jhhli0hhhmrh313nnydblyz68rhhmf4g6yrn35m8davj5cg1wd7"; - libraryHaskellDepends = [ base transformers ]; - description = "Functors from products of Haskell and its dual to Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hs-functors_0_1_3_0" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "hs-functors"; @@ -108035,7 +108341,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Functors from products of Haskell and its dual to Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-gchart" = callPackage @@ -110336,6 +110641,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_5_6" = callPackage + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck + }: + mkDerivation { + pname = "hspec"; + version = "2.5.6"; + sha256 = "0nfs2a0ymh8nw5v5v16qlbf3np8j1rv7nw3jwa9ib7mlqrmfp9ly"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations QuickCheck + ]; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -110388,6 +110709,8 @@ self: { pname = "hspec-core"; version = "2.4.8"; sha256 = "02zr6n7mqdncvf1braf38zjdplaxrkg11x9k8717k4yg57585ji4"; + revision = "1"; + editedCabalFile = "05rfar3kl9nkh421jxx71p6dn3zykj61lj1hjhrj0z3s6m1ihn5q"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random setenv stm @@ -110415,6 +110738,8 @@ self: { pname = "hspec-core"; version = "2.5.5"; sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x"; + revision = "1"; + editedCabalFile = "1fifkdjhzrvwsx27qcsj0jam66sswjas5vfrzmb75z0xqyg5lpr7"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -110431,6 +110756,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_5_6" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.5.6"; + sha256 = "0pj53qna5x742vnkdlhid7ginqv61awgw4csgb5ay2rd6br8q63g"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random + transformers + ]; + testToolDepends = [ hspec-meta ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -110486,6 +110839,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_5_6" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.5.6"; + sha256 = "0ilaq6l4gikpv6m82dyzfzhdq2d6x3h5jc7zlmw84jx43asqk5lc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + testToolDepends = [ hspec-meta ]; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -110662,6 +111035,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-leancheck" = callPackage + ({ mkDerivation, base, hspec, hspec-core, HUnit, leancheck }: + mkDerivation { + pname = "hspec-leancheck"; + version = "0.0.2"; + sha256 = "1780xhwmbvkhca3l6rckbnr92f7i3icarwprdcfnrrdpk4yq9ml8"; + libraryHaskellDepends = [ base hspec hspec-core HUnit leancheck ]; + testHaskellDepends = [ base hspec leancheck ]; + description = "LeanCheck support for the Hspec test framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-megaparsec" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec @@ -110678,14 +111063,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hspec-megaparsec_1_1_0" = callPackage + "hspec-megaparsec_2_0_0" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec }: mkDerivation { pname = "hspec-megaparsec"; - version = "1.1.0"; - sha256 = "1929fnpys1j7nja1c3limyl6f259gky9dpf98xyyx0pi663qdmf1"; + version = "2.0.0"; + sha256 = "0c4vb0c2y8yar0jjhh24wkkp1g7pbg2wc8h8nw3avfznbil6zyd8"; libraryHaskellDepends = [ base containers hspec-expectations megaparsec ]; @@ -110720,6 +111105,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-meta_2_5_6" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, HUnit + , QuickCheck, quickcheck-io, random, setenv, stm, time + , transformers + }: + mkDerivation { + pname = "hspec-meta"; + version = "2.5.6"; + sha256 = "196dyacvh7liq49ccwd5q0dw6n74igrvhk35zm95i3y8m44ky3a4"; + revision = "1"; + editedCabalFile = "0c7dq1vvk09fj6nljwwshgpkszg725hrpgnq9l2aka230sig9vz4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm time transformers + ]; + executableHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm time transformers + ]; + description = "A version of Hspec which is used to test Hspec itself"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-monad-control" = callPackage ({ mkDerivation, base, hspec-core, monad-control, transformers , transformers-base @@ -111975,8 +112389,8 @@ self: { }: mkDerivation { pname = "htirage"; - version = "1.20170804"; - sha256 = "04rjp4gzi2dfzp9vpmwrvlwdj0mwx7s1myvl85jzlf5ikic1898p"; + version = "2.1.0.20180829"; + sha256 = "1r0p1xsc7gg9d089z7d60qdfcaxahrzd9z951mr7jrqdi7b2fi3f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck text transformers @@ -112322,20 +112736,20 @@ self: { "htoml-megaparsec" = callPackage ({ mkDerivation, aeson, base, bytestring, composition-prelude - , containers, criterion, deepseq, file-embed, hspec, megaparsec - , mtl, tasty, tasty-hspec, tasty-hunit, text, time - , unordered-containers, vector + , containers, criterion, deepseq, file-embed, megaparsec, mtl + , tasty, tasty-hspec, tasty-hunit, text, time, unordered-containers + , vector }: mkDerivation { pname = "htoml-megaparsec"; - version = "2.0.0.2"; - sha256 = "1z0p35l2rjclxkmbvwg6fcfx50ibfd6v7gia5wbnkbgh3cwyp19d"; + version = "2.1.0.2"; + sha256 = "0m5v4f6djwr6sr9sndfal4gwxl0ryq2cg661ka8br7v1ww2d70yl"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers file-embed hspec megaparsec tasty + aeson base bytestring containers file-embed megaparsec tasty tasty-hspec tasty-hunit text time unordered-containers vector ]; benchmarkHaskellDepends = [ base criterion text ]; @@ -112457,6 +112871,8 @@ self: { pname = "http-api-data"; version = "0.3.8.1"; sha256 = "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf"; + revision = "1"; + editedCabalFile = "1843bapm2rdkl4941rycryircpqpp7mbal7vgmlikf11f8ws7y7x"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base bytestring containers hashable @@ -113037,8 +113453,8 @@ self: { }: mkDerivation { pname = "http-monad"; - version = "0.1.1.2"; - sha256 = "0s2ajy2iwi7k5zrs6asp5ncyy06jnphp4ncc130cg2kpnf32yyfz"; + version = "0.1.1.3"; + sha256 = "0hch3qjs5axf4grrvgfmd208ar0pviywkrgdmh26564aqrfpr2y1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113407,17 +113823,18 @@ self: { }) {}; "http2-client-grpc" = callPackage - ({ mkDerivation, base, binary, bytestring, data-default-class - , http2, http2-client, http2-grpc-types, proto-lens - , proto-lens-protoc, text, zlib + ({ mkDerivation, async, base, binary, bytestring, case-insensitive + , data-default-class, http2, http2-client, http2-grpc-types, lens + , proto-lens, proto-lens-protoc, text, tls, zlib }: mkDerivation { pname = "http2-client-grpc"; - version = "0.2.0.0"; - sha256 = "1bg4p6fy09mbi5r355vvrbmc0al7mcwbr3mx2lpkjkzm9cg53x2z"; + version = "0.5.0.1"; + sha256 = "0kjzl1a3fis2jzk18ad9kv1bnzplqshf7i2mg20w8jxvl952v494"; libraryHaskellDepends = [ - base binary bytestring data-default-class http2 http2-client - http2-grpc-types proto-lens proto-lens-protoc text zlib + async base binary bytestring case-insensitive data-default-class + http2 http2-client http2-grpc-types lens proto-lens + proto-lens-protoc text tls zlib ]; testHaskellDepends = [ base ]; description = "Implement gRPC-over-HTTP2 clients"; @@ -113426,12 +113843,18 @@ self: { }) {}; "http2-grpc-types" = callPackage - ({ mkDerivation, base, binary, bytestring, proto-lens, zlib }: + ({ mkDerivation, base, binary, bytestring, case-insensitive + , proto-lens, zlib + }: mkDerivation { pname = "http2-grpc-types"; - version = "0.1.0.0"; - sha256 = "0qj9bffznw8fawalj6hlvx8r0sj9smgks88wdqjq5ran02b6i2dl"; - libraryHaskellDepends = [ base binary bytestring proto-lens zlib ]; + version = "0.3.0.0"; + sha256 = "0r3gfc8alm535hqmyy39hd7nhpp3dmba52l4wf38bj7j3ckggpy5"; + revision = "1"; + editedCabalFile = "10gmgp63ll7zv8sbcw2klc0xi4qaiakbgsv46a5gv1pdgwh78w8b"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive proto-lens zlib + ]; description = "Types for gRPC over HTTP2 common for client and servers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -114637,8 +115060,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.9"; - sha256 = "1c2ykdxvrg0i1wbjgfc0mank5z7466crqcs5hdyddjc833xhmv2d"; + version = "0.6.2.14"; + sha256 = "18x7gxvn8p55j5iva4ag31kmdzcvlq76a56shsnh821xw3aw6ala"; libraryHaskellDepends = [ base bytestring mmap semigroups transformers vector ]; @@ -114653,15 +115076,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-prim_0_6_2_13" = callPackage + "hw-prim_0_6_2_15" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups , transformers, vector }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.13"; - sha256 = "0cvg99v9c86fzf76i4z3lilss0qgs1i91v1hsk2n22a79rmhpvnb"; + version = "0.6.2.15"; + sha256 = "10ab0fmygcgwm748m6grpfdzfxixsns2mbxhxhj3plmcbkfxxbyc"; libraryHaskellDepends = [ base bytestring mmap semigroups transformers vector ]; @@ -114795,8 +115218,8 @@ self: { }: mkDerivation { pname = "hw-simd"; - version = "0.1.1.1"; - sha256 = "1mcingwc7z6ybsn32c3g66r4j9sfwpm4jkqvwh8cbbbd97lhalmq"; + version = "0.1.1.2"; + sha256 = "0jcd6clhcqdmkcvhvf68xldgmx4n1wp333438ypbwk2mwp1q559l"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base vector @@ -118355,6 +118778,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_6_0_8" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, QuickCheck, scientific + , tagged, template-haskell, text, time, unordered-containers + , vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.6.0.8"; + sha256 = "1y2xgridlwmgmhvlchpjlpr8w17qscx6ng9hfara5qshll70vp5m"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ base doctest QuickCheck template-haskell ]; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -119309,8 +119757,8 @@ self: { ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: mkDerivation { pname = "interpolation"; - version = "0.1.0.2"; - sha256 = "1qjh0jx6xx1x80diay8q18basfwkrsm9x0yrqd27ig2mi9drp0qq"; + version = "0.1.0.3"; + sha256 = "0j9hdzi59lqq92773f8h17awrm9ghr45k876qc7krq87pgbr95z2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base utility-ht ]; @@ -119461,6 +119909,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "intro_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, dlist + , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers + , unordered-containers, writer-cps-mtl + }: + mkDerivation { + pname = "intro"; + version = "0.5.0.0"; + sha256 = "0s2xn72d2am24mql3nznrimj308lvzdr44jccm14zx7qq7wpbqr3"; + libraryHaskellDepends = [ + base bytestring containers deepseq dlist extra hashable mtl safe + text transformers unordered-containers writer-cps-mtl + ]; + testHaskellDepends = [ + base bytestring containers deepseq dlist extra hashable lens mtl + QuickCheck safe text transformers unordered-containers + writer-cps-mtl + ]; + description = "Safe and minimal prelude - Exports only total and safe functions, provides Text and Monad transformers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intro-prelude" = callPackage ({ mkDerivation, intro }: mkDerivation { @@ -121389,8 +121860,8 @@ self: { }: mkDerivation { pname = "jack"; - version = "0.7.1.3"; - sha256 = "1n0znnk3q8vic47k1vlv6mdqghrklagcwalvz1arsdfvpy74ig4c"; + version = "0.7.1.4"; + sha256 = "018lsa5mgl7vb0hrd4jswa40d6w7alfq082brax8p832zf0v5bj2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122114,8 +122585,8 @@ self: { ({ mkDerivation, base, haskeline, hspec, HUnit }: mkDerivation { pname = "jord"; - version = "0.4.0.0"; - sha256 = "0sa19hr49l71dlvm1wpkw6901zzws12higd4xksk8b81cwrgp8l2"; + version = "0.4.2.0"; + sha256 = "0nhkxd8vbygybihm1c20bhn8cfylj94l5jr9f7phkp1667lqxdgc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -122936,26 +123407,6 @@ self: { }) {}; "json-rpc-generic" = callPackage - ({ mkDerivation, aeson, aeson-generic-compat, base, containers - , dlist, QuickCheck, quickcheck-simple, scientific, text - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "json-rpc-generic"; - version = "0.2.1.4"; - sha256 = "0zibbxc5fqm9mazfdjbi6angyh5rlcccfd260k667w8lcxc6h7kl"; - libraryHaskellDepends = [ - aeson aeson-generic-compat base containers dlist scientific text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base QuickCheck quickcheck-simple text - ]; - description = "Generic encoder and decode for JSON-RPC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "json-rpc-generic_0_2_1_5" = callPackage ({ mkDerivation, aeson, aeson-generic-compat, base, containers , dlist, QuickCheck, quickcheck-simple, scientific, text , transformers, unordered-containers, vector @@ -122973,7 +123424,6 @@ self: { ]; description = "Generic encoder and decode for JSON-RPC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-rpc-server" = callPackage @@ -123768,6 +124218,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kafka" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "kafka"; + version = "0.0.0.0"; + sha256 = "07x6dsc4d4f3vksi21fxd1vix9wqsydrl17f2xq8858m2ay0j28j"; + doHaddock = false; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "kafka-client" = callPackage ({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec , hspec-discover, network, QuickCheck, snappy, time, zlib @@ -126680,8 +127141,8 @@ self: { }: mkDerivation { pname = "language-bash"; - version = "0.7.1"; - sha256 = "1p8ikx9iq9ssvm8b99hly7pqqw09588xjkgf5397kg5xpv8ga4gp"; + version = "0.8.0"; + sha256 = "16lkqy1skc82cyxsh313184dbm31hrsi3w1729ci8lw8dybmz6ax"; libraryHaskellDepends = [ base parsec pretty transformers ]; testHaskellDepends = [ base parsec process QuickCheck tasty tasty-expected-failure @@ -127022,10 +127483,10 @@ self: { }: mkDerivation { pname = "language-glsl"; - version = "0.2.1"; - sha256 = "08hrl9s8640a61npdshjrw5q3j3b2gvms846cf832j0n19mi24h0"; + version = "0.3.0"; + sha256 = "0hdg67ainlqpjjghg3qin6fg4p783m0zmjqh4rd5gyizwiplxkp1"; revision = "1"; - editedCabalFile = "1dlax6dfjc8ca0p5an3k1f29b078hgb44aj48njf97shvl9hqf5v"; + editedCabalFile = "10ac9pk4jy75k03j1ns4b5136l4kw8krr2d2nw2fdmpm5jzyghc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec prettyclass ]; @@ -127430,8 +127891,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.20"; - sha256 = "074k9lk7wqspbn193qa78f1nabv0s27dza9qh7qzni4v95zz5k4r"; + version = "1.3.20.1"; + sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127461,22 +127922,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-puppet_1_3_20_1" = callPackage + "language-puppet_1_4_0" = 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, lens, lens-aeson , megaparsec, memory, mtl, 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 + , parallel-io, parsec, parser-combinators, 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.20.1"; - sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs"; + version = "1.4.0"; + sha256 = "169kzd6csar170j0zqzisa82jxs5xfang17ys6aa4m1jx0nbh4mz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127485,10 +127946,10 @@ self: { 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 + operational parsec parser-combinators 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 @@ -127798,8 +128259,8 @@ self: { }: mkDerivation { pname = "lapack-ffi-tools"; - version = "0.1.0.1"; - sha256 = "0cddhc6hm72sjkj3i5f38z3bf4m0cy44jnbgv2v5ck5x0h55173w"; + version = "0.1.1"; + sha256 = "1y3h69mkbjidl146y1w0symk8rgpir5gb5914ymmg83nsyyl16vk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -127912,8 +128373,8 @@ self: { ({ mkDerivation, base, containers, utility-ht }: mkDerivation { pname = "latex"; - version = "0.1.0.3"; - sha256 = "1linwqab6z2s91vdxr874vk7rg7gv1ckabsxwmlr80gnhdfgyhmp"; + version = "0.1.0.4"; + sha256 = "10m0l0wlrkkl474sdmi7cl6w6kqyqzcp05h7jdacxhzbxyf8nahw"; libraryHaskellDepends = [ base containers utility-ht ]; description = "Parse, format and process LaTeX files"; license = stdenv.lib.licenses.bsd3; @@ -128529,20 +128990,20 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.7.1"; - sha256 = "184z6n86jg5vmd5f02qzg62hm14snrk5d9knsf72gayyj4fla1kh"; + version = "0.7.3"; + sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; - description = "Cholesterol-free property-based testing"; + description = "Enumerative property-based testing"; license = stdenv.lib.licenses.bsd3; }) {}; - "leancheck_0_7_3" = callPackage + "leancheck_0_7_4" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.7.3"; - sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9"; + version = "0.7.4"; + sha256 = "1lbr0b3k4fk0xlmqh5v4cidayzi9ijkr1i6ykzg2gd0xmjl9b4bq"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; @@ -128616,6 +129077,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "learn-physics_0_6_3" = callPackage + ({ mkDerivation, base, gloss, gnuplot, hmatrix, not-gloss + , spatial-math, vector-space + }: + mkDerivation { + pname = "learn-physics"; + version = "0.6.3"; + sha256 = "0nhc53l963fsviw3yqz7yxwbjwxsrp8s4jckffbg6hl8npakhirh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base gloss gnuplot hmatrix not-gloss spatial-math vector-space + ]; + executableHaskellDepends = [ + base gloss gnuplot not-gloss spatial-math + ]; + description = "Haskell code for learning physics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "learn-physics-examples" = callPackage ({ mkDerivation, base, gloss, gnuplot, learn-physics, not-gloss , spatial-math @@ -129063,11 +129545,25 @@ self: { pname = "lens-labels"; version = "0.2.0.1"; sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj"; + revision = "1"; + editedCabalFile = "0iyh7msip83dzj9gj5f18zchvjinhx40dmdb52vza0x1763qkilv"; libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; description = "Integration of lenses with OverloadedLabels"; license = stdenv.lib.licenses.bsd3; }) {}; + "lens-labels_0_3_0_0" = callPackage + ({ mkDerivation, base, ghc-prim, profunctors, tagged }: + mkDerivation { + pname = "lens-labels"; + version = "0.3.0.0"; + sha256 = "1kpbn9lsaxvw86w3r121rymrxcyihci7njpcw3f2663pb01v39rn"; + libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; + description = "Integration of lenses with OverloadedLabels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-misc" = callPackage ({ mkDerivation, base, lens, tagged, template-haskell }: mkDerivation { @@ -129114,8 +129610,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "1"; - editedCabalFile = "1b9db7dbfq46q63y6w1471nffj77rb363rk4b1l3l23g15cq6a5i"; + revision = "2"; + editedCabalFile = "1b14fcncz2yby0d4jhx2h0ma6nx0fd1z7hrg1va4h7zn06m99482"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; @@ -130928,22 +131424,22 @@ self: { "linear-code" = callPackage ({ mkDerivation, base, containers, data-default , ghc-typelits-knownnat, ghc-typelits-natnormalise, HaskellForMaths - , matrix, QuickCheck, random, random-shuffle, smallcheck, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck + , matrix-static, QuickCheck, random, random-shuffle, smallcheck + , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "linear-code"; - version = "0.1.1"; - sha256 = "0dyz7j6y6ayxd2367pkrln78zr2hx1bygswsy840hjf4xhm30a1b"; + version = "0.2.0"; + sha256 = "14d4gmpqx9x9acaldml7hf64fbpdrncn5akgid1scnqv1jzc9197"; libraryHaskellDepends = [ base containers data-default ghc-typelits-knownnat - ghc-typelits-natnormalise HaskellForMaths matrix random + ghc-typelits-natnormalise HaskellForMaths matrix-static random random-shuffle ]; testHaskellDepends = [ base containers data-default ghc-typelits-knownnat - ghc-typelits-natnormalise HaskellForMaths matrix QuickCheck random - random-shuffle smallcheck tasty tasty-hunit tasty-quickcheck + ghc-typelits-natnormalise HaskellForMaths matrix-static QuickCheck + random random-shuffle smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; description = "A simple library for linear codes (coding theory, error correction)"; @@ -131910,10 +132406,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "list-zip-def"; - version = "0.1.0.1"; - sha256 = "07fasgp9vagsqaaikrn38hxf7dbpfrjcrp97dn72pss7adz7yi6h"; + version = "0.1.0.2"; + sha256 = "15123r7a52qb6dcxy1bxid8llykx439srqripmvji3rizwlqaa89"; libraryHaskellDepends = [ base ]; - description = "Provides zips where the combining doesn't stop premature, but instead uses default values"; + description = "Provides zips with default values"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -132275,8 +132771,8 @@ self: { }: mkDerivation { pname = "llvm-ffi-tools"; - version = "0.0"; - sha256 = "18lfa6fzpcxp6j95wbi5axm58ipzwn98rx3d1c54zdkjhzrl507x"; + version = "0.0.0.1"; + sha256 = "0nicgcdlywb8w5fr7hi5hgayv9phwslp5s47p2c30kavj7c3f3zk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132509,8 +133005,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "3.1.1"; - sha256 = "0mhlz1jv81rl353qp0vbm39qz15yms9n0xlb0s27jj88yf66zks1"; + version = "3.1.1.1"; + sha256 = "1rqszg06r8md7cgw2zgf30yvri4isndj608r9l8grqfnyi4lfjay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133433,6 +133929,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "loglevel" = callPackage + ({ mkDerivation, base, deepseq, text }: + mkDerivation { + pname = "loglevel"; + version = "0.1.0.0"; + sha256 = "12hck2fb7xdk905428yd1a8dnm1hw1apkhw6fr7zqyxzhfqqm1yz"; + libraryHaskellDepends = [ base deepseq text ]; + testHaskellDepends = [ base text ]; + description = "Log Level Datatype"; + license = stdenv.lib.licenses.mit; + }) {}; + "logplex-parse" = callPackage ({ mkDerivation, base, hspec, iso8601-time, parsec, text, time }: mkDerivation { @@ -134037,8 +134545,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "3"; - editedCabalFile = "0y7j6m0n1xi40c7dmabi9lk6mjic9h49xx60rq9xc4xap90hjfqb"; + revision = "4"; + editedCabalFile = "11zfnngp3blx8c3sgy5cva1g9bp69wqz7ys23gdm905i7sjjs6a9"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -134095,8 +134603,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.2.1.0"; - sha256 = "1nd3nn5lyn9cwviijzfhqybj38zg10nf7ypb76ifaax91vj2hrkw"; + version = "0.4.0.0"; + sha256 = "0kiddzb7lwwdf96jz4ghvjnwr2hf9jiv8vjjlxwm76k3ab4wx09c"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -135136,8 +135644,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.2.12"; - sha256 = "0g3nciqjfqkhi6j5kcyp4zwrzbik3v9qrj0jpl374g4r1sw3piq9"; + version = "4.0.2.13"; + sha256 = "10a7q64dm9vw2a3qzvixlg0632l5h8j6xj9ga3w430fxch618f26"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -135998,18 +136506,18 @@ self: { "mandrill" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, containers, email-validate, http-client - , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck - , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time - , unordered-containers + , http-client-tls, http-types, microlens-th, mtl, old-locale + , QuickCheck, raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck + , text, time, unordered-containers }: mkDerivation { pname = "mandrill"; - version = "0.5.3.4"; - sha256 = "0gaz5drb8wvlr12ynwag4rcgmsyzd713j0qgpv9ydy3jlk65nrf7"; + version = "0.5.3.5"; + sha256 = "0yh7r3wrzpzm3iv0zvs6nzf36hwv0y7xlsz6cy3dlnyrr5jbsb1i"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers - email-validate http-client http-client-tls http-types lens mtl - old-locale QuickCheck text time unordered-containers + email-validate http-client http-client-tls http-types microlens-th + mtl old-locale QuickCheck text time unordered-containers ]; testHaskellDepends = [ aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit @@ -136765,15 +137273,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "math-functions_0_3_0_1" = callPackage + "math-functions_0_3_0_2" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit , primitive, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, vector, vector-th-unbox }: mkDerivation { pname = "math-functions"; - version = "0.3.0.1"; - sha256 = "1nrslskbgsy9yx0kzc5a0jdahch218qd16343j001pdxkygq21b2"; + version = "0.3.0.2"; + sha256 = "094kf3261b3m07r6gyf63s0pnhw5v0z1q5pzfskl4y8fdjvsp4kb"; libraryHaskellDepends = [ base data-default-class deepseq primitive vector vector-th-unbox ]; @@ -136783,7 +137291,7 @@ self: { vector vector-th-unbox ]; description = "Collection of tools for numeric computations"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -137032,6 +137540,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "matrix-static" = callPackage + ({ mkDerivation, base, deepseq, ghc-typelits-knownnat + , ghc-typelits-natnormalise, matrix, semigroups, tasty, tasty-hunit + , vector + }: + mkDerivation { + pname = "matrix-static"; + version = "0.1"; + sha256 = "0l4p0ahlpgf39wjwrvr6ibxpj5b6kmyn2li6yjbddi0af137ii4q"; + libraryHaskellDepends = [ + base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix + semigroups vector + ]; + testHaskellDepends = [ + base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix + semigroups tasty tasty-hunit vector + ]; + description = "Wrapper around matrix that adds matrix sizes to the type-level"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "matsuri" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, MissingH , mtl, network, old-locale, split, time, vty, vty-ui, XMPP @@ -137885,8 +138414,8 @@ self: { pname = "megaparsec"; version = "6.5.0"; sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy"; - revision = "3"; - editedCabalFile = "137ap53bgvnc0bdhkyv84290i3fzngryijsv33h7fb0q9k6dmb6h"; + revision = "4"; + editedCabalFile = "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -137901,6 +138430,33 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, hspec, hspec-expectations, mtl + , parser-combinators, QuickCheck, scientific, text, transformers + , weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "7.0.0"; + sha256 = "101kri8w4wf30xs9fnp938il13hxhy6gnnl4m1f0ws4d8q6qgmmz"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hspec + hspec-expectations mtl parser-combinators QuickCheck scientific + text transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq text weigh + ]; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -138917,21 +139473,6 @@ self: { }) {}; "microlens-ghc" = callPackage - ({ mkDerivation, array, base, bytestring, containers, microlens - , transformers - }: - mkDerivation { - pname = "microlens-ghc"; - version = "0.4.9"; - sha256 = "0wdwra9s7gllw0i7sf7d371h6d5qwlk6jrvhdm8hafj4fxagafma"; - libraryHaskellDepends = [ - array base bytestring containers microlens transformers - ]; - description = "microlens + array, bytestring, containers, transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-ghc_0_4_9_1" = callPackage ({ mkDerivation, array, base, bytestring, containers, microlens , transformers }: @@ -138944,7 +139485,6 @@ self: { ]; description = "microlens + array, bytestring, containers, transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-mtl" = callPackage @@ -138979,23 +139519,6 @@ self: { }) {}; "microlens-th" = callPackage - ({ mkDerivation, base, containers, microlens, template-haskell - , th-abstraction, transformers - }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.2.1"; - sha256 = "0hpwwk50a826s87ad0k6liw40qp6av0hmdhnsdfhhk5mka710mzc"; - libraryHaskellDepends = [ - base containers microlens template-haskell th-abstraction - transformers - ]; - testHaskellDepends = [ base microlens ]; - description = "Automatic generation of record lenses for microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-th_0_4_2_2" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell , th-abstraction, transformers }: @@ -139010,7 +139533,6 @@ self: { testHaskellDepends = [ base microlens ]; description = "Automatic generation of record lenses for microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "micrologger" = callPackage @@ -139192,8 +139714,8 @@ self: { }: mkDerivation { pname = "midi-music-box"; - version = "0.0.0.4"; - sha256 = "0l8nv3bfbncjbh80dav7qps5aqd20g88sx00xhqr6j9m66znfg1p"; + version = "0.0.0.5"; + sha256 = "1zgskam31akqi58wvjxqfgag937fczskyvzanivvxd7p6gvj5l0g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -140400,6 +140922,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "modern-uri_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-discover + , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck + , reflection, tagged, template-haskell, text, weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.3.0.0"; + sha256 = "059p1lzfk7bwshlgy0sgms651003992jgxv2lr7r714sy5brfwb4"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec mtl profunctors QuickCheck reflection tagged + template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + description = "Modern library for working with URIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -140602,8 +141151,8 @@ self: { }: mkDerivation { pname = "mohws"; - version = "0.2.1.5"; - sha256 = "1xkkkb1ili45icvlmz2r5i42qf1fib01ywqywgq4n53cyx1ncqa9"; + version = "0.2.1.6"; + sha256 = "0rnb6nq99bav0z5dxzc4xkb2ai6ifm5v2ijd76sgzbs2032v6wqs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -141221,15 +141770,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monad-memo_0_5_0" = callPackage + "monad-memo_0_5_1" = callPackage ({ mkDerivation, array, base, containers, criterion, primitive , QuickCheck, random, test-framework, test-framework-quickcheck2 , transformers, vector }: mkDerivation { pname = "monad-memo"; - version = "0.5.0"; - sha256 = "1ax1myhgnpy7gyb7pxn98424mda317zvji47bdwj2h58rpldqhjm"; + version = "0.5.1"; + sha256 = "1zsvp0g2kzjf5zkv1js65jfc1p3yrkr95csp2ljpqx857qy4lnn6"; libraryHaskellDepends = [ array base containers primitive transformers vector ]; @@ -141966,6 +142515,8 @@ self: { pname = "monadplus"; version = "1.4.2"; sha256 = "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin"; + revision = "1"; + editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp"; libraryHaskellDepends = [ base ]; description = "Haskell98 partial maps and filters over MonadPlus"; license = stdenv.lib.licenses.bsd3; @@ -142053,8 +142604,8 @@ self: { ({ mkDerivation, base, bindings-monetdb-mapi }: mkDerivation { pname = "monetdb-mapi"; - version = "0.1.0.0"; - sha256 = "0v7709zvx2q07zymdk2hi4nwaby4a5i02qgs97l5f9s4nwwb5qmr"; + version = "0.1.0.1"; + sha256 = "1r035w349js424x0864xghvs79v4wsf9br4rwqpfqkyz2hxsqhx0"; libraryHaskellDepends = [ base bindings-monetdb-mapi ]; description = "Mid-level bindings for the MonetDB API (mapi)"; license = stdenv.lib.licenses.bsd3; @@ -146841,16 +147392,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "network_2_7_0_2" = callPackage + "network_2_8_0_0" = callPackage ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit , unix }: mkDerivation { pname = "network"; - version = "2.7.0.2"; - sha256 = "1fsdcwz7w1g1gznr62a6za8jc2g8cq5asrcq2vc14x9plf31s2vf"; - revision = "2"; - editedCabalFile = "04h5wq6116brd2r3182g65crrbidn43wi43qz1n99gl042ydgf3w"; + version = "2.8.0.0"; + sha256 = "00skcish0xmm67ax999nv1nll9rm3gqmn92099iczd73nxl55468"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring directory doctest hspec HUnit @@ -148091,6 +148640,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {nfc = null;}; + "ngram" = callPackage + ({ mkDerivation, base, bytestring, cereal, cereal-text, containers + , optparse-generic, text, zlib + }: + mkDerivation { + pname = "ngram"; + version = "0.1.0.0"; + sha256 = "0qk5wgkr69jd9gdy524nsx6r9ss328ynq65k6wn5k7pjkmnfym26"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cereal cereal-text containers text + ]; + executableHaskellDepends = [ + base bytestring cereal cereal-text containers optparse-generic text + zlib + ]; + description = "Ngram models for compressing and classifying text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ngrams-loader" = callPackage ({ mkDerivation, attoparsec, base, machines, mtl, parseargs , resourcet, sqlite-simple, text @@ -148864,12 +149434,12 @@ self: { }) {}; "non-empty-containers" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { pname = "non-empty-containers"; - version = "0.1.1.0"; - sha256 = "1m4js4z27x43bkccbaqnlrmknfdiwqgdvvkfad7r4kgwdmil3mnc"; - libraryHaskellDepends = [ base containers ]; + version = "0.1.2.0"; + sha256 = "0lqyz0xn34byx8f71klj21ficjpy6c049x3fngs7x765vam2dmii"; + libraryHaskellDepends = [ base containers semigroupoids ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -149231,6 +149801,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nowdoc" = callPackage + ({ mkDerivation, base, bytestring, template-haskell }: + mkDerivation { + pname = "nowdoc"; + version = "0.1.1.0"; + sha256 = "0s2j7z9zyb3y3k5hviqjnb3l2z9mvxll5m9nsvq566hn5h5lkzjg"; + libraryHaskellDepends = [ base bytestring template-haskell ]; + testHaskellDepends = [ base bytestring template-haskell ]; + description = "Here document without variable expansion like PHP Nowdoc"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "np-extras" = callPackage ({ mkDerivation, base, containers, numeric-prelude, primes }: mkDerivation { @@ -149406,6 +149988,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ntype" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ntype"; + version = "0.1.0.0"; + sha256 = "0raz6azyj7a3fygpmylhz38b75zy57xdrginbhj2d6vwzxhkmscd"; + libraryHaskellDepends = [ base ]; + description = "N-ary sum/product types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "null-canvas" = callPackage ({ mkDerivation, aeson, base, containers, filepath, scotty, split , stm, text, transformers, wai-extra, warp @@ -149632,8 +150225,8 @@ self: { }: mkDerivation { pname = "numeric-prelude"; - version = "0.4.3"; - sha256 = "0bc937gblm8rz68fr3q2ms19hqjwi20wkmn1k1c0b675c2kgky5q"; + version = "0.4.3.1"; + sha256 = "0531yjw1rzbv3snv1lc955350frgf8526slsxbx3ias71krbdr69"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150334,8 +150927,8 @@ self: { }: mkDerivation { pname = "ochintin-daicho"; - version = "0.3.1.1"; - sha256 = "06xdr5763xipzpl83190p8ha1rm9akqa49dh0588ibbhk2zbk0ln"; + version = "0.3.4.2"; + sha256 = "0k7k4rj3356n9d8waw5sjiq97w9wbrhq3bwqr0hr3zh2h5imy5sy"; libraryHaskellDepends = [ base bookkeeping mono-traversable text transaction ]; @@ -151390,23 +151983,6 @@ self: { }) {}; "openexr-write" = callPackage - ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 - , deepseq, directory, hspec, split, vector, vector-split, zlib - }: - mkDerivation { - pname = "openexr-write"; - version = "0.1.0.1"; - sha256 = "0f45jgj08fmrj30f167xldapm5lqma4yy95y9mjx6appb7cg5qvd"; - libraryHaskellDepends = [ - base binary bytestring data-binary-ieee754 deepseq split vector - vector-split zlib - ]; - testHaskellDepends = [ base bytestring directory hspec vector ]; - description = "Library for writing images in OpenEXR HDR file format"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "openexr-write_0_1_0_2" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 , deepseq, directory, hspec, split, vector, vector-split, zlib }: @@ -151421,7 +151997,6 @@ self: { testHaskellDepends = [ base bytestring directory hspec vector ]; description = "Library for writing images in OpenEXR HDR file format"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openflow" = callPackage @@ -151901,14 +152476,16 @@ self: { "opentok" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-compat, base , base-compat, base64-string, bytestring, containers, convertible - , either, hscolour, http-client, http-client-tls, http-conduit - , http-types, iproute, jose, lens, monad-time, SHA, strings, text - , time, transformers, unordered-containers, utf8-string, uuid + , either, hscolour, hspec, http-client, http-client-tls + , http-conduit, http-types, iproute, jose, lens, monad-time + , QuickCheck, quickcheck-instances, SHA, split, strings, tasty + , tasty-hspec, tasty-quickcheck, text, time, transformers + , unordered-containers, utf8-string, uuid }: mkDerivation { pname = "opentok"; - version = "0.0.4"; - sha256 = "1wzl7ra1y3998kp54j9hpnv58kzk1ysx9qivi4fsg0psyvhqf17j"; + version = "0.0.5"; + sha256 = "1jcqsa9p1794hgf5ywq605i4rb85dm5qpvznn4n3s4y8d409k6wq"; libraryHaskellDepends = [ aeson aeson-casing aeson-compat base base-compat base64-string bytestring containers convertible either hscolour http-client @@ -151916,6 +152493,14 @@ self: { monad-time SHA strings text time transformers unordered-containers utf8-string uuid ]; + testHaskellDepends = [ + aeson aeson-casing aeson-compat base base-compat base64-string + bytestring containers convertible either hspec http-client + http-client-tls http-conduit http-types iproute jose lens + monad-time QuickCheck quickcheck-instances SHA split strings tasty + tasty-hspec tasty-quickcheck text time transformers + unordered-containers utf8-string uuid + ]; description = "An OpenTok SDK for Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -152094,8 +152679,8 @@ self: { }: mkDerivation { pname = "optima"; - version = "0.3.0.1"; - sha256 = "10xacn6myg486hk3i4a586xnwsjqjd1r29pyw1plgmb7yjp75z85"; + version = "0.3.0.2"; + sha256 = "116h7rdv7g2h5bjxr883s15hg9l194q3nkyn045w2ygapk4xsimg"; libraryHaskellDepends = [ attoparsec attoparsec-data base optparse-applicative text text-builder @@ -153531,6 +154116,8 @@ self: { pname = "pandoc-citeproc"; version = "0.14.3.1"; sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22"; + revision = "1"; + editedCabalFile = "1lqz432ij7yp6l412vcfk400nmxzbix6qckgmir46k1jm4glyqwk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -154090,6 +154677,8 @@ self: { pname = "papa-bifunctors-export"; version = "0.3.1"; sha256 = "070br6i23pdhha9kakfw4sq8rslyrjsf1n0iikm60ca5ldbl8vn0"; + revision = "1"; + editedCabalFile = "1d5jvb35as6kb9nmv99gv38v7rzl7c9mdg3ypwzmdqg0646m9k7m"; libraryHaskellDepends = [ base bifunctors ]; description = "export useful functions from `bifunctors`"; license = stdenv.lib.licenses.bsd3; @@ -154713,6 +155302,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "paripari" = callPackage + ({ mkDerivation, base, bytestring, parser-combinators, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "paripari"; + version = "0.2.0.0"; + sha256 = "0lg1bywgy4kfxl9q6jrk9kmww5d26azak023zqj0pg076575yji6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring parser-combinators text + ]; + executableHaskellDepends = [ + base bytestring parser-combinators text + ]; + testHaskellDepends = [ + base bytestring parser-combinators tasty tasty-hunit text + ]; + description = "Fast-path parser combinators with fallback for error reporting"; + license = stdenv.lib.licenses.mit; + }) {}; + "parport" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -155452,21 +156064,22 @@ self: { "patat" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , bytestring, containers, directory, filepath, mtl, network - , network-uri, optparse-applicative, pandoc, skylighting - , terminal-size, text, time, unordered-containers, yaml + , base64-bytestring, bytestring, colour, containers, directory + , filepath, mtl, network, network-uri, optparse-applicative, pandoc + , process, skylighting, terminal-size, text, time + , unordered-containers, yaml }: mkDerivation { pname = "patat"; - version = "0.7.2.0"; - sha256 = "1kn739dywchvvvcp972yyxg7r4n81s3qbrni684ag7493nck12iw"; + version = "0.8.0.0"; + sha256 = "1xbddlc73b0sgd02vxkbhra04wz77q0dn1937k6aq5l1vx663i81"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base bytestring containers - directory filepath mtl network network-uri optparse-applicative - pandoc skylighting terminal-size text time unordered-containers - yaml + aeson ansi-terminal ansi-wl-pprint base base64-bytestring + bytestring colour containers directory filepath mtl network + network-uri optparse-applicative pandoc process skylighting + terminal-size text time unordered-containers yaml ]; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; @@ -157284,31 +157897,6 @@ self: { }) {}; "persistent-mysql-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , io-streams, monad-logger, mysql-haskell, network, persistent - , persistent-template, resource-pool, resourcet, text, time, tls - , transformers, unliftio-core - }: - mkDerivation { - pname = "persistent-mysql-haskell"; - version = "0.4.1"; - sha256 = "1wp8va21l03i0wlchlmzik7npvrm4gma4wly0p9rljdwizhgh291"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers io-streams monad-logger - mysql-haskell network persistent resource-pool resourcet text time - tls transformers unliftio-core - ]; - executableHaskellDepends = [ - base monad-logger persistent persistent-template transformers - ]; - description = "A pure haskell backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "persistent-mysql-haskell_0_4_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-logger, mysql-haskell, network, persistent , persistent-template, resource-pool, resourcet, text, time, tls @@ -157506,34 +158094,6 @@ self: { }) {inherit (pkgs) sqlite;}; "persistent-sqlite" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , hspec, microlens-th, monad-logger, old-locale, persistent - , persistent-template, resource-pool, resourcet, sqlite, temporary - , text, time, transformers, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.8.1.2"; - sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g"; - configureFlags = [ "-fsystemlib" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers microlens-th monad-logger - old-locale persistent resource-pool resourcet text time - transformers unliftio-core unordered-containers - ]; - librarySystemDepends = [ sqlite ]; - testHaskellDepends = [ - base hspec persistent persistent-template temporary text time - transformers - ]; - description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {inherit (pkgs) sqlite;}; - - "persistent-sqlite_2_8_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-logger, old-locale, persistent , persistent-template, resource-pool, resourcet, sqlite, temporary @@ -157558,7 +158118,6 @@ self: { ]; description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; @@ -161245,8 +161804,8 @@ self: { }: mkDerivation { pname = "pomaps"; - version = "0.0.1.0"; - sha256 = "1vvvpqr3gnps425mv00scmab0hc8h93ylsiw07vm8cpafwkfxii8"; + version = "0.0.2.0"; + sha256 = "08mlj61archpiqq8375gi5ha9mpxgpnsfpsx3kqja92dgj0aq5q6"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -161460,8 +162019,8 @@ self: { }: mkDerivation { pname = "pooled-io"; - version = "0.0.2.1"; - sha256 = "1l7rgwlkhgxxh9y3ag341zifdjabhmwd6k9hg83rqnnmfs45lh3x"; + version = "0.0.2.2"; + sha256 = "1g8zppj2s1wfzg5rpdgz15m44ihxhmrx16jx12n4821cdhsm2nrs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162386,15 +162945,15 @@ self: { , hspec-wai, hspec-wai-json, HTTP, http-types , insert-ordered-containers, interpolatedstring-perl6, jose, lens , lens-aeson, monad-control, network-uri, optparse-applicative - , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe + , parsec, process, protolude, Ranged-sets, regex-tdfa, retry , scientific, swagger2, text, time, transformers-base, unix , unordered-containers, vector, wai, wai-cors, wai-extra , wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.5.0.0"; - sha256 = "1sixscxpx6dl7hj87yk6zz4a8rg4qwlcchqrxxg1m0gjhln0aqx3"; + version = "5.1.0"; + sha256 = "1x6jipc8ixv9wic5l0nlsirm3baddmrhphrr3snil1by5kz208g6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162403,7 +162962,7 @@ self: { contravariant-extras cookie either gitrev hasql hasql-pool hasql-transaction heredoc HTTP http-types insert-ordered-containers interpolatedstring-perl6 jose lens lens-aeson network-uri - optparse-applicative parsec protolude Ranged-sets regex-tdfa safe + optparse-applicative parsec protolude Ranged-sets regex-tdfa scientific swagger2 text time unordered-containers vector wai wai-cors wai-extra wai-middleware-static ]; @@ -162551,8 +163110,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.0.6"; - sha256 = "1gjjs03kpvq544pada5a1r9vjv3dwiqkkgp7hb6ync41mpwvhssl"; + version = "2.0.12"; + sha256 = "0ccbm3hvpffr673kyp1ky9xpq1ig4gspvqv88yp2ifhrpw9wsi39"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -162583,25 +163142,26 @@ self: { }) {}; "potoki-core" = callPackage - ({ mkDerivation, acquire, attoparsec, base, bytestring, directory - , foldl, hashable, ilist, primitive, profunctors, ptr, QuickCheck - , quickcheck-instances, random, rerebase, scanner, stm, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector + ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion + , directory, foldl, hashable, ilist, primitive, profunctors, ptr + , QuickCheck, quickcheck-instances, random, rerebase, scanner + , split, stm, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "potoki-core"; - version = "2.2.8.2"; - sha256 = "11d75dm2y1fw5kzbkf5vx55b0xa2sn1picbykfl6zypqbqmpa86g"; + version = "2.2.13.1"; + sha256 = "09qr9xh0gzfvqla0mqjwdb3xf8xx82fy5188xml5vp1wq234wv8j"; libraryHaskellDepends = [ acquire attoparsec base bytestring directory foldl hashable - primitive profunctors ptr scanner stm text transformers + primitive profunctors ptr scanner stm text time transformers unordered-containers vector ]; testHaskellDepends = [ acquire attoparsec foldl ilist QuickCheck quickcheck-instances - random rerebase tasty tasty-hunit tasty-quickcheck + random rerebase split tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ criterion rerebase ]; description = "Low-level components of \"potoki\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -163938,24 +164498,27 @@ self: { }) {}; "primitive-containers" = callPackage - ({ mkDerivation, base, containers, contiguous, gauge, ghc-prim - , primitive, primitive-sort, QuickCheck, quickcheck-classes, random - , tasty, tasty-quickcheck + ({ mkDerivation, aeson, base, containers, contiguous, deepseq + , gauge, ghc-prim, hashable, HUnit, primitive, primitive-sort + , quantification, QuickCheck, quickcheck-classes, random, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "primitive-containers"; - version = "0.2.0"; - sha256 = "11q0dvlsdabmsjsr0gznr8ndx1fyvbvv8jxfszj6na8jhrz7x84b"; + version = "0.3.0"; + sha256 = "0yk7gqngdkm3s3pmmzbvrjd52hiqjn0gg2j60iw7wnaalagcap6x"; libraryHaskellDepends = [ - base contiguous primitive primitive-sort + aeson base contiguous deepseq hashable primitive primitive-sort + quantification text unordered-containers vector ]; testHaskellDepends = [ - base containers primitive QuickCheck quickcheck-classes tasty - tasty-quickcheck + aeson base containers HUnit primitive quantification QuickCheck + quickcheck-classes tasty tasty-hunit tasty-quickcheck text ]; benchmarkHaskellDepends = [ base containers gauge ghc-prim primitive random ]; + description = "containers backed by arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -163968,8 +164531,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.6.7"; - sha256 = "0kh2cccy1pmvvsrl9sjvcar4l1i3igk9vf8lxxxlwypj43nm32ny"; + version = "0.7.0.2"; + sha256 = "01xjis2y8gpa1f45g3nf9lminy3yhbsb10fzhk23z5n8205jh77d"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive profunctors vector @@ -164032,8 +164595,8 @@ self: { pname = "primitive-sort"; version = "0.1.0.0"; sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3"; - revision = "1"; - editedCabalFile = "0b148bc30nbfrmdx1k7d4ky6k129w8vy146di90v9q12rvsdaz8w"; + revision = "2"; + editedCabalFile = "1yn5nwdw5jmzg603ln626gz2ifjn8fssgzq17g4nyriscqfg1aki"; libraryHaskellDepends = [ base contiguous ghc-prim primitive ]; testHaskellDepends = [ base containers doctest HUnit primitive QuickCheck smallcheck tasty @@ -164273,8 +164836,8 @@ self: { }: mkDerivation { pname = "probability"; - version = "0.2.5.1"; - sha256 = "0bgdyx562x91a3s79p293pz4qimwd2k35mfxap23ia6x6a5prrnk"; + version = "0.2.5.2"; + sha256 = "059l9by2zxb92dd2vshxx9f3sm1kazc2i2ll168hfsya9rrqqaqg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers random transformers utility-ht @@ -164637,18 +165200,6 @@ self: { }) {}; "product-isomorphic" = callPackage - ({ mkDerivation, base, template-haskell, th-data-compat }: - mkDerivation { - pname = "product-isomorphic"; - version = "0.0.3.2"; - sha256 = "1yqpfdbdq0zh69mbpgns8faj0ajc9a8wgp3c8sgn373py2as9jxl"; - libraryHaskellDepends = [ base template-haskell th-data-compat ]; - testHaskellDepends = [ base template-haskell ]; - description = "Weaken applicative functor on products"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "product-isomorphic_0_0_3_3" = callPackage ({ mkDerivation, base, template-haskell, th-data-compat }: mkDerivation { pname = "product-isomorphic"; @@ -164658,7 +165209,6 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Weaken applicative functor on products"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "product-profunctors" = callPackage @@ -165470,22 +166020,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens-arbitrary" = callPackage - ({ mkDerivation, base, bytestring, containers, lens-family - , proto-lens, QuickCheck, text + "proto-lens_0_4_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq + , lens-family, lens-labels, parsec, pretty, text, transformers + , void }: mkDerivation { - pname = "proto-lens-arbitrary"; - version = "0.1.2.1"; - sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2"; + pname = "proto-lens"; + version = "0.4.0.0"; + sha256 = "1yj86mnjc3509ad9g19fr9fdkblwfyilb5ydv1isn6xs7llq3c3r"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers lens-family proto-lens QuickCheck text + attoparsec base bytestring containers deepseq lens-family + lens-labels parsec pretty text transformers void ]; - description = "Arbitrary instances for proto-lens"; + description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "proto-lens-arbitrary_0_1_2_2" = callPackage + "proto-lens-arbitrary" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text }: @@ -165498,6 +166052,21 @@ self: { ]; description = "Arbitrary instances for proto-lens"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "proto-lens-arbitrary_0_1_2_3" = callPackage + ({ mkDerivation, base, bytestring, containers, lens-family + , proto-lens, QuickCheck, text + }: + mkDerivation { + pname = "proto-lens-arbitrary"; + version = "0.1.2.3"; + sha256 = "0ljr6iyqrdlfay0yd2j6q2wm5k79wnn4ay4kbmzmw2fdy0p73gyn"; + libraryHaskellDepends = [ + base bytestring containers lens-family proto-lens QuickCheck text + ]; + description = "Arbitrary instances for proto-lens"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -165508,8 +166077,8 @@ self: { }: mkDerivation { pname = "proto-lens-combinators"; - version = "0.1.0.10"; - sha256 = "0yv6wrg3wsp6617mw02n3d9gmlb9nyvfabffrznpvlaywwk8cnir"; + version = "0.1.0.11"; + sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base data-default-class lens-family proto-lens-protoc transformers @@ -165523,22 +166092,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "proto-lens-combinators_0_1_0_11" = callPackage - ({ mkDerivation, base, Cabal, data-default-class, HUnit - , lens-family, lens-family-core, proto-lens, proto-lens-protoc - , test-framework, test-framework-hunit, transformers + "proto-lens-combinators_0_4" = callPackage + ({ mkDerivation, base, Cabal, HUnit, lens-family, lens-family-core + , proto-lens, proto-lens-runtime, proto-lens-setup, test-framework + , test-framework-hunit, transformers }: mkDerivation { pname = "proto-lens-combinators"; - version = "0.1.0.11"; - sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + version = "0.4"; + sha256 = "1fc98ynjx0b9x4v56pzkf3h9y46a583aw3lf7l9ij4ck87y83q6b"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ - base data-default-class lens-family proto-lens-protoc transformers + base lens-family proto-lens transformers ]; testHaskellDepends = [ base HUnit lens-family lens-family-core proto-lens - proto-lens-protoc test-framework test-framework-hunit + proto-lens-runtime test-framework test-framework-hunit ]; description = "Utilities functions to proto-lens"; license = stdenv.lib.licenses.bsd3; @@ -165566,8 +166135,8 @@ self: { ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.1.1"; - sha256 = "1zi6kv6af39bbbcf2v7d1l2fc2f3m6r1i2yvv4ddm6w0i7vhd1qw"; + version = "0.1.1.2"; + sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; @@ -165575,12 +166144,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens-optparse_0_1_1_2" = callPackage + "proto-lens-optparse_0_1_1_3" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.1.2"; - sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55"; + version = "0.1.1.3"; + sha256 = "0dciwsc1qa9iisym5702a0kjwfiikqgfijdzpf21q2aiffagkacd"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; @@ -165624,17 +166193,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; - "proto-lens-protobuf-types_0_3_0_2" = callPackage + "proto-lens-protobuf-types_0_4_0_0" = callPackage ({ mkDerivation, base, Cabal, lens-labels, proto-lens - , proto-lens-protoc, protobuf, text + , proto-lens-runtime, proto-lens-setup, protobuf, text }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.3.0.2"; - sha256 = "0vslpjrhvkyz10g4fg1fbfkqggg7x0jd3vp68419aflgk293pgsx"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + version = "0.4.0.0"; + sha256 = "1h2ss8nn569g97cvq3lflgcc6sz3k9y3gx0ini69d1lrkccd8jmg"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ - base lens-labels proto-lens proto-lens-protoc text + base lens-labels proto-lens proto-lens-runtime text ]; libraryToolDepends = [ protobuf ]; description = "Basic protocol buffer message types"; @@ -165670,32 +166239,6 @@ self: { }) {inherit (pkgs) protobuf;}; "proto-lens-protoc" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers - , data-default-class, deepseq, directory, filepath - , haskell-src-exts, lens-family, lens-labels, pretty, process - , proto-lens, protobuf, text - }: - mkDerivation { - pname = "proto-lens-protoc"; - version = "0.3.1.0"; - sha256 = "0hihwynqlxhbc7280v7syag0p5php4gdvchbpzvwl54hvcjakgvx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers data-default-class deepseq - directory filepath haskell-src-exts lens-family lens-labels pretty - process proto-lens text - ]; - libraryToolDepends = [ protobuf ]; - executableHaskellDepends = [ - base bytestring containers data-default-class deepseq filepath - haskell-src-exts lens-family proto-lens text - ]; - description = "Protocol buffer compiler for the proto-lens library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protoc_0_3_1_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, deepseq, directory, filepath , haskell-src-exts, lens-family, lens-labels, pretty, process @@ -165719,9 +166262,63 @@ self: { ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) protobuf;}; + + "proto-lens-protoc_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath + , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text + }: + mkDerivation { + pname = "proto-lens-protoc"; + version = "0.4.0.0"; + sha256 = "1w22278jjcyj9z4lwpkxws9v97maqrwacmd5d0pl8d2byh8jqry8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers filepath haskell-src-exts lens-family pretty + proto-lens text + ]; + libraryToolDepends = [ protobuf ]; + executableHaskellDepends = [ + base bytestring containers lens-family proto-lens text + ]; + description = "Protocol buffer compiler for the proto-lens library"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; + "proto-lens-runtime" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , lens-family, lens-labels, proto-lens, text + }: + mkDerivation { + pname = "proto-lens-runtime"; + version = "0.4.0.1"; + sha256 = "0kyd2y4jhzb0isclk5gw98c4n49kjnl27rlywmajmbfwf2d6w4yc"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath lens-family lens-labels + proto-lens text + ]; + doHaddock = false; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "proto-lens-setup" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, deepseq + , directory, filepath, process, proto-lens-protoc, temporary, text + }: + mkDerivation { + pname = "proto-lens-setup"; + version = "0.4.0.0"; + sha256 = "0j0a2jq9axq8v4h918lnrvjg0zyb0gvr5v3x9c6lajv8fb8bxmlf"; + libraryHaskellDepends = [ + base bytestring Cabal containers deepseq directory filepath process + proto-lens-protoc temporary text + ]; + description = "Cabal support for codegen with proto-lens"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "protobuf" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cereal, containers , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged @@ -165792,6 +166389,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protobuf-simple_0_1_1_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-binary-ieee754, directory, filepath, hspec, mtl, parsec + , QuickCheck, quickcheck-instances, split, text + }: + mkDerivation { + pname = "protobuf-simple"; + version = "0.1.1.0"; + sha256 = "1i6dmf9nppjk2xd2s91bmbnb9r915h5ypq5923jpralry2ax6ach"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 mtl text + ]; + executableHaskellDepends = [ + base containers directory filepath mtl parsec split text + ]; + testHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 filepath + hspec parsec QuickCheck quickcheck-instances split text + ]; + description = "Simple Protocol Buffers library (proto2)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string @@ -165857,22 +166480,6 @@ self: { }) {}; "protocol-radius" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, cryptonite - , dlist, memory, template-haskell, text, transformers - }: - mkDerivation { - pname = "protocol-radius"; - version = "0.0.1.0"; - sha256 = "1ygn7kd6rdmgb4hy4iby0l9m1hm6w0linhjipgv7vczd8b0mw35f"; - libraryHaskellDepends = [ - base bytestring cereal containers cryptonite dlist memory - template-haskell text transformers - ]; - description = "parser and printer for radius protocol packet"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-radius_0_0_1_1" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, cryptonite , dlist, memory, template-haskell, text, transformers }: @@ -165886,7 +166493,6 @@ self: { ]; description = "parser and printer for radius protocol packet"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-radius-test" = callPackage @@ -166774,23 +167380,27 @@ self: { }) {}; "purescript-iso" = callPackage - ({ mkDerivation, aeson, async, attoparsec-uri, base, bytestring - , containers, monad-control, mtl, QuickCheck, quickcheck-instances - , stm, strict, tasty, tasty-quickcheck, text, time, utf8-string - , uuid, zeromq4-haskell, zeromq4-simple + ({ mkDerivation, aeson, aeson-attoparsec, aeson-diff, async + , attoparsec, attoparsec-uri, base, bytestring, containers + , emailaddress, monad-control, mtl, QuickCheck + , quickcheck-instances, scientific, stm, strict, tasty + , tasty-quickcheck, text, time, utf8-string, uuid, zeromq4-haskell + , zeromq4-simple }: mkDerivation { pname = "purescript-iso"; - version = "0.0.1.2"; - sha256 = "0mlrj4q40d71r61lc5h9a7wfycmj1kgn6appaqbffrdjz64hmrfh"; + version = "0.0.2"; + sha256 = "0biam9asa6h1ymzms91lafiw8h5pd7k3n13cmrk8b4lbs8zp48j1"; libraryHaskellDepends = [ - aeson async attoparsec-uri base bytestring containers monad-control - mtl QuickCheck quickcheck-instances stm strict text time + aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri + base bytestring containers emailaddress monad-control mtl + QuickCheck quickcheck-instances scientific stm strict text time utf8-string uuid zeromq4-haskell zeromq4-simple ]; testHaskellDepends = [ - aeson async attoparsec-uri base bytestring containers monad-control - mtl QuickCheck quickcheck-instances stm strict tasty + aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri + base bytestring containers emailaddress monad-control mtl + QuickCheck quickcheck-instances scientific stm strict tasty tasty-quickcheck text time utf8-string uuid zeromq4-haskell zeromq4-simple ]; @@ -167557,8 +168167,8 @@ self: { }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.5.0"; - sha256 = "14349jf69wvbcp18xi5jb0281qhrz38pw68qw91hwfr8vmqdx8h7"; + version = "0.5.1"; + sha256 = "1pwqc5i6viyk3ik8vh2zd9k25vj9y1r9mmikxwzjhv6jwc8sb5pb"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; @@ -167615,8 +168225,8 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.5.0"; - sha256 = "0c4z56siw1kkqiyzmbpjk6jkzmcxqv6ji52rnivlavlyw3b4s2a3"; + version = "0.5.1"; + sha256 = "082mz3j3bk7hlagwdw0y399r8jid2wf6xzsdd2wnc4n6z6w6p8gx"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator @@ -167648,8 +168258,8 @@ self: { }: mkDerivation { pname = "quadratic-irrational"; - version = "0.0.5"; - sha256 = "1z9a1q8px4sx7fq9i1lwfx98kz0nv8zhkz5vsfn31krvd4xvkndz"; + version = "0.0.6"; + sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0"; libraryHaskellDepends = [ arithmoi base containers mtl transformers ]; @@ -167700,15 +168310,15 @@ self: { }) {}; "quantification" = callPackage - ({ mkDerivation, aeson, base, containers, ghc-prim, hashable - , path-pieces, text, unordered-containers, vector + ({ mkDerivation, aeson, base, binary, containers, ghc-prim + , hashable, path-pieces, text, unordered-containers, vector }: mkDerivation { pname = "quantification"; - version = "0.4"; - sha256 = "0bsdfmzaaxq2mf6bbbphg2dy8q6lhc7n3mfcy20fp4la0cj49aj2"; + version = "0.5.0"; + sha256 = "0ls8rhy0idrgj9dnd5ajjfi55bhz4qsyncj3ghw3nyrbr0q7j0bk"; libraryHaskellDepends = [ - aeson base containers ghc-prim hashable path-pieces text + aeson base binary containers ghc-prim hashable path-pieces text unordered-containers vector ]; description = "Rage against the quantification"; @@ -168091,6 +168701,8 @@ self: { pname = "quickcheck-classes"; version = "0.4.14.1"; sha256 = "0qk7nx855lrb9z1nkc74dshsij6p704rmggx0f9akwcpscsvhiim"; + revision = "1"; + editedCabalFile = "1jsqd19gwd5hizqlabk0haly9slri4m7bhj32vqvi0lk4mync94l"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups semirings tagged transformers @@ -168125,8 +168737,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.18"; sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55"; - revision = "1"; - editedCabalFile = "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly"; + revision = "2"; + editedCabalFile = "02mhzd7dkhmbd8ljm114j7ixp1lcllblz3zfkz0i7n976rac86w7"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific tagged text time @@ -168302,31 +168914,30 @@ self: { }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring - , containers, directory, exceptions, filelock, filepath - , http-client, lifted-async, lifted-base, matrix, monad-control - , monad-logger, mtl, network, persistent, persistent-postgresql - , persistent-template, pretty-show, process, QuickCheck - , quickcheck-instances, random, resourcet, servant, servant-client - , servant-server, split, stm, strict, string-conversions, tasty - , tasty-quickcheck, text, tree-diff, vector, wai, warp + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , directory, doctest, exceptions, filelock, filepath, http-client + , lifted-async, matrix, monad-control, monad-logger, mtl, network + , persistent, persistent-postgresql, persistent-template + , pretty-show, process, QuickCheck, quickcheck-instances, random + , resourcet, servant, servant-client, servant-server, split, stm + , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck + , text, tree-diff, vector, wai, warp }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.4.0"; - sha256 = "1dzkqpl873hj2by15hlkf61x6a7fjzkhl6h4cwhg9krj2bh2lv5q"; + version = "0.4.2"; + sha256 = "1sa243hysdnlv8326jnbnmmlkbxhxmbhfssya5qx925x56qhd2d3"; libraryHaskellDepends = [ - ansi-wl-pprint async base containers exceptions lifted-async - lifted-base matrix monad-control mtl pretty-show QuickCheck random - split stm tree-diff vector + ansi-wl-pprint base containers exceptions lifted-async matrix + monad-control mtl pretty-show QuickCheck split stm tree-diff vector ]; testHaskellDepends = [ - base bytestring directory filelock filepath http-client + base bytestring directory doctest filelock filepath http-client lifted-async matrix monad-control monad-logger mtl network persistent persistent-postgresql persistent-template process QuickCheck quickcheck-instances random resourcet servant - servant-client servant-server strict string-conversions tasty - tasty-quickcheck text tree-diff vector wai warp + servant-client servant-server stm strict string-conversions tasty + tasty-hunit tasty-quickcheck text tree-diff vector wai warp ]; description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; @@ -168412,10 +169023,8 @@ self: { ({ mkDerivation, base, QuickCheck, template-haskell }: mkDerivation { pname = "quickcheck-with-counterexamples"; - version = "1.0"; - sha256 = "0pny7whz16mdmh51jpa7p9f8pa7jpcqqjks797wnj8848ia7ax87"; - revision = "3"; - editedCabalFile = "0wz7iwpgxx977y46xis4imrhds1i341fv6mpwydr1mzhzazifvz8"; + version = "1.1"; + sha256 = "13vnr98g9cds2jbg76z528lji5mfcxghwjj4sry0011wlrwrx1fd"; libraryHaskellDepends = [ base QuickCheck template-haskell ]; description = "Get counterexamples from QuickCheck as Haskell values"; license = stdenv.lib.licenses.bsd3; @@ -169639,8 +170248,10 @@ self: { }: mkDerivation { pname = "range"; - version = "0.1.2.0"; - sha256 = "028bigaq4vk5ykzf04f5hi3g37gxzzp6q24bjcb3gjfzcgy7z6ab"; + version = "0.2.0.0"; + sha256 = "0pmzm503skr4d1qwkq72mjkq1ba86la1qxb9h25gqc9dzmzy0w3k"; + revision = "1"; + editedCabalFile = "0a379q4rw8hsggknwnca4cibr1kmyrmjprdl8fpflpp7wh4vlpwf"; libraryHaskellDepends = [ base free parsec ]; testHaskellDepends = [ base Cabal free QuickCheck random test-framework @@ -170142,6 +170753,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rattletrap_6_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits + , bytestring, containers, filepath, http-client, http-client-tls + , HUnit, template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "rattletrap"; + version = "6.0.1"; + sha256 = "1chpivz9iprnj5p3kbqsgpviqg5d3dx41596ki1dydm1wmpn3bcj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + testHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls HUnit template-haskell + temporary text transformers + ]; + description = "Parse and generate Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers @@ -170416,19 +171058,20 @@ self: { "rdf4h" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , criterion, deepseq, directory, filepath, hashable, hgal, HTTP - , HUnit, hxt, mtl, network-uri, parsec, parsers, QuickCheck, safe - , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers + , http-conduit, HUnit, hxt, lifted-base, mtl, network-uri, parsec + , parsers, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck + , text, unordered-containers }: mkDerivation { pname = "rdf4h"; - version = "3.1.0"; - sha256 = "1hsa96a11mi8zlhfp9mhg4m13r4iwyhp9rhsgmpcq4g06ff1d6n8"; + version = "3.1.1"; + sha256 = "0r93mra0r8xdqi062xpsv5svzcinq31k4jjbjay53an6zd1qg9n4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers deepseq filepath - hashable hgal HTTP hxt mtl network-uri parsec parsers text - unordered-containers + hashable hgal HTTP http-conduit hxt lifted-base mtl network-uri + parsec parsers text unordered-containers ]; executableHaskellDepends = [ base containers text ]; testHaskellDepends = [ @@ -170620,8 +171263,8 @@ self: { }: mkDerivation { pname = "reactive-balsa"; - version = "0.4"; - sha256 = "0cmk386wjs6i7bnmawz0kcpm4sx5xa2ms9xhjisg83xhmacvqg7h"; + version = "0.4.0.1"; + sha256 = "1fhn7bxfrwaa5xb2ckfy2v4aw5cdzclayprjr40zg09s77qxclc1"; libraryHaskellDepends = [ alsa-core alsa-seq base containers data-accessor data-accessor-transformers event-list extensible-exceptions midi @@ -170677,8 +171320,8 @@ self: { }: mkDerivation { pname = "reactive-banana-bunch"; - version = "1.0"; - sha256 = "11lfbf5gn8friwgkmm3vl3b3hqfxm1vww0a3aq9949irvrplajzn"; + version = "1.0.0.1"; + sha256 = "1k4l1zk7jm26iyaa2srillrq8qnwnqkwhpy6shdw6mg4nfby706c"; libraryHaskellDepends = [ base non-empty reactive-banana transformers utility-ht ]; @@ -170829,8 +171472,8 @@ self: { }: mkDerivation { pname = "reactive-jack"; - version = "0.4.1"; - sha256 = "124fpfv486dm8cpgfdnrmckkk8y6ia4nwzapvnfghkslizzlbfab"; + version = "0.4.1.1"; + sha256 = "0kcb4sjj8499i5igl1fv8bjbz5d2zvs5nbqijfaw9pcg5zx7a0rr"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception extensible-exceptions jack midi non-negative random @@ -170850,8 +171493,8 @@ self: { }: mkDerivation { pname = "reactive-midyim"; - version = "0.4.1"; - sha256 = "1dx07c4d4sw7a797d1ap9ja48lhx37hbizhajgcf1qpilxgd4lvv"; + version = "0.4.1.1"; + sha256 = "1hsa7d79mf7r36grl9i41x84kg3s9j5gj2fy40mb1mhvr221pi9v"; libraryHaskellDepends = [ base containers data-accessor data-accessor-transformers event-list midi non-negative random reactive-banana-bunch semigroups @@ -171207,6 +171850,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "record-dot-preprocessor_0_1_4" = callPackage + ({ mkDerivation, base, extra, filepath }: + mkDerivation { + pname = "record-dot-preprocessor"; + version = "0.1.4"; + sha256 = "1mj39kdnf3978cc51hh1fnnr0ax3gnqw4fan0f099b7li5y2xlwx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base extra filepath ]; + description = "Preprocessor to allow record.field syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "record-encode" = callPackage ({ mkDerivation, base, generics-sop, hspec, QuickCheck, vector }: mkDerivation { @@ -171307,8 +171964,8 @@ self: { }: mkDerivation { pname = "records-sop"; - version = "0.1.0.0"; - sha256 = "0ipxs13mlkhndbssa218fiajj2c26l5q5dl8n0p3h1qk6gjyfqa1"; + version = "0.1.0.1"; + sha256 = "1832cgh1ry1slj10ff2qpxr6ibbvii7z1hvvdcwhyj55c31zrhlc"; libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; testHaskellDepends = [ base deepseq generics-sop hspec should-not-typecheck @@ -171339,8 +171996,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "1.2.0.1"; - sha256 = "1j36fyyfml7i0dxxfammaaqmg6yg1whdar1ffsvpkjg4b8lkxlr4"; + version = "1.2.1.1"; + sha256 = "0dh50664y470281gjiwkmdz8abiwgqin9r1ymznldwm37c3jljv5"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for GHC"; license = stdenv.lib.licenses.bsd3; @@ -171505,8 +172162,8 @@ self: { }: mkDerivation { pname = "redis-io"; - version = "0.7.0"; - sha256 = "06g630jrb0zxbai4n251plprafn5s9nywd3hgg14vz999wccns0z"; + version = "1.0.0"; + sha256 = "119qga77xv0kq6cppgz6ry3f1ql4slswqwqg7qyiyg639sli9nfp"; libraryHaskellDepends = [ attoparsec auto-update base bytestring containers exceptions iproute monad-control mtl network operational redis-resp @@ -171543,8 +172200,8 @@ self: { }: mkDerivation { pname = "redis-resp"; - version = "0.4.0"; - sha256 = "0clj5b6lbkdc64arb9z4qhbiqkx7mifja8ns7xxc619yhj9dbh4b"; + version = "1.0.0"; + sha256 = "12w00zjf901xi6wwb0g6wzbxkbh1iyyd7glxijx9sajv6jgd5365"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-conversion containers dlist double-conversion operational semigroups split transformers @@ -175022,8 +175679,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.7.6.3"; - sha256 = "19h3y5j2wim32cail0pix11vjhfbj3xiivlw2kyz1iqv4fxx8mby"; + version = "0.7.7.0"; + sha256 = "0v6irf01xykhv0mwr1k5i08jn77irqbz8h116j8p435d11xc5jrw"; libraryHaskellDepends = [ base data-default-class exceptions ghc-prim random transformers ]; @@ -176759,6 +177416,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "row" = callPackage + ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck + , tasty, tasty-smallcheck, util + }: + mkDerivation { + pname = "row"; + version = "0.0.0.0"; + sha256 = "16iy0b0aqvpn1dnw96h8vp4354774c0lp7fq4qibqwd8bv99mmps"; + libraryHaskellDepends = [ base base-unicode-symbols util ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + doHaddock = false; + description = "Row types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "row-types" = callPackage ({ mkDerivation, base, constraints, criterion, deepseq, hashable , text, unordered-containers @@ -178110,6 +178783,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "salak" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , filepath, hspec, QuickCheck, scientific, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "salak"; + version = "0.1.4"; + sha256 = "17zlgk85yp6ihfppf0simrvc70sk2a3jkjzxzzsgibyxmsm2jmxr"; + libraryHaskellDepends = [ + aeson base directory filepath scientific text unordered-containers + vector yaml + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath hspec + QuickCheck scientific text unordered-containers vector yaml + ]; + description = "Configuration Loader"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "saltine" = callPackage ({ mkDerivation, base, bytestring, libsodium, profunctors , QuickCheck, semigroups, test-framework @@ -179545,6 +180239,8 @@ self: { pname = "scotty"; version = "0.11.2"; sha256 = "18lxgnj05p4hk7pp4a84biz2dn387a5vxwzyh1kslns1bra6zn0x"; + revision = "1"; + editedCabalFile = "1h4fk7q8x7cvlqq4bbmdh465s6a8955bgchm121fvk08x7rm3yz3"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types monad-control mtl @@ -180453,27 +181149,27 @@ self: { }) {}; "secp256k1" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal - , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions - , test-framework, test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, base16-bytestring, bytestring, cereal + , cryptohash, entropy, hspec, hspec-discover, HUnit, mtl + , QuickCheck, secp256k1, string-conversions }: mkDerivation { pname = "secp256k1"; - version = "0.5.3"; - sha256 = "1fb9n7r64h35822zsa0w2jb214gdfg85ib20ni3caszc1k8rsmck"; - setupHaskellDepends = [ base Cabal ]; + version = "1.1.2"; + sha256 = "0nm8xx9cfn5gj2rqhcmikdkl3grj88xs4wikjbrlazvpyj4rc0q2"; libraryHaskellDepends = [ - base base16-bytestring bytestring cereal entropy mtl QuickCheck - string-conversions + base base16-bytestring bytestring cereal cryptohash entropy hspec + HUnit mtl QuickCheck string-conversions ]; + librarySystemDepends = [ secp256k1 ]; testHaskellDepends = [ - base base16-bytestring bytestring cereal cryptohash entropy HUnit - mtl QuickCheck string-conversions test-framework - test-framework-hunit test-framework-quickcheck2 + base base16-bytestring bytestring cereal cryptohash entropy hspec + HUnit mtl QuickCheck string-conversions ]; + testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1 library from Bitcoin Core"; license = stdenv.lib.licenses.publicDomain; - }) {}; + }) {inherit (pkgs) secp256k1;}; "secret-santa" = callPackage ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib @@ -180602,14 +181298,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "selda_0_3_2_0" = callPackage + "selda_0_3_3_1" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, mtl , psqueues, text, time, unordered-containers }: mkDerivation { pname = "selda"; - version = "0.3.2.0"; - sha256 = "1ngvh7w4s0w57qaizzxin641x9v4v2rm03lnkfcxklq93l3khgp6"; + version = "0.3.3.1"; + sha256 = "1rxwyls59mpmvb5f2l47ak5cnzmws847kgmn8fwbxb69h6a87bwr"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -182257,8 +182953,8 @@ self: { pname = "servant-dhall"; version = "0.1.0.1"; sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll"; - revision = "1"; - editedCabalFile = "0p8ygb5l79zzawnmy992wnicxv2cbbr0860063mbchmjwjf39x33"; + revision = "2"; + editedCabalFile = "1zdvk0cx8s1n107yx95vdv0xziwjmr1d6kypr36f1cqdvdh02jir"; libraryHaskellDepends = [ base base-compat bytestring dhall http-media megaparsec prettyprinter servant text @@ -182547,6 +183243,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-hmac-auth" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , case-insensitive, containers, cryptonite, http-client, http-types + , markdown-unlit, memory, mtl, servant, servant-client + , servant-client-core, servant-server, transformers, wai, warp + }: + mkDerivation { + pname = "servant-hmac-auth"; + version = "0.0.0"; + sha256 = "08873pwmn2wzhl2r87gx6db3f2j8848g4xq2i4gnwqj23s7sfy0z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring binary bytestring case-insensitive + containers cryptonite http-client http-types memory mtl servant + servant-client servant-client-core servant-server transformers wai + ]; + executableHaskellDepends = [ + aeson base http-client servant servant-client servant-server warp + ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ base ]; + description = "Servant authentication with HMAC"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-iCalendar" = callPackage ({ mkDerivation, base, data-default, http-media, iCalendar, servant }: @@ -182983,24 +183705,26 @@ self: { "servant-rawm" = callPackage ({ mkDerivation, base, bytestring, doctest, filepath, Glob , hspec-wai, http-client, http-media, http-types, lens, resourcet - , servant, servant-client, servant-docs, servant-server, tasty - , tasty-hspec, tasty-hunit, transformers, wai, wai-app-static, warp + , servant, servant-client, servant-client-core, servant-docs + , servant-server, tasty, tasty-hspec, tasty-hunit, text + , transformers, wai, wai-app-static, warp }: mkDerivation { pname = "servant-rawm"; - version = "0.2.0.2"; - sha256 = "0nkwi6jxwx8hwsf7fazvr9xffjsy99y4pb3ikw27f8ag8dx8frm2"; + version = "0.3.0.0"; + sha256 = "09va9glqkyarxsq9296br55ka8j5jd5nlb833hndpf4ib10yxzp9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring filepath http-client http-media http-types lens - resourcet servant-client servant-docs servant-server wai - wai-app-static + resourcet servant-client servant-client-core servant-docs + servant-server wai wai-app-static ]; testHaskellDepends = [ base bytestring doctest Glob hspec-wai http-client http-media - http-types servant servant-client servant-server tasty tasty-hspec - tasty-hunit transformers wai warp + http-types servant servant-client servant-client-core + servant-server tasty tasty-hspec tasty-hunit text transformers wai + warp ]; description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; @@ -183041,20 +183765,6 @@ self: { }) {}; "servant-ruby" = callPackage - ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign - , text - }: - mkDerivation { - pname = "servant-ruby"; - version = "0.8.0.1"; - sha256 = "07pdz6zdax415virbx30cjbiywlzfwzsaq9426l14zwmgf7pw155"; - libraryHaskellDepends = [ base casing servant-foreign text ]; - testHaskellDepends = [ base doctest QuickCheck ]; - description = "Generate a Ruby client from a Servant API with Net::HTTP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-ruby_0_8_0_2" = callPackage ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign , text }: @@ -183066,7 +183776,6 @@ self: { testHaskellDepends = [ base doctest QuickCheck ]; description = "Generate a Ruby client from a Servant API with Net::HTTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-scotty" = callPackage @@ -183976,6 +184685,8 @@ self: { pname = "set-cover"; version = "0.0.9"; sha256 = "1qbk5y2pg6jlclszd2nras5240r0ahapsibykkcqrxhgq0hgvsxg"; + revision = "1"; + editedCabalFile = "0mcg15645maj1ymfrgs9ghi8n3hwwd72441zxcg9gn1w3pq7zsaw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184076,17 +184787,6 @@ self: { }) {}; "setlocale" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "setlocale"; - version = "1.0.0.6"; - sha256 = "1rl8qb8vzv8fdbczy2dxwgn4cb68lfrjdxf2w8nn9wy1acqzcyjq"; - libraryHaskellDepends = [ base ]; - description = "Haskell bindings to setlocale"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "setlocale_1_0_0_8" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "setlocale"; @@ -184095,7 +184795,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Haskell bindings to setlocale"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setoid" = callPackage @@ -184557,8 +185256,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.9.0.3"; - sha256 = "1c1vphg9vv4lizcsg681wxq5dmvg5fkhp6x15738j7sfbd0k87ja"; + version = "1.9.0.5"; + sha256 = "1j417h6nkwkjgprcaf59lilv6d151qhc8ibzd0jimkx08pv414rz"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -184580,14 +185279,15 @@ self: { }) {}; "shake-cabal" = callPackage - ({ mkDerivation, base, Cabal, composition-prelude, directory, shake + ({ mkDerivation, base, Cabal, composition-prelude, directory + , filepath, shake }: mkDerivation { pname = "shake-cabal"; - version = "0.1.0.4"; - sha256 = "1in3f31pm253vzcds66pa2ddjl983l2w8j3vj52rykg2dynl625q"; + version = "0.1.0.5"; + sha256 = "1h8a3c3fwg2jz1p6k5253hjfaqbwwwdygrj2hdsgwn6laq75kd6s"; libraryHaskellDepends = [ - base Cabal composition-prelude directory shake + base Cabal composition-prelude directory filepath shake ]; description = "Shake library for use with cabal"; license = stdenv.lib.licenses.bsd3; @@ -185308,6 +186008,8 @@ self: { pname = "shelly"; version = "1.8.1"; sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y"; + revision = "1"; + editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186308,10 +187010,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.6"; - sha256 = "0cbzc5ib63x2m4xz88ks6xfg99c2plp2y6y7bzx3i3rrhd3y1pjn"; - revision = "1"; - editedCabalFile = "0qifmlqxd2pwh5rm7pzfwn6nq09yvjs7nfg8si4b3q7xlgal2sbx"; + version = "0.9.7"; + sha256 = "018rzapbmkkfhqzwdv2vgj4wbqi4wn2bgml0kd3khq3p06mhpnc5"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -186352,8 +187052,8 @@ self: { }: mkDerivation { pname = "simple-logging"; - version = "0.2.0.3"; - sha256 = "12ayxv1j2zzql01gka1p8m7pixjh6f87r5hamz3ydcyzn4vrl5j1"; + version = "0.2.0.4"; + sha256 = "13f6562rhk5bb5b2rmn0zsw2pil6qis463kx9d684j2m0qnqifdm"; libraryHaskellDepends = [ aeson base bytestring directory exceptions filepath hscolour iso8601-time lens mtl simple-effects string-conv text time uuid @@ -187550,8 +188250,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.7.2"; - sha256 = "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch"; + version = "0.7.3"; + sha256 = "1pwawhfl2w9d06sv44lxa5hvh4lz9d5l0n8j7zjm08jibl30fc8g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187574,10 +188274,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.7.2"; - sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq"; - revision = "1"; - editedCabalFile = "0qjmk3i9kjnd3195fhphjgqvsgbw6blfjl40mdyiblw1piyvc6yw"; + version = "0.7.3"; + sha256 = "0qk2g86b0avd24q7hbkdjj0l2r5ma7kbzf3cj4sjwmh7wmx0ss7c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187827,8 +188525,8 @@ self: { }: mkDerivation { pname = "slick"; - version = "0.1.0.2"; - sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm"; + version = "0.1.1.0"; + sha256 = "0gqc9z8w9m1dvsnv7g1rsi367akkzp95w96lvx20sdg1gnzbx5rc"; libraryHaskellDepends = [ aeson base binary bytestring containers lens lens-aeson mustache pandoc shake text time @@ -190674,6 +191372,24 @@ self: { license = "GPL"; }) {}; + "sox_0_2_3_1" = callPackage + ({ mkDerivation, base, containers, explicit-exception + , extensible-exceptions, process, sample-frame, semigroups + , transformers, unix, utility-ht + }: + mkDerivation { + pname = "sox"; + version = "0.2.3.1"; + sha256 = "0idab4rsqj4zjm7dlzbf38rzpvkp1z9psrkl4lrp2qp1s53sp9kh"; + libraryHaskellDepends = [ + base containers explicit-exception extensible-exceptions process + sample-frame semigroups transformers unix utility-ht + ]; + description = "Play, write, read, convert audio signals using Sox"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "soxlib" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception , extensible-exceptions, sample-frame, sox, storablevector @@ -190694,6 +191410,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) sox;}; + "soxlib_0_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, explicit-exception + , extensible-exceptions, sample-frame, sox, storablevector + , transformers, utility-ht + }: + mkDerivation { + pname = "soxlib"; + version = "0.0.3.1"; + sha256 = "0f7ci58yls5rhq1vy1q1imlsgkbvadv8646fvvymg0jq2mjwgsfd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring explicit-exception extensible-exceptions + sample-frame storablevector transformers utility-ht + ]; + libraryPkgconfigDepends = [ sox ]; + description = "Write, read, convert audio signals using libsox"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) sox;}; + "soyuz" = callPackage ({ mkDerivation, base, bytestring, cereal, cmdargs, containers , pretty, QuickCheck, trifecta, uniplate, vector @@ -191182,8 +191919,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.3.2"; - sha256 = "0cf8121hfmyj1jrklf2i1bp2q4517627vgaz1flf363n93jnckfk"; + version = "0.3.5"; + sha256 = "0i7a6mq0f46iihq7kd3a1780pqqhmmdi706c42y4dmmj32nb4v3h"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -191191,20 +191928,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "speculate_0_3_4" = callPackage - ({ mkDerivation, base, cmdargs, containers, leancheck }: - mkDerivation { - pname = "speculate"; - version = "0.3.4"; - sha256 = "10b6ka8rws62byxi4whncs77hl2jcx6pr3gibbh804v07dnl2dnv"; - libraryHaskellDepends = [ base cmdargs containers leancheck ]; - testHaskellDepends = [ base leancheck ]; - benchmarkHaskellDepends = [ base leancheck ]; - description = "discovery of properties about Haskell functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { @@ -191298,6 +192021,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "spherical" = callPackage + ({ mkDerivation, base, composition-prelude }: + mkDerivation { + pname = "spherical"; + version = "0.1.2.0"; + sha256 = "1nbfa0f14rd5wnxyygzf68v5v94wk0gr3rgi48d86ars8ip056f3"; + libraryHaskellDepends = [ base composition-prelude ]; + description = "Geometry on a sphere"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sphero" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, mtl , simple-bluetooth @@ -191728,6 +192462,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "spreadsheet_0_1_3_8" = callPackage + ({ mkDerivation, base, explicit-exception, transformers, utility-ht + }: + mkDerivation { + pname = "spreadsheet"; + version = "0.1.3.8"; + sha256 = "0rd7qi6wy17fcz1a6pfqjxl3z816r8p6gyvz4zq85kgkjpkicrv4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base explicit-exception transformers utility-ht + ]; + description = "Read and write spreadsheets from and to CSV files in a lazy way"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sprinkles" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , Cabal, case-insensitive, cereal, classy-prelude, containers, curl @@ -192170,6 +192921,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "squeal-postgresql_0_4_0_0" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, deepseq, doctest, generics-sop, hspec + , lifted-base, mmorph, monad-control, mtl, network-ip + , postgresql-binary, postgresql-libpq, records-sop, resource-pool + , scientific, text, time, transformers, transformers-base + , uuid-types, vector + }: + mkDerivation { + pname = "squeal-postgresql"; + version = "0.4.0.0"; + sha256 = "10z1rq6jz8g6sv52bh9hjmjsw0pml9m4l04gzi19zxnwa597xk2b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + deepseq generics-sop lifted-base mmorph monad-control mtl + network-ip postgresql-binary postgresql-libpq records-sop + resource-pool scientific text time transformers transformers-base + uuid-types vector + ]; + executableHaskellDepends = [ + base bytestring generics-sop mtl text transformers + transformers-base vector + ]; + testHaskellDepends = [ + base bytestring doctest generics-sop hspec text transformers + transformers-base vector + ]; + description = "Squeal PostgreSQL Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "squeeze" = callPackage ({ mkDerivation, base, Cabal, data-default, directory, extra , factory, filepath, mtl, QuickCheck, random, toolshed @@ -192893,8 +193678,8 @@ self: { }: mkDerivation { pname = "stack2nix"; - version = "0.2"; - sha256 = "103cimrwr8j0b1zjpw195mjkfrgcgkicrpygcc5y82nyrl1cc74f"; + version = "0.2.1"; + sha256 = "0rwl6fzxv2ly20mn0pgv63r0ik4zpjigbkc4771ni7zazkxvx1gy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194134,12 +194919,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stm_2_4_5_0" = callPackage + "stm_2_4_5_1" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.4.5.0"; - sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri"; + version = "2.4.5.1"; + sha256 = "1x53lg07j6d42vnmmk2f9sfqx2v4hxjk3hm11fccjdi70s0c5w3c"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = stdenv.lib.licenses.bsd3; @@ -194238,15 +195023,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stm-containers_1_0_1_1" = callPackage + "stm-containers_1_1_0_2" = callPackage ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable , HTF, list-t, QuickCheck, quickcheck-text, rerebase, stm-hamt , transformers }: mkDerivation { pname = "stm-containers"; - version = "1.0.1.1"; - sha256 = "16yds93abv9nmrbd5dcwbvmrq2ag0hdprs01khvnn9qg0nqs3lfn"; + version = "1.1.0.2"; + sha256 = "1yhivblfxycr2vk09gwg904n6fqkzn5g5rvg3whm40fnabdfa9av"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t stm-hamt transformers ]; @@ -194309,8 +195094,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.1.2.1"; - sha256 = "1xbd1kcmiq1qah8hc3bkzf9wlhwrnf2qlh8rah8dyln0dcwapi6q"; + version = "1.2.0.2"; + sha256 = "17ywv40vxclkg2lgl52r3j30r1n0jcvahamcfnr3n5a1lh86149w"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -195050,6 +195835,8 @@ self: { pname = "streaming"; version = "0.2.1.0"; sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1"; + revision = "2"; + editedCabalFile = "124nccw28cwzjzl82anbwk7phcyfzlz8yx6wyl4baymzdikvbpgq"; libraryHaskellDepends = [ base containers ghc-prim mmorph mtl semigroups transformers transformers-base @@ -195482,6 +196269,8 @@ self: { pname = "streaming-with"; version = "0.2.2.1"; sha256 = "005krn43z92x1v8w8pgfx489h3livkklgrr7s2i2wijgsz55xp09"; + revision = "1"; + editedCabalFile = "0z1jy02hc4k1xv0bd4981cblnm4pr022hakrj6zmi4zds74m9wzm"; libraryHaskellDepends = [ base exceptions managed streaming-bytestring temporary transformers ]; @@ -195512,28 +196301,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "streamly_0_4_1" = callPackage - ({ mkDerivation, atomic-primops, base, containers, deepseq + "streamly_0_5_0" = callPackage + ({ mkDerivation, atomic-primops, base, clock, containers, deepseq , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue , monad-control, mtl, QuickCheck, random, transformers , transformers-base }: mkDerivation { pname = "streamly"; - version = "0.4.1"; - sha256 = "0xxkb8vdnbyq5l590wh3ig68xw4ny44aymx4k816cbif2da5w7zy"; + version = "0.5.0"; + sha256 = "1kzgrwnr2w6w4yjmx4qm325d0hf4wy21gb7a1cv0db4jkha3672s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - atomic-primops base containers exceptions ghc-prim heaps + atomic-primops base clock containers exceptions ghc-prim heaps lockfree-queue monad-control mtl transformers transformers-base ]; testHaskellDepends = [ base containers exceptions hspec mtl QuickCheck random transformers ]; benchmarkHaskellDepends = [ - atomic-primops base containers deepseq exceptions gauge ghc-prim - heaps lockfree-queue monad-control mtl random transformers + atomic-primops base clock containers deepseq exceptions gauge + ghc-prim heaps lockfree-queue monad-control mtl random transformers transformers-base ]; description = "Beautiful Streaming, Concurrent and Reactive Composition"; @@ -196877,6 +197666,33 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "summoner_1_1_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory + , filepath, generic-deriving, gitrev, hedgehog, neat-interpolation + , optparse-applicative, process, relude, tasty, tasty-discover + , tasty-hedgehog, text, time, tomland + }: + mkDerivation { + pname = "summoner"; + version = "1.1.0"; + sha256 = "01wgnj89f6fpb6f54l9480zqps1g9v76kxf0g4vxpg2jhnzygv2d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring directory filepath + generic-deriving gitrev neat-interpolation optparse-applicative + process relude text time tomland + ]; + executableHaskellDepends = [ base relude ]; + testHaskellDepends = [ + base hedgehog relude tasty tasty-hedgehog tomland + ]; + testToolDepends = [ tasty-discover ]; + description = "Tool for creating completely configured production Haskell projects"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sump" = callPackage ({ mkDerivation, base, bytestring, data-default, lens, serialport , transformers, vector @@ -197956,8 +198772,8 @@ self: { }: mkDerivation { pname = "symantic"; - version = "6.3.1.20180213"; - sha256 = "16bbby4lcyna842gvf95ss8fvsp5kgzpn996yxzv3jjhxg00ls5d"; + version = "6.3.2.20180208"; + sha256 = "1a6ifwhrn35wfx0lf2gbq203rb882p7hl0yji7rwfrvxrp4ax518"; libraryHaskellDepends = [ base containers mono-traversable symantic-document symantic-grammar text transformers @@ -197966,13 +198782,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "symantic-cli" = callPackage + ({ mkDerivation, base, containers, megaparsec, symantic-document + , text, transformers + }: + mkDerivation { + pname = "symantic-cli"; + version = "0.0.0.20180410"; + sha256 = "0025rgjjz198sh6gb8zzy7283pnb6vza3q3d7x5xl27c77mpivpx"; + libraryHaskellDepends = [ + base containers megaparsec symantic-document text transformers + ]; + description = "Library for Command Line Interface (CLI)"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "symantic-document" = callPackage - ({ mkDerivation, ansi-terminal, base, text }: + ({ mkDerivation, ansi-terminal, base, containers, tasty + , tasty-hunit, text, transformers + }: mkDerivation { pname = "symantic-document"; - version = "0.0.0.20180213"; - sha256 = "0f3rr8117cr78nkcw7kpddcpisbmvsyw03ym7cq6ms0z8zqynwpm"; - libraryHaskellDepends = [ ansi-terminal base text ]; + version = "0.1.2.20180831"; + sha256 = "1vlxgn9gdd03azqf2csxjiyqsplg68wv3qr6d08zj5dvqskz27by"; + libraryHaskellDepends = [ ansi-terminal base text transformers ]; + testHaskellDepends = [ + base containers tasty tasty-hunit text transformers + ]; description = "Document symantics"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -197983,8 +198819,8 @@ self: { }: mkDerivation { pname = "symantic-grammar"; - version = "0.3.0.20180213"; - sha256 = "0kqy27c4ix16v7n7zqhc57alrg1n1xksdf7ijsbvpjs4597vpwih"; + version = "0.3.1.20180831"; + sha256 = "0n2x5sb5gv9lkhfmq9yfjxfk6q19h71xqbskkg7ar8nglz0jhldp"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base megaparsec tasty tasty-hunit text transformers @@ -198000,8 +198836,8 @@ self: { }: mkDerivation { pname = "symantic-lib"; - version = "0.0.3.20180213"; - sha256 = "17y4rmw9l4j3j9g2i60las3q6y7rlklzr48xr8arkhi0i5zi1qw2"; + version = "0.0.4.20180831"; + sha256 = "1agqlz7drckjm8a2swvqiryy7y6kdahq8d24rwkbzn3nw1bnyvk1"; libraryHaskellDepends = [ base containers mono-traversable symantic symantic-grammar text transformers @@ -198449,8 +199285,8 @@ self: { }: mkDerivation { pname = "synthesizer-core"; - version = "0.8.2"; - sha256 = "0r8lik2gmaxn1ay0wyjvq2r51jb8vy99hypvrnhbc6hsjybdh8aa"; + version = "0.8.2.1"; + sha256 = "1sdvqabxlgiqqb3kppxwyvmkmvcqrmrzicbmcmy6mr5c4npjxffj"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -198497,8 +199333,8 @@ self: { }: mkDerivation { pname = "synthesizer-filter"; - version = "0.4.1"; - sha256 = "1gbyb50lj5k69vn316lzb27jx5l2p8jn90b4k6zlqb050sp9c26s"; + version = "0.4.1.1"; + sha256 = "0130y7v7r6fhclyg4fg4jj07x1lvn8cvh40w43m2j3sdcmzaa25a"; libraryHaskellDepends = [ base containers numeric-prelude numeric-quest synthesizer-core transformers utility-ht @@ -198564,8 +199400,8 @@ self: { }: mkDerivation { pname = "synthesizer-midi"; - version = "0.6.1"; - sha256 = "02z6sywk047vn2is9fq9nr4agdy9xis9ydbl15pmrb0vlmvpx3qr"; + version = "0.6.1.1"; + sha256 = "1f57i0lz8wy9kz6qkpbrpywlf0lxwq44yqgzc9kgrb4gy97p0cm5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198719,6 +199555,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "system-fileio_0_3_16_4" = callPackage + ({ mkDerivation, base, bytestring, chell, system-filepath + , temporary, text, time, transformers, unix + }: + mkDerivation { + pname = "system-fileio"; + version = "0.3.16.4"; + sha256 = "1iy6g1f35gzyj12g9mdiw4zf75mmxpv1l8cyaldgyscsl648pr9l"; + libraryHaskellDepends = [ + base bytestring system-filepath text time unix + ]; + testHaskellDepends = [ + base bytestring chell system-filepath temporary text time + transformers unix + ]; + description = "Consistent filesystem interaction across GHC versions (deprecated)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "system-filepath" = callPackage ({ mkDerivation, base, bytestring, Cabal, chell, chell-quickcheck , deepseq, QuickCheck, text @@ -199344,6 +200200,32 @@ self: { license = "GPL"; }) {}; + "tagchup_0_4_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, data-accessor + , explicit-exception, non-empty, old-time, transformers, utility-ht + , xml-basic + }: + mkDerivation { + pname = "tagchup"; + version = "0.4.1.1"; + sha256 = "127ffhggdcbapizddhzwy538h3znppvr28mh9y2lv9ihbwcfxd75"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers data-accessor explicit-exception + non-empty transformers utility-ht xml-basic + ]; + testHaskellDepends = [ base xml-basic ]; + benchmarkHaskellDepends = [ + base bytestring containers data-accessor explicit-exception + old-time transformers utility-ht xml-basic + ]; + description = "alternative package for processing of tag soups"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagged" = callPackage ({ mkDerivation, base, deepseq, template-haskell, transformers , transformers-compat @@ -200001,8 +200883,8 @@ self: { }: mkDerivation { pname = "tar-conduit"; - version = "0.2.3.1"; - sha256 = "0z108pzvh4r87dykapxl36bhby4jhkya53dy2pglb891m54wswpc"; + version = "0.2.5"; + sha256 = "0gnklkw9qv496m8nxm1mlfddyiw8c5lsj5pcshxv7c6rv9n3vva3"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators directory filepath safe-exceptions text unix @@ -200019,6 +200901,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tar-conduit_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , conduit-extra, containers, criterion, deepseq, directory + , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh + }: + mkDerivation { + pname = "tar-conduit"; + version = "0.3.0"; + sha256 = "0g35wiqn0bi31sqnzknq90iy265c7lw15rkyrzc6c2vp6nl86j08"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + safe-exceptions text unix + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators conduit-extra + containers deepseq directory filepath hspec QuickCheck weigh + ]; + benchmarkHaskellDepends = [ + base bytestring conduit conduit-combinators containers criterion + deepseq directory filepath hspec + ]; + description = "Extract and create tar files using conduit for streaming"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tardis" = callPackage ({ mkDerivation, base, mmorph, mtl }: mkDerivation { @@ -200508,6 +201416,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tasty-leancheck" = callPackage + ({ mkDerivation, base, leancheck, tasty }: + mkDerivation { + pname = "tasty-leancheck"; + version = "0.0.1"; + sha256 = "06nki1l05hh5r0q2lkn4rmj0cl8hz7r7zc71r64fx2k9z65n5497"; + libraryHaskellDepends = [ base leancheck tasty ]; + testHaskellDepends = [ base leancheck tasty ]; + description = "LeanCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tasty-lens" = callPackage ({ mkDerivation, base, lens, smallcheck, smallcheck-lens, tasty , tasty-smallcheck @@ -202121,6 +203041,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-framework-leancheck" = callPackage + ({ mkDerivation, base, leancheck, test-framework }: + mkDerivation { + pname = "test-framework-leancheck"; + version = "0.0.1"; + sha256 = "0bwzc0vq28cmy5r966jxhacijd2hkna4magd9aw5wz34dcp4qv13"; + libraryHaskellDepends = [ base leancheck test-framework ]; + testHaskellDepends = [ base leancheck test-framework ]; + description = "LeanCheck support for test-framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "test-framework-program" = callPackage ({ mkDerivation, base, directory, process, test-framework }: mkDerivation { @@ -202165,6 +203097,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-framework-quickcheck2_0_3_0_5" = callPackage + ({ mkDerivation, base, extensible-exceptions, QuickCheck, random + , test-framework + }: + mkDerivation { + pname = "test-framework-quickcheck2"; + version = "0.3.0.5"; + sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"; + libraryHaskellDepends = [ + base extensible-exceptions QuickCheck random test-framework + ]; + description = "QuickCheck-2 support for the test-framework package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "test-framework-sandbox" = callPackage ({ mkDerivation, ansi-terminal, base, HUnit, lifted-base, mtl , temporary, test-framework, test-sandbox, test-sandbox-hunit @@ -202745,8 +203693,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.5.3.1"; - sha256 = "04vqh30m4vi9d4b4g311fb861qijbmf9zmn9ldsrdb1rrgjk2y9q"; + version = "0.5.4.3"; + sha256 = "1xcyi3bw44anzah5c4c0wm18vnyqsr3q7ww2kp2psk41ql6gan2h"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -202760,17 +203708,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-builder_0_5_4_1" = callPackage + "text-builder_0_6_1_2" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion - , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty - , tasty-hunit, tasty-quickcheck, text + , deferred-folds, QuickCheck, quickcheck-instances, rerebase + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "text-builder"; - version = "0.5.4.1"; - sha256 = "1ipmfnjbkp2qllqdahdf9jwbks6vhalaw65clv9izbhp7d20gjai"; + version = "0.6.1.2"; + sha256 = "0z42bgizn6ya89bnsdjk14y7k6mm5zj1782p97dc1vj9ym81ra18"; libraryHaskellDepends = [ - base base-prelude bytestring semigroups text + base base-prelude bytestring deferred-folds semigroups text + transformers ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -202891,6 +203841,8 @@ self: { pname = "text-generic-pretty"; version = "1.2.1"; sha256 = "1isj8wccd0yrgpmlggd2zykb8d9r77blngsqlbwmqs9gxbyk3wyg"; + revision = "1"; + editedCabalFile = "1m512nd5w4z6f12qy10bpjqfmpwkm5wg0kdrvvzc45s4dxmzwbxz"; libraryHaskellDepends = [ base containers ghc-prim groom ixset-typed protolude QuickCheck string-conversions text time unordered-containers wl-pprint-text @@ -202999,27 +203951,6 @@ self: { }) {}; "text-ldap" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, dlist - , memory, QuickCheck, quickcheck-simple, random, transformers - }: - mkDerivation { - pname = "text-ldap"; - version = "0.1.1.12"; - sha256 = "1kfp77nm8mvzi6h44334djr88z2w6syrwrvrqy2jfb65d0p9crbx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers dlist memory transformers - ]; - executableHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-simple random - ]; - description = "Parser and Printer for LDAP text data stream"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-ldap_0_1_1_13" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, dlist , memory, QuickCheck, quickcheck-simple, random, transformers }: @@ -203038,7 +203969,6 @@ self: { ]; description = "Parser and Printer for LDAP text data stream"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-lens" = callPackage @@ -203333,6 +204263,8 @@ self: { pname = "text-show"; version = "3.7.4"; sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry"; + revision = "1"; + editedCabalFile = "0002han9bgcc8m64a3k5wgfmzlma4j3qxqd7m2illyza19hijsj9"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -203365,8 +204297,8 @@ self: { pname = "text-show-instances"; version = "3.6.5"; sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql"; - revision = "1"; - editedCabalFile = "12k3hmn36w2mffhxjb5bx1g1gh3y0y4fync9hvk4gklh1w6dbs0a"; + revision = "2"; + editedCabalFile = "1lqvwm9ciazk13jabyr81rl4hsmwksjmks7ckxrdgz3jk201yr6i"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random @@ -203800,17 +204732,6 @@ self: { }) {}; "th-data-compat" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "th-data-compat"; - version = "0.0.2.6"; - sha256 = "1gbqrrpib065yw53063i7ydvm9ghwja30zc6s13mr2pp1l5a4bs2"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Compatibility for data definition template of TH"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-data-compat_0_0_2_7" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; @@ -203819,7 +204740,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-desugar" = callPackage @@ -203996,21 +204916,6 @@ self: { }) {}; "th-lift" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction - }: - mkDerivation { - pname = "th-lift"; - version = "0.7.10"; - sha256 = "13c89mr9g4jwrmqxx882ygr1lkvj1chw29p80qv2f3g5wnhlgkmr"; - libraryHaskellDepends = [ - base ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base ghc-prim template-haskell ]; - description = "Derive Template Haskell's Lift class for datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift_0_7_11" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: mkDerivation { @@ -204023,7 +204928,6 @@ self: { testHaskellDepends = [ base ghc-prim template-haskell ]; description = "Derive Template Haskell's Lift class for datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-lift-instances" = callPackage @@ -204128,17 +205032,6 @@ self: { }) {}; "th-reify-compat" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "th-reify-compat"; - version = "0.0.1.4"; - sha256 = "08lal845ixcw62skw2rsi98y9v3dgj7bq4ygmlxm6k3lfgd9v7q8"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Compatibility for the result type of TH reify"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-reify-compat_0_0_1_5" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-reify-compat"; @@ -204147,7 +205040,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for the result type of TH reify"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-reify-many" = callPackage @@ -204962,8 +205854,8 @@ self: { pname = "tibetan-utils"; version = "0.1.1.5"; sha256 = "09bqix2a2js98rhp748qx2i0vnxya3c6zvpjizbbnf5fwpspy01q"; - revision = "1"; - editedCabalFile = "0wmfv4dxjhjwsnkc8n7jfhbkvc7zwgcmkj7pvabmhcjzn5ch0dck"; + revision = "2"; + editedCabalFile = "17zyhdxwnq85kr60bnxirmyvw3b1679j5mhm3i30ri65896pjdwf"; libraryHaskellDepends = [ base composition-prelude either megaparsec text text-show ]; @@ -204974,6 +205866,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tibetan-utils_0_1_1_9" = callPackage + ({ mkDerivation, base, composition-prelude, either, hspec + , hspec-megaparsec, megaparsec, text, text-show + }: + mkDerivation { + pname = "tibetan-utils"; + version = "0.1.1.9"; + sha256 = "04xpncn9nnc51mzyvw1naydk47acbpkzpxipq1fgvvgclzda2gn8"; + libraryHaskellDepends = [ + base composition-prelude either megaparsec text text-show + ]; + testHaskellDepends = [ + base hspec hspec-megaparsec megaparsec text + ]; + description = "Parse and display tibetan numerals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tic-tac-toe" = callPackage ({ mkDerivation, base, glade, gtk, haskell98 }: mkDerivation { @@ -205364,17 +206275,6 @@ self: { }) {}; "time-locale-compat" = callPackage - ({ mkDerivation, base, old-locale, time }: - mkDerivation { - pname = "time-locale-compat"; - version = "0.1.1.4"; - sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj"; - libraryHaskellDepends = [ base old-locale time ]; - description = "Compatibile module for time-format locale"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "time-locale-compat_0_1_1_5" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { pname = "time-locale-compat"; @@ -205383,7 +206283,6 @@ self: { libraryHaskellDepends = [ base old-locale time ]; description = "Compatibile module for time-format locale"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-locale-vietnamese" = callPackage @@ -206870,8 +207769,8 @@ self: { }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.29"; - sha256 = "1blq3yjzd39fjpavjl5k3567algdl424l0al0rvr25xd239kvwzg"; + version = "0.1.0.36"; + sha256 = "16a15449pfdlan93ynrv3gh42vjlv95160nr1lwvqh91m7fvpnc3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -207017,8 +207916,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "total-map"; - version = "0.0.6"; - sha256 = "11dgcl7ab7akkfnmprnmphj4kazh3x3k09lz7m5glyg39kw8pzrj"; + version = "0.0.7"; + sha256 = "0chcnvsn3bzjmmp2bq6kxli1c73d477i49jbvnmqwz56an84ink1"; libraryHaskellDepends = [ base containers ]; description = "Finitely represented /total/ maps"; license = stdenv.lib.licenses.bsd3; @@ -209220,8 +210119,8 @@ self: { }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.41"; - sha256 = "1ybrsnppy7lnj5z2f8m38cd6ix89j6dlvgc2icl7lj3w14g6cfxm"; + version = "1.0.1.42"; + sha256 = "1jf3w8cw9nmg6b2wxs5agxxi1igfsykj857cjkqjsfr04z060v37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211691,6 +212590,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unicode_0_0_1_1" = callPackage + ({ mkDerivation, base, containers, semigroups, utility-ht }: + mkDerivation { + pname = "unicode"; + version = "0.0.1.1"; + sha256 = "1hgqnplpgaw0pwz0lfr59vmljcf4l5b4ynrhdcic94g18lpsmnvg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers semigroups ]; + testHaskellDepends = [ base containers utility-ht ]; + description = "Construct and transform unicode characters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unicode-names" = callPackage ({ mkDerivation, array, base, containers, unicode-properties }: mkDerivation { @@ -211944,6 +212858,8 @@ self: { pname = "uniprot-kb"; version = "0.1.2.0"; sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l"; + revision = "1"; + editedCabalFile = "0kvw9mzgjz6m1sslywn09n4axkjnwqpi4c5p00p9c81mr9fpbild"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec neat-interpolation QuickCheck text @@ -212002,8 +212918,8 @@ self: { }: mkDerivation { pname = "unique-logic-tf"; - version = "0.5"; - sha256 = "05v9ky3lrh4yzjsfgxa2sz44l7dlsvi5iv4h9rnsj2sd3hj2xcsa"; + version = "0.5.0.1"; + sha256 = "1v37bv5bjpkm5085sg4rf7ssbigsivib6fdxjhxyd36zhh08pdjy"; libraryHaskellDepends = [ base containers data-ref semigroups transformers utility-ht ]; @@ -212210,6 +213126,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "universal" = callPackage + ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck + , tasty, tasty-smallcheck, util + }: + mkDerivation { + pname = "universal"; + version = "0.0.0.0"; + sha256 = "0qcv0xi65l782yvn25an0qiavn942szs16j8p328i2pc6ggfymb2"; + libraryHaskellDepends = [ base base-unicode-symbols util ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + doHaddock = false; + description = "Universal"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "universal-binary" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -212415,19 +213347,6 @@ self: { }) {}; "unix-compat" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "unix-compat"; - version = "0.5.0.1"; - sha256 = "1gdf3h2knbymkivm784vq51mbcyj5y91r480awyxj5cw8gh9kwn2"; - revision = "1"; - editedCabalFile = "0yrdy4dz0zskgpw7c4wgkwskgayqxvch37axwka5z4g5gmic4mnn"; - libraryHaskellDepends = [ base unix ]; - description = "Portable POSIX-compatibility layer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unix-compat_0_5_1" = callPackage ({ mkDerivation, base, unix }: mkDerivation { pname = "unix-compat"; @@ -212436,7 +213355,6 @@ self: { libraryHaskellDepends = [ base unix ]; description = "Portable POSIX-compatibility layer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unix-fcntl" = callPackage @@ -212587,8 +213505,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.7.0"; - sha256 = "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs"; + version = "0.2.7.1"; + sha256 = "1rif0r52qw2g8kxnbxpcdsmy925py47f8gspfvkbp16nrpxk7k63"; libraryHaskellDepends = [ async base deepseq directory filepath process stm time transformers unix unliftio-core @@ -212601,14 +213519,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "unliftio_0_2_8_0" = callPackage + ({ mkDerivation, async, base, deepseq, directory, filepath, hspec + , process, stm, time, transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.8.0"; + sha256 = "04i03j1ffa3babh0i79zzvxk7xnm4v8ci0mpfzc4dm7m65cwk1h5"; + libraryHaskellDepends = [ + async base deepseq directory filepath process stm time transformers + unix unliftio-core + ]; + testHaskellDepends = [ + async base deepseq directory filepath hspec process stm time + transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "unliftio-core"; - version = "0.1.1.0"; - sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m"; - revision = "1"; - editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2"; + version = "0.1.2.0"; + sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = stdenv.lib.licenses.mit; @@ -212958,8 +213895,8 @@ self: { }: mkDerivation { pname = "unused"; - version = "0.8.0.0"; - sha256 = "1bs87ii03dydrcyx70drmbd1nrb5z1xj5bzrrqgbq2fzhh7rmb1n"; + version = "0.9.0.0"; + sha256 = "1qxz70a9gry1d4a2bgixssq29hkdvck3s0yccbjgksiy98rk463y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -213039,6 +213976,16 @@ self: { license = "unknown"; }) {}; + "update-monad" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "update-monad"; + version = "0.1.0.0"; + sha256 = "0l6gbfw0rmhkk2iq3wd2zzyld2nvjmbrlg7rqqv962cahs5mydns"; + libraryHaskellDepends = [ base mtl ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "update-nix-fetchgit" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, async, base, bytestring , data-fix, errors, hnix, process, text, time, transformers @@ -213826,17 +214773,6 @@ self: { }) {}; "util" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "util"; - version = "0.1.10.1"; - sha256 = "1z3k6x6ap1hjp53w9dnqx8d7pwpbgsabj3dlxcdg5pvr6m3ns184"; - libraryHaskellDepends = [ base ]; - description = "Utilities"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "util_0_1_11_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "util"; @@ -213845,7 +214781,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "util-exception" = callPackage @@ -213886,6 +214821,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "util-primitive-control" = callPackage + ({ mkDerivation, base, control, primitive, smallcheck, tasty + , tasty-smallcheck, util + }: + mkDerivation { + pname = "util-primitive-control"; + version = "0.1.0.0"; + sha256 = "104p69sw8jyc2dvarv7573cks3p6fvk5d61qhp9y47nylp4q8iqx"; + libraryHaskellDepends = [ base control primitive util ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + doHaddock = false; + description = "Utilities for stateful primitive types and types based on them"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "util-universe" = callPackage + ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck + , universe-base, universe-instances-base + }: + mkDerivation { + pname = "util-universe"; + version = "0.1.0.0"; + sha256 = "1jpi5ic14knr3g8qmz6ls430ll4m9wi5ag1ngmlz46h1zlw53l8y"; + libraryHaskellDepends = [ + base universe-base universe-instances-base + ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + description = "Utilities for universal types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "utility-ht" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -214575,22 +215541,6 @@ self: { }) {}; "validity-path" = callPackage - ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path - , validity - }: - mkDerivation { - pname = "validity-path"; - version = "0.3.0.1"; - sha256 = "1mfd062p9wh63qnz4a06rj7179lyllfc97g60cmpnjspmcdgy1ky"; - libraryHaskellDepends = [ base filepath path validity ]; - testHaskellDepends = [ - base filepath genvalidity-hspec hspec path validity - ]; - description = "Validity instances for Path"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-path_0_3_0_2" = callPackage ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path , validity }: @@ -214604,7 +215554,6 @@ self: { ]; description = "Validity instances for Path"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-primitive" = callPackage @@ -214619,17 +215568,6 @@ self: { }) {}; "validity-scientific" = callPackage - ({ mkDerivation, base, scientific, validity }: - mkDerivation { - pname = "validity-scientific"; - version = "0.2.0.1"; - sha256 = "1iphzdh9vqa51im1mx3sg7gpqczm39bcdc6li84lssyflg20kraw"; - libraryHaskellDepends = [ base scientific validity ]; - description = "Validity instances for scientific"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-scientific_0_2_0_2" = callPackage ({ mkDerivation, base, scientific, validity }: mkDerivation { pname = "validity-scientific"; @@ -214638,21 +215576,9 @@ self: { libraryHaskellDepends = [ base scientific validity ]; description = "Validity instances for scientific"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-text" = callPackage - ({ mkDerivation, base, bytestring, text, validity }: - mkDerivation { - pname = "validity-text"; - version = "0.3.0.1"; - sha256 = "0ccy6b21lxgqp9q2cmddip1r0axwh6ny4c2vrw1a16712yrhrcdf"; - libraryHaskellDepends = [ base bytestring text validity ]; - description = "Validity instances for text"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-text_0_3_1_0" = callPackage ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { pname = "validity-text"; @@ -214661,21 +215587,9 @@ self: { libraryHaskellDepends = [ base bytestring text validity ]; description = "Validity instances for text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-time" = callPackage - ({ mkDerivation, base, time, validity }: - mkDerivation { - pname = "validity-time"; - version = "0.2.0.1"; - sha256 = "1m8wsm97s7cwax183qsbmr8p010k9czigwlqbqr6qha3bk83n4bf"; - libraryHaskellDepends = [ base time validity ]; - description = "Validity instances for time"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-time_0_2_0_2" = callPackage ({ mkDerivation, base, time, validity }: mkDerivation { pname = "validity-time"; @@ -214684,23 +215598,9 @@ self: { libraryHaskellDepends = [ base time validity ]; description = "Validity instances for time"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-unordered-containers" = callPackage - ({ mkDerivation, base, hashable, unordered-containers, validity }: - mkDerivation { - pname = "validity-unordered-containers"; - version = "0.2.0.1"; - sha256 = "11pwrd1jbxdffw1lqq6zxgpgzvxrg4y01wnrn5bzwksiqzach742"; - libraryHaskellDepends = [ - base hashable unordered-containers validity - ]; - description = "Validity instances for unordered-containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-unordered-containers_0_2_0_2" = callPackage ({ mkDerivation, base, hashable, unordered-containers, validity }: mkDerivation { pname = "validity-unordered-containers"; @@ -214711,21 +215611,9 @@ self: { ]; description = "Validity instances for unordered-containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-uuid" = callPackage - ({ mkDerivation, base, uuid, validity }: - mkDerivation { - pname = "validity-uuid"; - version = "0.1.0.1"; - sha256 = "15lk4hig0j6xhz1b7m2hwpvyfwhlrvncgwb1830lpmgvvg18qb9n"; - libraryHaskellDepends = [ base uuid validity ]; - description = "Validity instances for uuid"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-uuid_0_1_0_2" = callPackage ({ mkDerivation, base, uuid, validity }: mkDerivation { pname = "validity-uuid"; @@ -214734,21 +215622,9 @@ self: { libraryHaskellDepends = [ base uuid validity ]; description = "Validity instances for uuid"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-vector" = callPackage - ({ mkDerivation, base, hashable, validity, vector }: - mkDerivation { - pname = "validity-vector"; - version = "0.2.0.1"; - sha256 = "0ljihk6qdb52c44hf39wigf3b0f0xs1z7adgxg4fqfxq8zq2a3k4"; - libraryHaskellDepends = [ base hashable validity vector ]; - description = "Validity instances for vector"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-vector_0_2_0_2" = callPackage ({ mkDerivation, base, hashable, validity, vector }: mkDerivation { pname = "validity-vector"; @@ -214757,7 +215633,6 @@ self: { libraryHaskellDepends = [ base hashable validity vector ]; description = "Validity instances for vector"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "valor" = callPackage @@ -215270,26 +216145,6 @@ self: { }) {}; "vector-algorithms" = callPackage - ({ mkDerivation, base, bytestring, containers, primitive - , QuickCheck, vector - }: - mkDerivation { - pname = "vector-algorithms"; - version = "0.7.0.1"; - sha256 = "0w4hf598lpxfg58rnimcqxrbnpqq2jmpjx82qa5md3q6r90hlipd"; - revision = "2"; - editedCabalFile = "186nxwg02m16v68gi186f0z99cafp4g87flhfccnzlrvshlfb83m"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring primitive vector ]; - testHaskellDepends = [ - base bytestring containers QuickCheck vector - ]; - description = "Efficient algorithms for vector arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-algorithms_0_7_0_4" = callPackage ({ mkDerivation, base, bytestring, containers, primitive , QuickCheck, vector }: @@ -215305,7 +216160,6 @@ self: { ]; description = "Efficient algorithms for vector arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-binary" = callPackage @@ -215580,11 +216434,25 @@ self: { pname = "vector-space"; version = "0.13"; sha256 = "05yn93vnhzhpp2i6qb4b3dasvmpk71rab6vhssqvpb3qhdvxb482"; + revision = "1"; + editedCabalFile = "0iakf0srv3lpkyjvivj7w5swv2ybwas0kx59igkq2b7bwp0y82wn"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; }) {}; + "vector-space_0_14" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.14"; + sha256 = "1kfziqdnsjr540y8iajpfmdkarhmjnc5xm897bswjhrpgyh2k6h3"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -216013,6 +216881,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_23" = callPackage + ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.23"; + sha256 = "0nxivlnzvnhsk9gn2d7x240n7803fy14pb5knjkxvsw0h0pj8kc6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers directory ghc-prof lens scientific text + vector vector-algorithms vty + ]; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -216164,18 +217051,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "vinyl_0_9_3" = callPackage - ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec - , lens, linear, microlens, mwc-random, primitive - , should-not-typecheck, singletons, tagged, vector + "vinyl_0_10_0" = callPackage + ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim + , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random + , primitive, should-not-typecheck, singletons, tagged, text + , unordered-containers, vector }: mkDerivation { pname = "vinyl"; - version = "0.9.3"; - sha256 = "1sxkkmnq7vl5bmpljs3riaqb2kqpx1kkkllqiz4zawmhw6wmw1nj"; + version = "0.10.0"; + sha256 = "1d1lm9mi9gkcaw0lczbmbn81c3kc5yji3jbp2rjabiwhyi61mj4m"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ - base doctest hspec lens microlens should-not-typecheck singletons + aeson base doctest hspec lens lens-aeson microlens mtl + should-not-typecheck singletons text unordered-containers vector ]; benchmarkHaskellDepends = [ base criterion linear microlens mwc-random primitive tagged vector @@ -216513,8 +217402,8 @@ self: { }: mkDerivation { pname = "voicebase"; - version = "0.1.1.1"; - sha256 = "1nc2cmfmdalggb7f9xw4xrhms31cky478wxxkq50as6bryl3k3q3"; + version = "0.1.1.2"; + sha256 = "1kw988gbx9vvrfybz3k1qxm3hyqxrfi0dyy5iwmq191y7x2scbj6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216681,7 +217570,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_23_1" = callPackage + "vty_5_24" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , deepseq, directory, filepath, hashable, HUnit, microlens , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck @@ -216692,8 +217581,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.23.1"; - sha256 = "1cd328prv1pddza87a2kfh93l101jg1afs5s951yhr9z93mgd7d9"; + version = "5.24"; + sha256 = "177yj12cgvmiq62z7kdkqbhmr98awyi3njp1xsbdr3p81k5arwrw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217101,36 +217990,6 @@ self: { }) {}; "wai-extra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, HUnit, iproute, lifted-base, network, old-locale - , resourcet, streaming-commons, stringsearch, text, time - , transformers, unix, unix-compat, vault, void, wai, wai-logger - , word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.24.1"; - sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types iproute lifted-base network - old-locale resourcet streaming-commons stringsearch text time - transformers unix unix-compat vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base bytestring case-insensitive cookie fast-logger hspec - http-types HUnit resourcet text time transformers wai zlib - ]; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-extra_3_0_24_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -217158,7 +218017,6 @@ self: { ]; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-frontend-monadcgi" = callPackage @@ -218664,6 +219522,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_24" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, doctest + , gauge, ghc-prim, hashable, hspec, http-client, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.24"; + sha256 = "1b0iwwmzzfs8x7c5spfn4y0kqwgkk711p1fzf854l6mmvsmiq4sk"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory doctest ghc-prim hashable + hspec http-client http-date http-types http2 HUnit iproute + lifted-base network process QuickCheck silently simple-sendfile stm + streaming-commons text time transformers unix unix-compat vault wai + word8 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network unix unix-compat + ]; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -218681,6 +219574,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "warp-grpc" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , http-types, http2-grpc-types, proto-lens, wai, warp, warp-tls + }: + mkDerivation { + pname = "warp-grpc"; + version = "0.1.0.2"; + sha256 = "1xndsd5li3bzj65pq0ml2c54v470zs14bqzimx4srnkas9kf5dyr"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive http-types http2-grpc-types + proto-lens wai warp warp-tls + ]; + description = "A minimal gRPC server on top of Warp"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "warp-static" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, directory , mime-types, text, wai-app-static, wai-extra, warp @@ -220434,8 +221343,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, utf8-string }: mkDerivation { pname = "wilton-ffi"; - version = "0.2.0.0"; - sha256 = "1n2cgf0cnpr7f9rgf2369qnz3mm1qvylpzncc7s42vcrrq4x3wj7"; + version = "0.3.0.1"; + sha256 = "00ib82h5c35g5qf605pn9qijg4y1xcn1jgjgqbd0imhnhhqyp067"; libraryHaskellDepends = [ aeson base bytestring utf8-string ]; description = "Haskell modules support for Wilton JavaScript runtime"; license = stdenv.lib.licenses.mit; @@ -222926,6 +223835,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xml-basic_0_1_3_1" = callPackage + ({ mkDerivation, base, containers, data-accessor + , explicit-exception, semigroups, utility-ht + }: + mkDerivation { + pname = "xml-basic"; + version = "0.1.3.1"; + sha256 = "1qm3g00zavdal1f1yj2jrg7lb6b845fbf63b4pym5p49wkw3yx4d"; + libraryHaskellDepends = [ + base containers data-accessor explicit-exception semigroups + utility-ht + ]; + description = "Basics for XML/HTML representation and processing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-catalog" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, text , transformers, uri-conduit, xml-conduit @@ -223885,16 +224811,12 @@ self: { }) {}; "xmonad-spotify" = callPackage - ({ mkDerivation, base, containers, dbus, X11, xmonad - , xmonad-contrib - }: + ({ mkDerivation, base, containers, dbus, X11 }: mkDerivation { pname = "xmonad-spotify"; - version = "0.1.0.0"; - sha256 = "1sl26ffaklasgyns8iz4jwm4736vfkflcv3gayn9bvb1kfr6g7rm"; - libraryHaskellDepends = [ - base containers dbus X11 xmonad xmonad-contrib - ]; + version = "0.1.0.1"; + sha256 = "11j2kd3l8yh3fn7smcggmi8jv66x80df52vwa7kmxchbsxf5qrpi"; + libraryHaskellDepends = [ base containers dbus X11 ]; description = "Bind media keys to work with Spotify"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -223938,14 +224860,14 @@ self: { "xmonad-volume" = callPackage ({ mkDerivation, alsa-mixer, base, composition-prelude, containers - , X11, xmonad + , X11 }: mkDerivation { pname = "xmonad-volume"; - version = "0.1.0.0"; - sha256 = "0n517ddbjpy6ylg3d1amz7asgc6sww2yy0bxasp0xsd40jc77cfx"; + version = "0.1.0.1"; + sha256 = "0lv1009d8w2xyx98c6g65z4mxp31jz79lqayvdw26a02kq63cild"; libraryHaskellDepends = [ - alsa-mixer base composition-prelude containers X11 xmonad + alsa-mixer base composition-prelude containers X11 ]; description = "XMonad volume controls"; license = stdenv.lib.licenses.bsd3; @@ -224625,15 +225547,15 @@ self: { "yaml" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, resourcet, scientific, semigroups, template-haskell - , temporary, text, transformers, unordered-containers, vector + , conduit, containers, directory, filepath, hspec, HUnit, mockery + , resourcet, scientific, semigroups, template-haskell, temporary + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "yaml"; version = "0.8.32"; sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w"; - configureFlags = [ "-fsystem-libyaml" ]; + configureFlags = [ "-f-system-libyaml" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224641,7 +225563,6 @@ self: { filepath resourcet scientific semigroups template-haskell text transformers unordered-containers vector ]; - librarySystemDepends = [ libyaml ]; testHaskellDepends = [ aeson attoparsec base base-compat bytestring conduit containers directory filepath hspec HUnit mockery resourcet scientific @@ -224650,32 +225571,32 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; + }) {}; - "yaml_0_10_0" = callPackage + "yaml_0_10_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, mtl, raw-strings-qq, resourcet, scientific, semigroups + , mockery, mtl, raw-strings-qq, resourcet, scientific , template-haskell, temporary, text, transformers , unordered-containers, vector }: mkDerivation { pname = "yaml"; - version = "0.10.0"; - sha256 = "0kyfzcp3hlb44rpf28ipz0m5cpanj91hlhvr9kidvg71826s9xcm"; + version = "0.10.1.1"; + sha256 = "1rbmflr1yfcg147v544laq9vybn4kidjlc7v96ddaamx8sg32192"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit containers directory - filepath mtl resourcet scientific semigroups template-haskell text + filepath mtl resourcet scientific template-haskell text transformers unordered-containers vector ]; librarySystemDepends = [ libyaml ]; testHaskellDepends = [ aeson attoparsec base base-compat bytestring conduit containers directory filepath hspec HUnit mockery mtl raw-strings-qq resourcet - scientific semigroups template-haskell temporary text transformers + scientific template-haskell temporary text transformers unordered-containers vector ]; description = "Support for parsing and rendering YAML documents"; From 11930854a2ad64f86f765904323413afe052e7a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 29 Aug 2018 19:43:31 +0200 Subject: [PATCH 535/600] haskell-yaml: drop obsolete override --- pkgs/development/haskell-modules/configuration-nix.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d363d2e87b69..dd599f67bc06 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -314,9 +314,6 @@ self: super: builtins.intersectAttrs super { # https://github.com/bos/pcap/issues/5 pcap = addExtraLibrary super.pcap pkgs.libpcap; - # https://github.com/snoyberg/yaml/issues/106 - yaml = disableCabalFlag super.yaml "system-libyaml"; - # The cabal files for these libraries do not list the required system dependencies. miniball = overrideCabal super.miniball (drv: { librarySystemDepends = [ pkgs.miniball ]; From 1c5d7ad52efb2002bdf5a04b3a699d0d021cc224 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2018 11:38:33 +0200 Subject: [PATCH 536/600] cabal2nix: fix (and clean up)override for hpack dependency --- .../haskell-modules/configuration-common.nix | 14 ++++---------- .../haskell-modules/hackage-packages.nix | 5 ++++- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2e293f1031b0..11772dd7d555 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1074,16 +1074,10 @@ self: super: { haddock-library = doJailbreak (dontCheck super.haddock-library); haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); - # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2. - # Lets remove this once the LTS has upraded to 0.29.6. - hpack = super.hpack_0_29_7; - - # The test suite does not know how to find the 'cabal2nix' binary. - cabal2nix = overrideCabal super.cabal2nix (drv: { - preCheck = '' - export PATH="$PWD/dist/build/cabal2nix:$PATH" - export HOME="$TMPDIR/home" - ''; + # The tool needs a newer hpack version than the one mandated by LTS-12.x. + cabal2nix = super.cabal2nix.overrideScope (self: super: { + hpack = self.hpack_0_30_0; + yaml = self.yaml_0_10_1_1; }); # Break out of "aeson <1.3, temporary <1.3". diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dc2e2abed6ab..6fda57921886 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -41611,6 +41611,10 @@ self: { base Cabal containers directory filepath language-nix lens pretty process tasty tasty-golden ]; + preCheck = '' + export PATH="$PWD/dist/build/cabal2nix:$PATH" + export HOME="$TMPDIR/home" + ''; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; @@ -202873,7 +202877,6 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "termplot" = callPackage From da86e4255b03510464fd32adca3ccb5fd7e77ede Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Tue, 28 Aug 2018 09:55:59 +0900 Subject: [PATCH 537/600] haskellPackages.termonad: Add dontCheck and remove from dont-distribute-packages. The doctests for termonad fail to build only with nix. When building without nix, the doctests run correctly: https://github.com/cdepillabout/termonad/issues/15 This PR disables the tests for termonad, as well as removing it from dont-distribute-packages. --- .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7b827664cdab..71dd526c1a3a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9060,7 +9060,6 @@ dont-distribute-packages: termcolor: [ i686-linux, x86_64-linux, x86_64-darwin ] terminal-text: [ i686-linux, x86_64-linux, x86_64-darwin ] termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - termonad: [ i686-linux, x86_64-linux, x86_64-darwin ] termplot: [ i686-linux, x86_64-linux, x86_64-darwin ] terntup: [ i686-linux, x86_64-linux, x86_64-darwin ] terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index dd599f67bc06..d016bd6ce8d6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -507,4 +507,8 @@ self: super: builtins.intersectAttrs super { LDAP = dontCheck (overrideCabal super.LDAP (drv: { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; })); + + # Doctests hang only when compiling with nix. + # https://github.com/cdepillabout/termonad/issues/15 + termonad = dontCheck super.termonad; } From 838b4fe552204841b37c2c08e7581409bd428906 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2018 12:26:48 +0200 Subject: [PATCH 538/600] haskell-Cabal: keep a copy of the 2.2.x version around in the package set --- .../configuration-hackage2nix.yaml | 1 + .../haskell-modules/hackage-packages.nix | 33 +++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 71dd526c1a3a..467234b8a25d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2378,6 +2378,7 @@ extra-packages: - Cabal == 1.18.* # required for cabal-install et al on old GHC versions - Cabal == 1.20.* # required for cabal-install et al on old GHC versions - Cabal == 1.24.* # required for jailbreak-cabal etc. + - Cabal == 2.2.* # required for jailbreak-cabal etc. - colour < 2.3.4 # newer versions don't support GHC 7.10.x - conduit >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227 - conduit-extra >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6fda57921886..ee9e9b90fdf9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2440,6 +2440,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Cabal_2_2_0_1" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, binary + , bytestring, containers, deepseq, Diff, directory, filepath + , integer-logarithms, mtl, optparse-applicative, parsec, pretty + , process, QuickCheck, tagged, tar, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, transformers + , tree-diff, unix + }: + mkDerivation { + pname = "Cabal"; + version = "2.2.0.1"; + sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty process text time transformers unix + ]; + testHaskellDepends = [ + array base base-compat base-orphans bytestring containers deepseq + Diff directory filepath integer-logarithms optparse-applicative + pretty process QuickCheck tagged tar tasty tasty-golden tasty-hunit + tasty-quickcheck text tree-diff + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Cabal_2_4_0_0" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, binary , bytestring, containers, deepseq, Diff, directory, filepath @@ -96129,7 +96158,7 @@ self: { description = "Haskell interface of the igraph library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {igraph = null;}; + }) {inherit (pkgs) igraph;}; "haskell-import-graph" = callPackage ({ mkDerivation, base, classy-prelude, ghc, graphviz, process, text @@ -117256,7 +117285,7 @@ self: { description = "Bindings to the igraph C library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {igraph = null;}; + }) {inherit (pkgs) igraph;}; "igrf" = callPackage ({ mkDerivation, ad, base, polynomial }: From e6e56bbe32099663b6f78db60c95abecd2fec927 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 3 Sep 2018 09:33:37 -0400 Subject: [PATCH 539/600] ghc: Apply fix to abi-hash with backpack. See https://phabricator.haskell.org/D5123. --- pkgs/development/compilers/ghc/8.4.3.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index aa9fab184364..365f401119da 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -99,6 +99,10 @@ stdenv.mkDerivation (rec { sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; extraPrefix = "utils/hsc2hs/"; stripLen = 1; + }) (fetchpatch rec { # https://phabricator.haskell.org/D5123 + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D5123.diff"; + sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; })] ++ stdenv.lib.optional deterministicProfiling (fetchpatch rec { url = "http://tarballs.nixos.org/sha256/${sha256}"; From cd41cad074153bedeb2ab98cf59c668183164ed3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 3 Sep 2018 09:34:14 -0400 Subject: [PATCH 540/600] haskell.compiler.ghc861: Apply fix to abi-hash with backpack. See https://phabricator.haskell.org/D5123. --- pkgs/development/compilers/ghc/8.6.1.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 7fcb52969151..36ef9d0cc73d 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs, alex, happy, hscolour -, autoconf, automake, coreutils, fetchurl, perl, python3, m4 +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 , libiconv ? null, ncurses @@ -90,6 +90,12 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123 + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D5123.diff"; + sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; + })]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. From 53d34305f69d3e8e217ef2fc68a5727c7c10f9af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 12 Sep 2018 10:27:39 +0200 Subject: [PATCH 541/600] haskell-stm: update overrides that use version 2.4.5.0 to version 2.4.5.1 --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 9bd45c9887f1..5684d14caddf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -40,7 +40,7 @@ self: super: { mtl = self.mtl_2_2_2; parsec = self.parsec_3_1_13_0; parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups]; - stm = self.stm_2_4_5_0; + stm = self.stm_2_4_5_1; text = self.text_1_2_3_0; # Build jailbreak-cabal with the latest version of Cabal. diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index f475512a8dab..eca2d111b542 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -39,7 +39,7 @@ self: super: { # These are now core libraries in GHC 8.4.x. mtl = self.mtl_2_2_2; parsec = self.parsec_3_1_13_0; - stm = self.stm_2_4_5_0; + stm = self.stm_2_4_5_1; text = self.text_1_2_3_0; # https://github.com/bmillwood/applicative-quoters/issues/6 diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index f73172e02d38..5d499c803dae 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -39,7 +39,7 @@ self: super: { # These are now core libraries in GHC 8.4.x. mtl = self.mtl_2_2_2; parsec = self.parsec_3_1_13_0; - stm = self.stm_2_4_5_0; + stm = self.stm_2_4_5_1; text = self.text_1_2_3_0; # Make sure we can still build Cabal 1.x. diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index c79406a94727..7e8bc1a1e8e3 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -25,7 +25,7 @@ self: super: # GHCJS does not ship with the same core packages as GHC. # https://github.com/ghcjs/ghcjs/issues/676 - stm = self.stm_2_4_5_0; + stm = self.stm_2_4_5_1; ghc-compact = self.ghc-compact_0_1_0_0; network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); From 9d47aaa3b69ad75b3a2699eafdf3d2d92b214d5f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 12 Sep 2018 10:33:23 +0200 Subject: [PATCH 542/600] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.11-9-gb3613cb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/e44c7d34b0e57883da9cc0e09b0b5de3b065fe98. --- .../haskell-modules/hackage-packages.nix | 899 ++++++++++++------ 1 file changed, 616 insertions(+), 283 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ee9e9b90fdf9..003d9d259ace 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6103,8 +6103,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.10.1"; - sha256 = "08qsa22xhw4cdhdzc8ixlwjazi9s0n48395g4vf5qwfap9r8rdq3"; + version = "0.10.2"; + sha256 = "05x733nk3dbla4y6p7b1nx4pv3b0wm6idhsm7p30z2f968k3hyv9"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -14973,14 +14973,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "QuickCheck_2_12_1" = callPackage + "QuickCheck_2_12_2" = callPackage ({ mkDerivation, base, containers, deepseq, erf, process, random , template-haskell, tf-random, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.12.1"; - sha256 = "1xq2cmz1yr63a2f6yz5v6majd0wqagx13xrk4b3xa7y9nbpxixag"; + version = "2.12.2"; + sha256 = "0cqjxwjn0374baf3qs059jmj8qr147i2fqxn6cjhsn4wbzxnc48r"; libraryHaskellDepends = [ base containers deepseq erf random template-haskell tf-random transformers @@ -23087,20 +23087,17 @@ self: { "algebraic-graphs" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, containers - , criterion, deepseq, extra, QuickCheck + , deepseq, extra, mtl, QuickCheck }: mkDerivation { pname = "algebraic-graphs"; - version = "0.1.1.1"; - sha256 = "0c8jrp0z3ibla7isbn1v5nhfka56hwq8h10r7h3vca53yzbafiw7"; + version = "0.2"; + sha256 = "0rfs58z60nn041ymi7lilc7dyijka30l4hhdznfaz9sfzx4f8yl8"; libraryHaskellDepends = [ - array base base-compat containers deepseq + array base base-compat containers deepseq mtl ]; testHaskellDepends = [ - base base-compat base-orphans containers extra QuickCheck - ]; - benchmarkHaskellDepends = [ - base base-compat containers criterion + array base base-compat base-orphans containers extra QuickCheck ]; description = "A library for algebraic graph construction and transformation"; license = stdenv.lib.licenses.mit; @@ -28494,8 +28491,8 @@ self: { pname = "arithmoi"; version = "0.7.0.0"; sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb"; - revision = "2"; - editedCabalFile = "1db2pcwip682f4zs1qnqzqqdswhqzbsxydy89m6zqm5ddlgrw5sq"; + revision = "3"; + editedCabalFile = "1s0jm2y0jhfrj7af80csckiizkfq5h0v4zb92mkwh1pkfi763fha"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers exact-pi ghc-prim integer-gmp @@ -29870,8 +29867,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "atomic-modify"; - version = "0.1.0.1"; - sha256 = "0kkfbm7jkarzj42ja7093i1j1h4klg362pfz1cvldvdhzjgs009r"; + version = "0.1.0.2"; + sha256 = "0j4zhr02bmkpar80vzxxj91qyz97wi7kia79q20a1y3sqbmx2sk5"; libraryHaskellDepends = [ base stm ]; description = "A typeclass for mutable references that have an atomic modify operation"; license = stdenv.lib.licenses.asl20; @@ -30027,8 +30024,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.1.8"; - sha256 = "183gdyivl6kab2k3z0jm6dk0wh83qwz3zvai7ayfkq3rjc6lb8ms"; + version = "3.2.2.0"; + sha256 = "10xwgc7y324fgisqjkx2jk5bq226fj3ayl373m6m1nbnx2qax22w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -30654,6 +30651,8 @@ self: { pname = "aura"; version = "2.0.0"; sha256 = "1k53r44kxy7p23nsjbx12mvn7nkl8j3h9fzy4v3dxyqkd4jz0996"; + revision = "1"; + editedCabalFile = "1z73n5fcrp23hms0l6r45p1knqqlng8g4gfb44a4raqj7da823zj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55659,6 +55658,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cue-sheet_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec + , mtl, QuickCheck, text + }: + mkDerivation { + pname = "cue-sheet"; + version = "2.0.0"; + sha256 = "1w6gmxwrqz7jlm7f0rccrik86w0syhjk5w5cvg29gi2yzj3grnql"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers data-default-class exceptions megaparsec + mtl QuickCheck text + ]; + testHaskellDepends = [ + base bytestring exceptions hspec hspec-megaparsec megaparsec + QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + description = "Support for construction, rendering, and parsing of CUE sheets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cufft" = callPackage ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath , template-haskell @@ -57483,8 +57506,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "data-forest"; - version = "0.1.0.6"; - sha256 = "11iisc82cgma5pp6apnjg112dd4cvqxclwf09zh9rh50lzkml9dk"; + version = "0.1.0.7"; + sha256 = "1q41cwinvv0ys260f1f7005403pvz1gbwn0d6cnwh8b7rlgp8f4j"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "A simple multi-way tree data structure"; @@ -59897,17 +59920,16 @@ self: { }) {}; "deferred-folds" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, primitive - , transformers + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, transformers, unordered-containers, vector }: mkDerivation { pname = "deferred-folds"; - version = "0.9.1"; - sha256 = "1s1zz1yq97f3ivm68d8rv75v87li2003qk7w4n9s4nrx118llv6f"; - revision = "1"; - editedCabalFile = "0k4jh84a5mivx2wcwpdr9clbfx61j45ijbd8p82cdp77j35nz1gc"; + version = "0.9.7"; + sha256 = "18kyf6li2n3gzsvvdqsf4vwb1l0la755m1dl7gddg2ysnb8kkqb0"; libraryHaskellDepends = [ - base bytestring containers foldl primitive transformers + base bytestring containers foldl hashable primitive transformers + unordered-containers vector ]; description = "Abstractions over deferred folds"; license = stdenv.lib.licenses.mit; @@ -64403,8 +64425,8 @@ self: { ({ mkDerivation, base, indexed }: mkDerivation { pname = "do-notation"; - version = "0.1.0.1"; - sha256 = "1ab32s7vjna1zkyvild62jsf9zkqls1bz3zp0fzfn0ykrv3045l8"; + version = "0.1.0.2"; + sha256 = "1xbvphpwbzns4567zbk8baq0zd068dcprp59cjzhbplf9cypiwy9"; libraryHaskellDepends = [ base indexed ]; testHaskellDepends = [ base indexed ]; description = "Generalize do-notation to work on monads and indexed monads simultaneously"; @@ -67500,8 +67522,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.0.2"; - sha256 = "0m7fkf8r1i0z3zrfmnqsdzk0fc9mhanqmx7x6rjiisjiaf91yr8d"; + version = "0.0.0.3"; + sha256 = "1b01aj05dbx51hgyhmggh1zgcbwfvyijkxj7knqpbgpj7hymv00y"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; @@ -68422,6 +68444,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_3_2_7" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3.2.7"; + sha256 = "1qdl0g8nbngr6kz4xrgi06rn1zf1np55ipk3wwdrg9hpfaaazcs3"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + description = "Email address validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -70785,6 +70824,8 @@ self: { pname = "eventstore"; version = "1.1.6"; sha256 = "00bdkklwrabxvbr725hkdsc1a2fdr50gdwryn7spmsqxmqgzv96w"; + revision = "1"; + editedCabalFile = "1y1a7brw220bg4mfc80qhkcyzlm38qvs6pkr7p8xyk104b8k5qgx"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger @@ -73687,20 +73728,20 @@ self: { }) {}; "fficxx" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, data-default - , directory, either, errors, filepath, hashable, haskell-src-exts - , lens, mtl, process, pureMD5, split, template, template-haskell - , text, transformers, unordered-containers + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal + , containers, data-default, directory, either, errors, filepath + , hashable, haskell-src-exts, lens, mtl, process, pureMD5, split + , template, template-haskell, text, transformers + , unordered-containers }: mkDerivation { pname = "fficxx"; - version = "0.4.1"; - sha256 = "1s1yzvs1j4as4875509hzny1399zimpzyh9zh5g0ddg8dqg5lfi4"; - enableSeparateDataOutput = true; + version = "0.5"; + sha256 = "16r7pbfxr1xf5jxwyk2qv50yishpk0mzndl88hv9bwpz7gbj55yy"; libraryHaskellDepends = [ - base bytestring Cabal containers data-default directory either - errors filepath hashable haskell-src-exts lens mtl process pureMD5 - split template template-haskell text transformers + aeson aeson-pretty base bytestring Cabal containers data-default + directory either errors filepath hashable haskell-src-exts lens mtl + process pureMD5 split template template-haskell text transformers unordered-containers ]; description = "automatic C++ binding generation"; @@ -73712,8 +73753,8 @@ self: { ({ mkDerivation, base, bytestring, template-haskell }: mkDerivation { pname = "fficxx-runtime"; - version = "0.3"; - sha256 = "18pzjhfqsr2f783xywmcfkz5isx31iqcyng4j5mbz92q2m166idb"; + version = "0.5"; + sha256 = "05ljkq3zv8nfx4xhvqql13qd81v46bnxnja8f8590yrf3zfqg87x"; libraryHaskellDepends = [ base bytestring template-haskell ]; description = "Runtime for fficxx-generated library"; license = stdenv.lib.licenses.bsd3; @@ -75195,8 +75236,8 @@ self: { }: mkDerivation { pname = "fizzbuzz-as-a-service"; - version = "0.1.0.2"; - sha256 = "0bskyv1zyk469bikh4rh6ad1i8d5ym9s89a88aw34cpphy0vq1zk"; + version = "0.1.0.3"; + sha256 = "0kzhbavi26qbph6pgna77fbnpfgrxi81h9v92177ycl980k4qdwv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -75481,44 +75522,33 @@ self: { }) {}; "flight-igc" = callPackage - ({ mkDerivation, base, cmdargs, directory, filemanip, filepath - , hlint, mtl, parsec, raw-strings-qq, system-filepath, transformers - }: + ({ mkDerivation, base, bytestring, parsec, utf8-string }: mkDerivation { pname = "flight-igc"; - version = "0.1.0"; - sha256 = "1cr25xhwmpzi0rg8znj1q7siy5skjm8q08ncgwvmd4h3mmdbb7xl"; - revision = "1"; - editedCabalFile = "0yaqp249gjqgch7w9d8y963afvjl43mhaywgni3x8ld14h55m7ia"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base parsec ]; - executableHaskellDepends = [ - base cmdargs directory filemanip filepath mtl raw-strings-qq - system-filepath transformers - ]; - testHaskellDepends = [ base hlint ]; + version = "1.0.0"; + sha256 = "17w40nfmdb4crg23fnqn663i4a60dx5714rcyaiqllm4r25n5qv9"; + libraryHaskellDepends = [ base bytestring parsec utf8-string ]; description = "A parser for IGC files"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flight-kml" = callPackage - ({ mkDerivation, aeson, base, detour-via-sci, doctest, hlint, hxt + ({ mkDerivation, aeson, base, detour-via-sci, doctest, hxt , hxt-xpath, parsec, path, raw-strings-qq, siggy-chardust , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck , tasty-smallcheck, template-haskell, time }: mkDerivation { pname = "flight-kml"; - version = "1.0.0"; - sha256 = "0h04f0hkcri1qjk9kfc4r0sg8wyf6hx6s4cjgzaqnmfak6sa9j9c"; + version = "1.0.1"; + sha256 = "1g70vm7qbxsx2azgb759xcpizq5c1ic2173w78jib0f7mpb8qc28"; libraryHaskellDepends = [ aeson base detour-via-sci hxt hxt-xpath parsec path siggy-chardust split time ]; testHaskellDepends = [ - aeson base detour-via-sci doctest hlint hxt hxt-xpath parsec path + aeson base detour-via-sci doctest hxt hxt-xpath parsec path raw-strings-qq siggy-chardust smallcheck split tasty tasty-hunit tasty-quickcheck tasty-smallcheck template-haskell time ]; @@ -89784,8 +89814,8 @@ self: { }: mkDerivation { pname = "grpc-etcd-client"; - version = "0.1.1.0"; - sha256 = "01x5463h4xc04k3rax10zz7safa65g331jb9ksikjyrbk11rlpl1"; + version = "0.1.1.2"; + sha256 = "1xrdasrg0m3cxlb227wmnl9vbakqiikrm3wi07wbnmbg6n5agzkr"; libraryHaskellDepends = [ base bytestring data-default-class grpc-api-etcd http2-client http2-client-grpc lens network proto-lens proto-lens-protoc @@ -90645,8 +90675,8 @@ self: { }: mkDerivation { pname = "h-gpgme"; - version = "0.5.0.0"; - sha256 = "0fvkj7cz7nfz52a2zccngb8gbs8p94whvgccvnxpwmkg90m45mfp"; + version = "0.5.1.0"; + sha256 = "0fdlfi068m23yizkfgsbzjvd1yxmrvmbndsbsvawljq98jc75sgl"; libraryHaskellDepends = [ base bindings-gpgme bytestring data-default email-validate time transformers unix @@ -92391,17 +92421,17 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.12.0"; - sha256 = "0i3d3kydbna29wvaahwg9mkhykzrbnk6lg62mcbak78z24l1zmzl"; + version = "1.13.0"; + sha256 = "1z5qaxslshd1adkhqcpx8m8fs8d3dw4vwbwvsqcpm7gis63qhbqg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers language-docker megaparsec mtl - ShellCheck split text void + aeson base bytestring containers directory filepath language-docker + megaparsec mtl ShellCheck split text void yaml ]; executableHaskellDepends = [ - base containers directory filepath gitrev language-docker - megaparsec optparse-applicative text yaml + base containers gitrev language-docker megaparsec + optparse-applicative text ]; testHaskellDepends = [ aeson base bytestring hspec HUnit language-docker megaparsec @@ -98091,31 +98121,30 @@ self: { }) {}; "haskoin-core" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable - , bytestring, cereal, conduit, containers, cryptohash, deepseq - , either, entropy, HUnit, largeword, mtl, murmur3, network, pbkdf - , QuickCheck, safe, scientific, secp256k1, split - , string-conversions, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, unordered-containers - , vector + ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring + , cereal, conduit, containers, cryptonite, deepseq, entropy + , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3 + , network, QuickCheck, safe, scientific, secp256k1-haskell, split + , string-conversions, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "haskoin-core"; - version = "0.4.2"; - sha256 = "0nyla9kqgyjahnpf3idi7kzyx8h7q92vk3jql1gl9iq8q9acwnzk"; + version = "0.5.2"; + sha256 = "1sjsni26m9f36v9zc3q6gkpv8d7bnwvn88s1v77d5z81jszfwq2b"; libraryHaskellDepends = [ - aeson base base16-bytestring byteable bytestring cereal conduit - containers cryptohash deepseq either entropy largeword mtl murmur3 - network pbkdf QuickCheck secp256k1 split string-conversions text - time vector + aeson array base base16-bytestring bytestring cereal conduit + containers cryptonite deepseq entropy hashable memory mtl murmur3 + network QuickCheck scientific secp256k1-haskell split + string-conversions text time transformers unordered-containers + vector ]; testHaskellDepends = [ - aeson base binary bytestring cereal containers HUnit largeword mtl - QuickCheck safe scientific secp256k1 split string-conversions - test-framework test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector + aeson base bytestring cereal containers hspec HUnit mtl QuickCheck + safe split string-conversions text vector ]; - description = "Implementation of the core Bitcoin protocol features"; + testToolDepends = [ hspec-discover ]; + description = "Bitcoin & Bitcoin Cash library for Haskell"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -98144,34 +98173,25 @@ self: { }) {}; "haskoin-node" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, cereal - , concurrent-extra, conduit, conduit-extra, containers - , data-default, deepseq, either, esqueleto, exceptions - , haskoin-core, HUnit, largeword, lifted-async, lifted-base - , monad-control, monad-logger, mtl, network, persistent - , persistent-sqlite, persistent-template, QuickCheck, random - , resource-pool, resourcet, stm, stm-chans, stm-conduit - , string-conversions, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time + ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra + , hashable, haskoin-core, hspec, monad-logger, mtl, network, nqe + , random, resourcet, rocksdb-haskell, rocksdb-query + , string-conversions, time, unique, unliftio }: mkDerivation { pname = "haskoin-node"; - version = "0.4.2"; - sha256 = "0khgdr5qql716d1klajs4y0mkyz0d9h3drahhv8062k64n7a989s"; + version = "0.5.2"; + sha256 = "1wrkah2sbinkc5yp2b6mj6z0aps1pl7j1hncygmsa5pvg8iifjih"; libraryHaskellDepends = [ - aeson async base bytestring cereal concurrent-extra conduit - conduit-extra containers data-default deepseq either esqueleto - exceptions haskoin-core largeword lifted-async lifted-base - monad-control monad-logger mtl network persistent - persistent-template random resource-pool stm stm-chans stm-conduit - string-conversions text time + base bytestring cereal conduit conduit-extra hashable haskoin-core + monad-logger mtl network nqe random resourcet rocksdb-haskell + rocksdb-query string-conversions time unique unliftio ]; testHaskellDepends = [ - base haskoin-core HUnit monad-logger mtl persistent - persistent-sqlite QuickCheck resourcet test-framework - test-framework-hunit test-framework-quickcheck2 + base bytestring cereal haskoin-core hspec monad-logger mtl network + nqe random rocksdb-haskell unliftio ]; - description = "Implementation of a Bitoin node"; + description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -98220,6 +98240,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskoin-store" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, conduit + , containers, directory, filepath, haskoin-core, haskoin-node + , hspec, http-types, monad-logger, mtl, network, nqe + , optparse-applicative, random, rocksdb-haskell, rocksdb-query + , scotty, string-conversions, text, time, transformers, unliftio + }: + mkDerivation { + pname = "haskoin-store"; + version = "0.1.3"; + sha256 = "1xlvh0q6jx37p4rnq4qspwnnq7hpvaqi9ib1mlgkdxj7ypxk26fr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cereal conduit containers haskoin-core + haskoin-node monad-logger mtl network nqe random rocksdb-haskell + rocksdb-query string-conversions text time transformers unliftio + ]; + executableHaskellDepends = [ + aeson base bytestring conduit directory filepath haskoin-core + haskoin-node http-types monad-logger nqe optparse-applicative + rocksdb-haskell scotty string-conversions text unliftio + ]; + testHaskellDepends = [ + base haskoin-core haskoin-node hspec monad-logger nqe + rocksdb-haskell unliftio + ]; + description = "Storage and index for Bitcoin and Bitcoin Cash"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "haskoin-util" = callPackage ({ mkDerivation, base, binary, bytestring, containers, either , HUnit, mtl, QuickCheck, test-framework, test-framework-hunit @@ -102003,6 +102054,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hexml_0_3_4" = callPackage + ({ mkDerivation, base, bytestring, extra }: + mkDerivation { + pname = "hexml"; + version = "0.3.4"; + sha256 = "0amy5gjk1sqj5dq8a8gp7d3z9wfhcflhxkssijnklnfn5s002x4k"; + libraryHaskellDepends = [ base bytestring extra ]; + testHaskellDepends = [ base bytestring ]; + description = "XML subset DOM parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hexml-lens" = callPackage ({ mkDerivation, base, bytestring, contravariant, doctest , foundation, hexml, hspec, lens, profunctors, QuickCheck, text @@ -107259,18 +107323,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hpack_0_30_0" = callPackage + "hpack_0_31_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec - , http-client, http-client-tls, http-types, HUnit, infer-license - , interpolate, mockery, pretty, QuickCheck, scientific - , template-haskell, temporary, text, transformers + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "hpack"; - version = "0.30.0"; - sha256 = "042lsw0pm5ljfd9vap0r1a8xcvfzyswp5rd495v0grdhxmpbqkyx"; + version = "0.31.0"; + sha256 = "0lh60zqjzbjq0hkdia97swz0g1r3ihj84fph9jq9936fpb7hm1n9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107292,6 +107356,7 @@ self: { QuickCheck scientific template-haskell temporary text transformers unordered-containers vector yaml ]; + testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -107693,18 +107758,18 @@ self: { }) {}; "hpp" = callPackage - ({ mkDerivation, base, bytestring, bytestring-trie, directory - , filepath, ghc-prim, time, transformers + ({ mkDerivation, base, bytestring, directory, filepath, ghc-prim + , time, transformers, unordered-containers }: mkDerivation { pname = "hpp"; - version = "0.5.2"; - sha256 = "1r1sas1rcxcra4q3vjw3qmiv0xc4j263m7p93y6bwm1fvpxlkvcc"; + version = "0.6.1"; + sha256 = "1gv2gndbyrppl8qan680kl9kmwv6b5a5j5yrwifzh8rj73s47a6i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring bytestring-trie directory filepath ghc-prim time - transformers + base bytestring directory filepath ghc-prim time transformers + unordered-containers ]; executableHaskellDepends = [ base directory filepath time ]; testHaskellDepends = [ base bytestring transformers ]; @@ -113858,16 +113923,16 @@ self: { "http2-client-grpc" = callPackage ({ mkDerivation, async, base, binary, bytestring, case-insensitive , data-default-class, http2, http2-client, http2-grpc-types, lens - , proto-lens, proto-lens-protoc, text, tls, zlib + , proto-lens, proto-lens-protoc, text, tls }: mkDerivation { pname = "http2-client-grpc"; - version = "0.5.0.1"; - sha256 = "0kjzl1a3fis2jzk18ad9kv1bnzplqshf7i2mg20w8jxvl952v494"; + version = "0.5.0.3"; + sha256 = "19vzrln75y64gkmzxcasmzxp8qsccg9jpr0z5k9s8w0g5vnfmp9x"; libraryHaskellDepends = [ async base binary bytestring case-insensitive data-default-class http2 http2-client http2-grpc-types lens proto-lens - proto-lens-protoc text tls zlib + proto-lens-protoc text tls ]; testHaskellDepends = [ base ]; description = "Implement gRPC-over-HTTP2 clients"; @@ -118811,7 +118876,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0_8" = callPackage + "influxdb_1_6_0_9" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, lens, network, optional-args, QuickCheck, scientific @@ -118820,8 +118885,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0.8"; - sha256 = "1y2xgridlwmgmhvlchpjlpr8w17qscx6ng9hfara5qshll70vp5m"; + version = "1.6.0.9"; + sha256 = "0xs2bbqgaj6zmk6wrfm21q516qa2x7qfcvfazkkvyv49vvk9i7is"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -119479,6 +119544,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "integer-logarithms_1_0_2_2" = callPackage + ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck + , smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "integer-logarithms"; + version = "1.0.2.2"; + sha256 = "1hvzbrh8fm1g9fbavdym52pr5n9f2bnfx1parkfizwqlbj6n51ms"; + libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Integer logarithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "integer-pure" = callPackage ({ mkDerivation }: mkDerivation { @@ -119942,15 +120026,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "intro_0_5_0_0" = callPackage + "intro_0_5_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, dlist , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers , unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.5.0.0"; - sha256 = "0s2xn72d2am24mql3nznrimj308lvzdr44jccm14zx7qq7wpbqr3"; + version = "0.5.1.0"; + sha256 = "0gsj5l0vgvpbdw2vwlr9r869jwc08lqbypp24g33dlnd338pjxzs"; libraryHaskellDepends = [ base bytestring containers deepseq dlist extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -119960,7 +120044,7 @@ self: { QuickCheck safe text transformers unordered-containers writer-cps-mtl ]; - description = "Safe and minimal prelude - Exports only total and safe functions, provides Text and Monad transformers"; + description = "Safe and minimal prelude"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -122038,6 +122122,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "japanese-calendar" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, time }: + mkDerivation { + pname = "japanese-calendar"; + version = "0.1.0.0"; + sha256 = "0i9699xammqi5q5rjn7cyzv41alm1c9hnq9njhf6mnxf0d08ch2y"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base hspec QuickCheck time ]; + description = "Data type of Japanese Calendar (Wareki)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "japanese-holidays" = callPackage ({ mkDerivation, base, doctest, hspec, QuickCheck , quickcheck-instances, time @@ -124814,21 +124910,26 @@ self: { }: mkDerivation { pname = "katydid"; - version = "0.3.1.0"; - sha256 = "0h7w54z9318m85qdd9whlmg3vnkv69gbl8nxc8iz35pw2cbw51r2"; + version = "0.4.0.2"; + sha256 = "0gg94j983q6bga015h2wiia2a0miy0s70rsxa46g3k0czpkzgyyg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers deepseq either extra hxt ilist json mtl parsec regex-tdfa text transformers ]; - executableHaskellDepends = [ base mtl ]; + executableHaskellDepends = [ + base bytestring containers deepseq either extra hxt ilist json mtl + parsec regex-tdfa text transformers + ]; testHaskellDepends = [ - base containers directory filepath HUnit hxt ilist json mtl parsec - primes tasty tasty-hunit text + base bytestring containers deepseq directory either extra filepath + HUnit hxt ilist json mtl parsec primes regex-tdfa tasty tasty-hunit + text transformers ]; benchmarkHaskellDepends = [ - base criterion deepseq directory filepath hxt mtl text + base bytestring containers criterion deepseq directory either extra + filepath hxt ilist json mtl parsec regex-tdfa text transformers ]; description = "A haskell implementation of Katydid"; license = stdenv.lib.licenses.bsd3; @@ -124910,16 +125011,17 @@ self: { }: mkDerivation { pname = "kazura-queue"; - version = "0.1.0.2"; - sha256 = "0yywvl9pdy78851cmby6z7f9ivinp83qxfxfmfn68qzavx5m9l0f"; - libraryHaskellDepends = [ - async atomic-primops base containers primitive - ]; + version = "0.1.0.4"; + sha256 = "0zi3b6d97ql3ixml238r50lpmp8aghz2mbc5yi94fyp9xvq42m2y"; + libraryHaskellDepends = [ atomic-primops base primitive ]; testHaskellDepends = [ - async base containers deepseq doctest exceptions free hspec - hspec-expectations HUnit mtl QuickCheck transformers + async atomic-primops base containers deepseq doctest exceptions + free hspec hspec-expectations HUnit mtl primitive QuickCheck + transformers + ]; + benchmarkHaskellDepends = [ + atomic-primops base criterion primitive stm ]; - benchmarkHaskellDepends = [ async base containers criterion stm ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -126415,6 +126517,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lambda-calculus-interpreter" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit }: + mkDerivation { + pname = "lambda-calculus-interpreter"; + version = "0.1.0.3"; + sha256 = "0ccvqblggpng130l7i857nh7vdr7yfxv8s8r17bd05ckclp21k0f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Lambda Calculus interpreter"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lambda-canvas" = callPackage ({ mkDerivation, base, GLUT, mtl, OpenGL, time }: mkDerivation { @@ -130103,8 +130220,8 @@ self: { }: mkDerivation { pname = "lhs2tex"; - version = "1.20"; - sha256 = "0fmhvxi1a839h3i6s2aqckh64bc0qyp4hbzc3wp85zr5gmzix1df"; + version = "1.21"; + sha256 = "17yfqvsrd2p39fxfmzfvnliwbmkfx5kxmdk0fw5rx9v17acjmnc7"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -132500,26 +132617,35 @@ self: { }) {}; "liszt" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , directory, exceptions, filepath, fsnotify, network, reflection - , scientific, sendfile, stm, stm-delay, text, transformers - , unordered-containers, winery + ({ mkDerivation, base, binary, bytestring, cereal, containers, cpu + , deepseq, directory, exceptions, filepath, fsnotify, gauge + , network, reflection, scientific, sendfile, stm, stm-delay, text + , transformers, unordered-containers, vector, vector-th-unbox + , winery }: mkDerivation { pname = "liszt"; - version = "0.1"; - sha256 = "0ffqpplasb6d0kbj6n50811a5qawaghv9s9vfszm6z2dw27zkjwd"; + version = "0.2"; + sha256 = "1dy7c1l64ylgyxsi5ivxdc4kikaja4yhakx2z5i1sdk7kc7gkr51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers deepseq directory exceptions - filepath fsnotify network reflection scientific sendfile stm - stm-delay text transformers unordered-containers winery + base binary bytestring cereal containers cpu deepseq directory + exceptions filepath fsnotify network reflection scientific sendfile + stm stm-delay text transformers unordered-containers vector + vector-th-unbox winery ]; executableHaskellDepends = [ - base binary bytestring containers deepseq directory exceptions - filepath fsnotify network reflection scientific sendfile stm - stm-delay text transformers unordered-containers winery + base binary bytestring cereal containers cpu deepseq directory + exceptions filepath fsnotify network reflection scientific sendfile + stm stm-delay text transformers unordered-containers vector + vector-th-unbox winery + ]; + benchmarkHaskellDepends = [ + base binary bytestring cereal containers cpu deepseq directory + exceptions filepath fsnotify gauge network reflection scientific + sendfile stm stm-delay text transformers unordered-containers + vector vector-th-unbox winery ]; description = "Append only key-list database"; license = stdenv.lib.licenses.bsd3; @@ -137203,6 +137329,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv_0_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, data-default, data-default-class + , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions + , vector + }: + mkDerivation { + pname = "massiv"; + version = "0.2.1.0"; + sha256 = "0x5qf5hp6ncrjc28xcjd2v4w33wpyy69whmgvvp163y0q3v1n3q7"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq ghc-prim primitive + vector + ]; + testHaskellDepends = [ + base bytestring data-default deepseq hspec QuickCheck + safe-exceptions vector + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq, directory , filepath, JuicyPixels, massiv, netpbm, process, vector @@ -139610,18 +139758,20 @@ self: { pname = "microspec"; version = "0.1.0.0"; sha256 = "0hykarba8ccwkslh8cfsxbriw043f8pa4jyhr3hqc5yqfijibr71"; + revision = "1"; + editedCabalFile = "0cnfj3v6fzck57bgrsnmgz8a9azvz04pm3hv17fg12xzchmp07cq"; libraryHaskellDepends = [ base QuickCheck ]; description = "Tiny QuickCheck test library with minimal dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; - "microspec_0_2_0_0" = callPackage - ({ mkDerivation, base, QuickCheck }: + "microspec_0_2_0_1" = callPackage + ({ mkDerivation, base, QuickCheck, time }: mkDerivation { pname = "microspec"; - version = "0.2.0.0"; - sha256 = "0nz9achmckza9n6hx7ix7yyh9fhhfjnbszzjssz4mnghcmm8l0wv"; - libraryHaskellDepends = [ base QuickCheck ]; + version = "0.2.0.1"; + sha256 = "1ygkxsj7rm42f245qip8893lm189immmd5ajimp5d1pkzfkw4dnp"; + libraryHaskellDepends = [ base QuickCheck time ]; description = "Tiny QuickCheck test library with minimal dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -140512,6 +140662,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "miso_0_21_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-api-data + , http-types, lucid, network-uri, servant, servant-lucid, text + , transformers, vector + }: + mkDerivation { + pname = "miso"; + version = "0.21.2.0"; + sha256 = "061bjvxcs6psh8hj947p4jm9ki9ngrwvn23szvk8i3x4xd87jbfm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-api-data http-types lucid + network-uri servant servant-lucid text transformers vector + ]; + description = "A tasty Haskell front-end framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "missing-foreign" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -144197,8 +144367,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "multi-instance"; - version = "0.0.0.2"; - sha256 = "11r7wy143zy9drjrz7l57bdsbaj2fd3sjwbiz7pcmcdr1bxxga63"; + version = "0.0.0.3"; + sha256 = "197jrq0r7va89z2hzhna0v4xmrranq1lgv4ncmbzlzliis6j7m22"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Typeclasses augmented with a phantom type parameter"; @@ -145211,8 +145381,8 @@ self: { ({ mkDerivation, base, safe-exceptions }: mkDerivation { pname = "mvar-lock"; - version = "0.1.0.1"; - sha256 = "0kdf7811kxwfj032d8g18za0nn9jlssh7dpvvr8kzjk01b77804r"; + version = "0.1.0.2"; + sha256 = "09diqzb4vp7bcg6v16fgjb70mi68i8srnyxf6qga58va6avbc4wg"; libraryHaskellDepends = [ base safe-exceptions ]; description = "A trivial lock based on MVar"; license = stdenv.lib.licenses.asl20; @@ -147520,8 +147690,8 @@ self: { }: mkDerivation { pname = "network-api-support"; - version = "0.3.3"; - sha256 = "1dp9fp907sc1r0mshby18vlbkji9bggikbycjbdlb6mzg7mjmiav"; + version = "0.3.4"; + sha256 = "0zzb5jxb6zxwq88qwldzy7qy5b4arz4vnn82ilcz2214w21bhzlp"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive http-client http-client-tls http-types text time tls @@ -149896,14 +150066,15 @@ self: { "nqe" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra - , containers, exceptions, hspec, stm, stm-conduit, text, unliftio + , containers, exceptions, hspec, mtl, stm, stm-conduit, text + , unliftio }: mkDerivation { pname = "nqe"; - version = "0.3.0.0"; - sha256 = "1ggss61zym8ramf3yavmsgn013nlcv40kp6r2v1ax7ccdqyzjh98"; + version = "0.4.1"; + sha256 = "1x6ila806i1b1smiby47c1sfj3m09xlxcqpg3ywdibh31znbhhqj"; libraryHaskellDepends = [ - base bytestring conduit conduit-extra containers stm unliftio + base conduit containers mtl stm unliftio ]; testHaskellDepends = [ base bytestring conduit conduit-extra exceptions hspec stm @@ -155336,13 +155507,13 @@ self: { }) {}; "paripari" = callPackage - ({ mkDerivation, base, bytestring, parser-combinators, tasty - , tasty-hunit, text + ({ mkDerivation, base, bytestring, parser-combinators, random + , tasty, tasty-hunit, text }: mkDerivation { pname = "paripari"; - version = "0.2.0.0"; - sha256 = "0lg1bywgy4kfxl9q6jrk9kmww5d26azak023zqj0pg076575yji6"; + version = "0.2.1.0"; + sha256 = "002sr369102k2wwzy3adav52vvz7d0yyy07lqzqf8b7fw6ffjcy2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155352,9 +155523,9 @@ self: { base bytestring parser-combinators text ]; testHaskellDepends = [ - base bytestring parser-combinators tasty tasty-hunit text + base bytestring parser-combinators random tasty tasty-hunit text ]; - description = "Fast-path parser combinators with fallback for error reporting"; + description = "Parser combinators with fast-path and slower fallback for error reporting"; license = stdenv.lib.licenses.mit; }) {}; @@ -163077,8 +163248,8 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.2.3"; - sha256 = "140z6r01byld665471dbk5zdqaf6lrcxwqp0wvbs5fbpjq37mfmp"; + version = "0.2.6"; + sha256 = "0x8nvxhw6wwq9w9dl16gvh6j6la224s2ldakx694518amqd4avrx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163143,8 +163314,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.0.12"; - sha256 = "0ccbm3hvpffr673kyp1ky9xpq1ig4gspvqv88yp2ifhrpw9wsi39"; + version = "2.0.15"; + sha256 = "09220lqyl4rd7al03349r6wbp8hd85rjfbr6kq1swzn3yja2zhsz"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -163183,8 +163354,8 @@ self: { }: mkDerivation { pname = "potoki-core"; - version = "2.2.13.1"; - sha256 = "09qr9xh0gzfvqla0mqjwdb3xf8xx82fy5188xml5vp1wq234wv8j"; + version = "2.2.16"; + sha256 = "0xjrbv087qyqqd3h3lam2jgrikp5lvsb716ndmqv0i1s4qlzxa6d"; libraryHaskellDepends = [ acquire attoparsec base bytestring directory foldl hashable primitive profunctors ptr scanner stm text time transformers @@ -167414,7 +167585,7 @@ self: { "purescript-iso" = callPackage ({ mkDerivation, aeson, aeson-attoparsec, aeson-diff, async - , attoparsec, attoparsec-uri, base, bytestring, containers + , attoparsec, attoparsec-uri, base, bytestring, containers, deepseq , emailaddress, monad-control, mtl, QuickCheck , quickcheck-instances, scientific, stm, strict, tasty , tasty-quickcheck, text, time, utf8-string, uuid, zeromq4-haskell @@ -167422,17 +167593,17 @@ self: { }: mkDerivation { pname = "purescript-iso"; - version = "0.0.2"; - sha256 = "0biam9asa6h1ymzms91lafiw8h5pd7k3n13cmrk8b4lbs8zp48j1"; + version = "0.0.3"; + sha256 = "15y761jk2r95gdkv85p7ij9npf3a6dlsyidf8y8djzk3m7j8ya2g"; libraryHaskellDepends = [ aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri - base bytestring containers emailaddress monad-control mtl + base bytestring containers deepseq emailaddress monad-control mtl QuickCheck quickcheck-instances scientific stm strict text time utf8-string uuid zeromq4-haskell zeromq4-simple ]; testHaskellDepends = [ aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri - base bytestring containers emailaddress monad-control mtl + base bytestring containers deepseq emailaddress monad-control mtl QuickCheck quickcheck-instances scientific stm strict tasty tasty-quickcheck text time utf8-string uuid zeromq4-haskell zeromq4-simple @@ -168785,6 +168956,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_19" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring + , case-insensitive, containers, hashable, old-time, QuickCheck + , scientific, tagged, text, time, transformers, transformers-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.19"; + sha256 = "0mls8095ylk5pq2j787ary5lyn4as64414silq3zn4sky3zsx92p"; + libraryHaskellDepends = [ + array base base-compat bytestring case-insensitive containers + hashable old-time QuickCheck scientific tagged text time + transformers transformers-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + base containers QuickCheck tagged uuid-types + ]; + description = "Common quickcheck instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -170281,16 +170476,14 @@ self: { }: mkDerivation { pname = "range"; - version = "0.2.0.0"; - sha256 = "0pmzm503skr4d1qwkq72mjkq1ba86la1qxb9h25gqc9dzmzy0w3k"; - revision = "1"; - editedCabalFile = "0a379q4rw8hsggknwnca4cibr1kmyrmjprdl8fpflpp7wh4vlpwf"; + version = "0.2.1.1"; + sha256 = "13gfhzplk2ji1d8x4944lv4dy4qg69wjvdwkica407nm10j0lxmc"; libraryHaskellDepends = [ base free parsec ]; testHaskellDepends = [ base Cabal free QuickCheck random test-framework test-framework-quickcheck2 ]; - description = "This has a bunch of code for specifying and managing ranges in your code"; + description = "An efficient and versatile range library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -174022,7 +174215,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "relude_0_2_0" = callPackage + "relude_0_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty , tasty-hedgehog, text, transformers, unordered-containers @@ -174030,10 +174223,8 @@ self: { }: mkDerivation { pname = "relude"; - version = "0.2.0"; - sha256 = "097kiflrwvkb3mxpkydh6a6x84azv4xla9nlm5qscacl4kn5z3q5"; - revision = "1"; - editedCabalFile = "10zqh8j0k7q6l5ag009c432has7zpwbi57drr12dpyqa1ldrk6h0"; + version = "0.3.0"; + sha256 = "10cbgz1xzw67q3y9fw8px7wwxblv5qym51qpdljmjz4ilpy0k35j"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers utf8-string @@ -176870,6 +177061,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) rocksdb;}; + "rocksdb-query" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, hspec + , resourcet, rocksdb-haskell, unliftio + }: + mkDerivation { + pname = "rocksdb-query"; + version = "0.1.1"; + sha256 = "17sgac07f6vc1ffp8ynlrjn1n0ww0dsdr43jha10d1n5564a2lyw"; + libraryHaskellDepends = [ + base bytestring cereal conduit resourcet rocksdb-haskell unliftio + ]; + testHaskellDepends = [ + base cereal hspec rocksdb-haskell unliftio + ]; + description = "RocksDB database querying library for Haskell"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "roguestar" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, old-time , process @@ -181204,6 +181413,29 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) secp256k1;}; + "secp256k1-haskell" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cereal + , entropy, hspec, hspec-discover, HUnit, mtl, QuickCheck, secp256k1 + , string-conversions + }: + mkDerivation { + pname = "secp256k1-haskell"; + version = "0.1.2"; + sha256 = "1kap1jjhqqmp8f067z9z8dw39gswn37bkj5j3byyvv4cn077ihva"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cereal entropy QuickCheck + string-conversions + ]; + librarySystemDepends = [ secp256k1 ]; + testHaskellDepends = [ + base base16-bytestring bytestring cereal entropy hspec HUnit mtl + QuickCheck string-conversions + ]; + testToolDepends = [ hspec-discover ]; + description = "Bindings for secp256k1 library from Bitcoin Core"; + license = stdenv.lib.licenses.publicDomain; + }) {inherit (pkgs) secp256k1;}; + "secret-santa" = callPackage ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib , haskell-qrencode, random @@ -181909,8 +182141,8 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.6.0"; - sha256 = "1hzi5bkzc3wl031jhpr7j639zxijb33sdwg7zrb5xqdrpmfhg1zm"; + version = "0.6.0.2"; + sha256 = "1lxz3cr04f4bqlm4jph66ckab494vqlaf6jc67dbmmwia6if2fpw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185554,6 +185786,32 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_17" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.17"; + sha256 = "1j6habv4glf8bvxiil9f59b553lfsi7mr7i30r63sy3g85qi09jg"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -191146,12 +191404,15 @@ self: { }) {}; "solve" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, filepath }: mkDerivation { pname = "solve"; - version = "1.0"; - sha256 = "06sk2imqgzk9zjr10ignigs04avnjjxfsi2qkk7vqfslhcfzgqnq"; - libraryHaskellDepends = [ base containers ]; + version = "1.1"; + sha256 = "045bj6wskglwg0j0jk0jsqkp4m809g2fy350bi6m84smg64rr3y4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers filepath ]; + executableHaskellDepends = [ base containers filepath ]; description = "Solving simple games"; license = stdenv.lib.licenses.mit; }) {}; @@ -191637,23 +191898,24 @@ self: { , attoparsec-uri, base, bytestring, deepseq, exceptions , extractable-singleton, hashable, http-client, http-client-tls , http-types, list-t, monad-control, monad-control-aligned, mtl - , nested-routes, path, path-extra, pred-trie, stm, strict, text - , tmapchan, tmapmvar, transformers, unordered-containers, urlpath - , uuid, wai, wai-middleware-content-type, wai-transformers - , websockets, websockets-simple, wuss + , nested-routes, path, path-extra, pred-trie, purescript-iso, stm + , strict, text, tmapchan, tmapmvar, transformers + , unordered-containers, urlpath, uuid, wai + , wai-middleware-content-type, wai-transformers, websockets + , websockets-simple, wuss }: mkDerivation { pname = "sparrow"; - version = "0.0.2.1"; - sha256 = "1j20536pjp4m26l8zvsaf8wv0vvj0fkwid1nkljl6zkggaqq5b8f"; + version = "0.0.2.2"; + sha256 = "0y1s22nfy234jgvvkxc77x0gcrlqb1g5vqni6vdwls6ww9n1jwba"; libraryHaskellDepends = [ aeson aeson-attoparsec async attoparsec attoparsec-uri base bytestring deepseq exceptions extractable-singleton hashable http-client http-client-tls http-types list-t monad-control monad-control-aligned mtl nested-routes path path-extra pred-trie - stm strict text tmapchan tmapmvar transformers unordered-containers - urlpath uuid wai wai-middleware-content-type wai-transformers - websockets websockets-simple wuss + purescript-iso stm strict text tmapchan tmapmvar transformers + unordered-containers urlpath uuid wai wai-middleware-content-type + wai-transformers websockets websockets-simple wuss ]; description = "Unified streaming dependency management for web apps"; license = stdenv.lib.licenses.bsd3; @@ -192058,8 +192320,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "spherical"; - version = "0.1.2.0"; - sha256 = "1nbfa0f14rd5wnxyygzf68v5v94wk0gr3rgi48d86ars8ip056f3"; + version = "0.1.2.1"; + sha256 = "0c6c5pf39dd9zpk8g3kcbg6hagsjvxcmqxmfk1imv5fmd2g8cv8p"; libraryHaskellDepends = [ base composition-prelude ]; description = "Geometry on a sphere"; license = stdenv.lib.licenses.bsd3; @@ -193410,6 +193672,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, file-embed, filepath, hspec, hspec-discover + , hspec-megaparsec, megaparsec, mtl, template-haskell, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "2.0.0"; + sha256 = "11j8rvl9dqda73hwd4p7rwmf36w6xc86ls53v9ip6ag2052j1cll"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath + megaparsec mtl template-haskell text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec template-haskell text yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async , attoparsec, base, base64-bytestring, bindings-uname, bytestring @@ -193433,8 +193723,8 @@ self: { pname = "stack"; version = "1.7.1"; sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r"; - revision = "9"; - editedCabalFile = "12gbrnhmci2kpz42x7nwfzcq3syp0z2l14fjcakw8bhjmgd9wp34"; + revision = "10"; + editedCabalFile = "1985lm9m6pm9mi4h4m2nrn9v2rnnfh14slcnqgyxy6k934xqvg35"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -197699,26 +197989,26 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; - "summoner_1_1_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory - , filepath, generic-deriving, gitrev, hedgehog, neat-interpolation - , optparse-applicative, process, relude, tasty, tasty-discover - , tasty-hedgehog, text, time, tomland + "summoner_1_1_0_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring + , directory, filepath, generic-deriving, gitrev, hedgehog + , neat-interpolation, optparse-applicative, process, relude, tasty + , tasty-discover, tasty-hedgehog, text, time, tomland }: mkDerivation { pname = "summoner"; - version = "1.1.0"; - sha256 = "01wgnj89f6fpb6f54l9480zqps1g9v76kxf0g4vxpg2jhnzygv2d"; + version = "1.1.0.1"; + sha256 = "0l9v85d9s5n6lz9k2k44pxx8yqqmrxnvz9q0pi5rhvwq53c50x83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring directory filepath + aeson ansi-terminal base-noprelude bytestring directory filepath generic-deriving gitrev neat-interpolation optparse-applicative process relude text time tomland ]; - executableHaskellDepends = [ base relude ]; + executableHaskellDepends = [ base-noprelude relude ]; testHaskellDepends = [ - base hedgehog relude tasty tasty-hedgehog tomland + base-noprelude hedgehog relude tasty tasty-hedgehog tomland ]; testToolDepends = [ tasty-discover ]; description = "Tool for creating completely configured production Haskell projects"; @@ -201314,8 +201604,8 @@ self: { pname = "tasty-hspec"; version = "1.1.5"; sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v"; - revision = "1"; - editedCabalFile = "0zgbcrahzfg37bnni6fj0qb0fpbk5rdha589mh960d5sbq58pljf"; + revision = "2"; + editedCabalFile = "0rya3dnhrci40nsf3fd5jdzn875n3awpy2xzb99jfl9i2cs3krc2"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -201612,8 +201902,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "tasty-travis"; - version = "0.2.0.1"; - sha256 = "05k9zddmhbcs2xf9n6ln3591cscxix7pakc42j4arw4iwrfiqp17"; + version = "0.2.0.2"; + sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg"; libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fancy Travis CI output for tasty tests"; @@ -202519,7 +202809,6 @@ self: { ]; description = "TensorFlow bindings"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libtensorflow;}; "tensorflow-core-ops" = callPackage @@ -202540,7 +202829,6 @@ self: { ]; description = "Haskell wrappers for Core Tensorflow Ops"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-logging" = callPackage @@ -202569,7 +202857,6 @@ self: { ]; description = "TensorBoard related functionality"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-mnist" = callPackage @@ -202622,7 +202909,6 @@ self: { ]; description = "Code generation for TensorFlow operations"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-ops" = callPackage @@ -202652,7 +202938,6 @@ self: { ]; description = "Friendly layer around TensorFlow bindings"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-proto" = callPackage @@ -202670,7 +202955,6 @@ self: { libraryToolDepends = [ protobuf ]; description = "TensorFlow protocol buffers"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "tensorflow-records" = callPackage @@ -203631,6 +203915,29 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "texmath_0_11_1" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.11.1"; + sha256 = "169jp9y6azpkkcbx0h03kbjg7f58wsk7bs18dn3h9m3sia6bnw99"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + description = "Conversion between formats used to represent mathematics"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -203740,7 +204047,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-builder_0_6_1_2" = callPackage + "text-builder_0_6_3" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , deferred-folds, QuickCheck, quickcheck-instances, rerebase , semigroups, tasty, tasty-hunit, tasty-quickcheck, text @@ -203748,8 +204055,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.6.1.2"; - sha256 = "0z42bgizn6ya89bnsdjk14y7k6mm5zj1782p97dc1vj9ym81ra18"; + version = "0.6.3"; + sha256 = "00i0p155sfii0pl3300xa4af57nhhcz690qr0drwby34xqjy2c1z"; libraryHaskellDepends = [ base base-prelude bytestring deferred-folds semigroups text transformers @@ -204248,8 +204555,8 @@ self: { }: mkDerivation { pname = "text-replace"; - version = "0.0.0.2"; - sha256 = "1qd3i8sj6z0vgb2yn345wh16w0lvmqdvywrkpcdsmbc00j8cwkjq"; + version = "0.0.0.3"; + sha256 = "0dj024y7qmkmv31n5h6li6wna3gpayr5gmyl6jiiiprdvild2i1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -212804,13 +213111,17 @@ self: { }) {inherit (pkgs) openssl;}; "uniform-pair" = callPackage - ({ mkDerivation, base, deepseq, prelude-extras }: + ({ mkDerivation, adjunctions, base, deepseq, distributive + , prelude-extras + }: mkDerivation { pname = "uniform-pair"; - version = "0.1.13"; - sha256 = "17dz0car02w2x5m23hlqlgjnpl86darc8vvr4axpsc9xim4sf7nk"; + version = "0.1.15"; + sha256 = "087wwdhkma76akzjzi053by43xv18c2a4q1babdsxapzjqpnr19k"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base deepseq prelude-extras ]; + libraryHaskellDepends = [ + adjunctions base deepseq distributive prelude-extras + ]; description = "Uniform pairs with class instances"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -215430,12 +215741,18 @@ self: { }) {}; "validated-literals" = callPackage - ({ mkDerivation, base, bytestring, template-haskell }: + ({ mkDerivation, base, bytestring, deepseq, tasty, tasty-hunit + , tasty-travis, template-haskell + }: mkDerivation { pname = "validated-literals"; - version = "0.2.0"; - sha256 = "0wd4dyv2gfmcxqbhmcil884bdcw8a1qw441280j7rrqy6fp442q2"; - libraryHaskellDepends = [ base bytestring template-haskell ]; + version = "0.2.0.1"; + sha256 = "0gvqsmyhcjf1l5a6vkhr7ffnw81l01y0dp05lzkmy8n177412pr4"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base bytestring deepseq tasty tasty-hunit tasty-travis + template-haskell + ]; description = "Compile-time checking for partial smart-constructors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -217113,8 +217430,8 @@ self: { }: mkDerivation { pname = "vinyl-gl"; - version = "0.3.3"; - sha256 = "09nd2v7550ivgjfby3kd27rf4b5b5ih8l7nx6v5h7r9s42vadb0r"; + version = "0.3.4"; + sha256 = "1r4vpilk8l0fm1v5n5lz27l57ciglbr82g5wsj3g4j7rghr14jpf"; libraryHaskellDepends = [ base containers GLUtil linear OpenGL tagged transformers vector vinyl @@ -219554,7 +219871,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "warp_3_2_24" = callPackage + "warp_3_2_25" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, doctest , gauge, ghc-prim, hashable, hspec, http-client, http-date @@ -219564,8 +219881,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.24"; - sha256 = "1b0iwwmzzfs8x7c5spfn4y0kqwgkk711p1fzf854l6mmvsmiq4sk"; + version = "3.2.25"; + sha256 = "0rl59bs99c3wwwyc1ibq0v11mkc7pxpy28r9hdlmjsqmdwn8y2vy"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -219607,16 +219924,16 @@ self: { }) {}; "warp-grpc" = callPackage - ({ mkDerivation, base, binary, bytestring, case-insensitive + ({ mkDerivation, async, base, binary, bytestring, case-insensitive , http-types, http2-grpc-types, proto-lens, wai, warp, warp-tls }: mkDerivation { pname = "warp-grpc"; - version = "0.1.0.2"; - sha256 = "1xndsd5li3bzj65pq0ml2c54v470zs14bqzimx4srnkas9kf5dyr"; + version = "0.1.0.3"; + sha256 = "1x40jskp4c2dj4w3pfrw4f3ys9c64nlas2068s7zl05qayw21srf"; libraryHaskellDepends = [ - base binary bytestring case-insensitive http-types http2-grpc-types - proto-lens wai warp warp-tls + async base binary bytestring case-insensitive http-types + http2-grpc-types proto-lens wai warp warp-tls ]; description = "A minimal gRPC server on top of Warp"; license = stdenv.lib.licenses.bsd3; @@ -221375,8 +221692,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, utf8-string }: mkDerivation { pname = "wilton-ffi"; - version = "0.3.0.1"; - sha256 = "00ib82h5c35g5qf605pn9qijg4y1xcn1jgjgqbd0imhnhhqyp067"; + version = "0.3.0.2"; + sha256 = "1qnsdj9676ifg9z67qdzblsszrzvhihwaww4s03jpy2324q42qhk"; libraryHaskellDepends = [ aeson base bytestring utf8-string ]; description = "Haskell modules support for Wilton JavaScript runtime"; license = stdenv.lib.licenses.mit; @@ -221445,35 +221762,35 @@ self: { ({ mkDerivation, aeson, base, binary, bytestring, cassava , containers, cpu, deepseq, directory, gauge, hashable, megaparsec , mtl, prettyprinter, prettyprinter-ansi-terminal, QuickCheck - , scientific, serialise, text, transformers, unordered-containers - , vector + , scientific, semigroups, serialise, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "winery"; - version = "0.2.1"; - sha256 = "09j7s44j5v6754g1v10yvmb7l9azn2p738x3c4p1iv6qlwghilbj"; + version = "0.3.1"; + sha256 = "1f63fgw7ky6kd0dk41rhqjxgvi33pa5ffrv0vk2i7dr88bmc1wgy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers cpu hashable megaparsec mtl - prettyprinter prettyprinter-ansi-terminal scientific text - transformers unordered-containers vector + prettyprinter prettyprinter-ansi-terminal scientific semigroups + text time transformers unordered-containers vector ]; executableHaskellDepends = [ aeson base bytestring containers cpu hashable megaparsec mtl - prettyprinter prettyprinter-ansi-terminal scientific text - transformers unordered-containers vector + prettyprinter prettyprinter-ansi-terminal scientific semigroups + text time transformers unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers cpu hashable megaparsec mtl prettyprinter prettyprinter-ansi-terminal QuickCheck scientific - text transformers unordered-containers vector + semigroups text time transformers unordered-containers vector ]; benchmarkHaskellDepends = [ aeson base binary bytestring cassava containers cpu deepseq directory gauge hashable megaparsec mtl prettyprinter - prettyprinter-ansi-terminal scientific serialise text transformers - unordered-containers vector + prettyprinter-ansi-terminal scientific semigroups serialise text + time transformers unordered-containers vector ]; description = "Sustainable serialisation library"; license = stdenv.lib.licenses.bsd3; @@ -228352,6 +228669,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yggdrasil" = callPackage + ({ mkDerivation, base, cryptonite, hspec, memory, mtl, QuickCheck + , transformers + }: + mkDerivation { + pname = "yggdrasil"; + version = "0.1.0.0"; + sha256 = "1w1nlas5fb7zmd0kvzb68ihylpsg7pf084vd1xk60l6n60cc9m4j"; + libraryHaskellDepends = [ + base cryptonite memory mtl transformers + ]; + testHaskellDepends = [ base cryptonite hspec QuickCheck ]; + description = "Executable specifications of composable cryptographic protocols"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "yhccore" = callPackage ({ mkDerivation, base, containers, mtl, pretty, uniplate }: mkDerivation { From ee6ecb0eafd65637140c898ae563a2d2c0f530d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 12 Sep 2018 10:35:02 +0200 Subject: [PATCH 543/600] all-cabal-hashes: update snapshot to Hackage at 2018-09-12T08:26:27Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index a2d04640d591..a72c94759fa8 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/22cb611adaf63739fc7e3956d83d450154ec766b.tar.gz"; - sha256 = "0wxggabwz8qs2hmnr3k3iwy9rmvicx4a1n22l7f6krk1hym5bkpl"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e44c7d34b0e57883da9cc0e09b0b5de3b065fe98.tar.gz"; + sha256 = "1manarsja8lsvs75zd3jnjhy5yb1576yv8ba0jqa4a1rszrkil1d"; } From 5048b0d1f9e908665a01c35f49b2d9816128e089 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 12 Sep 2018 11:47:19 +0300 Subject: [PATCH 544/600] lispPackages.quicklisp: 2018-04-30 -> 2018-08-31 ; regenerate packages Added a wrapper package that creates symlinks to OpenSSL libraries with the actual versions, because we have 1.0.2 with .so-suffix .1.0.0 and cl-async-ssl is unhappy because of that. I continue to dislike cl-postgres and simple-date upstream packaging. --- .../lisp-modules/lisp-packages.nix | 4 +- .../lisp-modules/openssl-lib-marked.nix | 18 +++ .../quicklisp-to-nix-output/alexandria.nix | 2 +- .../quicklisp-to-nix-output/array-utils.nix | 16 +-- .../asdf-system-connections.nix | 2 +- .../bordeaux-threads.nix | 14 +-- .../buildnode-xhtml.nix | 13 ++- .../quicklisp-to-nix-output/buildnode.nix | 8 +- .../quicklisp-to-nix-output/caveman.nix | 37 +++--- .../quicklisp-to-nix-output/chipz.nix | 2 +- .../quicklisp-to-nix-output/cl-aa.nix | 2 +- .../quicklisp-to-nix-output/cl-anonfun.nix | 2 +- .../quicklisp-to-nix-output/cl-async-repl.nix | 14 +-- .../quicklisp-to-nix-output/cl-async-ssl.nix | 14 +-- .../quicklisp-to-nix-output/cl-async.nix | 14 +-- .../quicklisp-to-nix-output/cl-csv.nix | 21 ++-- .../quicklisp-to-nix-output/cl-dbi.nix | 14 +-- .../quicklisp-to-nix-output/cl-html-parse.nix | 2 +- .../quicklisp-to-nix-output/cl-interpol.nix | 21 ++-- .../quicklisp-to-nix-output/cl-l10n-cldr.nix | 2 +- .../quicklisp-to-nix-output/cl-libuv.nix | 14 +-- .../quicklisp-to-nix-output/cl-markup.nix | 2 +- .../quicklisp-to-nix-output/cl-paths.nix | 2 +- .../quicklisp-to-nix-output/cl-postgres.nix | 23 ++-- .../cl-ppcre-unicode.nix | 14 +-- .../quicklisp-to-nix-output/cl-ppcre.nix | 14 +-- .../quicklisp-to-nix-output/cl-project.nix | 14 +-- .../cl-unification.nix | 2 +- .../quicklisp-to-nix-output/cl-utilities.nix | 2 +- .../quicklisp-to-nix-output/cl_plus_ssl.nix | 14 +-- .../clack-handler-hunchentoot.nix | 54 +++++++++ .../quicklisp-to-nix-output/clack-socket.nix | 16 +-- .../quicklisp-to-nix-output/clack-test.nix | 41 ++++--- .../clack-v1-compat.nix | 34 +++--- .../quicklisp-to-nix-output/clack.nix | 14 +-- .../quicklisp-to-nix-output/closer-mop.nix | 16 +-- .../quicklisp-to-nix-output/closure-html.nix | 14 +-- .../quicklisp-to-nix-output/clss.nix | 14 +-- .../quicklisp-to-nix-output/clx.nix | 14 +-- .../command-line-arguments.nix | 2 +- .../quicklisp-to-nix-output/css-lite.nix | 2 +- .../css-selectors-simple-tree.nix | 13 ++- .../css-selectors-stp.nix | 16 +-- .../quicklisp-to-nix-output/css-selectors.nix | 9 +- .../quicklisp-to-nix-output/dbd-mysql.nix | 14 +-- .../quicklisp-to-nix-output/dbd-postgres.nix | 14 +-- .../quicklisp-to-nix-output/dbd-sqlite3.nix | 14 +-- .../quicklisp-to-nix-output/dbi.nix | 14 +-- .../quicklisp-to-nix-output/dexador.nix | 14 +-- .../documentation-utils.nix | 16 +-- .../quicklisp-to-nix-output/fast-http.nix | 14 +-- .../quicklisp-to-nix-output/flexi-streams.nix | 14 +-- .../quicklisp-to-nix-output/form-fiddle.nix | 14 +-- .../quicklisp-to-nix-output/ironclad.nix | 14 +-- .../quicklisp-to-nix-output/iterate.nix | 2 +- .../quicklisp-to-nix-output/kmrcl.nix | 2 +- .../lack-component.nix | 16 +-- .../lack-middleware-backtrace.nix | 14 +-- .../quicklisp-to-nix-output/lack-util.nix | 14 +-- .../quicklisp-to-nix-output/lack.nix | 14 +-- .../quicklisp-to-nix-output/lift.nix | 2 +- .../quicklisp-to-nix-output/lisp-unit2.nix | 5 +- .../quicklisp-to-nix-output/lquery.nix | 14 +-- .../quicklisp-to-nix-output/map-set.nix | 2 +- .../quicklisp-to-nix-output/marshal.nix | 2 +- .../quicklisp-to-nix-output/md5.nix | 2 +- .../quicklisp-to-nix-output/metabang-bind.nix | 2 +- .../misc-extensions.nix | 2 +- .../quicklisp-to-nix-output/mt19937.nix | 2 +- .../named-readtables.nix | 2 +- .../net_dot_didierverna_dot_asdf-flv.nix | 2 +- .../quicklisp-to-nix-output/nibbles.nix | 14 +-- .../quicklisp-to-nix-output/parse-number.nix | 2 +- .../quicklisp-to-nix-output/plump.nix | 14 +-- .../quicklisp-to-nix-output/ptester.nix | 2 +- .../quicklisp-to-nix-output/rfc2388.nix | 16 +-- .../quicklisp-to-nix-output/rt.nix | 2 +- .../quicklisp-to-nix-output/salza2.nix | 2 +- .../quicklisp-to-nix-output/simple-date.nix | 26 ++--- .../quicklisp-to-nix-output/string-case.nix | 16 +-- .../quicklisp-to-nix-output/stumpwm.nix | 16 +-- .../quicklisp-to-nix-output/swank.nix | 16 +-- .../trivial-backtrace.nix | 2 +- .../trivial-features.nix | 2 +- .../trivial-gray-streams.nix | 16 +-- .../trivial-indent.nix | 16 +-- .../quicklisp-to-nix-output/trivial-mimes.nix | 16 +-- .../quicklisp-to-nix-output/trivial-types.nix | 2 +- .../quicklisp-to-nix-output/trivial-utf-8.nix | 2 +- .../quicklisp-to-nix-output/uffi.nix | 2 +- .../quicklisp-to-nix-output/uiop.nix | 16 +-- .../quicklisp-to-nix-output/unit-test.nix | 2 +- .../quicklisp-to-nix-output/usocket.nix | 14 +-- .../quicklisp-to-nix-output/vom.nix | 2 +- .../quicklisp-to-nix-output/woo.nix | 14 +-- .../quicklisp-to-nix-output/wookie.nix | 14 +-- .../quicklisp-to-nix-output/xsubseq.nix | 2 +- .../quicklisp-to-nix-output/yacc.nix | 2 +- .../quicklisp-to-nix-output/zpb-ttf.nix | 2 +- .../quicklisp-to-nix-overrides.nix | 5 +- .../lisp-modules/quicklisp-to-nix.nix | 105 +++++++++++++----- pkgs/development/lisp-modules/shell.nix | 3 +- 102 files changed, 666 insertions(+), 522 deletions(-) create mode 100644 pkgs/development/lisp-modules/openssl-lib-marked.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index f208b47234c6..5769ee94a1be 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "http://beta.quicklisp.org/dist/quicklisp/2018-04-30/distinfo.txt"; - sha256 = "0zpabwgvsmy90yca25sfixi6waixqdchllayyvcsdl3jaibbz4rq"; + url = "http://beta.quicklisp.org/dist/quicklisp/2018-08-31/distinfo.txt"; + sha256 = "1im4p6vcxkp5hrim28cdf5isyw8a1v9aqsz2xfsfp3z3qd49dixd"; }; buildPhase = '' true; ''; postInstall = '' diff --git a/pkgs/development/lisp-modules/openssl-lib-marked.nix b/pkgs/development/lisp-modules/openssl-lib-marked.nix new file mode 100644 index 000000000000..e2c632b8ebad --- /dev/null +++ b/pkgs/development/lisp-modules/openssl-lib-marked.nix @@ -0,0 +1,18 @@ +with import ../../../default.nix {}; +runCommand "openssl-lib-marked" {} '' + mkdir -p "$out/lib" + for lib in ssl crypto; do + version="${(builtins.parseDrvName openssl.name).version}" + ln -s "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version" + version="$(echo "$version" | sed -re 's/[a-z]+$//')" + while test -n "$version"; do + ln -sfT "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version" + nextversion="''${version%.*}" + if test "$version" = "$nextversion"; then + version= + else + version="$nextversion" + fi + done + done +'' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 22aa818f8756..9b9486e9758c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''alexandria''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index c90a9e091920..9daab46784d3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''array-utils''; - version = ''20180131-git''; + version = ''20180831-git''; description = ''A few utilities for working with arrays.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz''; - sha256 = ''01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0''; + url = ''http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz''; + sha256 = ''1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7''; }; packageName = "array-utils"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. - SHA256 01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0 URL - http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz - MD5 339670a03dd7d865cd045a6556d705c6 NAME array-utils FILENAME array-utils - DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS (array-utils-test) + SHA256 1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7 URL + http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz + MD5 fa07e8fac5263d4fed7acb3d53e5855a NAME array-utils FILENAME array-utils + DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS (array-utils-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix index 4612e6175b91..65df45d95a50 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''asdf-system-connections''; version = ''20170124-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix index f0fc5d4d0c0f..c5305587a029 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''bordeaux-threads''; - version = ''v0.8.5''; + version = ''v0.8.6''; parasites = [ "bordeaux-threads/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz''; - sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd''; + url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz''; + sha256 = ''1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y''; }; packageName = "bordeaux-threads"; @@ -21,10 +21,10 @@ rec { } /* (SYSTEM bordeaux-threads DESCRIPTION Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256 - 09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL - http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz - MD5 67e363a363e164b6f61a047957b8554e NAME bordeaux-threads FILENAME + 1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y URL + http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz + MD5 f959d3902694b1fe6de450a854040f86 NAME bordeaux-threads FILENAME bordeaux-threads DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION v0.8.5 SIBLINGS NIL PARASITES + DEPENDENCIES (alexandria fiveam) VERSION v0.8.6 SIBLINGS NIL PARASITES (bordeaux-threads/test)) */ 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 index 6dbff1d6e56c..ec4e31013f92 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -5,7 +5,7 @@ rec { 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" ]; + 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."named-readtables" 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''; @@ -34,16 +34,17 @@ rec { (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 iterate FILENAME iterate) + (NAME named-readtables FILENAME named-readtables) + (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) + cxml-xml flexi-streams iterate named-readtables 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 index ecc1634bfce0..86bdb36c8d23 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -7,7 +7,7 @@ rec { 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" ]; + 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."named-readtables" 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''; @@ -35,6 +35,7 @@ rec { (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 named-readtables FILENAME named-readtables) (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) @@ -42,8 +43,9 @@ rec { 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) + cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 + named-readtables 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) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index 02e6e2bf6045..f3e64cb965e4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''caveman''; - version = ''20171019-git''; + version = ''20180831-git''; description = ''Web Application Framework for Common Lisp''; - deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz''; - sha256 = ''0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra''; + url = ''http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz''; + sha256 = ''0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s''; }; packageName = "caveman"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 - 0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra URL - http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz - MD5 41318d26a0825e504042fa693959feaf NAME caveman FILENAME caveman DEPS + 0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s URL + http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz + MD5 b417563f04b2619172127a6abeed786a NAME caveman FILENAME caveman DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -38,22 +38,26 @@ rec { (NAME cl-syntax FILENAME cl-syntax) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack) + (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot) + (NAME clack-socket FILENAME clack-socket) (NAME clack-test FILENAME clack-test) (NAME clack-v1-compat FILENAME clack-v1-compat) (NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) - (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad) + (NAME http-body FILENAME http-body) + (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad) (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack) (NAME lack-component FILENAME lack-component) (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) (NAME map-set FILENAME map-set) - (NAME marshal FILENAME marshal) (NAME myway FILENAME myway) + (NAME marshal FILENAME marshal) (NAME md5 FILENAME md5) + (NAME myway FILENAME myway) (NAME named-readtables FILENAME named-readtables) (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse) (NAME prove FILENAME prove) (NAME quri FILENAME quri) - (NAME smart-buffer FILENAME smart-buffer) + (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) (NAME static-vectors FILENAME static-vectors) (NAME trivial-backtrace FILENAME trivial-backtrace) @@ -67,14 +71,15 @@ rec { (alexandria anaphora babel babel-streams bordeaux-threads cffi cffi-grovel cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64 cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project - cl-reexport cl-syntax cl-syntax-annot cl-utilities clack clack-test - clack-v1-compat dexador do-urlencode fast-http fast-io flexi-streams - http-body ironclad jonathan lack lack-component lack-middleware-backtrace - lack-util let-plus local-time map-set marshal myway named-readtables - nibbles proc-parse prove quri smart-buffer split-sequence static-vectors + cl-reexport cl-syntax cl-syntax-annot cl-utilities clack + clack-handler-hunchentoot clack-socket clack-test clack-v1-compat dexador + do-urlencode fast-http fast-io flexi-streams http-body hunchentoot + ironclad jonathan lack lack-component lack-middleware-backtrace lack-util + let-plus local-time map-set marshal md5 myway named-readtables nibbles + proc-parse prove quri rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket xsubseq) - VERSION 20171019-git SIBLINGS + VERSION 20180831-git SIBLINGS (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index c8f34e0fa17f..a9808173b626 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''chipz''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index a420c22054f6..531d429df244 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''cl-aa''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index 42a7bd595853..a413743eb8d5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''cl-anonfun''; version = ''20111203-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index d72a9c69ac0f..377c8c2209bc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-repl''; - version = ''cl-async-20171130-git''; + version = ''cl-async-20180711-git''; description = ''REPL integration for CL-ASYNC.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; - sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; + url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz''; + sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz''; }; packageName = "cl-async-repl"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 - 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL - http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz - MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-repl FILENAME + 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL + http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz + MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-repl FILENAME cl-async-repl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -39,5 +39,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20171130-git SIBLINGS + VERSION cl-async-20180711-git SIBLINGS (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index f7392b880d11..2129c7f83f7a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-ssl''; - version = ''cl-async-20171130-git''; + version = ''cl-async-20180711-git''; description = ''SSL Wrapper around cl-async socket implementation.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; - sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; + url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz''; + sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz''; }; packageName = "cl-async-ssl"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 - 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL - http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz - MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-ssl FILENAME + 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL + http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz + MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-ssl FILENAME cl-async-ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -40,5 +40,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20171130-git SIBLINGS + VERSION cl-async-20180711-git SIBLINGS (cl-async-repl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index 90638ed56f16..e5a2a0bc7fd3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async''; - version = ''20171130-git''; + version = ''20180711-git''; parasites = [ "cl-async-base" "cl-async-util" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; - sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; + url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz''; + sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz''; }; packageName = "cl-async"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 - 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL - http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz - MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async FILENAME cl-async DEPS + 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL + http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz + MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async FILENAME cl-async DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -37,5 +37,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop vom) - VERSION 20171130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) + VERSION 20180711-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) PARASITES (cl-async-base cl-async-util)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index b0fe8888dcfc..56ccab7b5cd5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-csv''; - version = ''20180228-git''; + version = ''20180831-git''; parasites = [ "cl-csv/speed-test" "cl-csv/test" ]; description = ''Facilities for reading and writing CSV format files''; - deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ]; + deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz''; - sha256 = ''1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r''; + url = ''http://beta.quicklisp.org/archive/cl-csv/2018-08-31/cl-csv-20180831-git.tgz''; + sha256 = ''0cy2pnzm3c6hmimp0kl5nz03rw6nzgy37i1ifpg9grmd3wipm9fd''; }; packageName = "cl-csv"; @@ -21,16 +21,17 @@ rec { } /* (SYSTEM cl-csv DESCRIPTION Facilities for reading and writing CSV format files SHA256 - 1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r URL - http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz - MD5 be174a4d7cc2ea24418df63757daed94 NAME cl-csv FILENAME cl-csv DEPS + 0cy2pnzm3c6hmimp0kl5nz03rw6nzgy37i1ifpg9grmd3wipm9fd URL + http://beta.quicklisp.org/archive/cl-csv/2018-08-31/cl-csv-20180831-git.tgz + MD5 4bd0ef366dea9d48c4581ed73a208cf3 NAME cl-csv FILENAME cl-csv DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)) + (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME named-readtables FILENAME named-readtables)) DEPENDENCIES (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate - lisp-unit2) - VERSION 20180228-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES + lisp-unit2 named-readtables) + VERSION 20180831-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES (cl-csv/speed-test cl-csv/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index 995ef9bc745e..40c1ac7d6a9a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-dbi''; - version = ''20180430-git''; + version = ''20180831-git''; description = ''''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz''; - sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz''; + sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; }; packageName = "cl-dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 - 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL - http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz - MD5 1bc845e8738c4987342cb0f56200ba50 NAME cl-dbi FILENAME cl-dbi DEPS + 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL + http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz + MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME cl-dbi FILENAME cl-dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-types) - VERSION 20180430-git SIBLINGS + VERSION 20180831-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 0321572e72a6..61a35f2b58c6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''cl-html-parse''; version = ''20161031-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index d4ce8531291e..1f58be6c09e9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-interpol''; - version = ''20171227-git''; + version = ''20180711-git''; parasites = [ "cl-interpol-test" ]; description = ''''; - deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" ]; + deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz''; - sha256 = ''1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy''; + url = ''http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz''; + sha256 = ''1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r''; }; packageName = "cl-interpol"; @@ -20,11 +20,12 @@ rec { overrides = x: x; } /* (SYSTEM cl-interpol DESCRIPTION NIL SHA256 - 1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy URL - http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz - MD5 e9d2f0238bb8f7a0c5b1ef1e6ef390ae NAME cl-interpol FILENAME cl-interpol + 1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r URL + http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz + MD5 b2d6893ef703c5b6e5736fa33ba0794e NAME cl-interpol FILENAME cl-interpol DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) - (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 20171227-git - SIBLINGS NIL PARASITES (cl-interpol-test)) */ + (NAME flexi-streams FILENAME flexi-streams) + (NAME named-readtables FILENAME named-readtables)) + DEPENDENCIES (cl-ppcre cl-unicode flexi-streams named-readtables) VERSION + 20180711-git SIBLINGS NIL PARASITES (cl-interpol-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index 825fea4eb906..dfabda0428f0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''cl-l10n-cldr''; version = ''20120909-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index 1aced09d34fd..c950fa292a8b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-libuv''; - version = ''20180328-git''; + version = ''20180831-git''; description = ''Low-level libuv bindings for Common Lisp.''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz''; - sha256 = ''1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p''; + url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz''; + sha256 = ''1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f''; }; packageName = "cl-libuv"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. - SHA256 1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p URL - http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz - MD5 c50f2cca0bd8d25db35b4ec176242858 NAME cl-libuv FILENAME cl-libuv DEPS + SHA256 1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f URL + http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz + MD5 d755a060faac0d50a4500ae1628401ce NAME cl-libuv FILENAME cl-libuv DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-grovel cffi-toolchain trivial-features) VERSION - 20180328-git SIBLINGS NIL PARASITES NIL) */ + 20180831-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index 67468edbb6cb..8967b0970c56 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''cl-markup''; version = ''20131003-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index f546e4711acc..e8034b11c237 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''cl-paths''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 60e38a7de720..a0443cb5af08 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-postgres''; - version = ''postmodern-20180430-git''; + version = ''postmodern-20180831-git''; - parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; + parasites = [ "cl-postgres/tests" ]; description = ''Low-level client library for PostgreSQL''; - deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; + deps = [ args."fiveam" args."md5" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz''; - sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz''; + sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx''; }; packageName = "cl-postgres"; @@ -20,14 +20,13 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL - http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz - MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME cl-postgres FILENAME cl-postgres + SHA256 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL + http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz + MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME cl-postgres FILENAME cl-postgres DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) - (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) (NAME split-sequence FILENAME split-sequence) (NAME usocket FILENAME usocket)) - DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket) - VERSION postmodern-20180430-git SIBLINGS (postmodern s-sql simple-date) - PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ + DEPENDENCIES (fiveam md5 split-sequence usocket) VERSION + postmodern-20180831-git SIBLINGS (postmodern s-sql simple-date) PARASITES + (cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 7853d5a279a2..e65c0a03ddc5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-unicode''; - version = ''cl-ppcre-20171227-git''; + version = ''cl-ppcre-20180831-git''; parasites = [ "cl-ppcre-unicode-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz''; - sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz''; + sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb''; }; packageName = "cl-ppcre-unicode"; @@ -21,13 +21,13 @@ rec { } /* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 - 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL - http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz - MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre-unicode FILENAME + 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL + http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz + MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-test FILENAME cl-ppcre-test) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION - cl-ppcre-20171227-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ + cl-ppcre-20180831-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index cbdf3a471461..3f56cf3dfaee 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre''; - version = ''20171227-git''; + version = ''20180831-git''; parasites = [ "cl-ppcre-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz''; - sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz''; + sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb''; }; packageName = "cl-ppcre"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library - SHA256 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL - http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz - MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre FILENAME cl-ppcre DEPS + SHA256 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL + http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz + MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre FILENAME cl-ppcre DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 20171227-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ + VERSION 20180831-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index 658ffdb51b82..15fd56107c82 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-project''; - version = ''20171019-git''; + version = ''20180831-git''; description = ''Generate a skeleton for modern project''; deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz''; - sha256 = ''1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q''; + url = ''http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz''; + sha256 = ''0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s''; }; packageName = "cl-project"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 - 1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q URL - http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz - MD5 9dbfd7f9b0a83ca608031ebf32185a0f NAME cl-project FILENAME cl-project + 0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s URL + http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz + MD5 11fbcc0f4f5c6d7b921eb83ab5f3ee1b NAME cl-project FILENAME cl-project DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -32,4 +32,4 @@ rec { DEPENDENCIES (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre let-plus local-time prove uiop) - VERSION 20171019-git SIBLINGS (cl-project-test) PARASITES NIL) */ + VERSION 20180831-git SIBLINGS (cl-project-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 4434e711d9de..6d284b7b0120 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''cl-unification''; version = ''20171227-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index 1b78d0d28983..750da99d5d6a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''cl-utilities''; version = ''1.2.4''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index a757b3d4a8a0..af0e917425a1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl_plus_ssl''; - version = ''cl+ssl-20180328-git''; + version = ''cl+ssl-20180831-git''; parasites = [ "openssl-1.1.0" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz''; - sha256 = ''095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62''; + url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz''; + sha256 = ''1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r''; }; packageName = "cl+ssl"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62 URL - http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz - MD5 ec6f921505ba7bb8e35878b3ae9eea29 NAME cl+ssl FILENAME cl_plus_ssl DEPS + 1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r URL + http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz + MD5 56cd0b42cd9f7b8645db330ebc98600c 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) @@ -33,5 +33,5 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi flexi-streams trivial-features trivial-garbage trivial-gray-streams uiop) - VERSION cl+ssl-20180328-git SIBLINGS (cl+ssl.test) PARASITES + VERSION cl+ssl-20180831-git SIBLINGS (cl+ssl.test) PARASITES (openssl-1.1.0)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix new file mode 100644 index 000000000000..252f9794e769 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -0,0 +1,54 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clack-handler-hunchentoot''; + version = ''clack-20180831-git''; + + description = ''Clack handler for Hunchentoot.''; + + 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."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; + sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; + }; + + packageName = "clack-handler-hunchentoot"; + + asdFilesToKeep = ["clack-handler-hunchentoot.asd"]; + overrides = x: x; +} +/* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot. + SHA256 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL + http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz + MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-handler-hunchentoot + FILENAME clack-handler-hunchentoot DEPS + ((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_plus_ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME clack-socket FILENAME clack-socket) + (NAME flexi-streams FILENAME flexi-streams) + (NAME hunchentoot FILENAME hunchentoot) (NAME md5 FILENAME md5) + (NAME rfc2388 FILENAME rfc2388) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-backtrace FILENAME trivial-backtrace) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME usocket FILENAME usocket)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad + cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence + trivial-backtrace trivial-features trivial-garbage trivial-gray-streams + usocket) + VERSION clack-20180831-git SIBLINGS + (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket + clack-test clack-v1-compat clack t-clack-handler-fcgi + t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie + t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql + clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth + clack-middleware-postmodern clack-middleware-rucksack + clack-session-store-dbi t-clack-middleware-auth-basic + t-clack-middleware-csrf) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index a4a66ecfa64f..d5163cabe045 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''clack-socket''; - version = ''clack-20180328-git''; + version = ''clack-20180831-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz''; - sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai''; + url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; + sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; }; packageName = "clack-socket"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM clack-socket DESCRIPTION NIL SHA256 - 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL - http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz - MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-socket FILENAME - clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180328-git SIBLINGS + 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL + http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz + MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-socket FILENAME + clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180831-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index be88069fd5d9..1d081fbef581 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-test''; - version = ''clack-20180328-git''; + version = ''clack-20180831-git''; description = ''Testing Clack Applications.''; - deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."named-readtables" args."nibbles" args."proc-parse" args."prove" 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."trivial-types" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz''; - sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai''; + url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; + sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; }; packageName = "clack-test"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256 - 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL - http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz - MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-test FILENAME clack-test + 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL + http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz + MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-test FILENAME clack-test DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) @@ -36,21 +36,24 @@ rec { (NAME cl-syntax FILENAME cl-syntax) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack) - (NAME dexador FILENAME dexador) (NAME fast-http FILENAME fast-http) - (NAME fast-io FILENAME fast-io) + (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot) + (NAME clack-socket FILENAME clack-socket) (NAME dexador FILENAME dexador) + (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) - (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad) + (NAME http-body FILENAME http-body) + (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad) (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack) (NAME lack-component FILENAME lack-component) (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus) - (NAME local-time FILENAME local-time) + (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables) (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse) (NAME prove FILENAME prove) (NAME quri FILENAME quri) - (NAME smart-buffer FILENAME smart-buffer) + (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) (NAME static-vectors FILENAME static-vectors) + (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME trivial-features FILENAME trivial-features) (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-gray-streams FILENAME trivial-gray-streams) @@ -61,12 +64,14 @@ rec { (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain chipz chunga cl+ssl cl-annot cl-ansi-text cl-base64 cl-colors cl-cookie cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot cl-utilities clack - dexador fast-http fast-io flexi-streams http-body ironclad jonathan lack - lack-component lack-middleware-backtrace lack-util let-plus local-time - named-readtables nibbles proc-parse prove quri smart-buffer split-sequence - static-vectors trivial-features trivial-garbage trivial-gray-streams - trivial-mimes trivial-types usocket xsubseq) - VERSION clack-20180328-git SIBLINGS + clack-handler-hunchentoot clack-socket dexador fast-http fast-io + flexi-streams http-body hunchentoot ironclad jonathan lack lack-component + lack-middleware-backtrace lack-util let-plus local-time md5 + named-readtables nibbles proc-parse prove quri rfc2388 smart-buffer + split-sequence static-vectors trivial-backtrace trivial-features + trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket + xsubseq) + VERSION clack-20180831-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index b810de3fd1c8..8b2e2c70453a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-v1-compat''; - version = ''clack-20180328-git''; + version = ''clack-20180831-git''; description = ''''; - deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz''; - sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai''; + url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; + sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; }; packageName = "clack-v1-compat"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 - 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL - http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz - MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-v1-compat FILENAME + 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL + http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz + MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-v1-compat FILENAME clack-v1-compat DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) @@ -37,19 +37,22 @@ rec { (NAME cl-syntax FILENAME cl-syntax) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack) + (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot) + (NAME clack-socket FILENAME clack-socket) (NAME clack-test FILENAME clack-test) (NAME dexador FILENAME dexador) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) - (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad) + (NAME http-body FILENAME http-body) + (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad) (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack) (NAME lack-component FILENAME lack-component) (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) (NAME marshal FILENAME marshal) - (NAME named-readtables FILENAME named-readtables) + (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables) (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse) (NAME prove FILENAME prove) (NAME quri FILENAME quri) - (NAME smart-buffer FILENAME smart-buffer) + (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) (NAME static-vectors FILENAME static-vectors) (NAME trivial-backtrace FILENAME trivial-backtrace) @@ -63,13 +66,14 @@ rec { (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64 cl-colors cl-cookie cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot - cl-utilities clack clack-test dexador fast-http fast-io flexi-streams - http-body ironclad jonathan lack lack-component lack-middleware-backtrace - lack-util let-plus local-time marshal named-readtables nibbles proc-parse - prove quri smart-buffer split-sequence static-vectors trivial-backtrace + cl-utilities clack clack-handler-hunchentoot clack-socket clack-test + dexador fast-http fast-io flexi-streams http-body hunchentoot ironclad + jonathan lack lack-component lack-middleware-backtrace lack-util let-plus + local-time marshal md5 named-readtables nibbles proc-parse prove quri + rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types uiop usocket xsubseq) - VERSION clack-20180328-git SIBLINGS + VERSION clack-20180831-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 08e5ff71cc5c..0b2828d06dfc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack''; - version = ''20180328-git''; + version = ''20180831-git''; description = ''Web application environment for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz''; - sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai''; + url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; + sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; }; packageName = "clack"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 - 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL - http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz - MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack FILENAME clack DEPS + 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL + http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz + MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack FILENAME clack DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack) @@ -31,7 +31,7 @@ rec { DEPENDENCIES (alexandria bordeaux-threads ironclad lack lack-component lack-middleware-backtrace lack-util nibbles uiop) - VERSION 20180328-git SIBLINGS + VERSION 20180831-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index ec7599f2bd3f..a13537d7e90f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20180430-git''; + version = ''20180831-git''; description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz''; - sha256 = ''1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz''; + sha256 = ''01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg''; }; packageName = "closer-mop"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v URL - http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz - MD5 7578c66d4d468a21de9c5cf065b8615f NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS NIL PARASITES NIL) */ + SHA256 01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg URL + http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz + MD5 968426b07f9792f95fe3c9b83d68d756 NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix index 29c90369244a..f55ccecadc61 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closure-html''; - version = ''20140826-git''; + version = ''20180711-git''; description = ''''; deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz''; - sha256 = ''1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb''; + url = ''http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz''; + sha256 = ''0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq''; }; packageName = "closure-html"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM closure-html DESCRIPTION NIL SHA256 - 1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb URL - http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz - MD5 3f8d8a4fd54f915ca6cc5fdf29239d98 NAME closure-html FILENAME + 0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL + http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz + MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME closure-html DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME closure-common FILENAME closure-common) @@ -30,4 +30,4 @@ rec { DEPENDENCIES (alexandria babel closure-common flexi-streams trivial-features trivial-gray-streams) - VERSION 20140826-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 76f50463a6ae..3f6d6ae32ac6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clss''; - version = ''20180131-git''; + version = ''20180831-git''; description = ''A DOM tree searching engine based on CSS selectors.''; deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz''; - sha256 = ''0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r''; + url = ''http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz''; + sha256 = ''18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd''; }; packageName = "clss"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. - SHA256 0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r URL - http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz MD5 - 138244b7871d8ea832832aa9cc5867e6 NAME clss FILENAME clss DEPS + SHA256 18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd URL + http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz MD5 + 39b69790115d6c4fe4709f5a45b5d4a4 NAME clss FILENAME clss DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION - 20180131-git SIBLINGS NIL PARASITES NIL) */ + 20180831-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index bd2b0ff19bdb..685e81283688 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20180430-git''; + version = ''20180711-git''; parasites = [ "clx/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz''; - sha256 = ''18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3''; + url = ''http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz''; + sha256 = ''0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h''; }; packageName = "clx"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 - 18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3 URL - http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz MD5 - bf9c1d6b1b2856ddbd4bf2fa75bbc309 NAME clx FILENAME clx DEPS - ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180430-git + 0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h URL + http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz MD5 + 27d5e904d2b7e4cdf4e8492839d15bad NAME clx FILENAME clx DEPS + ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180711-git SIBLINGS NIL PARASITES (clx/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index 1ae6fa0f4ec4..e1fb59658528 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''command-line-arguments''; version = ''20151218-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index bb5ab940638a..f4941aa80cd6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''css-lite''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix index ba523ae837d7..c83b29939687 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix @@ -5,7 +5,7 @@ rec { description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree''; - deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" 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."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; + deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" 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''; @@ -36,8 +36,9 @@ rec { (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 iterate FILENAME iterate) + (NAME named-readtables FILENAME named-readtables) + (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) (NAME string-case FILENAME string-case) (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) (NAME trivial-features FILENAME trivial-features) @@ -46,8 +47,8 @@ rec { DEPENDENCIES (alexandria babel buildnode cl-html5-parser cl-interpol cl-ppcre cl-unicode closer-mop closure-common closure-html collectors css-selectors cxml - cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate puri - split-sequence string-case swank symbol-munger trivial-features - trivial-gray-streams yacc) + cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate + named-readtables puri split-sequence string-case swank symbol-munger + trivial-features trivial-gray-streams yacc) VERSION css-selectors-20160628-git SIBLINGS (css-selectors-stp css-selectors) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix index fbe06a179fdd..69ada2ce80a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix @@ -5,7 +5,7 @@ rec { description = ''An implementation of css selectors that interacts with cxml-stp''; - 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."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; + 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."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; @@ -36,17 +36,19 @@ rec { (NAME cxml-stp FILENAME cxml-stp) (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number) - (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) - (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) + (NAME iterate FILENAME iterate) + (NAME named-readtables FILENAME named-readtables) + (NAME parse-number FILENAME parse-number) (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 xpath FILENAME xpath) (NAME yacc FILENAME yacc)) DEPENDENCIES (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop closure-common closure-html collectors css-selectors cxml cxml-dom - cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate parse-number - puri split-sequence swank symbol-munger trivial-features - trivial-gray-streams xpath yacc) + cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate + named-readtables parse-number puri split-sequence swank symbol-munger + trivial-features trivial-gray-streams xpath yacc) VERSION css-selectors-20160628-git SIBLINGS (css-selectors-simple-tree css-selectors) PARASITES NIL) */ 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 index 2ad018e5549c..3316f59447d7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -7,7 +7,7 @@ rec { 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" ]; + 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."named-readtables" 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''; @@ -37,6 +37,7 @@ rec { (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 named-readtables FILENAME named-readtables) (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) @@ -45,8 +46,8 @@ rec { 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) + cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 + named-readtables 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/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 6dfa61634f2b..218107e95d6a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-mysql''; - version = ''cl-dbi-20180430-git''; + version = ''cl-dbi-20180831-git''; description = ''Database driver for MySQL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz''; - sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz''; + sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; }; packageName = "dbd-mysql"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL - http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz - MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-mysql FILENAME dbd-mysql DEPS + 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL + http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz + MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-mysql FILENAME dbd-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot) @@ -35,5 +35,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-features trivial-types) - VERSION cl-dbi-20180430-git SIBLINGS + VERSION cl-dbi-20180831-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index bb9558fda51e..9387806255ac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-postgres''; - version = ''cl-dbi-20180430-git''; + version = ''cl-dbi-20180831-git''; description = ''Database driver for PostgreSQL.''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz''; - sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz''; + sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; }; packageName = "dbd-postgres"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL - http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz - MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-postgres FILENAME + 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL + http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz + MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-postgres FILENAME dbd-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -37,5 +37,5 @@ rec { (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot closer-mop dbi md5 named-readtables split-sequence trivial-garbage trivial-types usocket) - VERSION cl-dbi-20180430-git SIBLINGS + VERSION cl-dbi-20180831-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 6e8e85e72abc..808914068a35 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20180430-git''; + version = ''cl-dbi-20180831-git''; description = ''Database driver for SQLite3.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz''; - sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz''; + sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; }; packageName = "dbd-sqlite3"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL - http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz - MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-sqlite3 FILENAME dbd-sqlite3 + 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL + http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz + MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-sqlite3 FILENAME dbd-sqlite3 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -38,5 +38,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot closer-mop dbi iterate named-readtables split-sequence sqlite trivial-features trivial-types uiop) - VERSION cl-dbi-20180430-git SIBLINGS + VERSION cl-dbi-20180831-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index e75961dd9ace..2de381f44b8e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbi''; - version = ''cl-20180430-git''; + version = ''cl-20180831-git''; description = ''Database independent interface for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz''; - sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz''; + sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; }; packageName = "dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - SHA256 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL - http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz - MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbi FILENAME dbi DEPS + SHA256 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL + http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz + MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbi FILENAME dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop named-readtables split-sequence trivial-types) - VERSION cl-20180430-git SIBLINGS + VERSION cl-20180831-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */ 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 d3111b18b22b..2e392928f495 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20180328-git''; + version = ''20180831-git''; description = ''Yet another HTTP client for Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" 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/2018-03-28/dexador-20180328-git.tgz''; - sha256 = ''13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb''; + url = ''http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz''; + sha256 = ''1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs''; }; packageName = "dexador"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb URL - http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz - MD5 27eaa0c3c15e6e12e5d6046d62e4394f NAME dexador FILENAME dexador DEPS + 1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs URL + http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz + MD5 f2859026d90e63e79e8e4728168fab13 NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -48,4 +48,4 @@ rec { fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-garbage trivial-gray-streams trivial-mimes usocket xsubseq) - VERSION 20180328-git SIBLINGS (dexador-test) PARASITES NIL) */ + VERSION 20180831-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 7ee5f91a1580..541f1c6a169d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''documentation-utils''; - version = ''20180228-git''; + version = ''20180831-git''; description = ''A few simple tools to help you with documenting your library.''; deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz''; - sha256 = ''0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w''; + url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz''; + sha256 = ''0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5''; }; packageName = "documentation-utils"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 - 0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w URL - http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz - MD5 b0c823120a376e0474433d151df52548 NAME documentation-utils FILENAME + 0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5 URL + http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz + MD5 e0f58ffe20602cada3413b4eeec909ef NAME documentation-utils FILENAME documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (trivial-indent) VERSION 20180228-git SIBLINGS NIL PARASITES - NIL) */ + DEPENDENCIES (trivial-indent) VERSION 20180831-git SIBLINGS + (multilang-documentation-utils) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index 99792023bdd0..82c8603d4a45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-http''; - version = ''20180131-git''; + version = ''20180831-git''; description = ''A fast HTTP protocol parser in Common Lisp''; deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz''; - sha256 = ''057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg''; + url = ''http://beta.quicklisp.org/archive/fast-http/2018-08-31/fast-http-20180831-git.tgz''; + sha256 = ''1827ra8nkjh5ghg2hn96w3zs8n1lvqzbf8wmzrcs8yky3l0m4qrm''; }; packageName = "fast-http"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp - SHA256 057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg URL - http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz - MD5 0722e935fb644d57d44e8604e41e689e NAME fast-http FILENAME fast-http DEPS + SHA256 1827ra8nkjh5ghg2hn96w3zs8n1lvqzbf8wmzrcs8yky3l0m4qrm URL + http://beta.quicklisp.org/archive/fast-http/2018-08-31/fast-http-20180831-git.tgz + MD5 d5e839f204b2dd78a390336572d1ee65 NAME fast-http FILENAME fast-http DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) (NAME flexi-streams FILENAME flexi-streams) @@ -32,4 +32,4 @@ rec { DEPENDENCIES (alexandria babel cl-utilities flexi-streams proc-parse smart-buffer trivial-features trivial-gray-streams xsubseq) - VERSION 20180131-git SIBLINGS (fast-http-test) PARASITES NIL) */ + VERSION 20180831-git SIBLINGS (fast-http-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index 7b37e5709e86..08b6d35a1fb9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''flexi-streams''; - version = ''20180328-git''; + version = ''20180711-git''; parasites = [ "flexi-streams-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz''; - sha256 = ''0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11''; + url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz''; + sha256 = ''1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2''; }; packageName = "flexi-streams"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp - SHA256 0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11 URL - http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz - MD5 af40ae10a0aab65eccfe161a32e1033b NAME flexi-streams FILENAME + SHA256 1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2 URL + http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz + MD5 1e5bc255540dcbd71f9cba56573cfb4c NAME flexi-streams FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 20180328-git SIBLINGS NIL PARASITES + (trivial-gray-streams) VERSION 20180711-git SIBLINGS NIL PARASITES (flexi-streams-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 2aa5c0749250..4a23cbf51ee7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''form-fiddle''; - version = ''20180131-git''; + version = ''20180831-git''; description = ''A collection of utilities to destructure lambda forms.''; deps = [ args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz''; - sha256 = ''1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff''; + url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz''; + sha256 = ''013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj''; }; packageName = "form-fiddle"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 - 1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff URL - http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz - MD5 a0cc2ea1af29889e4991f7fefac366dd NAME form-fiddle FILENAME form-fiddle + 013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj URL + http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz + MD5 1e9ae81423ed3c5f2e07c26f93b45956 NAME form-fiddle FILENAME form-fiddle DEPS ((NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180131-git + DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 8061f3844e0b..3d259fc5b6c5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''ironclad''; - version = ''v0.39''; + version = ''v0.42''; parasites = [ "ironclad/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."nibbles" args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz''; - sha256 = ''0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8''; + url = ''http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz''; + sha256 = ''1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr''; }; packageName = "ironclad"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8 URL - http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz - MD5 f4abb18cbbe173c569d8ed99800d9f9e NAME ironclad FILENAME ironclad DEPS + 1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr URL + http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz + MD5 18f2dbc9dbff97de9ea44af5344485b5 NAME ironclad FILENAME ironclad DEPS ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES - (nibbles rt) VERSION v0.39 SIBLINGS (ironclad-text) PARASITES + (nibbles rt) VERSION v0.42 SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index f85b128652d0..f276ec72736d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''iterate''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index 62a3ae2bb7d1..e5cbad3e9e83 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''kmrcl''; version = ''20150923-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 79f2d38ef10d..94edb06e6aee 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''lack-component''; - version = ''lack-20180430-git''; + version = ''lack-20180831-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz''; - sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v''; + url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; + sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; }; packageName = "lack-component"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM lack-component DESCRIPTION NIL SHA256 - 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL - http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5 - b9a0c08d54538679a8dd141022e8abb1 NAME lack-component FILENAME - lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180430-git SIBLINGS + 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL + http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 + fd57a7185997a1a5f37bbd9d6899118d NAME lack-component FILENAME + lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180831-git SIBLINGS (lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index c0acbc2f01fc..a98028e0c060 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-middleware-backtrace''; - version = ''lack-20180430-git''; + version = ''lack-20180831-git''; description = ''''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz''; - sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v''; + url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; + sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; }; packageName = "lack-middleware-backtrace"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 - 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL - http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5 - b9a0c08d54538679a8dd141022e8abb1 NAME lack-middleware-backtrace FILENAME + 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL + http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 + fd57a7185997a1a5f37bbd9d6899118d NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20180430-git SIBLINGS + (uiop) VERSION lack-20180831-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 29fcd359f6b6..3478ac8488b4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-util''; - version = ''lack-20180430-git''; + version = ''lack-20180831-git''; description = ''''; deps = [ args."ironclad" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz''; - sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v''; + url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; + sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; }; packageName = "lack-util"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-util DESCRIPTION NIL SHA256 - 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL - http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5 - b9a0c08d54538679a8dd141022e8abb1 NAME lack-util FILENAME lack-util DEPS + 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL + http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 + fd57a7185997a1a5f37bbd9d6899118d NAME lack-util FILENAME lack-util DEPS ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad nibbles) VERSION lack-20180430-git SIBLINGS + DEPENDENCIES (ironclad nibbles) VERSION lack-20180831-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 9260b06dd830..fdcda10a275f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack''; - version = ''20180430-git''; + version = ''20180831-git''; description = ''A minimal Clack''; deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz''; - sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v''; + url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; + sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; }; packageName = "lack"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL - http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5 - b9a0c08d54538679a8dd141022e8abb1 NAME lack FILENAME lack DEPS + 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL + http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 + fd57a7185997a1a5f37bbd9d6899118d NAME lack FILENAME lack DEPS ((NAME ironclad FILENAME ironclad) (NAME lack-component FILENAME lack-component) (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles)) DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION - 20180430-git SIBLINGS + 20180831-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index b44c0c8a9874..a3ddc2fd953e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''lift''; version = ''20151031-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index 62197234305a..8d21f88cbf82 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -7,7 +7,7 @@ rec { description = ''Common Lisp library that supports unit testing.''; - deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."symbol-munger" ]; + deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz''; @@ -30,8 +30,9 @@ rec { (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate) + (NAME named-readtables FILENAME named-readtables) (NAME symbol-munger FILENAME symbol-munger)) DEPENDENCIES (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate - symbol-munger) + named-readtables symbol-munger) VERSION 20180131-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index 1ca094d139db..ad335774cbb5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lquery''; - version = ''20180131-git''; + version = ''20180831-git''; description = ''A library to allow jQuery-like HTML/DOM manipulation.''; deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz''; - sha256 = ''1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9''; + url = ''http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz''; + sha256 = ''1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v''; }; packageName = "lquery"; @@ -19,13 +19,13 @@ rec { } /* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 - 1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9 URL - http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz - MD5 07e92aad32c4d12c4699956b57dbc9b8 NAME lquery FILENAME lquery DEPS + 1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v URL + http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz + MD5 d0d3efa47f151afeb754c4bc0c059acf NAME lquery FILENAME lquery DEPS ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss) (NAME documentation-utils FILENAME documentation-utils) (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils clss documentation-utils form-fiddle plump trivial-indent) - VERSION 20180131-git SIBLINGS (lquery-test) PARASITES NIL) */ + VERSION 20180831-git SIBLINGS (lquery-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index 006361ed80c1..db25e6ae5347 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''map-set''; version = ''20160628-hg''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index c34d79f3d13d..4f6842606b45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''marshal''; version = ''cl-20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index c65d95d9ef7a..953dd0a58a4a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''md5''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index 5647b9a92707..d72e0839d1e8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''metabang-bind''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index 3c289fefa9ab..6334804c4f70 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''misc-extensions''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix index 29460307e698..a8cfc070bf99 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''mt19937''; version = ''1.1.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index e1d6a1477a7b..82d06b1c93b2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''named-readtables''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix index 67636d3f6cf3..4e7c84566a0a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''net_dot_didierverna_dot_asdf-flv''; version = ''asdf-flv-version-2.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index d706bc5bad1a..ea6adac9e9f8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''nibbles''; - version = ''20180430-git''; + version = ''20180831-git''; parasites = [ "nibbles/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz''; - sha256 = ''1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g''; + url = ''http://beta.quicklisp.org/archive/nibbles/2018-08-31/nibbles-20180831-git.tgz''; + sha256 = ''0z25f2z54pnz1s35prqvnl42bv0xqh50y94bds1jwfv0wvfq27la''; }; packageName = "nibbles"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM nibbles DESCRIPTION A library for accessing octet-addressed blocks of data in big- and little-endian orders - SHA256 1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g URL - http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz - MD5 8d8d1cc72ce11253d01854219ea20a06 NAME nibbles FILENAME nibbles DEPS - ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180430-git SIBLINGS NIL + SHA256 0z25f2z54pnz1s35prqvnl42bv0xqh50y94bds1jwfv0wvfq27la URL + http://beta.quicklisp.org/archive/nibbles/2018-08-31/nibbles-20180831-git.tgz + MD5 4badf1f066a59c3c270d40be1116ecd5 NAME nibbles FILENAME nibbles DEPS + ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180831-git SIBLINGS NIL PARASITES (nibbles/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index 5c1f90220eb3..e636df0805e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''parse-number''; version = ''v1.7''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 2bde901ad43e..0a1591d7c424 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20180228-git''; + version = ''20180831-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz''; - sha256 = ''0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01''; + url = ''http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz''; + sha256 = ''0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf''; }; packageName = "plump"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01 URL - http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz - MD5 f210bc3fae00bac3140d939cbb2fd1de NAME plump FILENAME plump DEPS + 0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf URL + http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz + MD5 5a899a19906fd22fb0cb1c65eb584891 NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION - 20180228-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + 20180831-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix index c90b252313bf..ffa2e595c26a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''ptester''; version = ''20160929-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index 41ead034791a..25d535176a6a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''rfc2388''; - version = ''20130720-git''; + version = ''20180831-git''; description = ''Implementation of RFC 2388''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz''; - sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6''; + url = ''http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz''; + sha256 = ''1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33''; }; packageName = "rfc2388"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM rfc2388 DESCRIPTION Implementation of RFC 2388 SHA256 - 1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6 URL - http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz - MD5 10a8bfea588196b1147d5dc7bf759bb1 NAME rfc2388 FILENAME rfc2388 DEPS NIL - DEPENDENCIES NIL VERSION 20130720-git SIBLINGS NIL PARASITES NIL) */ + 1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33 URL + http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz + MD5 f57e3c588e5e08210516260e67d69226 NAME rfc2388 FILENAME rfc2388 DEPS NIL + DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix index 8ed7c1a44993..d5be4be7daf4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''rt''; version = ''20101006-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index d55f7700092c..9056cfbdcca8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''salza2''; version = ''2.0.9''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 07b1498f2e3f..b1e89b3eef8a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''simple-date''; - version = ''postmodern-20180430-git''; + version = ''postmodern-20180831-git''; - parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; + parasites = [ "simple-date/postgres-glue" ]; description = ''''; - deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; + deps = [ args."cl-postgres" args."md5" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz''; - sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz''; + sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx''; }; packageName = "simple-date"; @@ -20,12 +20,12 @@ rec { overrides = x: x; } /* (SYSTEM simple-date DESCRIPTION NIL SHA256 - 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL - http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz - MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME simple-date FILENAME simple-date + 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL + http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz + MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME simple-date FILENAME simple-date DEPS - ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam) - (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket)) - DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION - postmodern-20180430-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES - (simple-date/postgres-glue simple-date/tests)) */ + ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5) + (NAME usocket FILENAME usocket)) + DEPENDENCIES (cl-postgres md5 usocket) VERSION postmodern-20180831-git + SIBLINGS (cl-postgres postmodern s-sql) PARASITES + (simple-date/postgres-glue)) */ 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 index 9cc6338c8b89..17a56c09b7e8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''string-case''; - version = ''20151218-git''; + version = ''20180711-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''; + url = ''http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz''; + sha256 = ''1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z''; }; packageName = "string-case"; @@ -19,7 +19,7 @@ rec { } /* (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) */ + SHA256 1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z URL + http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz + MD5 145c4e13f1e90a070b0a95ca979a9680 NAME string-case FILENAME string-case + DEPS NIL DEPENDENCIES NIL VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index 883e648a2f68..bb39c74c9625 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20180430-git''; + version = ''20180831-git''; description = ''A tiling, keyboard driven window manager''; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz''; - sha256 = ''0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz''; + sha256 = ''1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w''; }; packageName = "stumpwm"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m URL - http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz - MD5 40e1be3872e6a87a6f9e03f8ede5e48e NAME stumpwm FILENAME stumpwm DEPS + 1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w URL + http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz + MD5 a523654c5f7ffdfe6c6c4f37e9499851 NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180430-git SIBLINGS NIL - PARASITES NIL) */ + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180831-git SIBLINGS + (stumpwm-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 6819e4b25713..9734118526c6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''swank''; - version = ''slime-v2.20''; + version = ''slime-v2.22''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz''; - sha256 = ''0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26''; + url = ''http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz''; + sha256 = ''0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk''; }; packageName = "swank"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM swank DESCRIPTION NIL SHA256 - 0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26 URL - http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz MD5 - 115188047b753ce1864586e114ecb46c NAME swank FILENAME swank DEPS NIL - DEPENDENCIES NIL VERSION slime-v2.20 SIBLINGS NIL PARASITES NIL) */ + 0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk URL + http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz MD5 + edf090905d4f3a54ef62f8c13972bba5 NAME swank FILENAME swank DEPS NIL + DEPENDENCIES NIL VERSION slime-v2.22 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index a772694b9830..9a4afce3280f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''trivial-backtrace''; version = ''20160531-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 5efc57669552..1a562c2288bb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''trivial-features''; version = ''20161204-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index 9a285fea2f18..edb01bd2fc52 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''trivial-gray-streams''; - version = ''20180328-git''; + version = ''20180831-git''; description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz''; - sha256 = ''01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f''; + url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz''; + sha256 = ''0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170''; }; packageName = "trivial-gray-streams"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-gray-streams DESCRIPTION Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams). - SHA256 01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f URL - http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz - MD5 9f831cbb7a4efe93eaa8fa2acee4b01b NAME trivial-gray-streams FILENAME - trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180328-git + SHA256 0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170 URL + http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz + MD5 070733919aa016a508b2ecb443e37c80 NAME trivial-gray-streams FILENAME + trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index e044f097701d..4214779af320 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''trivial-indent''; - version = ''20180131-git''; + version = ''20180831-git''; description = ''A very simple library to allow indentation hints for SWANK.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz''; - sha256 = ''1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w''; + url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz''; + sha256 = ''017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m''; }; packageName = "trivial-indent"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 - 1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w URL - http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz - MD5 a915258466d07465da1f71476bf59d12 NAME trivial-indent FILENAME - trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL + 017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m URL + http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz + MD5 0cc411500f5aa677cd771d45f4cd21b8 NAME trivial-indent FILENAME + trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index 6946141f1121..f06c0d7ebf57 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''trivial-mimes''; - version = ''20180131-git''; + version = ''20180831-git''; description = ''Tiny library to detect mime types in files.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz''; - sha256 = ''0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b''; + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz''; + sha256 = ''0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr''; }; packageName = "trivial-mimes"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 - 0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b URL - http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz - MD5 9c91e72a8ee2455f9c5cbba1f7d2fcef NAME trivial-mimes FILENAME - trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL + 0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr URL + http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz + MD5 503680e90278947d888bcbe3338c74e3 NAME trivial-mimes FILENAME + trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 1af66736f30f..8cc04c2c64ac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''trivial-types''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index 753f21dbcb96..c925382d81d4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''trivial-utf-8''; version = ''20111001-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 0ac190993d80..1986f7c88f7a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''uffi''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index afb8b3885681..fdaa07109b49 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''uiop''; - version = ''3.3.1''; + version = ''3.3.2''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz''; - sha256 = ''0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc''; + url = ''http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz''; + sha256 = ''1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5''; }; packageName = "uiop"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM uiop DESCRIPTION NIL SHA256 - 0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc URL - http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz MD5 - 7a90377c4fc96676d5fa5197d9e9ec11 NAME uiop FILENAME uiop DEPS NIL - DEPENDENCIES NIL VERSION 3.3.1 SIBLINGS (asdf-driver) PARASITES NIL) */ + 1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5 URL + http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz MD5 + 8d7b7b4065873107147678c6ef72e5ee NAME uiop FILENAME uiop DEPS NIL + DEPENDENCIES NIL VERSION 3.3.2 SIBLINGS (asdf-driver) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix index 3a4b05e05269..6c4564967320 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''unit-test''; version = ''20120520-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index b4b4f4543a10..6d02b9764701 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''usocket''; - version = ''0.7.0.1''; + version = ''0.7.1''; description = ''Universal socket library for Common Lisp''; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz''; - sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2''; + url = ''http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz''; + sha256 = ''18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw''; }; packageName = "usocket"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 - 1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL - http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz - MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket FILENAME usocket DEPS + 18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw URL + http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz MD5 + fb48ff59f0d71bfc9c2939aacdb123a0 NAME usocket FILENAME usocket DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES - (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test) + (split-sequence) VERSION 0.7.1 SIBLINGS (usocket-server usocket-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index 11b9351c03ad..6a4751f799ea 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''vom''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index cc5c23faf862..4a36b6563534 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''woo''; - version = ''20170830-git''; + version = ''20180831-git''; description = ''An asynchronous HTTP server written in Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz''; - sha256 = ''130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv''; + url = ''http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz''; + sha256 = ''142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8''; }; packageName = "woo"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp - SHA256 130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv URL - http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz MD5 - 3f506a771b3d8f2c7fc97b049dcfdedf NAME woo FILENAME woo DEPS + SHA256 142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8 URL + http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz MD5 + 93dfbc504ebd4fa7ed5f444fcc5444e7 NAME woo FILENAME woo DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -43,4 +43,4 @@ rec { cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse quri smart-buffer split-sequence static-vectors swap-bytes trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq) - VERSION 20170830-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ + VERSION 20180831-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index 8c4afa9697d8..6db21bf9005e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''wookie''; - version = ''20180228-git''; + version = ''20180831-git''; description = ''An evented webserver for Common Lisp.''; deps = [ args."alexandria" args."babel" args."babel-streams" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz''; - sha256 = ''1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq''; + url = ''http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz''; + sha256 = ''1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx''; }; packageName = "wookie"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 - 1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq URL - http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz - MD5 7cd3d634686e532f2c6e2f5f2d4e1dae NAME wookie FILENAME wookie DEPS + 1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx URL + http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz + MD5 c825760241580a95c68b1ac6f428e07e NAME wookie FILENAME wookie DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) (NAME blackbird FILENAME blackbird) @@ -49,4 +49,4 @@ rec { cl-fad cl-libuv cl-ppcre cl-utilities do-urlencode fast-http fast-io flexi-streams proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-gray-streams vom xsubseq) - VERSION 20180228-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index c70c3f2e1e12..b9ab71744c3a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''xsubseq''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix index 733185e2b26f..c7031f4aa3fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''yacc''; version = ''cl-20101006-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 090aa670ad9e..74e5d7e97e95 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -1,4 +1,4 @@ -{ fetchurl, ... }: +args @ { fetchurl, ... }: rec { baseName = ''zpb-ttf''; version = ''1.0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 91493d7431e8..face797fe2a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -48,7 +48,7 @@ in cl_plus_ssl = addNativeLibs [pkgs.openssl]; cl-colors = skipBuildPhase; cl-libuv = addNativeLibs [pkgs.libuv]; - cl-async-ssl = addNativeLibs [pkgs.openssl]; + cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)]; cl-async-test = addNativeLibs [pkgs.openssl]; clsql = x: { propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib]; @@ -143,7 +143,8 @@ $out/lib/common-lisp/query-fs" fiveam md5 usocket ]; parasites = [ - "simple-date/tests" + # Needs pomo? Wants to do queries unconditionally? + # "simple-date/tests" ]; }; cl-postgres = x: { diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 71d974d9711b..8a126d4fd986 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,9 +6,6 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; - "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; - - "unit-test" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."unit-test" or (x: {})) @@ -17,14 +14,6 @@ let quicklisp-to-nix-packages = rec { })); - "clack-socket" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clack-socket" or (x: {})) - (import ./quicklisp-to-nix-output/clack-socket.nix { - inherit fetchurl; - })); - - "stefil" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."stefil" or (x: {})) @@ -106,14 +95,6 @@ let quicklisp-to-nix-packages = rec { })); - "rfc2388" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."rfc2388" or (x: {})) - (import ./quicklisp-to-nix-output/rfc2388.nix { - inherit fetchurl; - })); - - "net_dot_didierverna_dot_asdf-flv" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."net_dot_didierverna_dot_asdf-flv" or (x: {})) @@ -142,7 +123,6 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; - "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -255,6 +235,7 @@ let quicklisp-to-nix-packages = rec { "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "puri" = quicklisp-to-nix-packages."puri"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "swank" = quicklisp-to-nix-packages."swank"; @@ -287,6 +268,7 @@ let quicklisp-to-nix-packages = rec { "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "puri" = quicklisp-to-nix-packages."puri"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "swank" = quicklisp-to-nix-packages."swank"; @@ -364,14 +346,6 @@ let quicklisp-to-nix-packages = rec { })); - "md5" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."md5" or (x: {})) - (import ./quicklisp-to-nix-output/md5.nix { - inherit fetchurl; - })); - - "clsql-uffi" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clsql-uffi" or (x: {})) @@ -498,6 +472,7 @@ let quicklisp-to-nix-packages = rec { "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; })); @@ -510,6 +485,7 @@ let quicklisp-to-nix-packages = rec { "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; })); @@ -565,6 +541,14 @@ let quicklisp-to-nix-packages = rec { })); + "rfc2388" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."rfc2388" or (x: {})) + (import ./quicklisp-to-nix-output/rfc2388.nix { + inherit fetchurl; + })); + + "named-readtables" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."named-readtables" or (x: {})) @@ -589,6 +573,14 @@ let quicklisp-to-nix-packages = rec { })); + "md5" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."md5" or (x: {})) + (import ./quicklisp-to-nix-output/md5.nix { + inherit fetchurl; + })); + + "map-set" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."map-set" or (x: {})) @@ -688,11 +680,14 @@ let quicklisp-to-nix-packages = rec { "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "clack" = quicklisp-to-nix-packages."clack"; + "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; + "clack-socket" = quicklisp-to-nix-packages."clack-socket"; "dexador" = quicklisp-to-nix-packages."dexador"; "fast-http" = quicklisp-to-nix-packages."fast-http"; "fast-io" = quicklisp-to-nix-packages."fast-io"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "http-body" = quicklisp-to-nix-packages."http-body"; + "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "jonathan" = quicklisp-to-nix-packages."jonathan"; "lack" = quicklisp-to-nix-packages."lack"; @@ -701,14 +696,17 @@ let quicklisp-to-nix-packages = rec { "lack-util" = quicklisp-to-nix-packages."lack-util"; "let-plus" = quicklisp-to-nix-packages."let-plus"; "local-time" = quicklisp-to-nix-packages."local-time"; + "md5" = quicklisp-to-nix-packages."md5"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "nibbles" = quicklisp-to-nix-packages."nibbles"; "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "prove" = quicklisp-to-nix-packages."prove"; "quri" = quicklisp-to-nix-packages."quri"; + "rfc2388" = quicklisp-to-nix-packages."rfc2388"; "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; @@ -719,6 +717,42 @@ let quicklisp-to-nix-packages = rec { })); + "clack-socket" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack-socket" or (x: {})) + (import ./quicklisp-to-nix-output/clack-socket.nix { + inherit fetchurl; + })); + + + "clack-handler-hunchentoot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack-handler-hunchentoot" or (x: {})) + (import ./quicklisp-to-nix-output/clack-handler-hunchentoot.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "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"; + "clack-socket" = quicklisp-to-nix-packages."clack-socket"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; + "md5" = quicklisp-to-nix-packages."md5"; + "rfc2388" = quicklisp-to-nix-packages."rfc2388"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + "cl-syntax" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-syntax" or (x: {})) @@ -1056,7 +1090,6 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/simple-date.nix { inherit fetchurl; "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; - "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -1692,6 +1725,7 @@ let quicklisp-to-nix-packages = rec { "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "parse-number" = quicklisp-to-nix-packages."parse-number"; "puri" = quicklisp-to-nix-packages."puri"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; @@ -1728,6 +1762,7 @@ let quicklisp-to-nix-packages = rec { "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "puri" = quicklisp-to-nix-packages."puri"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "string-case" = quicklisp-to-nix-packages."string-case"; @@ -1763,6 +1798,7 @@ let quicklisp-to-nix-packages = rec { "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "puri" = quicklisp-to-nix-packages."puri"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "swank" = quicklisp-to-nix-packages."swank"; @@ -2254,6 +2290,7 @@ let quicklisp-to-nix-packages = rec { "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; })); @@ -2420,12 +2457,15 @@ let quicklisp-to-nix-packages = rec { "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "clack" = quicklisp-to-nix-packages."clack"; + "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; + "clack-socket" = quicklisp-to-nix-packages."clack-socket"; "clack-test" = quicklisp-to-nix-packages."clack-test"; "dexador" = quicklisp-to-nix-packages."dexador"; "fast-http" = quicklisp-to-nix-packages."fast-http"; "fast-io" = quicklisp-to-nix-packages."fast-io"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "http-body" = quicklisp-to-nix-packages."http-body"; + "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "jonathan" = quicklisp-to-nix-packages."jonathan"; "lack" = quicklisp-to-nix-packages."lack"; @@ -2435,11 +2475,13 @@ let quicklisp-to-nix-packages = rec { "let-plus" = quicklisp-to-nix-packages."let-plus"; "local-time" = quicklisp-to-nix-packages."local-time"; "marshal" = quicklisp-to-nix-packages."marshal"; + "md5" = quicklisp-to-nix-packages."md5"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "nibbles" = quicklisp-to-nix-packages."nibbles"; "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "prove" = quicklisp-to-nix-packages."prove"; "quri" = quicklisp-to-nix-packages."quri"; + "rfc2388" = quicklisp-to-nix-packages."rfc2388"; "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; @@ -2555,6 +2597,8 @@ let quicklisp-to-nix-packages = rec { "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "clack" = quicklisp-to-nix-packages."clack"; + "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; + "clack-socket" = quicklisp-to-nix-packages."clack-socket"; "clack-test" = quicklisp-to-nix-packages."clack-test"; "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat"; "dexador" = quicklisp-to-nix-packages."dexador"; @@ -2563,6 +2607,7 @@ let quicklisp-to-nix-packages = rec { "fast-io" = quicklisp-to-nix-packages."fast-io"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "http-body" = quicklisp-to-nix-packages."http-body"; + "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "jonathan" = quicklisp-to-nix-packages."jonathan"; "lack" = quicklisp-to-nix-packages."lack"; @@ -2573,12 +2618,14 @@ let quicklisp-to-nix-packages = rec { "local-time" = quicklisp-to-nix-packages."local-time"; "map-set" = quicklisp-to-nix-packages."map-set"; "marshal" = quicklisp-to-nix-packages."marshal"; + "md5" = quicklisp-to-nix-packages."md5"; "myway" = quicklisp-to-nix-packages."myway"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "nibbles" = quicklisp-to-nix-packages."nibbles"; "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "prove" = quicklisp-to-nix-packages."prove"; "quri" = quicklisp-to-nix-packages."quri"; + "rfc2388" = quicklisp-to-nix-packages."rfc2388"; "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index 9eba1e15b799..b3d50b2fb075 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -1,5 +1,6 @@ with import ../../../default.nix {}; let +openssl_lib_marked = import ./openssl-lib-marked.nix; self = rec { name = "ql-to-nix"; env = buildEnv { name = name; paths = buildInputs; }; @@ -10,6 +11,6 @@ self = rec { lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib"; }; in stdenv.mkDerivation self From e0c081c6ac817eac903587eca6dadb2dd6a84276 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 12 Sep 2018 11:55:56 +0200 Subject: [PATCH 545/600] haskell-cabal2nix: update override for hpack 0.31.0 * pkgs/development/haskell-modules/configuration-common.nix: --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 11772dd7d555..2f89623ecdeb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1076,7 +1076,7 @@ self: super: { # The tool needs a newer hpack version than the one mandated by LTS-12.x. cabal2nix = super.cabal2nix.overrideScope (self: super: { - hpack = self.hpack_0_30_0; + hpack = self.hpack_0_31_0; yaml = self.yaml_0_10_1_1; }); From 515a7aa4523bf8948d48e517c50e7258fee69bf2 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 24 May 2018 00:52:05 +0200 Subject: [PATCH 546/600] acme module: fix self-signed cert with openssl 1.1 --- nixos/modules/security/acme.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 946da92d80e7..092704c6fc3f 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -302,15 +302,15 @@ in workdir="$(mktemp -d)" # Create CA - openssl genrsa -des3 -passout pass:x -out $workdir/ca.pass.key 2048 - openssl rsa -passin pass:x -in $workdir/ca.pass.key -out $workdir/ca.key + openssl genrsa -des3 -passout pass:xxxx -out $workdir/ca.pass.key 2048 + openssl rsa -passin pass:xxxx -in $workdir/ca.pass.key -out $workdir/ca.key openssl req -new -key $workdir/ca.key -out $workdir/ca.csr \ -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=Security Department/CN=example.com" openssl x509 -req -days 1 -in $workdir/ca.csr -signkey $workdir/ca.key -out $workdir/ca.crt # Create key - openssl genrsa -des3 -passout pass:x -out $workdir/server.pass.key 2048 - openssl rsa -passin pass:x -in $workdir/server.pass.key -out $workdir/server.key + openssl genrsa -des3 -passout pass:xxxx -out $workdir/server.pass.key 2048 + openssl rsa -passin pass:xxxx -in $workdir/server.pass.key -out $workdir/server.key openssl req -new -key $workdir/server.key -out $workdir/server.csr \ -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com" openssl x509 -req -days 1 -in $workdir/server.csr -CA $workdir/ca.crt \ From 1f2babe59f1f5b77e049063b05885d88a668cc62 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Wed, 12 Sep 2018 14:47:45 +0300 Subject: [PATCH 547/600] android-file-transfer: 3.4 -> 3.5 --- pkgs/tools/filesystems/android-file-transfer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 40725defbed9..336dc785bbfd 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "android-file-transfer-${version}"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "1xwl0vk57174gdjhgqkzrirwzd2agdm84q30dq9q376ixgxjrifc"; + sha256 = "036hca41ikgnw4maykjdp53l31rm01mgamy9y56i5qqh84cwmls2"; }; buildInputs = [ cmake fuse readline pkgconfig qtbase ]; buildPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; - homepage = http://whoozle.github.io/android-file-transfer-linux/; + homepage = https://whoozle.github.io/android-file-transfer-linux/; license = licenses.lgpl21; maintainers = [ maintainers.xaverdh ]; platforms = platforms.linux; From 929f71d3811680e9cbfb437878f454f77aefd35f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 19 Jul 2018 21:03:38 +0200 Subject: [PATCH 548/600] grafana module: allow path for extraConfig vals --- nixos/modules/services/monitoring/grafana.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 3e801f9b838d..c30647f5460b 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -235,7 +235,7 @@ in { but without GF_ prefix ''; default = {}; - type = types.attrsOf types.str; + type = with types; attrsOf (either str path); }; }; From 139eb11a6d471bb78aed90d6da827f66f727c429 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 11 Sep 2018 22:56:51 +0200 Subject: [PATCH 549/600] alock: mark linux only The darwin build fails and it's probably not particularly useful there. utils.c:33:19: error: use of undeclared identifier 'CLOCK_MONOTONIC' clock_gettime(CLOCK_MONOTONIC, &t); /cc ZHF #45961 --- pkgs/misc/screensavers/alock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 596668b0ce96..59d5a146e165 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { xscreensaver and never will. It's just for locking the current X session. ''; - platforms = platforms.unix; # Cygwin had problems at one point + platforms = platforms.linux; maintainers = with maintainers; [ ftrvxmtrx chris-martin ]; license = licenses.mit; }; From 80a4e48e4509a9545e582a4258d9948dca2454c5 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 20:07:49 +0200 Subject: [PATCH 550/600] asio: mark broken on darwin Started to fail since 1.12.1. Undefined symbols for architecture x86_64: "boost::chrono::steady_clock::now()", referenced from: pinger::start_send() in ping.o asio::detail::timer_queue > >::wait_duration_msec(long) const in ping.o asio::detail::timer_queue > >::wait_duration_usec(long) const in ping.o asio::detail::timer_queue > >::get_ready_timers(asio::detail::op_queue&) in ping.o pinger::handle_receive(unsigned long) in p /cc ZHF #45961 --- pkgs/development/libraries/asio/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index 58dd4f614231..72305cb633fb 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { homepage = http://asio.sourceforge.net/; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; + broken = stdenv.isDarwin; # test when updating to >=1.12.1 platforms = platforms.unix; }; } From 37961c65073de7d642d66ea91c66977d8e537e5e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 12 Sep 2018 20:34:17 +0200 Subject: [PATCH 551/600] scdoc: 1.4.1 -> 1.4.2 --- pkgs/tools/typesetting/scdoc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 16b7a734c22d..bdf074b558e7 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz"; - sha256 = "14nabq1hrz5jvilx22yxbqjsd9s4ll0fnl750n1qbyyxw2m6vj9b"; + sha256 = "1hhvg9cifx1v8b5i91lgq5cjdcskzl3rz7vwmwdq7ad0nqnykz82"; }; postPatch = '' substituteInPlace Makefile \ --replace "-static" "" \ --replace "/usr/local" "$out" + # It happens from time to time that the version wasn't updated: + sed -iE 's/VERSION=[0-9]\.[0-9]\.[0-9]/VERSION=${version}/' Makefile ''; doCheck = true; From 0fe81b0d543b5e34ef0f7c5d699d65ee7e467186 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 12 Sep 2018 20:35:28 +0200 Subject: [PATCH 552/600] androidStudioPackages.{dev,canary}: 3.3.0.7 -> 3.3.0.9 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 38d252b345d1..2385cd31cfaa 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp"; }; latestVersion = { # canary & dev - version = "3.3.0.7"; # "Android Studio 3.3 Canary 8" - build = "182.4978721"; - sha256Hash = "0xa19wrw1a6y7f2jdv8699yqv7g34h3zdw3wc0ql0447afzwg9a9"; + version = "3.3.0.9"; # "Android Studio 3.3 Canary 10" + build = "182.4996246"; + sha256Hash = "0g6hhfhlfj9szw48z22n869n6d0rw5fhljazj63dmw6i4v6rd92g"; }; in rec { # Old alias From f1542f612b1a85871676751e8fd4f1940a6ec514 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 20:49:10 +0200 Subject: [PATCH 553/600] atlas: mark broken on darwin Started to fail since 3.10.3. /private/tmp/nix-build-atlas-3.10.3.drv-0/ATLAS/build/bin/ATLrun.sh: line 4: 31119 Segmentation fault: 11 $atldir/$* make[3]: *** [Makefile:1695: ssanity_test] Error 139 /cc ZHF #45961 --- pkgs/development/libraries/science/math/atlas/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 8b740bdb6f6d..fb90ed754da9 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation { homepage = http://math-atlas.sourceforge.net/; description = "Automatically Tuned Linear Algebra Software (ATLAS)"; license = stdenv.lib.licenses.bsd3; + broken = stdenv.isDarwin; # test when updating to >=3.10.3 platforms = stdenv.lib.platforms.unix; longDescription = '' From d726c0ff1dcf4bbe3ac4fc6df5d0635d9d00e69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Wed, 12 Sep 2018 00:17:44 +0200 Subject: [PATCH 554/600] scs: Fix darwin build Additionally we make the unit-test deterministic by specifying a seed instead of using something random. --- .../libraries/science/math/scs/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 0539083e823c..f9d1a84b1f03 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, blas, liblapack, gfortran }: +{ stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "scs-${version}"; @@ -11,24 +11,30 @@ stdenv.mkDerivation rec { sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9"; }; - buildInputs = [ blas liblapack gfortran.cc.lib ]; - # Actually link and add libgfortran to the rpath - patchPhase = '' - sed -i 's/#-lgfortran/-lgfortran/' scs.mk + postPatch = '' + substituteInPlace scs.mk \ + --replace "#-lgfortran" "-lgfortran" \ + --replace "gcc" "cc" ''; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = [ blas liblapack gfortran.cc.lib ]; + doCheck = true; - # Test demo requires passing any int as $1; 42 chosen arbitrarily - checkPhase = '' - ./out/demo_socp_indirect 42 + # Test demo requires passing data and seed; numbers chosen arbitrarily. + postCheck = '' + ./out/demo_socp_indirect 42 0.42 0.42 42 ''; installPhase = '' + runHook preInstall mkdir -p $out/lib cp -r include $out/ - cp out/*.a out/*.so $out/lib/ + cp out/*.a out/*.so out/*.dylib $out/lib/ + runHook postInstall ''; meta = with stdenv.lib; { From cf9d1a6d3043c46c75c2eb60c4627cb77b595bcc Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 20:55:53 +0200 Subject: [PATCH 555/600] bitcoin-abc: mark broken on darwin Last successful build https://hydra.nixos.org/build/74552872. /cc ZHF #45961 --- pkgs/applications/altcoins/bitcoin-abc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index bd365e167304..1e11f0eefc4b 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { homepage = https://bitcoinabc.org/; maintainers = with maintainers; [ lassulus ]; license = licenses.mit; + broken = stdenv.isDarwin; platforms = platforms.unix; }; } From d990bae6ef6448aac894c58b601cd6824ba3f2ba Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 20:58:23 +0200 Subject: [PATCH 556/600] bitcoin-classic: mark broken on darwin Last successful build https://hydra.nixos.org/build/74552951. /cc ZHF #45961 --- pkgs/applications/altcoins/bitcoin-classic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index 31c8ed6fc8d0..34faf77e980d 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { homepage = https://bitcoinclassic.com/; maintainers = with maintainers; [ jefdaj ]; license = licenses.mit; + broken = stdenv.isDarwin; platforms = platforms.unix; }; } From eaff0b74c035077c2b2b1e6e14be6f704247080c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 21:01:03 +0200 Subject: [PATCH 557/600] bitcoin-unlimited: mark broken on darwin /cc ZHF #45961 --- pkgs/applications/altcoins/bitcoin-unlimited.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index 5a67dc565aa7..13ec55bb589d 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { homepage = https://www.bitcoinunlimited.info/; maintainers = with maintainers; [ DmitryTsygankov ]; license = licenses.mit; + broken = stdenv.isDarwin; platforms = platforms.unix; }; } From 8f6ede967e00242a2944e88cfb24486814995798 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 21:02:24 +0200 Subject: [PATCH 558/600] bitcoin-xt: mark broken on darwin /cc ZHF #45961 --- pkgs/applications/altcoins/bitcoin-xt.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index feb2924f8651..cab1b388a126 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec{ homepage = https://bitcoinxt.software/; maintainers = with maintainers; [ jefdaj ]; license = licenses.mit; + broken = stdenv.isDarwin; platforms = platforms.unix; }; } From e7ecf593e27e9505c51fba93c260e892c17cdf06 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 21:04:48 +0200 Subject: [PATCH 559/600] ethsign: mark broken on darwin Could be caused by our older 10.10.5 CoreFoundation. go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:51:216: cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:162:47: cannot use nil as type _Ctype_CFAllocatorRef in argument to _Cfunc_CFStringCreateWithCStringNoCopy go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:163:225: cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal /cc ZHF #45961 --- pkgs/applications/altcoins/ethsign/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix index 35fd4bc718c8..8e89de4d6906 100644 --- a/pkgs/applications/altcoins/ethsign/default.nix +++ b/pkgs/applications/altcoins/ethsign/default.nix @@ -54,6 +54,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://github.com/dapphub/ethsign; description = "Make raw signed Ethereum transactions"; + broken = stdenv.isDarwin; # test with CoreFoundation 10.11 license = [licenses.gpl3]; }; } From 1e379f29f7ff009b5c353998bb4d1662b69790b5 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 12 Sep 2018 21:05:49 +0200 Subject: [PATCH 560/600] electrum: 3.1.3 -> 3.2.3 --- pkgs/applications/misc/electrum/default.nix | 26 ++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ed2f0626e5d2..95754579c487 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,12 +1,24 @@ { stdenv, fetchurl, python3, python3Packages, zbar }: +let + qdarkstyle = python3Packages.buildPythonPackage rec { + pname = "QDarkStyle"; + version = "2.5.4"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1w715m1i5pycfqcpkrggpn0rs9cakx6cm5v8rggcxnf4p0i0kdiy"; + }; + doCheck = false; # no tests + }; +in + python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.1.3"; + version = "3.2.3"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "05m28yd3zr9awjhaqikf4rg08j5i4ygm750ip1z27wl446sysniy"; + sha256 = "022iw4cq0c009wvqn7wd815jc0nv8198lq3cawn8h6c28hw2mhs1"; }; propagatedBuildInputs = with python3Packages; [ @@ -17,12 +29,14 @@ python3Packages.buildPythonApplication rec { pbkdf2 protobuf pyaes - pycrypto + pycryptodomex pyqt5 pysocks + qdarkstyle qrcode requests tlslite + typing # plugins keepkey @@ -35,10 +49,10 @@ python3Packages.buildPythonApplication rec { preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc5 icons.qrc -o gui/qt/icons_rc.py + pyrcc5 icons.qrc -o electrum/gui/qt/icons_rc.py # Recording the creation timestamps introduces indeterminism to the build - sed -i '/Created: .*/d' gui/qt/icons_rc.py - sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" lib/qrscanner.py + sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py + sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py ''; postInstall = '' From 7880cd67525d58c7da0f4858ef29dd25af0ce89e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 Sep 2018 20:21:29 +0100 Subject: [PATCH 561/600] vault: 0.10.4 -> 0.11.1 changelog: https://github.com/hashicorp/vault/blob/v0.11.1/CHANGELOG.md --- pkgs/tools/security/vault/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index a9e8d8fca351..091b17c6ffe1 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,13 +9,13 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.10.4"; + version = "0.11.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1f11arvj7zp8wwkvv3nn7kyga0ci8psdif6djrnzwjksskdgdbx5"; + sha256 = "1ydnb9z6rd5ck6wza5ir6927xq375i1a9zh5p2xanp29ly6ijiiz"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70b30adddb62..275529ae561e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22054,9 +22054,7 @@ with pkgs; valauncher = callPackage ../applications/misc/valauncher { }; - vault = callPackage ../tools/security/vault { - go = go_1_10; - }; + vault = callPackage ../tools/security/vault { }; vaultenv = haskellPackages.vaultenv; From c3c427026788e50ce78aa333bd3d515ce863e6ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:41:44 -0700 Subject: [PATCH 562/600] worker: 3.15.1 -> 3.15.2 (#46155) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from worker --- pkgs/applications/misc/worker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index bfb43d3e49d1..f9267411dda4 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.15.1"; + version = "3.15.2"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "05h25dxqff4xhmrk7j9j11yxpqa4qm7m3xprv7yldryc1mbvnpwi"; + sha256 = "0km17ls51vp4nxlppf58vvxxymyx6w3xlzjc8wghxpjj098v4pp8"; }; buildInputs = [ libX11 ]; From a2d959c35fd0f65d8a2e5f56549e7c501e3d90f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:42:44 -0700 Subject: [PATCH 563/600] tinyproxy: 1.8.4 -> 1.10.0 (#46171) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from tinyproxy --- pkgs/tools/networking/tinyproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 8ecc85544354..809286cefe96 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec{ name = "tinyproxy-${version}"; - version = "1.8.4"; + version = "1.10.0"; src = fetchFromGitHub { - sha256 = "043mfqin5bsba9igm1lqbkp2spibk4j3niyjqc868cnzgx60709c"; + sha256 = "0gzapnllzyc005l3rs6iarjk1p5fc8mf9ysbck1mbzbd8xg6w35s"; rev = "${version}"; repo = "tinyproxy"; owner = "tinyproxy"; From cdf162eafb9bf593419d69af5253777b91c3da97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:48:50 -0700 Subject: [PATCH 564/600] uftp: 4.9.7 -> 4.9.8 (#46175) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from uftp --- pkgs/servers/uftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index a484e0382104..768fdf0b46f8 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.7"; + version = "4.9.8"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "1gh1zpc6dh690xjhfp5x2ajhwjkchyh5wazr8agm6axxwqhd9gn8"; + sha256 = "16g54372xy5apk485xz9bp1hfci15mssw7m7givls4lpwhc67379"; }; buildInputs = [ openssl ]; From c4e8db3de02c7ceee6d0e0d7bb366c1464a34129 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:49:12 -0700 Subject: [PATCH 565/600] star: 2.6.0c -> 2.6.1a (#46176) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from star --- pkgs/applications/science/biology/star/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index f52df902db6a..c552d9f9de35 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "star-${version}"; - version = "2.6.0c"; + version = "2.6.1a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "04cj6jw8d9q6lk9c78wa4fky6jdlicf1d13plq7182h8vqiz8p59"; + sha256 = "11zs32d96gpjldrylz3nr5r2qrshf0nmzh5nmcy4wrk7y5lz81xc"; }; sourceRoot = "source/source"; From 626dac304a903aa32dd9096f5a692366f3751b6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:50:40 -0700 Subject: [PATCH 566/600] snd: 18.6 -> 18.7 (#46184) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from snd --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 7c96fd364c18..0709917a0442 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.6"; + name = "snd-18.7"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1jyqkkz2a6zw0jn9y15xd3027r8glkpw794fjk6hd3al1byjhz2z"; + sha256 = "1d7g043r534shwsq5s4xsywgn5qv96v9wnhdx04j21s9w7fy9ypl"; }; nativeBuildInputs = [ pkgconfig ]; From 1b5744a42db755aa651278985bd255b2cf304a5d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:52:09 -0700 Subject: [PATCH 567/600] radarr: 0.2.0.995 -> 0.2.0.1120 (#46185) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from radarr --- pkgs/servers/radarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 5fd23476d7da..8d920af654da 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.995"; + version = "0.2.0.1120"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "04sgs292qz65fcg5vsps0fk2669xzvyfw1rbc5sbbk3hig5lhlns"; + sha256 = "0vsjaza0k4djb3vnazl2py4qmbxqfyyr0x9p4flq78yn79hp3439"; }; buildInputs = [ makeWrapper ]; From 0837ff1108f0b3e8292fb525a098a328ee7ca15e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:52:56 -0700 Subject: [PATCH 568/600] sec: 2.7.12 -> 2.8.0 (#46199) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from sec --- pkgs/tools/admin/sec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index f7b6aaa76c68..dede514729ec 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,11 +1,11 @@ { fetchurl, perl, stdenv }: stdenv.mkDerivation rec { - name = "sec-2.7.12"; + name = "sec-2.8.0"; src = fetchurl { url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz"; - sha256 = "0f5a2nkd5cmg1rziizz2gmgdwb5dz99x9pbxw30p384rjh79zcaa"; + sha256 = "0q9fhkkh0n0jya4kf5c54smk4xbnv01hqhip2y6fnnj9imwskymz"; }; buildInputs = [ perl ]; From 124c6581000263b1efe6635e54e460f9aabf166f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:53:27 -0700 Subject: [PATCH 569/600] rosegarden: 17.12.1 -> 18.06 (#46188) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from rosegarden --- pkgs/applications/audio/rosegarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index e57d85de05a9..0b2bd9507e55 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.12.1"; + version = "18.06"; name = "rosegarden-${version}"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; - sha256 = "155kqbxg85wqv0w97cmmx8wq0r4xb3qpnk20lfma04vj8k6hc1mg"; + sha256 = "04qc80sqb2ji42pq3mayhvqqn39hlxzymsywpbpzfpchr19chxx7"; }; patchPhase = '' From 69504d47c9c44d2e34274562f2992dbd5dc2e39b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:56:47 -0700 Subject: [PATCH 570/600] miniupnpc_2: 2.0.20180203 -> 2.1 (#46250) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from miniupnpc --- pkgs/tools/networking/miniupnpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index b4c2a6ea3970..88b4b7fab88f 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -28,8 +28,8 @@ let }; in { miniupnpc_2 = generic { - version = "2.0.20180203"; - sha256 = "1dr0qaf2qz49aawgsnv7l41rda5yvdk3qfz2hd5cv9iwav3sipch"; + version = "2.1"; + sha256 = "1ik440yspbp3clr4m01xsl9skwyrzcvzb5nbm3i0g9x53vhbb7z1"; }; miniupnpc_1 = generic { version = "1.9.20160209"; From d8b1223da9efad268484e222c9a1bfbd5a5e8aa5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:57:25 -0700 Subject: [PATCH 571/600] tilix: 1.8.3 -> 1.8.5 (#46180) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from tilix --- pkgs/applications/misc/tilix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index e101005e44ec..98e320b7aaf5 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "tilix-${version}"; - version = "1.8.3"; + version = "1.8.5"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = "${version}"; - sha256 = "05x2nyyb5w3122j90g0f7lh9jl7xi1nk176sl01vl2ks7zar00dq"; + sha256 = "1ixhkssz0xn3x75n2iw6gd3hka6bgmgwfgbvblbjhhx8gcpbw3s7"; }; nativeBuildInputs = [ From 14e7afdd95bc597b2f28f77232b237310dfcf0d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:58:07 -0700 Subject: [PATCH 572/600] lynis: 2.6.7 -> 2.6.8 (#46247) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from lynis --- pkgs/tools/security/lynis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index bb7a6a0e7724..8158a4fbfd74 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.6.7"; + version = "2.6.8"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "0ayil5bzxqaksmr79x0gxy60k8djzg0bs60jfg8qi6128q6srhar"; + sha256 = "1g7jxjqvzl78fy770vlg6n6l003nvm452i2g3wnrb1fqcwkrm6ax"; }; nativeBuildInputs = [ makeWrapper perl ]; From dd43e1d97f73f3771822b322d31459581c5d41c7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 13:58:49 -0700 Subject: [PATCH 573/600] lockfileProgs: 0.1.17 -> 0.1.18 (#46248) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from lockfile-progs --- pkgs/tools/misc/lockfile-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index 308b5217a6fc..e851855834a4 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { _name = "lockfile-progs"; - version = "0.1.17"; + version = "0.1.18"; name = "${_name}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz"; - sha256 = "04f5cvhrld15w58wkg6k2azywszsc5xp9cbmfx4jylwrak90byq3"; + sha256 = "1rjwn3fh2hy8hmpr66y8yp7v5i3325v1mk0gr7pqhqbyp6j9aad4"; }; buildInputs = [ liblockfile ]; From 654a0bd5b5795c99a843d7b7c3b4d1f50272705f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 14:03:13 -0700 Subject: [PATCH 574/600] inboxer: 1.1.2 -> 1.1.4 (#46262) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from inboxer --- pkgs/applications/networking/mailreaders/inboxer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index 390f68bd105f..4edf61ceaaed 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "inboxer-${version}"; - version = "1.1.2"; + version = "1.1.4"; meta = with stdenv.lib; { description = "Unofficial, free and open-source Google Inbox Desktop App"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "100185j10dj044mg5p9xlq7fj7n7xki9qw5xn845dgq0dpj8rkrm"; + sha256 = "1jhx7mghslk8s2h50g8avnspf2v2r8yj0i8hkhw3qy2sa91m3ck1"; }; unpackPhase = '' From e077fc1965a7fdfd179bc25d673e7d385e93ee83 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 14:05:48 -0700 Subject: [PATCH 575/600] mercurialFull: 4.7 -> 4.7.1 (#46243) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from mercurial-full --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 73cf4d74e182..41809e83b457 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.7"; + version = "4.7.1"; 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 = "17rl1lyvr3qa5x73xyiwnv09wwiwjd18f01gvispzyvpgx1v3309"; + sha256 = "03217dk8jh2ckrqqhqyahw44f5j2aq3kv03ba5v2b11i3hy3h0w5"; }; inherit python; # pass it so that the same version can be used in hg2git From 656330577a3b49bdf9f812a88f2fe3ecfabf38db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 14:06:42 -0700 Subject: [PATCH 576/600] hebcal: 4.13 -> 4.14 (#46269) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from hebcal --- pkgs/tools/misc/hebcal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index fb6944c1cf36..da231c16cc90 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.13"; + version = "4.14"; name = "hebcal-${version}"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "0h9hbfkbq620sw9gnnkivv7yi7dnp1k6axzwr0yccbv5cg67xs3h"; + sha256 = "1zq8f7cigh5r31p03az338sbygkx8gbday35c9acppglci3r8fvc"; }; nativeBuildInputs = [ autoreconfHook ]; From e94947af0ae98104013ec18a770e0e01c4bcc887 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 14:07:27 -0700 Subject: [PATCH 577/600] gromacs: 2018.2 -> 2018.3 (#46275) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from gromacs --- .../science/molecular-dynamics/gromacs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 295e726c679d..1caa84a69334 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { - name = "gromacs-2018.2"; + name = "gromacs-2018.3"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.2.tar.gz"; - sha256 = "0mvqsg2j4h529a0vvvgpa4cb3p8zan18zcdlmx1na2si1h9fipab"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.3.tar.gz"; + sha256 = "14d219987h98mv5xgn2846snmslwax8z3cgp5b2njacp4j9a88s4"; }; buildInputs = [cmake fftw] From 7f40c3a93cd30ee61976c9a4e7f67b29a97f80fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 14:10:04 -0700 Subject: [PATCH 578/600] gitAndTools.git-imerge: 1.0.0 -> 1.1.0 (#46281) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-imerge/versions --- .../version-management/git-and-tools/git-imerge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 49856552aa3b..10e786222710 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "git-imerge-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "mhagger"; repo = "git-imerge"; rev = "v${version}"; - sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74"; + sha256 = "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; From 64ab031a579ec1349167791d3a342cb4439d0520 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 14:11:11 -0700 Subject: [PATCH 579/600] focuswriter: 1.6.15 -> 1.6.16 (#46286) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/focuswriter/versions --- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 706f2f015b12..000797c9b705 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.6.15"; + version = "1.6.16"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "0afs9cm5q7zxag28m427ycwwxkbn47zw7v111x7963ydqyn9gr9q"; + sha256 = "1warfv9d485a7ysmjazxw4zvi9l0ih1021s6c5adkc86m88k296m"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; From 7d6c70bc74681221f3eeb616b0842c8ce6a49a8b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 21:40:50 +0200 Subject: [PATCH 580/600] libfakeXinerama: add license --- pkgs/tools/X11/xpra/libfakeXinerama.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index 4ca509f8b936..d6fab2b19103 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -24,10 +24,11 @@ stdenv.mkDerivation rec { ln -s libXinerama.so.1 $out/lib/libXinerama.so ''; - meta = { + meta = with stdenv.lib; { homepage = http://xpra.org/; description = "fakeXinerama for Xpra"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + platforms = platforms.linux; + maintainers = [ maintainers.tstrobel ]; + license = licenses.gpl2; }; } From 0052a756d29cb1803bdd667abe991ff0fc75abef Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 21:42:39 +0200 Subject: [PATCH 581/600] xpra: add license --- pkgs/tools/X11/xpra/default.nix | 1 + pkgs/tools/X11/xpra/gtk3.nix | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index fd7f70004dbf..23270793b34e 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -81,5 +81,6 @@ in buildPythonApplication rec { description = "Persistent remote applications for X"; platforms = platforms.linux; maintainers = with maintainers; [ tstrobel offline ]; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 16693b08e110..ceba4269e808 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -68,11 +68,12 @@ buildPythonApplication rec { #''; - meta = { + meta = with stdenv.lib; { homepage = http://xpra.org/; downloadPage = "https://xpra.org/src/"; downloadURLRegexp = "xpra-.*[.]tar[.]xz$"; description = "Persistent remote applications for X"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From f24a78f671696a893fc6164a5e8948b3678706b6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 21:45:57 +0200 Subject: [PATCH 582/600] x2vnc: add licenses --- pkgs/tools/X11/x2vnc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index 2703379a23b9..f3ab23d364c5 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { homepage = http://fredrik.hubbe.net/x2vnc.html; description = "A program to control a remote VNC server"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } From 72305e7eaecddfc26c781a87b7ba3c76f020a039 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 21:47:25 +0200 Subject: [PATCH 583/600] x11vnc: add license --- pkgs/tools/X11/x11vnc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 2d319cccf206..2dc6d8ffd78c 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' x11vnc/ssltools.h ''; - meta = { + meta = with stdenv.lib; { description = "A VNC server connected to a real X11 screen"; homepage = http://www.karlrunge.com/x11vnc/; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From 239a0ea2b9d3aad57c9ef5c2b9a2b711c5af8529 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 21:54:53 +0200 Subject: [PATCH 584/600] virtualgl[Lib]: fix license --- pkgs/tools/X11/virtualgl/default.nix | 1 + pkgs/tools/X11/virtualgl/lib.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index b0d017acf84b..aa839e6d684d 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + inherit (virtualglLib.meta) license; }; } diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index c552011f3844..4c911e756330 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.virtualgl.org/; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; - license = licenses.free; # many parts under different free licenses + license = licenses.wxWindows; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; From 4d933fbfdc7cef9263265f28f988b72b2b540a0d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 21:56:37 +0200 Subject: [PATCH 585/600] dex: add license --- pkgs/tools/X11/dex/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index 2a3a406135b3..fd0c0503de9f 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -16,9 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3.pkgs.sphinx ]; makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ]; - meta = { + meta = with stdenv.lib; { description = "A program to generate and execute DesktopEntry files of the Application type"; homepage = https://github.com/jceb/dex; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl3Plus; }; } From d9416449b59bb11087ea19babd0e08591406df9c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 21:58:01 +0200 Subject: [PATCH 586/600] flvtool2: add licenses --- pkgs/tools/video/flvtool2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index 975e13b65da7..037e07c72286 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -1,4 +1,4 @@ -{ buildRubyGem, ruby }: +{ lib, buildRubyGem, ruby }: buildRubyGem rec { inherit ruby; @@ -12,5 +12,6 @@ buildRubyGem rec { homepage = https://github.com/unnu/flvtool2; description = "A tool to manipulate Macromedia Flash Video files"; platforms = ruby.meta.platforms; + license = lib.licenses.bsd3; }; } From 7d25ffade45e9d504ba2d5bc500bff5a2c30e99f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 22:03:47 +0200 Subject: [PATCH 587/600] dd_rescue: add license + update homepage --- pkgs/tools/system/dd_rescue/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index 1ea574dbe8ea..e0d11769fd9f 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile \ --replace "\$(DESTDIR)/usr" "$out" \ --replace "-o root" "" \ - --replace "-g root" "" + --replace "-g root" "" ''; makeFlags = [ "LIBDIR=$out" ]; @@ -29,12 +29,13 @@ stdenv.mkDerivation rec { tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue" cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" ''; - + meta = with stdenv.lib; { description = "A tool to copy data from a damaged block device"; maintainers = with maintainers; [ raskin domenkozar ]; platforms = platforms.linux; - downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/"; + homepage = "http://www.garloff.de/kurt/linux/ddrescue/"; + license = licenses.gpl2Plus; inherit version; updateWalker = true; }; From 131bc90d08199bed568789e7524ce9e5172c7bab Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 22:05:26 +0200 Subject: [PATCH 588/600] localtime: add license --- pkgs/tools/system/localtime/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index c49054f3a67c..442b9a42f2b8 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "2e7b4317c723406bd75b2a1d640219ab9f8090ce"; sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8"; }; - + buildInputs = [ go systemd polkit m4 removeReferencesTo ]; disallowedRequisites = [ go ]; @@ -19,9 +19,10 @@ stdenv.mkDerivation { find $out/bin -type f -exec remove-references-to -t ${go} '{}' + ''; - meta = { + meta = with stdenv.lib; { description = "A daemon for keeping the system timezone up-to-date based on the current location"; homepage = https://github.com/Stebalien/localtime; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl3; }; } From 4503d462c779cf53d6ba3bddce2a61eb4a961a06 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 22:07:50 +0200 Subject: [PATCH 589/600] sg3_utils: add licenses --- pkgs/tools/system/sg3_utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index ca1af7a74e4b..8be7203fb3d4 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1wwy7iiz1lvc32c777yd4vp0c0dqfdlm5jrsm3aa62xx141pmjqx"; }; - meta = { + meta = with stdenv.lib; { homepage = http://sg.danny.cz/sg/; description = "Utilities that send SCSI commands to devices"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = with licenses; [ bsd2 gpl2Plus ]; }; } From 6d8be09c8adccda1ece13e2bc06eabf88d955111 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 12 Sep 2018 22:09:47 +0200 Subject: [PATCH 590/600] vbetool: add license --- pkgs/tools/system/vbetool/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index c30a7b14e891..32cf56a1d74e 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://www.codon.org.uk/~mjg59/vbetool/; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.gpl2; }; } From 0dff3d5c736ba419d2b9d5c6612322f5a6fde650 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 21:50:33 +0200 Subject: [PATCH 591/600] litecoin: add missing framework and mark broken on darwin In file included from qt/bitcoin.cpp:9: ./qt/bitcoingui.h:14:10: fatal error: 'QLabel' file not found #include ^~~~~~~~ 1 error generated. /cc ZHF #45961 --- pkgs/applications/altcoins/default.nix | 6 ++++-- pkgs/applications/altcoins/litecoin.nix | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 4236cd7910bc..90cefed13aa5 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -62,8 +62,10 @@ rec { buildGoPackage = buildGo110Package; }; - litecoin = callPackage ./litecoin.nix { withGui = true; }; - litecoind = callPackage ./litecoin.nix { withGui = false; }; + litecoin = callPackage ./litecoin.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + litecoind = litecoin.override { withGui = false; }; masari = callPackage ./masari.nix { }; diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index b930923e8f45..ed268e34946f 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/pkgs/applications/altcoins/litecoin.nix @@ -2,9 +2,12 @@ , pkgconfig, autoreconfHook , openssl, db48, boost, zlib, miniupnpc , glib, protobuf, utillinux, qt4, qrencode -, withGui, libevent }: +, AppKit +, withGui ? true, libevent +}: with stdenv.lib; + stdenv.mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; @@ -20,6 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc glib protobuf utillinux libevent ] + ++ optionals stdenv.isDarwin [ AppKit ] ++ optionals withGui [ qt4 qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] @@ -39,6 +43,7 @@ stdenv.mkDerivation rec { homepage = https://litecoin.org/; platforms = platforms.unix; license = licenses.mit; - maintainers = with maintainers; [ offline AndersonTorres ]; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ offline AndersonTorres ]; }; } From b8148813941f026af03b7e8a94e66a4bcfe83c64 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 21:56:52 +0200 Subject: [PATCH 592/600] aws-okta: mark broken on darwin Could be caused by our older 10.10.5 CoreFoundation. # github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:35:33: cannot use nil as type _Ctype_CFAllocatorRef in argument to _Cfunc_CFDataCreate go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:61: cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:98:41: cannot use nil as type _Ctype_CFAllocatorRef in argument to _Cfunc_CFStringCreateWithBytes go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:133: cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal /cc ZHF #45961 --- pkgs/tools/security/aws-okta/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 7ec5b024de13..cdb35453d3d2 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -1,4 +1,5 @@ { buildGoPackage, fetchFromGitHub, stdenv }: + buildGoPackage rec { name = "aws-okta-${version}"; version = "0.19.0"; @@ -19,6 +20,7 @@ buildGoPackage rec { description = "aws-vault like tool for Okta authentication"; license = licenses.mit; maintainers = [maintainers.imalsogreg]; + broken = stdenv.isDarwin; # test with CoreFoundation 10.11 platforms = platforms.all; homepage = https://github.com/segmentio/aws-okta; downloadPage = "https://github.com/segmentio/aws-okta"; From 9fc6f1123df05698644849d301e4b8c8aaf686b5 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 12 Sep 2018 22:39:38 +0200 Subject: [PATCH 593/600] asymptote: mark broken on darwin It only builds with gc-7.6.0 on darwin for some reason. /cc ZHF #45961 --- pkgs/tools/graphics/asymptote/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 1aa4fff82241..a0bf0a434471 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl - , freeglut, ghostscriptX, imagemagick, fftw + , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz , darwin @@ -35,7 +35,7 @@ stdenv.mkDerivation { preConfigure = '' export HOME="$PWD" - patchShebangs . + patchShebangs . sed -e 's@epswrite@eps2write@g' -i runlabel.in xz -d < ${texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex cp texinfo-*/doc/texinfo.tex doc/ @@ -63,6 +63,7 @@ stdenv.mkDerivation { description = "A tool for programming graphics intended to replace Metapost"; license = licenses.gpl3Plus; maintainers = [ maintainers.raskin maintainers.peti ]; + broken = stdenv.isDarwin; # https://github.com/vectorgraphics/asymptote/issues/69 platforms = platforms.linux ++ platforms.darwin; }; } From 65bc378de8f2268040da3d221ec5a48c3081b86c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Sep 2018 14:20:26 -0700 Subject: [PATCH 594/600] mbuffer: 20180318 -> 20180625 (#46241) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from mbuffer --- pkgs/tools/misc/mbuffer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 664c5cc8e78e..5eefc94a2cd6 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20180318"; + version = "20180625"; name = "mbuffer-${version}"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1sh0ipf77aav1k17dgl9dcjlb17zygs07x01g0nn0cg7yw5y5hfk"; + sha256 = "174m3zbm0qb68p1qng1vldcs23s7qjhyf7d39sw3r03m7y7f5g5p"; }; buildInputs = [ openssl ]; From 61a9463498393cf41986c2c6c7d7203c05777003 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 12 Sep 2018 23:56:03 +0200 Subject: [PATCH 595/600] weechatScripts.weechat-matrix-bridge: don't export `olm.lua' as script (#46582) Loading olm.lua as weechat script with `/script load olm.lua' causes errors like this: ``` /nix/store/43jbh7yxh8j4gjfzbvpd9clncah5dip1-weechat-matrix-bridge-2018-05-29/lib/ffi.so: undefined symbol: lua_tointeger ``` As `olm.lua' is loaded by `matrix.lua' it doesn't need to be included manually by the weechat configuration. --- .../irc/weechat/scripts/weechat-matrix-bridge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 1018e46ec625..d2960ae93a99 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { --replace "__NIX_LIB_PATH__" "$out/lib/?.so" ''; - passthru.scripts = [ "olm.lua" "matrix.lua" ]; + passthru.scripts = [ "matrix.lua" ]; installPhase = '' mkdir -p $out/{share,lib} From 1ec301ded21cf12a861facc5fe029dc9bcc50593 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 12 Sep 2018 23:56:08 +0000 Subject: [PATCH 596/600] openssl: 1.1.0 -> 1.1.1 (#46524) --- pkgs/applications/altcoins/default.nix | 4 ++-- pkgs/development/libraries/openssl/default.nix | 10 ++++++---- pkgs/tools/misc/powerline-rs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 ++++++----- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 90cefed13aa5..f075903332b4 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }: +{ callPackage, boost155, boost165, openssl_1_1, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }: rec { @@ -90,7 +90,7 @@ rec { zcash = callPackage ./zcash { withGui = false; - openssl = openssl_1_1_0; + openssl = openssl_1_1; }; parity = callPackage ./parity { }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index de13f963b674..87751188a03a 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPackages, perl +{ stdenv, fetchurl, buildPackages, perl, coreutils , withCryptodev ? false, cryptodevHeaders , enableSSL2 ? false , static ? false @@ -31,6 +31,8 @@ let substituteInPlace "$a" \ --replace /bin/rm rm done + '' + optionalString (versionAtLeast version "1.1.1") '' + substituteInPlace config --replace '/usr/bin/env' '${coreutils}/bin/env' '' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) '' substituteInPlace crypto/async/arch/async_posix.h \ --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ @@ -125,9 +127,9 @@ in { sha256 = "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah"; }; - openssl_1_1_0 = common { - version = "1.1.0i"; - sha256 = "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb"; + openssl_1_1 = common { + version = "1.1.1"; + sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8"; }; } diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index b16be0b5bdca..67f805988a3e 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl_1_1_0, libssh2, libgit2, libzip, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; name = "${pname}-${version}"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; nativeBuildInputs = [ pkgconfig file perl cmake curl ]; - buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; postInstall = '' install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5b8191fb58d..671b5df3586c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3690,11 +3690,11 @@ with pkgs; nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { - openssl = openssl_1_1_0; + openssl = openssl_1_1; }; nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; - openssl = openssl_1_1_0; + openssl = openssl_1_1; }; nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix { @@ -3730,7 +3730,7 @@ with pkgs; ldapvi = callPackage ../tools/misc/ldapvi { }; ldns = callPackage ../development/libraries/ldns { - openssl = openssl_1_1_0; + openssl = openssl_1_1; }; leafpad = callPackage ../applications/editors/leafpad { }; @@ -5576,7 +5576,7 @@ with pkgs; tokei = callPackage ../development/tools/misc/tokei { }; tor = callPackage ../tools/security/tor { - openssl = openssl_1_1_0; + openssl = openssl_1_1; # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. libevent = libevent.override { sslSupport = false; @@ -11452,7 +11452,7 @@ with pkgs; }; }) openssl_1_0_2 - openssl_1_1_0; + openssl_1_1; openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { cryptodevHeaders = linuxPackages.cryptodev.override { @@ -15162,6 +15162,7 @@ with pkgs; powerline-rs = callPackage ../tools/misc/powerline-rs { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; profont = callPackage ../data/fonts/profont { }; From d225a91b7c21d24d3bb162a48e55bb533641f2db Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Thu, 13 Sep 2018 00:40:11 +0200 Subject: [PATCH 597/600] mitmproxy: 3.0.4 -> 4.0.4, fix tests - add missing checkInputs - apply upstream patch to fix some tests that failed due to expired test ssl certs - re-enable a previously disabled test case --- pkgs/tools/networking/mitmproxy/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index d3b62d3259cc..d06399169707 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,18 +1,29 @@ -{ stdenv, fetchFromGitHub, python3Packages, glibcLocales }: +{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, fetchpatch }: with python3Packages; buildPythonPackage rec { pname = "mitmproxy"; - version = "3.0.4"; + version = "4.0.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "10l761ds46r1p2kjxlgby9vdxbjjlgq72s6adjypghi41s3qf034"; + sha256 = "14i9dkafvyl15rq2qa8xldscn5lmkk2g52kbi2hl63nzx9yibx6r"; }; + patches = [ + (fetchpatch { + # Tests failed due to expired test certificates, + # https://github.com/mitmproxy/mitmproxy/issues/3316 + # TODO: remove on next update + name = "test-certificates.patch"; + url = "https://github.com/mitmproxy/mitmproxy/commit/1b6a8d6acd3d70f9b9627ad4ae9def08103f8250.patch"; + sha256 = "03y79c25yir7d8xj79czdc81y3irqq1i3ks9ca0mv1az8b7xsvfv"; + }) + ]; + postPatch = '' # remove dependency constraints sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py @@ -23,8 +34,7 @@ buildPythonPackage rec { checkPhase = '' export HOME=$(mktemp -d) export LC_CTYPE=en_US.UTF-8 - # test_echo resolves hostnames - pytest -k 'not test_echo and not test_find_unclaimed_URLs ' + pytest -k 'not test_find_unclaimed_URLs' ''; propagatedBuildInputs = [ @@ -38,6 +48,7 @@ buildPythonPackage rec { checkInputs = [ beautifulsoup4 flask pytest requests glibcLocales + asynctest parver pytest-asyncio ]; meta = with stdenv.lib; { From 68b7de9e2e265fcec9255c729fcb152e7c71227c Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Thu, 13 Sep 2018 02:32:37 +0200 Subject: [PATCH 598/600] pythonPackages.BTrees: fix build (#46588) a test case failed since the update to 4.5.1, disable it --- pkgs/development/python-modules/btrees/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index c96d305a7f61..665d5347bbaf 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -15,6 +15,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ persistent zope_interface ]; checkInputs = [ zope_testrunner ]; + # disable a failing test that looks broken + postPatch = '' + substituteInPlace BTrees/tests/common.py \ + --replace "testShortRepr" "no_testShortRepr" + ''; + src = fetchPypi { inherit pname version; sha256 = "dcc096c3cf92efd6b9365951f89118fd30bc209c9af83bf050a28151a9992786"; From 56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 13 Sep 2018 12:21:08 +0800 Subject: [PATCH 599/600] milkytracker: 1.01 -> 1.02.00 --- .../milkytracker/decompressor_gzip.patch | 20 -------------- .../audio/milkytracker/default.nix | 27 +++++++++---------- 2 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 pkgs/applications/audio/milkytracker/decompressor_gzip.patch diff --git a/pkgs/applications/audio/milkytracker/decompressor_gzip.patch b/pkgs/applications/audio/milkytracker/decompressor_gzip.patch deleted file mode 100644 index c64421116dea..000000000000 --- a/pkgs/applications/audio/milkytracker/decompressor_gzip.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.archlinux.org/task/31324 -https://410333.bugs.gentoo.org/attachment.cgi?id=322456 - -diff -ur src.old/compression/DecompressorGZIP.cpp src/compression/DecompressorGZIP.cpp ---- src.old/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200 -+++ src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200 -@@ -57,11 +57,11 @@ - - bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint) - { -- gzFile *gz_input_file = NULL; -+ gzFile gz_input_file = NULL; - int len = 0; - pp_uint8 *buf; - -- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL) -+ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL) - return false; - - if ((buf = new pp_uint8[0x10000]) == NULL) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 6a71971c5fdf..6b3abeb1e23c 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,29 +1,26 @@ -{ stdenv, fetchurl, SDL2, alsaLib, cmake, libjack2, perl -, zlib, zziplib, pkgconfig, makeWrapper -}: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +, SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: stdenv.mkDerivation rec { - version = "1.01"; + version = "1.02.00"; name = "milkytracker-${version}"; - src = fetchurl { - url = "https://github.com/milkytracker/MilkyTracker/archive/v${version}.00.tar.gz"; - sha256 = "1dvnddsnn9c83lz4dlm0cfjpc0m524amfkbalxbswdy0qc8cj1wv"; + src = fetchFromGitHub { + owner = "milkytracker"; + repo = "MilkyTracker"; + rev = "v${version}"; + sha256 = "05a6d7l98k9i82dwrgi855dnccm3f2lkb144gi244vhk1156n0ca"; }; - preBuild='' - export CPATH=${zlib.out}/lib - ''; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; - buildInputs = [ SDL2 alsaLib libjack2 perl zlib zziplib ]; + buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; - meta = { + meta = with stdenv.lib; { description = "Music tracker application, similar to Fasttracker II"; homepage = http://milkytracker.org; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.zoomulator ]; + maintainers = with maintainers; [ zoomulator ]; }; } From 0f2b10d1ac41c2f573fddbdf110a1ae435ffdd8a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 12 Sep 2018 23:33:57 -0500 Subject: [PATCH 600/600] libiio: init at 0.15 Signed-off-by: Austin Seipp --- pkgs/development/libraries/libiio/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/libiio/default.nix diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix new file mode 100644 index 000000000000..defb17bcd88a --- /dev/null +++ b/pkgs/development/libraries/libiio/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub +, cmake, flex, bison +, libxml2 +}: + +stdenv.mkDerivation rec { + name = "libiio-${version}"; + version = "0.15"; + + src = fetchFromGitHub { + owner = "analogdevicesinc"; + repo = "libiio"; + rev = "refs/tags/v${version}"; + sha256 = "05sbvvjka03qi080ad6g2y6gfwqp3n3zv7dpv237dym0zjyxqfa7"; + }; + + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ cmake flex bison ]; + buildInputs = [ libxml2 ]; + + meta = with stdenv.lib; { + description = "API for interfacing with the Linux Industrial I/O Subsystem"; + homepage = https://github.com/analogdevicesinc/libiio; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 671b5df3586c..533b04d9e0e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10395,6 +10395,8 @@ with pkgs; libgrss = callPackage ../development/libraries/libgrss { }; + libiio = callPackage ../development/libraries/libiio { }; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { };