diff options
Diffstat (limited to 'pkgs')
56 files changed, 722 insertions, 362 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 2e474ed3410c..56b17a865df8 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -94,6 +94,14 @@ self: # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; + # Build same version as Haskell package + hindent = super.hindent.overrideAttrs (attrs: { + version = external.hindent.version; + src = external.hindent.src; + packageRequires = [ self.haskell-mode ]; + propagatedUserEnvPkgs = [ external.hindent ]; + }); + # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index c0febd803cc0..f3b77c708a7b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -108,6 +108,14 @@ self: # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; + # Build same version as Haskell package + hindent = super.hindent.overrideAttrs (attrs: { + version = external.hindent.version; + src = external.hindent.src; + packageRequires = [ self.haskell-mode ]; + propagatedUserEnvPkgs = [ external.hindent ]; + }); + # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 3562a4f9b168..5ed8b81eabb5 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -3,8 +3,7 @@ with stdenv.lib; -let patches' = if patches == null then [] else patches; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "st-0.8.1"; src = fetchurl { @@ -12,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4"; }; - patches = patches'; + inherit patches; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c2471d8a0eaa..ff9b8b10b18e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -138,10 +138,6 @@ let # for updated patches and hints about build flags # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000") ./patches/fix-freetype.patch - ] ++ optionals (versionRange "66" "68") [ - ./patches/nix_plugin_paths_52.patch - (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") - ] ++ optionals (versionAtLeast version "68") [ ./patches/nix_plugin_paths_68.patch ] ++ optionals (versionRange "68" "69") [ ./patches/remove-webp-include-68.patch diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch deleted file mode 100644 index fc1b609479b2..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index f4e119d..d9775bd 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -68,21 +68,14 @@ static base::LazyInstance<base::FilePath> - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - // Gets the path for bundled implementations of components. Note that these -@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_COMPONENTS: -@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; -@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 16873ead34f3..7f2f4387da54 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 = "0m82ag02mydq5xkd0pamk2nq035j7yzhl47hnwl1irm632rpnfb4"; - sha256bin64 = "0xx6kjaa13al1ka0rfcrz1aj0nwhdwzqakz533ghk8qyvhanypkp"; - version = "68.0.3440.59"; + sha256 = "193sz96jrygixgzkaxx1vrpkhmnr6c7yzhsvv4p1qn0jymh2xd57"; + sha256bin64 = "0wwmfsxbphxqfw4g6jgxlr0p32vjf4h8yfd5zz36xpa79dryb8sv"; + version = "68.0.3440.68"; }; dev = { - sha256 = "1gpjf213ai3sjh894jsl5ziild15049p6bnh36z0r1f5w68pzakg"; - sha256bin64 = "1slj3gj4786lqrypng48zy5030snar8pirqwm92b5pq25xd595j8"; - version = "69.0.3486.0"; + sha256 = "102lqnl2m9cbcql6sghib1504fyicx7cgv0jkfx863jpzhrfrkcv"; + sha256bin64 = "1y3iy25b3cck7kz5g913z64x1wdj1znqbn049g8h82x3krp76bgx"; + version = "69.0.3497.12"; }; stable = { - sha256 = "0am0q0wkmrvhidi4x07fvgb4ymv5q3agmwzgm808dj7ninfnnba5"; - sha256bin64 = "06baih4wf88rpmw73vfhap4dxd61vjgmr256ix8qd937x2hv7qd3"; - version = "67.0.3396.99"; + sha256 = "0hcmnn72xj9p3y77cb6cnr1vz81hiqmksdi6nw7xqfw5cwr7h5yw"; + sha256bin64 = "0pa49yxj9s41mzhik7jixr4hwqanf31yzr1fsc6y5hkadbj7rwij"; + version = "68.0.3440.75"; }; } diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix new file mode 100644 index 000000000000..78910d1ecf6e --- /dev/null +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { + name = "sieve-connect-${version}"; + version = "0.89"; + + src = fetchFromGitHub { + owner = "philpennock"; + repo = "sieve-connect"; + rev = "v${version}"; + sha256 = "0g7cv29wd5673inl4c87xb802k86bj6gcwh131xrbbg0a0g1c8fp"; + }; + + buildInputs = [ perl ]; + nativeBuildInputs = [ makeWrapper ]; + + preBuild = '' + # Fixes failing build when not building in git repo + mkdir .git + touch .git/HEAD + echo "${version}" > versionfile + echo "$(date +%Y-%m-%d)" > datefile + ''; + + buildFlags = [ "PERL5LIB=${stdenv.lib.makePerlPath [ perlPackages.FileSlurp ]}" "bin" "man" ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + install -m 755 sieve-connect $out/bin + gzip -c sieve-connect.1 > $out/share/man/man1/sieve-connect.1.gz + + wrapProgram $out/bin/sieve-connect \ + --prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [ + AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS PodUsage + TermReadKey TermReadLineGnu ])}" + ''; + + meta = with stdenv.lib; { + description = "A client for the MANAGESIEVE Protocol"; + longDescription = '' + This is sieve-connect. A client for the ManageSieve protocol, + as specifed in RFC 5804. Historically, this was MANAGESIEVE as + implemented by timsieved in Cyrus IMAP. + ''; + homepage = https://github.com/philpennock/sieve-connect; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index d32beeef4f48..6a0b686602ff 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -9,7 +9,7 @@ assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; stdenv.mkDerivation rec { name = "${attr}-${version}"; attr = if enableGUI then "giac-with-xcas" else "giac"; - version = "1.4.9-59"; + version = "1.4.9-59"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; @@ -50,6 +50,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; doCheck = true; + preCheck = '' + # One test in this file fails. That test just tests a part of the pari + # interface that isn't actually used in giac. Of course it would be better + # to only remove that one test, but that would require a patch. + # Removing the whole test set should be good enough for now. + # Upstream report: https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102#p10326 + echo > check/chk_fhan11 + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index a811c9da8c27..9fe1d9df46dc 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -8,11 +8,11 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { name = "pari-${version}"; - version = "2.9.5"; + version = "2.11.0"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb"; + sha256 = "18f9yj8ffn3dxignbxj1x36771zbxy4js0r18mv6831ymb6cld9q"; }; buildInputs = [ @@ -67,8 +67,8 @@ stdenv.mkDerivation rec { run 3 or 4 times faster.) gp2c currently only understands a subset of the GP language. ''; - homepage = "http://pari.math.u-bordeaux.fr/"; - downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; + homepage = http://pari.math.u-bordeaux.fr; + downloadPage = http://pari.math.u-bordeaux.fr/download.html; license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes raskin AndersonTorres ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 950c0c86a6e4..bc79f9ff12fd 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -36,10 +36,11 @@ rec { in { imageName # To find the digest of an image, you can use skopeo: - # skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest' - # sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b + # see doc/functions.xml , imageDigest , sha256 + , os ? "linux" + , arch ? "x86_64" # This used to set a tag to the pulled image , finalImageTag ? "latest" , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar" @@ -59,7 +60,7 @@ rec { sourceURL = "docker://${imageName}@${imageDigest}"; destNameTag = "${imageName}:${finalImageTag}"; } '' - skopeo copy "$sourceURL" "docker-archive://$out:$destNameTag" + skopeo --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag" ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 4ceaf77373e6..2ee99ce973ef 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -13,7 +13,7 @@ with lib; /* ename: Original Emacs package name, possibly containing special symbols. */ -, ename ? pname +, ename ? null , version , recipe , meta ? {} @@ -30,6 +30,11 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ + ename = + if isNull(ename) + then pname + else ename; + melpa = fetchFromGitHub { owner = "melpa"; repo = "melpa"; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 75037f6a07db..9651dbb72f4d 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,5 +1,5 @@ -{ lowPrio, newScope, stdenv, cmake, libstdcxxHook -, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith +{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook +, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -16,25 +16,28 @@ let compiler-rt_src = fetch "compiler-rt" "0h5lpv1z554szi4r4blbskhwrkd78ir50v3ng8xvk1s86fa7gj53"; clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m"; - # Add man output without introducing extra dependencies. - overrideManOutput = drv: - let drv-manpages = drv.override { enableManpages = true; }; in - drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); in { - llvm = overrideManOutput (callPackage ./llvm.nix { + llvm = callPackage ./llvm.nix { inherit compiler-rt_src; - }); - clang-unwrapped = overrideManOutput (callPackage ./clang { + }; + clang-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; + }; + + llvm-manpages = lowPrio (tools.llvm.override { + enableManpages = true; + python = pkgs.python; # don't use python-boot + }); + + clang-manpages = lowPrio (tools.clang-unwrapped.override { + enableManpages = true; + python = pkgs.python; # don't use python-boot }); libclang = tools.clang-unwrapped.lib; - llvm-manpages = lowPrio tools.llvm.man; - clang-manpages = lowPrio tools.clang-unwrapped.man; clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; @@ -54,7 +57,7 @@ let }); libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); in { stdenv = overrideCC stdenv buildLlvmTools.clang; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 514c3a006e38..e474f9a73fe8 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -13,7 +13,7 @@ , compiler-rt_src , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? !enableManpages }: let diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 00b0083108b5..38d2b0d461d4 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,5 +1,5 @@ -{ lowPrio, newScope, stdenv, cmake, libstdcxxHook -, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith +{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook +, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -15,13 +15,8 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3"; - # Add man output without introducing extra dependencies. - overrideManOutput = drv: - let drv-manpages = drv.override { enableManpages = true; }; in - drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -33,15 +28,23 @@ let ''; in { - llvm = overrideManOutput (callPackage ./llvm.nix { }); + llvm = callPackage ./llvm.nix { }; - clang-unwrapped = overrideManOutput (callPackage ./clang { + clang-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; + }; + + llvm-manpages = lowPrio (tools.llvm.override { + enableManpages = true; + python = pkgs.python; # don't use python-boot + }); + + clang-manpages = lowPrio (tools.clang-unwrapped.override { + enableManpages = true; + python = pkgs.python; # don't use python-boot }); libclang = tools.clang-unwrapped.lib; - llvm-manpages = lowPrio tools.llvm.man; - clang-manpages = lowPrio tools.clang-unwrapped.man; clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; @@ -70,7 +73,7 @@ let }); libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix {}; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 68eebc33c6b9..4b24e6dad726 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -12,7 +12,7 @@ , libcxxabi , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? !enableManpages }: let diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 141daa88dcff..831e4b65344c 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,5 +1,5 @@ -{ lowPrio, newScope, stdenv, cmake, libstdcxxHook -, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith +{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook +, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -15,13 +15,8 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd"; - # Add man output without introducing extra dependencies. - overrideManOutput = drv: - let drv-manpages = drv.override { enableManpages = true; }; in - drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -33,15 +28,23 @@ let ''; in { - llvm = overrideManOutput (callPackage ./llvm.nix { }); + llvm = callPackage ./llvm.nix { }; - clang-unwrapped = overrideManOutput (callPackage ./clang { + clang-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; + }; + + llvm-manpages = lowPrio (tools.llvm.override { + enableManpages = true; + python = pkgs.python; # don't use python-boot + }); + + clang-manpages = lowPrio (tools.clang-unwrapped.override { + enableManpages = true; + python = pkgs.python; # don't use python-boot }); libclang = tools.clang-unwrapped.lib; - llvm-manpages = lowPrio tools.llvm.man; - clang-manpages = lowPrio tools.clang-unwrapped.man; clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; @@ -70,7 +73,7 @@ let }); libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix {}; diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 766a10c9579d..795c177bc80d 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -3,15 +3,15 @@ let param = { "8.6" = { - version = "20171214"; - rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00"; - sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd"; + version = "20180709"; + rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; + sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; }; "8.7" = { - version = "20171214"; - rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00"; - sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd"; + version = "20180709"; + rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; + sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; }; }."${coq.coq-version}" diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1ec0adafef8f..3c8f94860b40 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -249,14 +249,6 @@ self: super: { # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably) # This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: { - patches = old.patches or [] ++ [ - # should land in hnix-5.2 - (pkgs.fetchpatch { - url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch"; - sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh"; - name = "disable-hpack-test-by-default.patch"; - }) - ]; testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ]; }))); diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7c866911c593..9bf8577923c8 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -17,7 +17,7 @@ let , ldapSupport ? config.php.ldap or true , mhashSupport ? config.php.mhash or true , mysqlSupport ? (config.php.mysql or true) && (!php7) - , mysqlndSupport ? config.php.mysqlnd or false + , mysqlndSupport ? config.php.mysqlnd or true , mysqliSupport ? config.php.mysqli or true , pdo_mysqlSupport ? config.php.pdo_mysql or true , libxml2Support ? config.php.libxml2 or true diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix index 66f358e4b95b..7d6f2541d3d1 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix @@ -75,6 +75,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.pkgs = builtins.throw "python-boot does not support packages, this package is only intended for bootstrapping." {}; + meta = { homepage = http://python.org; description = "A high-level dynamically-typed programming language"; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 264c05e1af9d..cc970483fb01 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -35,20 +35,20 @@ }: let - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "08yahgf427d2qbs2mw02xww6bv5yjkfc1hihihh7fhqgfz0jnj1h"; + sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "00x1x53qv2pnc7i56244b5nf44wm2mp77hj486i5697r6hikk8n3"; + sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz"; }; # Contrib must be built in order to enable Tesseract support: @@ -59,16 +59,16 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "dfe3162c237af211e98b8960018b564bc209261d"; - sha256 = "1k5xiwdi5r2y3fs5g70lpknxqi4pj32w6l311gfwng3q1cb2crif"; + rev = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a"; + sha256 = "1ys9mshfpm8iy8h4ml792gnqrq959dsrcv26axx14niivxyjbji8"; } + "/ippicv"; - files = let name = platform : "ippicv_2017u3_${platform}_general_20170822.tgz"; in + files = let name = platform : "ippicv_2017u3_${platform}_general_20180518.tgz"; in if stdenv.system == "x86_64-linux" then - { ${name "lnx_intel64"} = "4e0352ce96473837b1d671ce87f17359"; } + { ${name "lnx_intel64"} = "b7cc351267db2d34b9efa1cd22ff0572"; } else if stdenv.system == "i686-linux" then - { ${name "lnx_ia32"} = "dcdb0ba4b123f240596db1840cd59a76"; } + { ${name "lnx_ia32"} = "ea72de74dae3c604eb6348395366e78e"; } else if stdenv.system == "x86_64-darwin" then - { ${name "mac_intel64"} = "c1ebb5dfa5b7f54b0c44e1917805a463"; } + { ${name "mac_intel64"} = "3ae52b9be0fe73dd45bc5e9429cd3732"; } else throw "ICV is not available for this platform (or not yet supported by this package)"; dst = ".cache/ippicv"; @@ -132,17 +132,6 @@ let ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" '') extra.files); - # See opencv_contrib/modules/dnn_modern/CMakeLists.txt - tinyDnn = rec { - src = fetchurl { - url = "https://github.com/tiny-dnn/tiny-dnn/archive/${name}"; - sha256 = "12x1b984cn0psn6kz1fy75zljgzqvkdyjy8i292adfnyqpl1rip2"; - }; - name = "v1.0.0a3.tar.gz"; - md5 = "adb1c512e09ca2c7a6faef36f9c53e59"; - dst = ".cache/tiny_dnn"; - }; - opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; printEnabled = enabled : if enabled then "ON" else "OFF"; @@ -156,6 +145,11 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; + # TODO: remove the following patch once commit + # https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f + # is released. + patches = [ ./fix-dnn.patch ]; + # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with @@ -174,9 +168,6 @@ stdenv.mkDerivation rec { ${installExtraFiles vgg} ${installExtraFiles boostdesc} ${installExtraFiles face} - - mkdir -p "${tinyDnn.dst}" - ln -s "${tinyDnn.src}" "${tinyDnn.dst}/${tinyDnn.md5}-${tinyDnn.name}" ''); buildInputs = @@ -243,9 +234,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" - - # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. - "-DBUILD_opencv_dnn_modern=OFF" ]; enableParallelBuilding = true; @@ -273,11 +261,11 @@ stdenv.mkDerivation rec { passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = { + meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = https://opencv.org/; - license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3; - maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = with licenses; if enableUnfree then unfree else bsd3; + maintainers = with maintainers; [viric mdaiter basvandijk]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/opencv/fix-dnn.patch b/pkgs/development/libraries/opencv/fix-dnn.patch new file mode 100644 index 000000000000..62234a43e461 --- /dev/null +++ b/pkgs/development/libraries/opencv/fix-dnn.patch @@ -0,0 +1,13 @@ +diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp +index 730c752ce..abbce0453 100644 +--- a/modules/dnn/src/caffe/caffe_io.cpp ++++ b/modules/dnn/src/caffe/caffe_io.cpp +@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) { + std::ifstream fs(filename, std::ifstream::in); + CHECK(fs.is_open()) << "Can't open \"" << filename << "\""; + IstreamInputStream input(&fs); +- return google::protobuf::TextFormat::Parser(true).Parse(&input, proto); ++ return google::protobuf::TextFormat::Parser().Parse(&input, proto); + } + + bool ReadProtoFromBinaryFile(const char* filename, Message* proto) { diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 6fe88fd7cea8..b3f5e12b0ecd 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.6.0.1"; + version = "2.6.4.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 = "0skdv3wff1i78hb0y771apw0cak5rzxbwbh6l922snfm01z9k1ws"; + sha256 = "13icrwxxb7k3cj37dl07h0apk6lwyrg1qrwjwh4l82i8f32bnjz2"; }; outputs = [ "lib" "dev" "doc" "out" ]; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix new file mode 100644 index 000000000000..b4c2767f9dd6 --- /dev/null +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, + lxml, tzlocal, python-dateutil, pygments, future, requests-kerberos, + defusedxml, cached-property, isodate, requests_ntlm, dnspython, + psutil, requests-mock, pyyaml +}: + +buildPythonPackage rec { + pname = "exchangelib"; + version = "1.11.4"; + + # tests are not present in the PyPI version + src = fetchFromGitHub { + owner = "ecederstrand"; + repo = pname; + rev = "v${version}"; + sha256 = "1fpbnjnmqm62vll3m2ys1naikch70kqm26hz86f1cl0r2l2afbab"; + }; + + # one test is failing due to it trying to send a request to example.com + patches = [ ./skip_failing_test.patch ]; + checkInputs = [ psutil requests-mock pyyaml ]; + propagatedBuildInputs = [ + lxml tzlocal python-dateutil pygments requests-kerberos + future defusedxml cached-property isodate requests_ntlm dnspython ]; + + meta = with stdenv.lib; { + description = "Client for Microsoft Exchange Web Services (EWS)"; + homepage = "https://github.com/ecederstrand/exchangelib"; + license = licenses.bsd2; + maintainers = with maintainers; [ catern ]; + }; +} diff --git a/pkgs/development/python-modules/exchangelib/skip_failing_test.patch b/pkgs/development/python-modules/exchangelib/skip_failing_test.patch new file mode 100644 index 000000000000..6c070acaf75a --- /dev/null +++ b/pkgs/development/python-modules/exchangelib/skip_failing_test.patch @@ -0,0 +1,18 @@ +--- ./tests/__init__.py 1980-01-02 00:00:00.000000000 +0000 ++++ ./tests/__init__.py 1980-01-02 00:00:00.000000000 +0000 +@@ -301,6 +301,7 @@ + self.assertEqual(id(base_p.thread_pool), id(p.thread_pool)) + self.assertEqual(id(base_p._session_pool), id(p._session_pool)) + ++ @unittest.skip("no network connection inside the Nix sandbox") + def test_close(self): + proc = psutil.Process() + ip_addresses = {info[4][0] for info in socket.getaddrinfo( +@@ -1257,6 +1258,7 @@ + ) + + ++@unittest.skip("no network connection inside the Nix sandbox") + class EWSTest(unittest.TestCase): + @classmethod + def setUpClass(cls): diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix new file mode 100644 index 000000000000..7ee739752725 --- /dev/null +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, krb5 }: + +buildPythonPackage rec { + pname = "pykerberos"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag"; + }; + + buildInputs = [ krb5 ]; + + # there are no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "High-level interface to Kerberos"; + license = licenses.asl20; + maintainers = with maintainers; [ catern ]; + }; +} diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix new file mode 100644 index 000000000000..ab0758a84e16 --- /dev/null +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }: + +buildPythonPackage rec { + pname = "requests-kerberos"; + version = "0.12.0"; + + # tests are not present in the PyPI version + src = fetchFromGitHub { + owner = "requests"; + repo = pname; + rev = "v${version}"; + sha256 = "1qw96aw84nljh9cip372mfv50p1yyirfgigavvavgpc3c5g278s6"; + }; + + checkInputs = [ mock ]; + propagatedBuildInputs = [ requests pykerberos ]; + + # they have a setup.py which mentions a test suite that doesn't exist... + patches = [ ./fix_setup.patch ]; + + meta = with stdenv.lib; { + description = "An authentication handler for using Kerberos with Python Requests."; + homepage = "https://github.com/requests/requests-kerberos"; + license = licenses.isc; + maintainers = with maintainers; [ catern ]; + }; +} diff --git a/pkgs/development/python-modules/requests-kerberos/fix_setup.patch b/pkgs/development/python-modules/requests-kerberos/fix_setup.patch new file mode 100644 index 000000000000..67cc3a60f77e --- /dev/null +++ b/pkgs/development/python-modules/requests-kerberos/fix_setup.patch @@ -0,0 +1,9 @@ +--- ./setup.py 1980-01-02 00:00:00.000000000 +0000 ++++ ./setup.py 1980-01-02 00:00:00.000000000 +0000 +@@ -56,6 +56,5 @@ + ':sys_platform=="win32"': ['winkerberos>=0.5.0'], + ':sys_platform!="win32"': ['pykerberos>=1.1.8,<2.0.0'], + }, +- test_suite='test_requests_kerberos', + tests_require=['mock'], + ) diff --git a/pkgs/development/python-modules/sabyenc/default.nix b/pkgs/development/python-modules/sabyenc/default.nix new file mode 100644 index 000000000000..7c82e22efd68 --- /dev/null +++ b/pkgs/development/python-modules/sabyenc/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "sabyenc"; + version = "3.3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fpvd5mckf1kbn0bhc5ybm08y41ps7sc5f9khz08qyjbikbcww85"; + }; + + # tests are not included in pypi distribution + doCheck = false; + + meta = { + description = "Python yEnc package optimized for use within SABnzbd"; + homepage = "https://github.com/sabnzbd/sabyenc/"; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.georgewhewell ]; + }; + +} diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index b59a93d37324..56b64cd061b5 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { - version = "0.15.1"; + version = "0.15.2"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0v7wdwbxy4bcx488lm1glf4iv3wfdwbkg8fh6kmmmfn1lhgkaay6"; + sha256 = "1w83zi6d9npi1jmiy022v92xp1cwdvn2qqgghlnl2v9sprryqlxz"; }; sourceRoot = "."; @@ -128,10 +128,10 @@ stdenv.mkDerivation rec { buildPhase = '' export TMPDIR=/tmp/.bazel-$UID ./compile.sh - ./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone - cp bazel-bin/scripts/bazel-complete.bash output/ + scripts/generate_bash_completion.sh \ + --bazel=./output/bazel \ + --output=output/bazel-complete.bash \ + --prepend=scripts/bazel-complete-template.bash ''; # Build the CPP and Java examples to verify that Bazel works. @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { mv output/bazel $out/bin wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}" mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions - mv output/bazel-complete.bash $out/share/bash-completion/completions/ + 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/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 17620c9df6c8..1fd52f435574 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -1,4 +1,13 @@ -{ stdenv, makeWrapper, fetchurl, elk6Version, nodejs, coreutils, which }: +{ elk6Version +, enableUnfree ? true +, stdenv +, makeWrapper +, fetchzip +, fetchurl +, nodejs +, coreutils +, which +}: with stdenv.lib; let @@ -6,12 +15,31 @@ let info = splitString "-" stdenv.system; arch = elemAt info 0; plat = elemAt info 1; - shas = { - "x86_64-linux" = "1br9nvwa3i5sfcbnrxp2x3dxxnsbs9iavz6zwgw0jlh5ngf5vysk"; - "x86_64-darwin" = "1w4dck02i0rrl8m18kvy2zz02cb7bb9a2pdhkd1jfy1qz4ssnhii"; + shas = + if enableUnfree + then { + "x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0"; + "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3"; + } + else { + "x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly"; + "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b"; + }; + + # For the correct phantomjs version see: + # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js + phantomjs = rec { + name = "phantomjs-${version}-linux-x86_64"; + version = "2.1.1"; + src = fetchzip { + inherit name; + url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv"; + }; }; + in stdenv.mkDerivation rec { - name = "kibana-${version}"; + name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; version = elk6Version; src = fetchurl { @@ -28,12 +56,19 @@ in stdenv.mkDerivation rec { makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + '' + + # phantomjs is needed in the unfree version. When phantomjs doesn't exist in + # $out/libexec/kibana/data kibana will try to download and unpack it during + # runtime which will fail because the nix store is read-only. So we make sure + # it already exist in the nix store. + optionalString enableUnfree '' + ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name} ''; meta = { description = "Visualize logs and time-stamped data"; homepage = http://www.elasticsearch.org/overview/kibana; - license = licenses.asl20; + license = if enableUnfree then licenses.elastic else licenses.asl20; maintainers = with maintainers; [ offline rickynils basvandijk ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index dc157b672530..48f9822ad869 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -28,7 +28,7 @@ buildGoPackage rec { excludedPackages = "integration"; nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; - buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux ]; + buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs ostree libselinux ]; buildFlagsArray = '' -ldflags= @@ -37,8 +37,8 @@ buildGoPackage rec { ''; preBuild = '' - export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev lvm2}/include -I${getDev btrfs-progs}/include" - export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib lvm2}/lib" + export CGO_CFLAGS="$CFLAGS" + export CGO_LDFLAGS="$LDFLAGS" ''; postBuild = '' diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index ce911ae40d5e..111bc449d888 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "194z3j9zwlbc6j97iy1m1cl0xqks3ws2bjp2xrgy8cwpi7fclaw2"; + sha256 = "0ymg6y6v0mdhs1rs11fn33xdp3r6v85563z0f4p7s22j1kd3nd6r"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 8a9580d99e17..b3dfed3d265e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -32,7 +32,7 @@ let # Documentation & usage see vim-utils.nix. # attribute names should be the same as used by vim-pi to make dependency # resolution work - self = rec { +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 { @@ -454,17 +454,6 @@ let }; - deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-07-19"; - src = fetchgit { - url = "https://github.com/Shougo/deoplete.nvim"; - rev = "0f1921799644cd662cb0a3393ba71096e5e56115"; - sha256 = "0xbi6zac45fr8ipz1vqafl6ljh7bpdhbz7dfdyv8z04aqvn621s2"; - }; - dependencies = []; - - }; - ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "ultisnips-2018-04-30"; src = fetchgit { @@ -609,11 +598,11 @@ let }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2018-04-15"; + name = "clighter8-2018-07-25"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "6d325abd043fd1bc31bea821f751996541bfc944"; - sha256 = "1kmk6q1hca97052dif1m3ygcr9zrnc3i2lrvkzlmsqb159mgfsgq"; + rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181"; + sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg"; }; dependencies = []; preFixup = '' @@ -623,11 +612,11 @@ let }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-07-16"; + name = "neomake-2018-07-23"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "f26a31a315f60150fd42682df911306b4d795dd8"; - sha256 = "1rxlzypzwlr6j84llg30d122142la621nai1f7735i58kvmzk51w"; + rev = "b24cac5f6aa1d8f8e8bcfae52ed255f277f4f163"; + sha256 = "00hmbip0r3l0h6fk0bxs9rqbfj0vn246804s2s7shdjsvn6a3pa0"; }; dependencies = []; @@ -876,11 +865,11 @@ let }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-07-07"; + name = "vim-2018-07-23"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "a88e82a94f0ff41e84e51fe501635f0f64d1bb33"; - sha256 = "1ld7vbh6dxrf3wqbya9pvvzwp7qgv2pdj74g5w7yjn1bdi597vnm"; + rev = "d329d61c1752807059aef388c4e9629296760a35"; + sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm"; }; dependencies = []; @@ -920,11 +909,11 @@ let }; editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "editorconfig-vim-2017-10-14"; + name = "editorconfig-vim-2018-07-25"; src = fetchgit { url = "https://github.com/editorconfig/editorconfig-vim"; - rev = "0abb0634a8bf3c760a283e9e7475594b83869a46"; - sha256 = "1wazl37ivn9nhsy296g1ncvvwc78930lbp8arhwavr52mzpfji21"; + rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4"; + sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x"; }; dependencies = []; @@ -986,11 +975,11 @@ let }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2018-04-05"; + name = "vim-localvimrc-2018-07-23"; src = fetchgit { url = "https://github.com/embear/vim-localvimrc"; - rev = "736f9712dd2eb8a7a3ae15d61611db9b5a66c648"; - sha256 = "09r8hvvm8fdr5rlrgfwnhjkk967dfmis8vgi3d45c9svhsybhkja"; + rev = "a3cb22a68625e022df1da402361801cc817bcec5"; + sha256 = "0n3fl4wh5bhppxwkpd69jmnck2js08dgzfxcpfqrvx22zr22m8kc"; }; dependencies = []; @@ -1041,16 +1030,30 @@ let }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-07-18"; + name = "vim-go-2018-07-22"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "2c909e71e184de6ea23e3f8adc7d199856c2806b"; - sha256 = "0v42yrgnd3hi8s2i9ij7ldgyvs75jkikw1kpqblysdim9cfbbqfk"; + 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 { @@ -1349,11 +1352,11 @@ let }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2017-11-17"; + name = "vim-orgmode-2018-07-25"; src = fetchgit { url = "https://github.com/jceb/vim-orgmode"; - rev = "ce17a40108a7d5051a3909bd7c5c94b0b5660637"; - sha256 = "0ni99a5zylb0sbmik2xydia87qlv1xcl18j92nwxg8d6wxsnywb9"; + rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c"; + sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx"; }; dependencies = []; @@ -1371,11 +1374,11 @@ let }; tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tslime-vim-2016-06-14"; + name = "tslime-vim-2018-07-23"; src = fetchgit { url = "https://github.com/jgdavey/tslime.vim"; - rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2"; - sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1"; + rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; + sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; }; dependencies = []; @@ -1448,11 +1451,11 @@ let }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-07-11"; + name = "fzf-vim-2018-07-22"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "8d56bdd6ade7899f0b0a10cfc219804b4ccbc109"; - sha256 = "0m3p2gp42hshxb7hrgw63fp155a5l1x9fjr2k21dv22xqlaqy9hj"; + rev = "6ce58caad320be3cf9ff5d275191f88524edf326"; + sha256 = "02s6ky1mnb18iy91p6syy3qnp55zwg2d52ybm6cic2gwvj1az1sf"; }; dependencies = []; @@ -1580,11 +1583,11 @@ let }; swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "swift-vim-2018-04-20"; + name = "swift-vim-2018-07-21"; src = fetchgit { url = "https://github.com/keith/swift.vim"; - rev = "404df978f9830d9cf0a1f5002cb02f594e3e8996"; - sha256 = "03xhzljzcfm0678d6i8j5493pi5knav1hx0jldgn3hish892pfr3"; + rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab"; + sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153"; }; dependencies = []; @@ -1679,11 +1682,11 @@ let }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-07-13"; + name = "vimtex-2018-07-25"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "e3dabe0a369dac556508ac5d1132979d654bc753"; - sha256 = "10wkfh106xc89bk72n0xc2xa7iva74p4pj0n9wfd3dbspagrf9j2"; + rev = "5c5cd72b680bca8c3b5b45ee790f3f6f5890e77c"; + sha256 = "1pahrkf536ay56jdiqdda1bq0q5d788bvf099r0wvxwgqk77hr6n"; }; dependencies = []; @@ -1870,22 +1873,22 @@ let }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-07-08"; + name = "vim-signify-2018-07-25"; src = fetchgit { url = "https://github.com/mhinz/vim-signify"; - rev = "9303070b022c4a642a8d35361e3680622c525144"; - sha256 = "0was67gn22dn361jg1qc4iscdkm0cg65dprfyd7r6ifhi6v01jmz"; + rev = "a9fc705b9bdffaac46f13e47d6565c904102dedc"; + sha256 = "0hk24anfhh1v62zn03cbqrf8c260q6g5cka8dpq8c5943v6kln59"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-07-03"; + name = "vim-startify-2018-07-21"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "7bbc46e1c2eb9e2e6e4e5a34a634b40d85eb1bde"; - sha256 = "1q5gxyd85xfhl4i8gzw23dq36bg14lld5i91vnz8xys25idzjs1s"; + rev = "8cde338d1f35057fd64146090c960a55b953dcd9"; + sha256 = "01aali5s946589cxy8k5qb0qzhxwlgwv4grri3x60h2520fc1z29"; }; dependencies = []; @@ -2094,11 +2097,11 @@ let }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2018-06-13"; + name = "python-mode-2018-07-23"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "bb746d0d0cba9adedbac856429e37a0dbfc599c6"; - sha256 = "1zlzlfz4arb2gi9ba5mdkpfkirhyk21g18cwx1f150b14baq734f"; + rev = "d241974f40e8d206f9970e51fb0069951862ba35"; + sha256 = "1cjhlbk71785zy0g0lf2bmsdsnvqwx03v8lxq7i7j2qazalszxci"; }; dependencies = []; @@ -2334,11 +2337,22 @@ let }; denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-07-19"; + name = "denite-nvim-2018-07-22"; src = fetchgit { url = "https://github.com/shougo/denite.nvim"; - rev = "0cab5543d755be4a6c9d331672b07235f8473f1f"; - sha256 = "1r9a29fjmab7r10f5c39xdmbpq14jc6lwyj7d63b5p2dnlva2wr0"; + 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 = []; @@ -2484,6 +2498,17 @@ let ''; }; + 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 = []; + + }; + gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "gundo-vim-2017-05-09"; src = fetchgit { @@ -2495,6 +2520,17 @@ let }; + 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 { @@ -2660,6 +2696,17 @@ let }; + 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 { @@ -2672,11 +2719,11 @@ let }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-07-18"; + name = "vim-dispatch-2018-07-25"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "43760f9d8469d59fd629a97e19dce4491192cca6"; - sha256 = "16kziq3y4v0nksilrblryf2vham87w9c3y133xm6zznyjsjp2x90"; + rev = "dbb9320d000caa56dfada5f99fe0b5209ef0590b"; + sha256 = "1yqc8fwyf66jckvjf8z8h62399kzgfdzcbnnd9ax8q3wjyk3lfsh"; }; dependencies = []; @@ -2693,12 +2740,23 @@ let }; + 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-18"; + name = "vim-fugitive-2018-07-25"; src = fetchgit { url = "https://github.com/tpope/vim-fugitive"; - rev = "9b9a81b170040ab0061ebd5beec1f5e2e1177056"; - sha256 = "189w34rjh67j1hs77284xaxq8xlhc0zrk4nnk3qnprwg5qfr4plz"; + rev = "6bab1a0c398a9a6aaef607a5361709393eba79ac"; + sha256 = "1rsiha7a0k7ib455dvxrl46zl7x386i70rhwnbmy8lk6wa32mz7v"; }; dependencies = []; @@ -2715,6 +2773,17 @@ let }; + 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 { @@ -2727,11 +2796,22 @@ let }; vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-rhubarb-2018-07-19"; + name = "vim-rhubarb-2018-07-21"; src = fetchgit { url = "https://github.com/tpope/vim-rhubarb"; - rev = "186bf27e05ab8713193b1d1210cd3c79f392445a"; - sha256 = "127gv59dkw1z7lpspxk7by2pf1mqqb6jxc58g359m76lfqpkcvvv"; + 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 = []; @@ -2771,11 +2851,22 @@ let }; vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-surround-2018-06-15"; + name = "vim-surround-2018-07-23"; src = fetchgit { url = "https://github.com/tpope/vim-surround"; - rev = "aa1f120ad3a29c27cc41d581cda3751c59343cce"; - sha256 = "1vblmvmbl9k2fzm0fjlbvvbb5izyljaxg187s29cp6p4xm0frcql"; + 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 = []; @@ -2848,11 +2939,11 @@ let }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-07-24"; + name = "youcompleteme-2018-07-25"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "459b3e620e45191b15c48c66b02ff89f1a0674db"; - sha256 = "0s4sndx0mm13xcb559agfcqqdwhp2sr7kpp4ksc9gx41k7626rdr"; + rev = "15362d9cb8ec054c929e9a202252825eabe47e58"; + sha256 = "0nk3wqlz15pvm6hbla8shd3sskbdmwd1x9cq85la223h6s138hwy"; }; dependencies = []; buildPhase = '' @@ -2874,11 +2965,11 @@ let }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-07-13"; + name = "vim-airline-2018-07-24"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline"; - rev = "4cc255a3849c15484f7da5b5039d73f1a567a7e2"; - sha256 = "124pl87zwfg4fnb3il5jy5dz03bq5vzyk10z60dvkfw4cr57hlfw"; + rev = "59f3669a42728406da6d1b948608cae120d1453f"; + sha256 = "12rgvaqfqh0mfv85qdqpr5zn3q3v6npbk11al62fzpa9s55q0025"; }; dependencies = []; @@ -2896,11 +2987,11 @@ let }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2018-01-11"; + name = "vim-pandoc-2018-07-23"; src = fetchgit { url = "https://github.com/vim-pandoc/vim-pandoc"; - rev = "3a686781ab5ea622616798475deb394e48d3cc48"; - sha256 = "1nvz8v52jydkvnlid5w8dkjmr548ryla2vaxnlgj125aamkvmgn3"; + rev = "0060e5c6ac9e4a2391e8a36359dcbbb5827978cb"; + sha256 = "0y0ppy1imy4kjkyflxwh5hfp6vcs93xia6myyd5sc6l3gbcg1lrk"; }; dependencies = []; @@ -3127,33 +3218,33 @@ let }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2018-06-12"; + name = "vimwiki-2018-07-21"; src = fetchgit { url = "https://github.com/vimwiki/vimwiki"; - rev = "9f8b0082dbd99e706cc18de2076f7a66c2ca0a90"; - sha256 = "0q9ik2shvg9lcavds2y7ffsj34zl5ichprm2sylz2bfhjcqgsslw"; + rev = "9f797f6ad9fd2a5e943bc99b5f9cd44b2cbd0fb4"; + sha256 = "0snqxbfpc9jy9zy3n0g2xc01kgxznnnd0g00v2nb17vs3m1b7arc"; }; dependencies = []; }; dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "dhall-vim-2018-07-15"; + name = "dhall-vim-2018-07-23"; src = fetchgit { url = "https://github.com/vmchale/dhall-vim"; - rev = "a17c1ebb1487f2a69dd5230e9d4b8a247b50e2ae"; - sha256 = "1xrlzvi626bhxh8rs0gz4hjkx7qc0f6bb0vl6ainnkjqafb310qw"; + rev = "5bdddb86e660f172841109a28e2a98efb76448ce"; + sha256 = "0rkzgn5ny84624q7phc8wdm4nvkq2ypkq5lkbmahhm26cxvlkqlq"; }; dependencies = []; }; ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-07-17"; + name = "ale-2018-07-25"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "5453e0e1a43302226da1d1d753e162af0231f9d3"; - sha256 = "0zcgfjssvfcc30ksgp42khc9s91gxymkz3dzdhnvwkm0vx90mjlp"; + rev = "79ffdde267323a206a96227904549c370f27decf"; + sha256 = "02np0jnz50qs3fl6n0wh1xfzgq8lbfgagf2mw8cbj8a4gmzx67fg"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9e7f70925a20..4d0e85e153ce 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -52,6 +52,7 @@ "github:esneider/YUNOcommit.vim" "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" @@ -194,7 +195,7 @@ "github:sheerun/vim-polyglot" "github:shougo/context_filetype.vim" "github:shougo/denite.nvim" -"github:Shougo/deoplete.nvim" +"github:shougo/deoplete.nvim" "github:shougo/echodoc.vim" "github:shougo/neco-syntax" "github:shougo/neco-vim" @@ -207,8 +208,10 @@ "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" @@ -224,17 +227,22 @@ "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-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" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort new file mode 100644 index 000000000000..febd2185bac3 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort @@ -0,0 +1,4 @@ + postPatch = '' + substituteInPlace ftplugin/python_vimisort.vim \ + --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' + ''; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 461b90bc978c..7c7da3612465 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -85,6 +85,7 @@ let --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto' ''; + separateDebugInfo = true; enableParallelBuilding = true; makeFlags = [ "all" "fdb_java" ] @@ -92,7 +93,9 @@ let # it gets statically linked in ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] # Needed environment overrides - ++ [ "KVRELEASE=1" ]; + ++ [ "KVRELEASE=1" + "NOSTRIP=1" + ]; # on 6.0 and later, we can specify all this information manually configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' @@ -152,9 +155,9 @@ in with builtins; { }; foundationdb60 = makeFdb rec { - version = "6.0.2pre2430_${substring 0 8 rev}"; + version = "6.0.3pre2446_${substring 0 8 rev}"; branch = "release-6.0"; - rev = "7938d247a5eaf886a176575de6592b76374df58c"; - sha256 = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h"; + rev = "dd5481fb60ee1652986b2a028b31dcbb6cb171b5"; + sha256 = "0mhlb728badk1h3410jbhy7f48m3jjnjna26wwyw5680xz72d6dm"; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 8c86cc6577a7..62fd3397cb63 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,13 +26,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.31.2"; + version = "0.33.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "15nfdq5s0d4bv1in6vymhq70hpz48p0nlzx25wxpibbrix630h8q"; + sha256 = "1immk6k0wgiks1s39dhyjg79n6rgans9zy85r5wmkp4dlc3r5rx6"; }; patches = [ @@ -45,7 +45,7 @@ in pythonPackages.buildPythonApplication rec { signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client matrix-angular-sdk bleach netaddr jinja2 psycopg2 psutil msgpack-python lxml matrix-synapse-ldap3 - phonenumbers jsonschema affinity bcrypt + phonenumbers jsonschema affinity bcrypt sortedcontainers ]; # Checks fail because of Tox. @@ -59,6 +59,6 @@ in pythonPackages.buildPythonApplication rec { homepage = https://matrix.org; description = "Matrix reference homeserver"; license = licenses.asl20; - maintainers = [ maintainers.ralith maintainers.roblabla ]; + maintainers = with maintainers; [ ralith roblabla ekleog ]; }; } diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index b7fddeb854d1..afa6321fb5d3 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}: let - pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]); + pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc sabyenc ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { version = "2.3.3"; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 06caf191587c..84872649c492 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -1,14 +1,26 @@ -{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux }: +{ elk6Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre_headless +, utillinux +, autoPatchelfHook +, zlib +}: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = elk6Version; - name = "elasticsearch-${version}"; + name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "13hf00khq33yw6zv022vcrsf6vm43isx40x7ww8r1lqx3vmg3rli"; + sha256 = + if enableUnfree + then "0960ak602pm95p2mha9cb1mrwdky8pfw3y89r2v4zpr5n730hmnh" + else "1i4i1ai75bf8k0zd1qf8x0bavrm8rcw13xdim443zza09w95ypk4"; }; patches = [ ./es-home-6.x.patch ]; @@ -32,10 +44,22 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" ''; + passthru = { inherit enableUnfree; }; + meta = { description = "Open Source, Distributed, RESTful Search Engine"; - license = licenses.asl20; + license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ apeschar basvandijk ]; }; -} +} // optionalAttrs enableUnfree { + dontPatchELF = true; + nativeBuildInputs = [ autoPatchelfHook ]; + runtimeDependencies = [ zlib ]; + postFixup = '' + for exe in $(find $out/modules/x-pack/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do + echo "patching $exe..." + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe" + done + ''; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a1b458986e50..cc28dc73ca87 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2476,6 +2476,7 @@ let }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; + configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b7b3640a9535..22dd700b2dda 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -339,15 +339,7 @@ in rec { llvmPackages_5 = super.llvmPackages_5 // (let tools = super.llvmPackages_5.tools.extend (_: super: { - # Build man pages with final stdenv not before - llvm = lib.extendDerivation - true - { inherit (super.llvm) man; } - llvmPackages_5.llvm; - clang-unwrapped = lib.extendDerivation - true - { inherit (super.clang-unwrapped) man; } - llvmPackages_5.clang-unwrapped; + inherit (llvmPackages_5) llvm clang-unwrapped; }); libraries = super.llvmPackages_5.libraries.extend (_: _: { inherit (llvmPackages_5) compiler-rt libcxx libcxxabi; @@ -384,9 +376,8 @@ in rec { initialPath = import ../common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; - # Hack to avoid man pages in stdenv, building bootstrap python cc = pkgs.llvmPackages.libcxxClang.override { - cc = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ]; + cc = pkgs.llvmPackages.clang-unwrapped; }; extraNativeBuildInputs = []; diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix new file mode 100644 index 000000000000..40725defbed9 --- /dev/null +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: + +stdenv.mkDerivation rec { + name = "android-file-transfer-${version}"; + version = "3.4"; + src = fetchFromGitHub { + owner = "whoozle"; + repo = "android-file-transfer-linux"; + rev = "v${version}"; + sha256 = "1xwl0vk57174gdjhgqkzrirwzd2agdm84q30dq9q376ixgxjrifc"; + }; + buildInputs = [ cmake fuse readline pkgconfig qtbase ]; + buildPhase = '' + cmake . + make + ''; + installPhase = '' + make install + ''; + meta = with stdenv.lib; { + description = "Reliable MTP client with minimalistic UI"; + homepage = http://whoozle.github.io/android-file-transfer-linux/; + license = licenses.lgpl21; + maintainers = [ maintainers.xaverdh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 6cd9623ad1c0..0b606882a5c3 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.3.0.3"; + version = "2.5.0.0"; 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 = "1q0izb8ajzxl36fjpy4rn63sz01055r9s33fga99jprdmkkfzz6x"; + sha256 = "19vd8252g5bmzm4i9gybpj7i2mhsflcgfl4ns5k3g1vv7f69i1dn"; }; outputs = [ "bin" "lib" "dev" "doc" "out" ]; diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 5e6db9fdc209..59c0396eebea 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -2,24 +2,25 @@ stdenv.mkDerivation { name = "fortune-mod-1.99.1"; - + src = fetchurl { url = http://ftp.de.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz; sha256 = "1kpa2hgbglj5dbfasvl9wc1q3xpl91mqn3sfby46r4rwyzhswlgw"; }; - + buildInputs = [ recode ]; - + preConfigure = '' - sed -i "s|/usr/|$out/|" Makefile + sed -i "s|/usr/|$out/|" Makefile ''; preBuild = '' makeFlagsArray=("CC=$CC" "REGEXDEFS=-DHAVE_REGEX_H -DPOSIX_REGEX" "LDFLAGS=") ''; - + postInstall = '' - ln -s $out/games/fortune $out/bin/fortune + mv $out/games/fortune $out/bin/fortune + rmdir $out/games ''; meta = { diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index e8e2152f7110..b85d2bffc341 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -42,8 +42,8 @@ buildGoPackage rec { cp $src/bin/fzf-tmux $bin/bin mkdir -p $man/share/man cp -r $src/man/man1 $man/share/man - mkdir -p $out/share/vim-plugins - ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} + mkdir -p $out/share/vim-plugins/${name} + cp -r $src/plugin $out/share/vim-plugins/${name} cp -R $src/shell $bin/share/fzf cat <<SCRIPT > $bin/bin/fzf-share diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 6aa3fd836965..4f15ba90d39d 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -1,12 +1,23 @@ -{ stdenv, fetchurl, elk6Version, makeWrapper, jre }: +{ elk6Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre +}: + +with stdenv.lib; stdenv.mkDerivation rec { version = elk6Version; - name = "logstash-${version}"; + name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "07j3jjg5ik4gjgvcx15qqqas9p1m3815jml82a5r1ip9l6vc4h20"; + sha256 = + if enableUnfree + then "0yx9hpiav4d5z1b52x2h5i0iknqs9lmxy8vmz0wkb23mjiz8njdr" + else "1ir8pbq706mxr56k5cgc9ajn2jp603zrqj66dimx6xxf2nfamw0w"; }; dontBuild = true; @@ -35,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; homepage = https://www.elastic.co/products/logstash; - license = licenses.asl20; + license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index c0163f066aae..db2071ab17da 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -2,7 +2,7 @@ let - version = "2.2.0.1"; + version = "2.3.0.0"; 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 = "10qvkh608nsx8gqs3pj4pb8aivwpshbmjw2766grgmrb35d31brl"; + sha256 = "1hczdg3dzi9z6f0wicm2qa2239fiax915zp66xspdz6qd23nqrxb"; }; 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 c70e8273163a..1971bbffa406 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -1,10 +1,25 @@ -{ stdenv, execline, fetchgit, s6, s6-dns, skalibs }: +{ stdenv, execline, fetchgit, s6, s6-dns, skalibs + +# Whether to build the TLS/SSL tools and what library to use +# acceptable values: "libressl", false +# TODO: add bearssl +, sslSupport ? "libressl" , libressl +}: let + inherit (stdenv) lib; version = "2.3.0.2"; -in stdenv.mkDerivation rec { + sslSupportEnabled = sslSupport != false; + sslLibs = { + "libressl" = libressl; + }; + +in +assert sslSupportEnabled -> sslLibs ? ${sslSupport}; + +stdenv.mkDerivation rec { name = "s6-networking-${version}"; @@ -41,7 +56,12 @@ in stdenv.mkDerivation rec { "--with-dynlib=${s6.out}/lib" "--with-dynlib=${s6-dns.lib}/lib" ] - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + ++ (lib.optionals sslSupportEnabled [ + "--enable-ssl=${sslSupport}" + "--with-include=${lib.getDev sslLibs.${sslSupport}}/include" + "--with-lib=${lib.getLib sslLibs.${sslSupport}}/lib" + ]) + ++ (lib.optional stdenv.isDarwin "--build=${stdenv.system}"); postInstall = '' mkdir -p $doc/share/doc/s6-networking/ @@ -51,8 +71,8 @@ in stdenv.mkDerivation rec { meta = { homepage = http://www.skarnet.org/software/s6-networking/; description = "A suite of small networking utilities for Unix systems"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; + 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 5436c2f8c707..f6eed5671cea 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -2,7 +2,7 @@ let - version = "0.3.0.0"; + version = "0.4.0.1"; 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 = "174a3l92nkhxrx8gq36xmb5a7krj40iz1xdiii25nxwjfiw5ynfb"; + sha256 = "10gkkdbvkb4s2yshx425v9diwm7vvbl320a2bm0c3wz71xr94wsw"; }; outputs = [ "bin" "lib" "dev" "doc" "out" ]; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 05666a7ad678..035d4280494c 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.6.1.1"; + version = "2.7.1.1"; 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 = "162hng8xcwjp8pr4d78zq3f82lm9c6ldbcfll0mjsmnxdds5hrsg"; + sha256 = "0dncw3h9wc4cgc9q8zjwicgbcqcn6722yhk8g9bvrhs7h4fkfqav"; }; # NOTE lib: cannot split lib from bin at the moment, diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 55251c904514..3663f6e9798a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -313,6 +313,7 @@ mapAliases ({ # added 2018-07-16 forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); + callPackage_i686 = pkgsi686Linux.callPackage; inherit (ocaml-ng) # added 2016-09-14 ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a1746a21e5e..72bdaf84d277 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2254,12 +2254,15 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.9"; - elk6Version = "6.2.4"; + elk6Version = "6.3.2"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; + elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { + enableUnfree = false; + }; elasticsearchPlugins = recurseIntoAttrs ( callPackage ../servers/search/elasticsearch/plugins.nix { } @@ -3364,6 +3367,9 @@ with pkgs; kibana = callPackage ../development/tools/misc/kibana { }; kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; + kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { + enableUnfree = false; + }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -3443,6 +3449,9 @@ with pkgs; logstash = callPackage ../tools/misc/logstash { }; logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; + logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { + enableUnfree = false; + }; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; @@ -5065,6 +5074,8 @@ with pkgs; siege = callPackage ../tools/networking/siege {}; + sieve-connect = callPackage ../applications/networking/sieve-connect {}; + sigal = callPackage ../applications/misc/sigal { inherit (pythonPackages) buildPythonApplication fetchPypi; }; @@ -6211,6 +6222,7 @@ with pkgs; }; clang = llvmPackages.clang; + clang-manpages = llvmPackages.clang-manpages; clang-sierraHack = clang.override { name = "clang-wrapper-with-reexport-hack"; @@ -6843,6 +6855,7 @@ with pkgs; lldb_6 = llvmPackages_6.lldb; llvm = llvmPackages.llvm; + llvm-manpages = llvmPackages.llvm-manpages; llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; @@ -11866,7 +11879,7 @@ with pkgs; sofia_sip = callPackage ../development/libraries/sofia-sip { }; soil = callPackage ../development/libraries/soil { }; - + sonic = callPackage ../development/libraries/sonic { }; soprano = callPackage ../development/libraries/soprano { }; @@ -18251,7 +18264,7 @@ with pkgs; st = callPackage ../applications/misc/st { conf = config.st.conf or null; - patches = config.st.patches or null; + patches = config.st.patches or []; extraLibs = config.st.extraLibs or []; }; @@ -20941,7 +20954,7 @@ with pkgs; spyder = callPackage ../applications/science/spyder { }; openspace = callPackage ../applications/science/astronomy/openspace { }; - + stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; tulip = callPackage ../applications/science/misc/tulip { @@ -21012,6 +21025,8 @@ with pkgs; ### MISC + android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; + antimicro = libsForQt5.callPackage ../tools/misc/antimicro { }; atari800 = callPackage ../misc/emulators/atari800 { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 5d042c3385e1..ba82bd217fdc 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -298,23 +298,6 @@ let helm-words = callPackage ../applications/editors/emacs-modes/helm-words { }; - hindent = melpaBuild rec { - pname = "hindent"; - version = external.hindent.version; - src = external.hindent.src; - packageRequires = [ haskell-mode ]; - propagatedUserEnvPkgs = [ external.hindent ]; - recipe = writeText "recipe" '' - (hindent - :repo "commercialhaskell/hindent" :fetcher github - :files ("elisp/*.el")) - ''; - meta = { - description = "Indent haskell code using the \"hindent\" program"; - license = bsd3; - }; - }; - icicles = callPackage ../applications/editors/emacs-modes/icicles { }; redshank = callPackage ../applications/editors/emacs-modes/redshank { }; diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index 77f620da7249..f4e778aed127 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -4,7 +4,7 @@ with pkgs; runCommand "nixpkgs-metrics" { buildInputs = [ nix time ]; - requiredSystemFeatures = [ "benchmark" ]; + # requiredSystemFeatures = [ "benchmark" ]; # TODO: a 1-job machine for this on Hydra? } '' export NIX_DB_DIR=$TMPDIR diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c71082f6a4fe..9239a2b82eb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -256,6 +256,8 @@ in { ewmh = callPackage ../development/python-modules/ewmh { }; + exchangelib = callPackage ../development/python-modules/exchangelib { }; + dbus-python = callPackage ../development/python-modules/dbus { dbus = pkgs.dbus; }; @@ -415,6 +417,8 @@ in { inherit (pkgs.llvmPackages) openmp; }; + pykerberos = callPackage ../development/python-modules/pykerberos { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pyparser = callPackage ../development/python-modules/pyparser { }; @@ -475,6 +479,8 @@ in { rx = callPackage ../development/python-modules/rx { }; + sabyenc = callPackage ../development/python-modules/sabyenc { }; + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; seekpath = callPackage ../development/python-modules/seekpath { }; @@ -2050,6 +2056,8 @@ in { requests-cache = callPackage ../development/python-modules/requests-cache { }; + requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; + requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; howdoi = callPackage ../development/python-modules/howdoi {}; |