From e7f57503e0734606ee35313b6e0fdbb170914d64 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 28 Feb 2019 19:19:04 -0500 Subject: [PATCH 001/219] v8: 5.4.232 -> 7.4.255 --- .../interpreters/proglodyte-wasm/default.nix | 4 +- pkgs/development/libraries/v8/5_x.nix | 199 ++++++++++++++++ pkgs/development/libraries/v8/6_x.nix | 193 --------------- pkgs/development/libraries/v8/darwin.patch | 22 ++ pkgs/development/libraries/v8/default.nix | 220 ++++++------------ .../tools/build-managers/gn/default.nix | 2 + .../tools/build-managers/gn/setup-hook.sh | 14 ++ pkgs/development/tools/xcbuild/wrapper.nix | 7 +- pkgs/top-level/all-packages.nix | 22 +- pkgs/top-level/static.nix | 3 - 10 files changed, 323 insertions(+), 363 deletions(-) create mode 100644 pkgs/development/libraries/v8/5_x.nix delete mode 100644 pkgs/development/libraries/v8/6_x.nix create mode 100644 pkgs/development/libraries/v8/darwin.patch create mode 100644 pkgs/development/tools/build-managers/gn/setup-hook.sh diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix index 9a30ae7d8a85..5710f1066757 100644 --- a/pkgs/development/interpreters/proglodyte-wasm/default.nix +++ b/pkgs/development/interpreters/proglodyte-wasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, clang, python, v8_static, coreutils }: +{ stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }: let sexpr_wasm_prototype = stdenv.mkDerivation { @@ -45,7 +45,7 @@ stdenv.mkDerivation { installPhase = '' export DESTDIR=$out export MKTEMPDIR=${coreutils}/bin - export D8DIR=${v8_static}/bin + export D8DIR=${v8}/bin export SWDIR=${sexpr_wasm_prototype}/bin make install ''; diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix new file mode 100644 index 000000000000..2b9fa5cc04c0 --- /dev/null +++ b/pkgs/development/libraries/v8/5_x.nix @@ -0,0 +1,199 @@ +{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu +, patchelf, coreutils, xcbuild +, doCheck ? false +, static ? false +}: + +assert readline != null; + +let + arch = if stdenv.isx86_64 then "x64" + else if stdenv.isi686 then "ia32" + else if stdenv.isAarch64 then "arm64" + else if stdenv.isAarch32 then "arm" + else throw "Unknown architecture for v8"; + git_url = "https://chromium.googlesource.com"; + clangFlag = if stdenv.isDarwin then "1" else "0"; + sharedFlag = if static then "static_library" else "shared_library"; + + deps = { + "build" = fetchgit { + url = "${git_url}/chromium/src/build.git"; + rev = "2c67d4d74b6b3673228fab191918500a582ef3b0"; + sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q"; + }; + "tools/gyp" = fetchgit { + url = "${git_url}/external/gyp.git"; + rev = "e7079f0e0e14108ab0dba58728ff219637458563"; + sha256 = "0yd1ds13z0r9d2sb67f9i1gjn1zgzwyfv96qqqp6pn5pcfbialg6"; + }; + "third_party/icu" = fetchgit { + url = "${git_url}/chromium/deps/icu.git"; + rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf"; + sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns"; + }; + "buildtools" = fetchgit { + url = "${git_url}/chromium/buildtools.git"; + rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582"; + sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0"; + }; + "base/trace_event/common" = fetchgit { + url = "${git_url}/chromium/src/base/trace_event/common.git"; + rev = "315bf1e2d45be7d53346c31cfcc37424a32c30c8"; + sha256 = "1pp2ygvp20j6g4868hrmiw0j704kdvsi9d9wx2gbk7w79rc36695"; + }; + "platform/inspector_protocol" = fetchgit { + url = "${git_url}/chromium/src/third_party/WebKit/Source/platform/inspector_protocol.git"; + rev = "f49542089820a34a9a6e33264e09b73779407512"; + sha256 = "1lwpass3p4rpp2kjmxxxpkqyv4lznxhf4i0yy7mmrd7jkpc7kn8k"; + }; + "tools/mb" = fetchgit { + url = "${git_url}/chromium/src/tools/mb.git"; + rev = "0c4dc43c454f26936ddf3074ab8e9a41e3dc03a3"; + sha256 = "0f96qphbmwn1pprv0a6xf68p01s1jzx2sz6pmadqbrs1dgh1xwnk"; + }; + "tools/swarming_client" = fetchgit { + url = "${git_url}/external/swarming.client.git"; + rev = "7f63a272f7d9785ce41b6d10bb3106c49a968e57"; + sha256 = "1pmb8bq4qifjf2dzz8c4jdwhlvwgrl9ycjaalcyh1sbh4lx3yvv2"; + }; + "testing/gtest" = fetchgit { + url = "${git_url}/external/github.com/google/googletest.git"; + rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; + sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; + }; + "testing/gmock" = fetchgit { + url = "${git_url}/external/googlemock.git"; + rev = "0421b6f358139f02e102c9c332ce19a33faf75be"; + sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp"; + }; + "test/benchmarks/data" = fetchgit { + url = "${git_url}/v8/deps/third_party/benchmarks.git"; + rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; + sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; + }; + "test/mozilla/data" = fetchgit { + url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; + rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; + sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; + }; + "test/simdjs/data" = fetchgit { + url = "${git_url}/external/github.com/tc39/ecmascript_simd.git"; + rev = "baf493985cb9ea7cdbd0d68704860a8156de9556"; + sha256 = "178r0k40a58c1187gfzqz2i6as34l8cliy1g1x870wyy0qcvlq2q"; + }; + "test/test262/data" = fetchgit { + url = "${git_url}/external/github.com/tc39/test262.git"; + rev = "88bc7fe7586f161201c5f14f55c9c489f82b1b67"; + sha256 = "0gc7fmaqrgwb6rl02jnrm3synpwzzg0dfqy3zm386r1qcisl93xs"; + }; + "test/test262/harness" = fetchgit { + url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; + rev = "cbd968f54f7a95c6556d53ba852292a4c49d11d8"; + sha256 = "094c3600a4wh1m3fvvlivn290kik1pzzvwabq77lk8bh4jkkv7ki"; + }; + "tools/clang" = fetchgit { + url = "${git_url}/chromium/src/tools/clang.git"; + rev = "496622ab4aaa5be7e5a9b80617013cb02f45dc87"; + sha256 = "1gkhk2bzpxwzkirzcqfixxpprbr8mn6rk00krm25daarm3smydmf"; + }; + }; + +in + +stdenv.mkDerivation rec { + name = "v8-${version}"; + version = "5.4.232"; + + inherit doCheck; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = version; + sha256 = "1nqxbkz75m8xrjih0sj3f3iqvif4192vxdaxzy8r787rihjwg9nx"; + }; + + postUnpack = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + cp -r ${v}/* $sourceRoot/${n} + '') deps)} + ''; + + # Patch based off of: + # https://github.com/cowboyd/libv8/tree/v5.1.281.67.0/patches + patches = lib.optional (!doCheck) ./libv8-5.4.232.patch; + + postPatch = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' gypfiles/gyp_v8 + sed -i 's,/bin/echo,${coreutils}/bin/echo,' gypfiles/standalone.gypi + sed -i '/CR_CLANG_REVISION/ d' gypfiles/standalone.gypi + sed -i 's/-Wno-format-pedantic//g' gypfiles/standalone.gypi + ''; + + configurePhase = '' + PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ + gypfiles/gyp_v8 \ + -f make \ + --generator-output="out" \ + -Dflock_index=0 \ + -Dclang=${clangFlag} \ + -Dv8_enable_i18n_support=1 \ + -Duse_system_icu=1 \ + -Dcomponent=${sharedFlag} \ + -Dconsole=readline \ + -Dv8_target_arch=${arch} \ + -Dv8_use_external_startup_data=0 + ''; + + nativeBuildInputs = [ which ]; + buildInputs = [ readline python icu ] + ++ stdenv.lib.optional stdenv.isDarwin xcbuild + ++ stdenv.lib.optional stdenv.isLinux patchelf; + + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes" + + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; + + buildFlags = [ + "LINK=c++" + "-C out" + "builddir=$(CURDIR)/Release" + "BUILDTYPE=Release" + ]; + + enableParallelBuilding = true; + + dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + + # the `libv8_libplatform` target is _only_ built as a static library, + # and is expected to be statically linked in when needed. + # see the following link for further commentary: + # https://github.com/cowboyd/therubyracer/issues/391 + installPhase = '' + install -vD out/Release/d8 "$out/bin/d8" + install -vD out/Release/mksnapshot "$out/bin/mksnapshot" + ${if static then "" + else if stdenv.isDarwin then '' + install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib" + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + '' else '' + install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" + ''} + mkdir -p "$out/include" + cp -vr include/*.h "$out/include" + cp -vr include/libplatform "$out/include" + mkdir -p "$out/lib" + cp -v out/Release/*.a "$out/lib" + ''; + + meta = with lib; { + description = "Google's open source JavaScript engine"; + maintainers = with maintainers; [ cstrahan proglodyte ]; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix deleted file mode 100644 index 85d0c0d91bb5..000000000000 --- a/pkgs/development/libraries/v8/6_x.nix +++ /dev/null @@ -1,193 +0,0 @@ -{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig -, doCheck ? false -, snapshot ? true -}: - -let - arch = if stdenv.isAarch32 - then if stdenv.is64bit - then"arm64" - else "arm" - else if stdenv.is64bit - then"x64" - else "ia32"; - git_url = "https://chromium.googlesource.com"; - - # This data is from the DEPS file in the root of a V8 checkout - deps = { - "base/trace_event/common" = fetchgit { - url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "211b3ed9d0481b4caddbee1322321b86a483ca1f"; - sha256 = "080sya1dg32hi5gj7zr3r5l18r6w8g0imajyf3xfvnz67a2i8dd7"; - }; - "build" = fetchgit { - url = "${git_url}/chromium/src/build.git"; - rev = "7315579e388589b62236ad933f09afd1e838d234"; - sha256 = "14gsigyjfm03kfzmz0v6429b6qnycvzx0yj3vwaks8may26aiv71"; - }; - "buildtools" = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "0dd5c6f980d22be96b728155249df2da355989d9"; - sha256 = "0m1fh0qjcx9c69khnqcsqvrnqs7ji6wfxns9vv9mknj20sph5ydr"; - }; - "test/benchmarks/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/benchmarks.git"; - rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; - sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; - }; - "test/mozilla/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; - rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; - sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; - }; - "test/test262/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/test262.git"; - rev = "a6c1d05ac4fed084fa047e4c52ab2a8c9c2a8aef"; - sha256 = "1cy3val2ih6r4sbaxd1v9fir87mrlw1kr54s64g68gnch53ck9s3"; - }; - "test/test262/harness" = fetchgit { - url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; - rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd"; - sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp"; - }; - "test/wasm-js" = fetchgit { - url = "${git_url}/external/github.com/WebAssembly/spec.git"; - rev = "2113ea7e106f8a964e0445ba38f289d2aa845edd"; - sha256 = "07aw7x2xzmzk905mqf8gbbb1bi1a5kv99g8iv6x2p07d3zns7xzx"; - }; - "third_party/depot_tools" = fetchgit { - url = "${git_url}/chromium/tools/depot_tools.git"; - rev = "fb734036f4b5ae6d5afc63cbfc41d3a5d1c29a82"; - sha256 = "1738y7xgfnn0hfdr8g5jw7555841ycxbn580mdffwv4jnbn7120s"; - }; - "third_party/googletest/src" = fetchgit { - url = "${git_url}/external/github.com/google/googletest.git"; - rev = "ce468a17c434e4e79724396ee1b51d86bfc8a88b"; - sha256 = "0nik8wb1b0zk2sslawgp5h211r5bc4x7m962dgnmbk11ccvsmr23"; - }; - "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "a9a2bd3ee4f1d313651c5272252aaf2a3e7ed529"; - sha256 = "1bfyxakgv9z0rxbqsy5csi85kg8dqy7i6zybmng5wyzag9cns4f9"; - }; - "third_party/instrumented_libraries" = fetchgit { - url = "${git_url}/chromium/src/third_party/instrumented_libraries.git"; - rev = "323cf32193caecbf074d1a0cb5b02b905f163e0f"; - sha256 = "0q3n3ivqva28qpn67ds635521pwzpc9apcyagz65i9j17bb1k231"; - }; - "third_party/jinja2" = fetchgit { - url = "${git_url}/chromium/src/third_party/jinja2.git"; - rev = "b41863e42637544c2941b574c7877d3e1f663e25"; - sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r"; - }; - "third_party/markupsafe" = fetchgit { - url = "${git_url}/chromium/src/third_party/markupsafe.git"; - rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; - sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; - }; - "third_party/proguard" = fetchgit { - url = "${git_url}/chromium/src/third_party/proguard.git"; - rev = "eba7a98d98735b2cc65c54d36baa5c9b46fe4f8e"; - sha256 = "1yx86z2p243b0ykixgqz6nlqfp8swa6n0yl5fgb29fa4jvsjz3d1"; - }; - "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "c0b1d892b2bc1291eb287d716ca239c1b03fb215"; - sha256 = "1mz1pqzr2b37mymbkqkmpmj48j7a8ig0ibaw3dfilbx5nbl4wd2z"; - }; - "tools/gyp" = fetchgit { - url = "${git_url}/external/gyp.git"; - rev = "d61a9397e668fa9843c4aa7da9e79460fe590bfb"; - sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0"; - }; - "tools/luci-go" = fetchgit { - url = "${git_url}/chromium/src/tools/luci-go.git"; - rev = "abcd908f74fdb155cc8870f5cae48dff1ece7c3c"; - sha256 = "07c8vanc31wal6aw8v0s499l7ifrgvdvi2sx4ln3nyha5ngxinld"; - }; - "tools/swarming_client" = fetchgit { - url = "${git_url}/infra/luci/client-py.git"; - rev = "9a518d097dca20b7b00ce3bdfc5d418ccc79893a"; - sha256 = "1d8nly7rp24gx7q0m01jvsc15nw5fahayfczwd40gzzzkmvhjazi"; - }; - }; - -in - -stdenv.mkDerivation rec { - name = "v8-${version}"; - version = "6.9.427.14"; - - inherit doCheck; - - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = version; - sha256 = "13d50iz87qh7v8l8kjky8wqs9rvz02pgw74q8crqi5ywnvvill1x"; - }; - - postUnpack = '' - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (n: v: '' - mkdir -p $sourceRoot/${n} - cp -r ${v}/* $sourceRoot/${n} - '') deps)} - ''; - - prePatch = '' - # use our gn, not the bundled one - sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py - - # disable tests - if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi - - # disable sysroot usage - chmod u+w build/config build/config/sysroot.gni - sed -i build/config/sysroot.gni \ - -e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }' - - # patch shebangs (/usr/bin/env) - patchShebangs tools/dev/v8gen.py - ''; - - configurePhase = '' - tools/dev/v8gen.py -vv ${arch}.release -- \ - is_component_build=true \ - ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \ - is_clang=false \ - linux_use_bundled_binutils=false \ - treat_warnings_as_errors=false \ - use_custom_libcxx=false \ - use_custom_libcxx_for_host=false - ''; - - nativeBuildInputs = [ gn ninja pkgconfig ]; - buildInputs = [ python glib ]; - - buildPhase = '' - ninja -C out.gn/${arch}.release/ - ''; - - enableParallelBuilding = true; - - installPhase = '' - install -vD out.gn/${arch}.release/d8 "$out/bin/d8" - install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot" - mkdir -p "$out/lib" - for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do - install -vD out.gn/${arch}.release/$f "$out/lib/$f" - done - install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat" - mkdir -p "$out/include" - cp -vr include/*.h "$out/include" - cp -vr include/libplatform "$out/include" - ''; - - meta = with lib; { - description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte ]; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/v8/darwin.patch b/pkgs/development/libraries/v8/darwin.patch new file mode 100644 index 000000000000..629d5e4dc392 --- /dev/null +++ b/pkgs/development/libraries/v8/darwin.patch @@ -0,0 +1,22 @@ +diff --git a/toolchain/gcc_toolchain.gni b/toolchain/gcc_toolchain.gni +index 80e2a362a..df138c87b 100644 +--- a/build/toolchain/gcc_toolchain.gni ++++ b/build/toolchain/gcc_toolchain.gni +@@ -355,6 +355,8 @@ template("gcc_toolchain") { + # AIX does not support either -D (deterministic output) or response + # files. + command = "$ar -X64 {{arflags}} -r -c -s {{output}} {{inputs}}" ++ } else if (current_os == "mac") { ++ command = "$ar {{arflags}} -r -c -s {{output}} {{inputs}}" + } else { + rspfile = "{{output}}.rsp" + rspfile_content = "{{inputs}}" +@@ -546,7 +548,7 @@ template("gcc_toolchain") { + + start_group_flag = "" + end_group_flag = "" +- if (current_os != "aix") { ++ if (current_os != "aix" && current_os != "mac") { + # the "--start-group .. --end-group" feature isn't available on the aix ld. + start_group_flag = "-Wl,--start-group" + end_group_flag = "-Wl,--end-group " diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 2b9fa5cc04c0..f7c4f34e8e6e 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,101 +1,43 @@ -{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu -, patchelf, coreutils, xcbuild -, doCheck ? false -, static ? false +{ stdenv, lib, fetchgit, fetchFromGitHub +, gn, ninja, python, glib, pkgconfig, icu +, xcbuild, darwin +, fetchpatch }: -assert readline != null; - let - arch = if stdenv.isx86_64 then "x64" - else if stdenv.isi686 then "ia32" - else if stdenv.isAarch64 then "arm64" - else if stdenv.isAarch32 then "arm" - else throw "Unknown architecture for v8"; git_url = "https://chromium.googlesource.com"; - clangFlag = if stdenv.isDarwin then "1" else "0"; - sharedFlag = if static then "static_library" else "shared_library"; + # This data is from the DEPS file in the root of a V8 checkout deps = { - "build" = fetchgit { - url = "${git_url}/chromium/src/build.git"; - rev = "2c67d4d74b6b3673228fab191918500a582ef3b0"; - sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q"; + "base/trace_event/common" = fetchgit { + url = "${git_url}/chromium/src/base/trace_event/common.git"; + rev = "936ba8a963284a6b3737cf2f0474a7131073abee"; + sha256 = "14nr22fqdpxma1kzjflj6a865vr3hfnnm2gs4vcixyq4kmfzfcy2"; }; - "tools/gyp" = fetchgit { - url = "${git_url}/external/gyp.git"; - rev = "e7079f0e0e14108ab0dba58728ff219637458563"; - sha256 = "0yd1ds13z0r9d2sb67f9i1gjn1zgzwyfv96qqqp6pn5pcfbialg6"; + "build" = fetchgit { + url = "${git_url}/chromium/src/build.git"; + rev = "325e95d6dae64f35b160b3dc7d73218cee5ec079"; + sha256 = "0dddyxa76p2xpjhmxif05v63i5ar6h5v684fdl667sg84f5bhhxf"; + }; + "third_party/googletest/src" = fetchgit { + url = "${git_url}/external/github.com/google/googletest.git"; + rev = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081"; + sha256 = "0gmr10042c0xybxnn6g7ndj1na1mmd3l9w7449qlcv4s8gmfs7k6"; }; "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf"; - sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns"; + url = "${git_url}/chromium/deps/icu.git"; + rev = "960f195aa87acaec46e6104ec93a596da7ae0843"; + sha256 = "073kh6gpcairgjxf3hlhpqljc13gwl2aj8fz91fv220xibwqs834"; }; - "buildtools" = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582"; - sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0"; + "third_party/jinja2" = fetchgit { + url = "${git_url}/chromium/src/third_party/jinja2.git"; + rev = "b41863e42637544c2941b574c7877d3e1f663e25"; + sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r"; }; - "base/trace_event/common" = fetchgit { - url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "315bf1e2d45be7d53346c31cfcc37424a32c30c8"; - sha256 = "1pp2ygvp20j6g4868hrmiw0j704kdvsi9d9wx2gbk7w79rc36695"; - }; - "platform/inspector_protocol" = fetchgit { - url = "${git_url}/chromium/src/third_party/WebKit/Source/platform/inspector_protocol.git"; - rev = "f49542089820a34a9a6e33264e09b73779407512"; - sha256 = "1lwpass3p4rpp2kjmxxxpkqyv4lznxhf4i0yy7mmrd7jkpc7kn8k"; - }; - "tools/mb" = fetchgit { - url = "${git_url}/chromium/src/tools/mb.git"; - rev = "0c4dc43c454f26936ddf3074ab8e9a41e3dc03a3"; - sha256 = "0f96qphbmwn1pprv0a6xf68p01s1jzx2sz6pmadqbrs1dgh1xwnk"; - }; - "tools/swarming_client" = fetchgit { - url = "${git_url}/external/swarming.client.git"; - rev = "7f63a272f7d9785ce41b6d10bb3106c49a968e57"; - sha256 = "1pmb8bq4qifjf2dzz8c4jdwhlvwgrl9ycjaalcyh1sbh4lx3yvv2"; - }; - "testing/gtest" = fetchgit { - url = "${git_url}/external/github.com/google/googletest.git"; - rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; - sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; - }; - "testing/gmock" = fetchgit { - url = "${git_url}/external/googlemock.git"; - rev = "0421b6f358139f02e102c9c332ce19a33faf75be"; - sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp"; - }; - "test/benchmarks/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/benchmarks.git"; - rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; - sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; - }; - "test/mozilla/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; - rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; - sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; - }; - "test/simdjs/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/ecmascript_simd.git"; - rev = "baf493985cb9ea7cdbd0d68704860a8156de9556"; - sha256 = "178r0k40a58c1187gfzqz2i6as34l8cliy1g1x870wyy0qcvlq2q"; - }; - "test/test262/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/test262.git"; - rev = "88bc7fe7586f161201c5f14f55c9c489f82b1b67"; - sha256 = "0gc7fmaqrgwb6rl02jnrm3synpwzzg0dfqy3zm386r1qcisl93xs"; - }; - "test/test262/harness" = fetchgit { - url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; - rev = "cbd968f54f7a95c6556d53ba852292a4c49d11d8"; - sha256 = "094c3600a4wh1m3fvvlivn290kik1pzzvwabq77lk8bh4jkkv7ki"; - }; - "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "496622ab4aaa5be7e5a9b80617013cb02f45dc87"; - sha256 = "1gkhk2bzpxwzkirzcqfixxpprbr8mn6rk00krm25daarm3smydmf"; + "third_party/markupsafe" = fetchgit { + url = "${git_url}/chromium/src/third_party/markupsafe.git"; + rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; + sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; }; }; @@ -103,15 +45,23 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "5.4.232"; + version = "7.4.255"; - inherit doCheck; + doCheck = true; + + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/RPi-Distro/chromium-browser/master/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch"; + sha256 = "02hczcg43m36q8j1kv5j3hq9czj9niiil9w13w22vzv2f3c67dvn"; + }) + ./darwin.patch + ]; src = fetchFromGitHub { owner = "v8"; repo = "v8"; rev = version; - sha256 = "1nqxbkz75m8xrjih0sj3f3iqvif4192vxdaxzy8r787rihjwg9nx"; + sha256 = "14i0c71hmffzqnq9n73dh9dnabdxhbjhzkhqpk5yv9y90bwrzi2n"; }; postUnpack = '' @@ -120,80 +70,46 @@ stdenv.mkDerivation rec { mkdir -p $sourceRoot/${n} cp -r ${v}/* $sourceRoot/${n} '') deps)} + chmod u+w -R . ''; - # Patch based off of: - # https://github.com/cowboyd/libv8/tree/v5.1.281.67.0/patches - patches = lib.optional (!doCheck) ./libv8-5.4.232.patch; + gnFlags = [ + "use_custom_libcxx=false" + "is_clang=${if stdenv.cc.isClang then "true" else "false"}" + "use_sysroot=false" + # "use_system_icu=true" + "is_component_build=false" + "v8_use_external_startup_data=false" + "v8_monolithic=true" + "is_debug=true" + "is_official_build=false" + "treat_warnings_as_errors=false" + "v8_enable_i18n_support=true" + "use_gold=false" + "use_system_xcode=true" + # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' + ''host_toolchain="//build/toolchain/linux/unbundle:default"'' + ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' + ] ++ stdenv.lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; - postPatch = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' gypfiles/gyp_v8 - sed -i 's,/bin/echo,${coreutils}/bin/echo,' gypfiles/standalone.gypi - sed -i '/CR_CLANG_REVISION/ d' gypfiles/standalone.gypi - sed -i 's/-Wno-format-pedantic//g' gypfiles/standalone.gypi - ''; + nativeBuildInputs = [ gn ninja pkgconfig python ] + ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; + buildInputs = [ glib icu ]; - configurePhase = '' - PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ - gypfiles/gyp_v8 \ - -f make \ - --generator-output="out" \ - -Dflock_index=0 \ - -Dclang=${clangFlag} \ - -Dv8_enable_i18n_support=1 \ - -Duse_system_icu=1 \ - -Dcomponent=${sharedFlag} \ - -Dconsole=readline \ - -Dv8_target_arch=${arch} \ - -Dv8_use_external_startup_data=0 - ''; - - nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu ] - ++ stdenv.lib.optional stdenv.isDarwin xcbuild - ++ stdenv.lib.optional stdenv.isLinux patchelf; - - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes" - + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; - - buildFlags = [ - "LINK=c++" - "-C out" - "builddir=$(CURDIR)/Release" - "BUILDTYPE=Release" - ]; + ninjaFlags = [ ":d8" "v8_monolith" ]; enableParallelBuilding = true; - dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; - - # the `libv8_libplatform` target is _only_ built as a static library, - # and is expected to be statically linked in when needed. - # see the following link for further commentary: - # https://github.com/cowboyd/therubyracer/issues/391 installPhase = '' - install -vD out/Release/d8 "$out/bin/d8" - install -vD out/Release/mksnapshot "$out/bin/mksnapshot" - ${if static then "" - else if stdenv.isDarwin then '' - install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib" - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib - '' else '' - install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" - ''} - mkdir -p "$out/include" - cp -vr include/*.h "$out/include" - cp -vr include/libplatform "$out/include" - mkdir -p "$out/lib" - cp -v out/Release/*.a "$out/lib" + install -D d8 $out/bin/d8 + install -D obj/libv8_monolith.a $out/lib/libv8.a + cp -r ../../include $out ''; meta = with lib; { description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; + platforms = platforms.unix; license = licenses.bsd3; }; } diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 8c1b55fc5c9a..7ee4c4ee2580 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { install -vD out/gn "$out/bin/gn" ''; + setupHook = ./setup-hook.sh; + meta = with lib; { description = "A meta-build system that generates NinjaBuild files"; homepage = https://gn.googlesource.com/gn; diff --git a/pkgs/development/tools/build-managers/gn/setup-hook.sh b/pkgs/development/tools/build-managers/gn/setup-hook.sh new file mode 100644 index 000000000000..75d2edcaf1c6 --- /dev/null +++ b/pkgs/development/tools/build-managers/gn/setup-hook.sh @@ -0,0 +1,14 @@ +gnConfigurePhase() { + runHook preConfigure + + echo "gn flags: $gnFlags ${gnFlagsArray[@]}" + + gn gen out/Release --args="$gnFlags ${gnFlagsArray[@]}" + cd out/Release/ + + runHook postConfigure +} + +if [ -z "$dontUseGnConfigure" -a -z "$configurePhase" ]; then + configurePhase=gnConfigurePhase +fi diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 959c79405e86..12e72c62a99d 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -3,7 +3,7 @@ , runtimeShell , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" , xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" -, sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }: +, sdkVer ? stdenv.targetPlatform.sdkVer or "10.12" }: let @@ -107,6 +107,9 @@ runCommand "xcodebuild-${xcbuild.version}" { ln -s ${platforms} $out/Platforms ln -s ${toolchains} $out/Toolchains + mkdir -p $out/Applications/Xcode.app/Contents + ln -s $out $out/Applications/Xcode.app/Contents/Developer + makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ --add-flags "DERIVED_DATA_DIR=." \ @@ -116,7 +119,7 @@ runCommand "xcodebuild-${xcbuild.version}" { --run '[ "$1" = "-license" ] && exit 0' substitute ${xcode-select} $out/bin/xcode-select \ - --subst-var-by DEVELOPER_DIR $out + --subst-var-by DEVELOPER_DIR $out/Applications/Xcode.app/Contents/Developer chmod +x $out/bin/xcode-select substitute ${xcrun} $out/bin/xcrun diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b231ba0c9fa..25285a8e08cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5259,9 +5259,7 @@ in routino = callPackage ../tools/misc/routino { }; - rq = callPackage ../development/tools/rq { - v8 = v8.override { static = true; }; - }; + rq = callPackage ../development/tools/rq { }; rsnapshot = callPackage ../tools/backup/rsnapshot { }; @@ -8189,9 +8187,7 @@ in tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; - proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { - v8_static = v8.override { static = true; }; - }; + proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; wasm-gc = callPackage ../development/interpreters/wasm-gc { }; @@ -12932,11 +12928,7 @@ in stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5; }; - v8_6_x = callPackage ../development/libraries/v8/6_x.nix { - inherit (python2Packages) python; - }; - - v8 = callPackage ../development/libraries/v8 ({ + v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ inherit (python2Packages) python gyp; icu = icu58; # v8-5.4.232 fails against icu4c-59.1 } // lib.optionalAttrs stdenv.isLinux { @@ -12944,6 +12936,14 @@ in stdenv = overrideCC stdenv gcc6; }); + v8_6_x = v8; + v8 = callPackage ../development/libraries/v8 { + inherit (python2Packages) python; + } // lib.optionalAttrs stdenv.isLinux { + # doesn't build with gcc7 + stdenv = overrideCC stdenv gcc6; + }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index e6ef50e7ee95..a9775934dd1d 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -82,9 +82,6 @@ in { busybox = super.busybox.override { enableStatic = true; }; - v8 = super.v8.override { - static = true; - }; libiberty = super.libiberty.override { staticBuild = true; }; From e71d172982a60da167322e24f42d44adb74e327a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 23 Apr 2019 20:59:57 +0300 Subject: [PATCH 002/219] mariadb.galera: 25.3.24 -> 25.3.26 --- pkgs/servers/sql/mariadb/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 767565dd5820..74637e13aa71 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -221,13 +221,13 @@ connector-c = stdenv.mkDerivation rec { galera = stdenv.mkDerivation rec { name = "mariadb-galera-${version}"; - version = "25.3.24"; + version = "25.3.26"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "1yx3rqy7r4w2l3hnrri30hvsa296v8xidi18p5fdzcpmnhnlwjbi"; + sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f"; fetchSubmodules = true; }; @@ -243,9 +243,9 @@ galera = stdenv.mkDerivation rec { export LIBPATH="${galeraLibs}/lib" ''; - sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0"; + sconsFlags = "ssl=1 system_asio=0 strict_build_flags=0"; - postInstall = '' + installPhase = '' # copied with modifications from scripts/packages/freebsd.sh GALERA_LICENSE_DIR="$share/licenses/${name}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} From a52e317200eca8ef7b8c6d6b77336a6a9f397a0e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 27 Apr 2019 20:37:42 -0400 Subject: [PATCH 003/219] check-meta: use system tuple in platforms Fixes #60345 --- lib/default.nix | 2 +- pkgs/stdenv/generic/check-meta.nix | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 8735b6476795..3efaaf0f8f9e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -50,7 +50,7 @@ let filesystem = callLibs ./filesystem.nix; # back-compat aliases - platforms = systems.forMeta; + platforms = systems.doubles; inherit (builtins) add addErrorContext attrNames concatLists deepSeq elem elemAt filter genericClosure genList getAttr diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 76e1c351ff40..33868c2e4ae6 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -168,7 +168,7 @@ let license = either (listOf lib.types.attrs) (either lib.types.attrs str); maintainers = listOf (attrsOf str); priority = int; - platforms = listOf (either str lib.systems.parsedPlatform.types.system); + platforms = listOf str; hydraPlatforms = listOf str; broken = bool; # TODO: refactor once something like Profpatsch's types-simple will land @@ -209,11 +209,6 @@ let else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; - checkPlatform = attrs: let - anyMatch = lib.any (lib.meta.platformMatch hostPlatform); - in anyMatch (attrs.meta.platforms or lib.platforms.all) && - ! anyMatch (attrs.meta.badPlatforms or []); - checkOutputsToInstall = attrs: let expectedOutputs = attrs.meta.outputsToInstall or []; actualOutputs = attrs.outputs or [ "out" ]; @@ -235,8 +230,10 @@ let { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } else if !allowBroken && attrs.meta.broken or false then { valid = false; reason = "broken"; errormsg = "is marked as broken"; } - else if !allowUnsupportedSystem && !(checkPlatform attrs) then - { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.config}’"; } + else if !allowUnsupportedSystem && + (!lib.lists.elem hostPlatform.system (attrs.meta.platforms or lib.platforms.all) || + lib.lists.elem hostPlatform.system (attrs.meta.badPlatforms or [])) then + { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; } else if !(hasAllowedInsecure attrs) then { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } else if checkOutputsToInstall attrs then From e500bb84090ddca3e213f4d6ced1f1647be486d6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 30 Apr 2019 11:50:45 -0400 Subject: [PATCH 004/219] systems: add riscv double This was never listed in doubles.nix! Not sure why? --- lib/systems/doubles.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index c6877ebef0bc..ff071c182d4f 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -19,6 +19,8 @@ let "x86_64-windows" "i686-windows" "wasm64-wasi" "wasm32-wasi" + + "riscv32-linux" "riscv64-linux" ]; allParsed = map parse.mkSystemFromString all; @@ -36,6 +38,7 @@ in rec { i686 = filterDoubles predicates.isi686; x86_64 = filterDoubles predicates.isx86_64; mips = filterDoubles predicates.isMips; + riscv = filterDoubles predicates.isRiscV; cygwin = filterDoubles predicates.isCygwin; darwin = filterDoubles predicates.isDarwin; From accfd7ca0832dd7c3b4568f7835d2637910be99b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 30 Apr 2019 17:43:52 -0400 Subject: [PATCH 005/219] unix-tools: get platforms from doubles --- pkgs/top-level/unix-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 00edb7c09072..beb2a996a5ef 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -22,7 +22,7 @@ let in runCommand "${cmd}-${version}" { meta = { priority = 10; - platforms = map (n: { kernel.name = n; }) (attrNames providers); + platforms = lib.platforms.${stdenv.hostPlatform.parsed.kernel.name} or lib.platforms.all; }; passthru = { inherit provider; }; preferLocalBuild = true; From 9c10ac1663f0a3da3b8388efe9ef7cc44c4a887c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 17:38:52 -0500 Subject: [PATCH 006/219] lua-modules/generated: regen for formatting, luv -> 1.28 --- .../lua-modules/generated-packages.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e13f6a4d96e7..922f698ffbcb 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -395,16 +395,16 @@ lua-messagepack = buildLuarocksPackage { version = "0.5.1-2"; src = fetchurl { - url = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock; - sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g"; + url = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock; + sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://fperrad.frama.io/lua-MessagePack/"; - description="a pure Lua implementation of the MessagePack serialization format"; + description = "a pure Lua implementation of the MessagePack serialization format"; license = { fullName = "MIT/X11"; }; @@ -439,16 +439,16 @@ lua-toml = buildLuarocksPackage { version = "2.0-1"; src = fetchurl { - url = https://luarocks.org/lua-toml-2.0-1.src.rock; - sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; + url = https://luarocks.org/lua-toml-2.0-1.src.rock; + sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/jonstoler/lua-toml"; - description="toml decoder/encoder for Lua"; + description = "toml decoder/encoder for Lua"; license = { fullName = "MIT"; }; @@ -613,16 +613,16 @@ rapidjson = buildLuarocksPackage { version = "0.5.1-1"; src = fetchurl { - url = https://luarocks.org/rapidjson-0.5.1-1.src.rock; - sha256 = "0hnqsixnbz95cvm9q5dn0lr0qjvhqw4llw6l1sjswwk0am4yybay"; + url = https://luarocks.org/rapidjson-0.5.1-1.src.rock; + sha256 = "0hnqsixnbz95cvm9q5dn0lr0qjvhqw4llw6l1sjswwk0am4yybay"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "cmake"; meta = { homepage = "https://github.com/xpol/lua-rapidjson"; - description="Json module based on the very fast RapidJSON."; + description = "Json module based on the very fast RapidJSON."; license = { fullName = "MIT"; }; @@ -696,11 +696,11 @@ std_normalize = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.27.0-0"; + version = "1.28.0-1"; src = fetchurl { - url = https://luarocks.org/luv-1.27.0-0.src.rock; - sha256 = "16csnnypi2m71ncr8qwc9drqbrb40l5li1nk7zpsxnslg5fiax6x"; + url = https://luarocks.org/luv-1.28.0-1.src.rock; + sha256 = "15m946p982bk4apig7yf07jm25ck26v2qxcvnrfh60vrbaw6gihw"; }; disabled = ( luaOlder "5.1" ); propagatedBuildInputs = [ lua ]; From b01e5a4b62806b6fd0c3be09094690cabef52112 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 11:06:43 -0500 Subject: [PATCH 007/219] luaPackages.luv: force using system libuv --- pkgs/development/lua-modules/overrides.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index c88f5f9f57ca..935de7cf0159 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -47,6 +47,15 @@ with super; buildInputs = [ pkgs.libiconv ]; }); luv = super.luv.overrideAttrs(oa: { + # Use system libuv instead of building local and statically linking + # This is a hacky way to specify -DWITH_SHARED_LIBUV=ON which + # should be possible but I'm unable to make work. + # While at it, remove bundled libuv source entirely to be sure. + # We may wish to drop bundled lua submodules too... + preBuild = '' + sed -i 's,\(option(WITH_SHARED_LIBUV.*\)OFF,\1ON,' CMakeLists.txt + rm -rf deps/libuv + ''; propagatedBuildInputs = oa.propagatedBuildInputs ++ [ pkgs.libuv ]; }); From 1db3a91bab24e2e6ec3fa78de5be8b6c938cb0c0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 19 May 2019 14:35:10 +0300 Subject: [PATCH 008/219] mariadb: change server config --- pkgs/servers/sql/mariadb/default.nix | 91 ++++++++++++++-------------- 1 file changed, 44 insertions(+), 47 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 767565dd5820..50413e52f04e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy -, libiconv, openssl, pcre, boost, judy, bison, libxml2 +, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5 , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices , asio, buildEnv, check, scons @@ -37,7 +37,7 @@ common = rec { # attributes common to both builds buildInputs = [ ncurses openssl zlib pcre jemalloc libiconv - ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] + ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd libkrb5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; prePatch = '' @@ -54,35 +54,33 @@ common = rec { # attributes common to both builds "-DDEFAULT_COLLATION=utf8_general_ci" "-DSECURITY_HARDENED=ON" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock" + "-DINSTALL_BINDIR=bin" + "-DINSTALL_DOCDIR=share/doc/mysql" + "-DINSTALL_DOCREADMEDIR=share/doc/mysql" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_SUPPORTFILESDIR=share/doc/mysql" + "-DINSTALL_MYSQLTESTDIR=OFF" + "-DINSTALL_SQLBENCHDIR=OFF" "-DWITH_ZLIB=system" "-DWITH_SSL=system" "-DWITH_PCRE=system" - + "-DWITH_SAFEMALLOC=OFF" + "-DEMBEDDED_LIBRARY=OFF" + ] ++ optional stdenv.isDarwin [ # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides - # to pass in java explicitly. This should have no effect on Linux. + # to pass in java explicitly. "-DCONNECT_WITH_JDBC=OFF" - - # Same as above. Somehow on Darwin CMake decides that we support GSS even though we aren't provding the - # library through Nix, and then breaks later on. This should have no effect on Linux. - "-DPLUGIN_AUTH_GSSAPI=NO" - "-DPLUGIN_AUTH_GSSAPI_CLIENT=NO" - ] - ++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" - ++ optional stdenv.hostPlatform.isMusl "-DWITHOUT_TOKUDB=1" # mariadb docs say disable this for musl - ; - - preConfigure = '' - cmakeFlags="$cmakeFlags -DINSTALL_INCLUDEDIR=''${!outputDev}/include/mysql" - ''; - - postInstall = '' - rm "$out"/lib/*.a - find "''${!outputBin}/bin" -name '*test*' -delete - ''; + "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" + ] ++ optional stdenv.hostPlatform.isMusl [ + "-DWITHOUT_TOKUDB=1" # mariadb docs say disable this for musl + ]; passthru.mysqlVersion = "5.7"; @@ -128,6 +126,8 @@ client = stdenv.mkDerivation (common // { everything = stdenv.mkDerivation (common // { name = "mariadb-${common.version}"; + outputs = [ "out" "dev" "man" ]; + nativeBuildInputs = common.nativeBuildInputs ++ [ bison ]; buildInputs = common.buildInputs ++ [ @@ -137,39 +137,36 @@ everything = stdenv.mkDerivation (common // { cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_SYSCONFDIR=etc/mysql" - "-DINSTALL_INFODIR=share/mysql/docs" - "-DINSTALL_MANDIR=share/man" "-DINSTALL_PLUGINDIR=lib/mysql/plugin" - "-DINSTALL_SCRIPTDIR=bin" - "-DINSTALL_SUPPORTFILESDIR=share/mysql" - "-DINSTALL_DOCREADMEDIR=share/doc/mysql" - "-DINSTALL_DOCDIR=share/doc/mysql" - "-DINSTALL_SHAREDIR=share/mysql" - "-DINSTALL_MYSQLTESTDIR=OFF" - "-DINSTALL_SQLBENCHDIR=OFF" - - "-DENABLED_LOCAL_INFILE=ON" + "-DENABLED_LOCAL_INFILE=OFF" "-DWITH_READLINE=ON" - "-DWITH_EXTRA_CHARSETS=complex" - "-DWITH_EMBEDDED_SERVER=ON" - "-DWITH_ARCHIVE_STORAGE_ENGINE=1" - "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" - "-DWITH_INNOBASE_STORAGE_ENGINE=1" - "-DWITH_PARTITION_STORAGE_ENGINE=1" - "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1" - "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1" + "-DWITH_EXTRA_CHARSETS=all" + "-DWITH_EMBEDDED_SERVER=OFF" + "-DWITH_UNIT_TESTS=OFF" "-DWITH_WSREP=ON" "-DWITH_INNODB_DISALLOW_WRITES=ON" + "-DWITHOUT_EXAMPLE=1" + "-DWITHOUT_FEDERATED=1" ] ++ stdenv.lib.optionals stdenv.isDarwin [ - "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1" + "-DWITHOUT_OQGRAPH=1" "-DWITHOUT_TOKUDB=1" ]; - postInstall = common.postInstall + '' + preConfigure = '' + cmakeFlags="$cmakeFlags \ + -DINSTALL_SHAREDIR=$dev/share/mysql + -DINSTALL_SUPPORTFILESDIR=$dev/share/mysql" + ''; + + postInstall = '' + chmod +x "$out"/bin/wsrep_sst_common rm -r "$out"/data # Don't need testing data - rm "$out"/share/man/man1/mysql-test-run.pl.1 - rm "$out"/bin/rcmysql + rm "$out"/bin/{mysql_find_rows,mysql_waitpid,mysqlaccess,mysqladmin,mysqlbinlog,mysqlcheck} + rm "$out"/bin/{mysqldump,mysqlhotcopy,mysqlimport,mysqlshow,mysqlslap,mysqltest} + rm "$out"/lib/mysql/plugin/{auth_gssapi_client.so,client_ed25519.so,daemon_example.ini} + rm "$out"/lib/{libmysqlclient.so,libmysqlclient_r.so} + mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql + mkdir -p "$dev"/lib && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib '' + optionalString (! stdenv.isDarwin) '' sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; From 3a6e362ec34c31357b8fbc950a50b43fd7e6a761 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 19 May 2019 14:40:53 +0300 Subject: [PATCH 009/219] mariadb: change client config --- pkgs/servers/sql/mariadb/default.nix | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 50413e52f04e..14d60bc1b2f0 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -96,28 +96,24 @@ common = rec { # attributes common to both builds client = stdenv.mkDerivation (common // { name = "mariadb-client-${common.version}"; - outputs = [ "bin" "dev" "out" ]; + outputs = [ "out" "dev" "man" ]; propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc cmakeFlags = common.cmakeFlags ++ [ "-DWITHOUT_SERVER=ON" + "-DWITH_WSREP=OFF" ]; - preConfigure = common.preConfigure + '' - cmakeFlags="$cmakeFlags \ - -DINSTALL_BINDIR=$bin/bin \ - -DINSTALL_SCRIPTDIR=$bin/bin \ - -DINSTALL_SUPPORTFILESDIR=$bin/share/mysql \ - -DINSTALL_DOCDIR=$bin/share/doc/mysql \ - -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \ - " - ''; - - # prevent cycle; it needs to reference $dev - postInstall = common.postInstall + '' - moveToOutput bin/mysql_config "$dev" - moveToOutput bin/mariadb_config "$dev" + postInstall = '' + rm -r "$out"/share/mysql + rm -r "$out"/share/doc + rm "$out"/bin/{msql2mysql,mysql_plugin,mytop,wsrep_sst_rsync_wan,mysql_config,mariadb_config} + rm "$out"/lib/plugin/{daemon_example.ini,dialog.so,mysql_clear_password.so,sha256_password.so} + rm "$out"/lib/{libmariadb.so,libmysqlclient.so,libmysqlclient_r.so} + mv "$out"/lib/libmariadb.so.3 "$out"/lib/libmysqlclient.so + ln -sv libmysqlclient.so "$out"/lib/libmysqlclient_r.so + mkdir -p "$dev"/lib && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib ''; enableParallelBuilding = true; # the client should be OK From c9d2d2fa824a7f02800e3eb490272596e7333970 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 19 May 2019 15:08:04 +0300 Subject: [PATCH 010/219] mariadb: change default codepage to utf8mb4 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 14d60bc1b2f0..0eac14023644 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -50,8 +50,8 @@ common = rec { # attributes common to both builds cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" "-DMANUFACTURER=NixOS.org" - "-DDEFAULT_CHARSET=utf8" - "-DDEFAULT_COLLATION=utf8_general_ci" + "-DDEFAULT_CHARSET=utf8mb4" + "-DDEFAULT_COLLATION=utf8mb4_unicode_ci" "-DSECURITY_HARDENED=ON" "-DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock" From 19c404cf45ee6b8b8617570c260da36d6d49f64c Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 19 May 2019 17:38:50 -0400 Subject: [PATCH 011/219] refind: allows building for aarch64 --- .../bootloaders/refind/0001-toolchain.patch | 27 +++++++++++++++++++ pkgs/tools/bootloaders/refind/default.nix | 8 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/bootloaders/refind/0001-toolchain.patch diff --git a/pkgs/tools/bootloaders/refind/0001-toolchain.patch b/pkgs/tools/bootloaders/refind/0001-toolchain.patch new file mode 100644 index 000000000000..13c4c88f95f0 --- /dev/null +++ b/pkgs/tools/bootloaders/refind/0001-toolchain.patch @@ -0,0 +1,27 @@ +diff --git a/Make.common b/Make.common +index 3f0b919..ee365f5 100644 +--- a/Make.common ++++ b/Make.common +@@ -33,22 +33,6 @@ ARCH ?= $(HOSTARCH) + + # Note: TIANOBASE is defined in master Makefile and exported + GENFW = $(TIANOBASE)/BaseTools/Source/C/bin/GenFw +-prefix = /usr/bin/ +-ifeq ($(ARCH),aarch64) +- CC = $(prefix)aarch64-linux-gnu-gcc +- AS = $(prefix)aarch64-linux-gnu-as +- LD = $(prefix)aarch64-linux-gnu-ld +- AR = $(prefix)aarch64-linux-gnu-ar +- RANLIB = $(prefix)aarch64-linux-gnu-ranlib +- OBJCOPY = $(prefix)aarch64-linux-gnu-objcopy +-else +- CC = $(prefix)gcc +- AS = $(prefix)as +- LD = $(prefix)ld +- AR = $(prefix)ar +- RANLIB = $(prefix)ranlib +- OBJCOPY = $(prefix)objcopy +-endif + + ifeq ($(MAKEWITH),TIANO) + # Below file defines TARGET (RELEASE or DEBUG) and TOOL_CHAIN_TAG (GCC44, GCC45, GCC46, or GCC47) diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index bc84edeb21b7..0cdcd4c58df4 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -4,6 +4,7 @@ let archids = { "x86_64-linux" = { hostarch = "x86_64"; efiPlatform = "x64"; }; "i686-linux" = rec { hostarch = "ia32"; efiPlatform = hostarch; }; + "aarch64-linux" = rec { hostarch = "aarch64"; efiPlatform = "aa64"; }; }; inherit @@ -21,6 +22,10 @@ stdenv.mkDerivation rec { sha256 = "1bjd0dl77bc5k6g3kc7s8m57vpbg2zscph9qh84xll9rc10g3fir"; }; + patches = [ + ./0001-toolchain.patch + ]; + buildInputs = [ gnu-efi ]; hardeningDisable = [ "stackprotector" ]; @@ -32,6 +37,7 @@ stdenv.mkDerivation rec { "GNUEFILIB=${gnu-efi}/lib" "EFICRT0=${gnu-efi}/lib" "HOSTARCH=${hostarch}" + "ARCH=${hostarch}" ]; buildFlags = [ "gnuefi" "fs_gnuefi" ]; @@ -116,7 +122,7 @@ stdenv.mkDerivation rec { ''; homepage = http://refind.sourceforge.net/; maintainers = [ maintainers.AndersonTorres ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; license = licenses.gpl3Plus; }; From 82135b6c81342f02b4c6f71cda5d0465d29a70a3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 19 May 2019 18:53:18 -0400 Subject: [PATCH 012/219] nixos/geoclue2: don't run as root --- nixos/modules/services/desktops/geoclue2.nix | 13 +++++++++++++ pkgs/development/libraries/geoclue/default.nix | 1 + 2 files changed, 14 insertions(+) diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index a16dbc04a5f7..040fe157d52d 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -188,6 +188,19 @@ in systemd.packages = [ package ]; + users.users.geoclue = { + isSystemUser = true; + home = "/var/lib/geoclue"; + group = "geoclue"; + description = "Geoinformation service"; + }; + + users.groups.geoclue = {}; + + systemd.tmpfiles.rules = [ + "d /var/lib/geoclue 0755 geoclue geoclue" + ]; + # restart geoclue service when the configuration changes systemd.services."geoclue".restartTriggers = [ config.environment.etc."geoclue/geoclue.conf".source diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 70319c9151f5..6a44f01d0110 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { "-Ddemo-agent=${if withDemoAgent then "true" else "false"}" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" + "-Ddbus-srv-user=geoclue" ] ++ optionals stdenv.isDarwin [ "-D3g-source=false" "-Dcdma-source=false" From f9dfeab02d15ee0dfe2c5ccf20ea3762eaf83800 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 22 May 2019 21:02:48 -0500 Subject: [PATCH 013/219] txr: 209 -> 216 Versions 210-215 crashed during tests, but this one looks good! Enjoy! --- pkgs/tools/misc/txr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index 368b0f908c76..b777e217cf88 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, bison, flex, libffi }: stdenv.mkDerivation rec { - name = "txr-${version}"; - version = "209"; + pname = "txr"; + version = "216"; src = fetchurl { - url = "http://www.kylheku.com/cgit/txr/snapshot/${name}.tar.bz2"; - sha256 = "1g236bk5ygh3car4kki3w6n0pwny8q4awg8p86fh2khj52qz6mdl"; + url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; + sha256 = "07cxdpc9zsqd0c2668g00dqjpd6zc4mfdn74aarr6d2hpzdhh937"; }; nativeBuildInputs = [ bison flex ]; From 6c834d2f9d263aa180d9cbd0a3ad85c9a97ec18e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 22 May 2019 21:59:53 -0500 Subject: [PATCH 014/219] txr: install vim syntax support --- pkgs/tools/misc/txr/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index b777e217cf88..cf5588209a47 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -20,7 +20,17 @@ stdenv.mkDerivation rec { # Remove failing test-- mentions 'usr/bin' so probably related :) preCheck = "rm -rf tests/017"; - # TODO: install 'tl.vim', make avail when txr is installed or via plugin + postInstall = '' + d=$out/share/vim-plugins/txr + mkdir -p $d/{syntax,ftdetect} + + cp {tl,txr}.vim $d/syntax/ + + cat > $d/ftdetect/txr.vim < Date: Thu, 23 May 2019 09:18:01 -0400 Subject: [PATCH 015/219] timetrap: restore "t" executable lost in 44a554792d58f8bf1239ab3cd8892ac9f1e693ff --- pkgs/applications/office/timetrap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index ad0d5c636f36..efeb23b3e83d 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -3,7 +3,7 @@ bundlerApp { pname = "timetrap"; gemdir = ./.; - exes = [ "timetrap" ]; + exes = [ "t" "timetrap" ]; meta = with lib; { description = "A simple command line time tracker written in ruby"; From 329731f231e191c9e2680a1d9d2f5030651e6909 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Fri, 10 May 2019 23:14:43 -0400 Subject: [PATCH 016/219] git-repo-updater: init at 0.5 --- .../tools/git-repo-updater/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/git-repo-updater/default.nix diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/pkgs/development/tools/git-repo-updater/default.nix new file mode 100644 index 000000000000..6acb628a322c --- /dev/null +++ b/pkgs/development/tools/git-repo-updater/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonApplication, fetchPypi +, colorama, GitPython }: + +buildPythonApplication rec { + pname = "gitup"; + version = "0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "11ilz9i2yxrbipyjzpfkj7drx9wkrn3phvd1a60jivphbqdldpgf"; + }; + + propagatedBuildInputs = [ colorama GitPython ]; + + meta = with lib; { + description = "Easily update multiple Git repositories at once"; + homepage = "https://github.com/earwig/git-repo-updater"; + license = licenses.mit; + maintainers = [ maintainers.bdesham ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dcede063b8a..3ecb6a06c3bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -770,6 +770,8 @@ in git-fire = callPackage ../tools/misc/git-fire { }; + git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; + git-town = callPackage ../tools/misc/git-town { }; github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; From b39e516708fd236116412e4fc15e4b6778ef6481 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 28 May 2019 11:51:43 +0300 Subject: [PATCH 017/219] hashcat: 5.0.0 -> 5.1.0 --- pkgs/tools/security/hashcat/default.nix | 10 ++++----- .../hashcat/use-installed-xxhash.patch | 22 ------------------- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 pkgs/tools/security/hashcat/use-installed-xxhash.patch diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 8316adb5a1e2..72a13c0f259e 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd, xxHash }: stdenv.mkDerivation rec { - name = "hashcat-${version}"; - version = "5.0.0"; + pname = "hashcat"; + version = "5.1.0"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "13xh1lmzdppvx8wr8blqhdr8vpa24j099kz2xzb9pcnqy26dk4kh"; + sha256 = "0f73y4cg8c7a6q7x34qvpfi4g3lw6j9bnn0a13g43aqyiskflfr8"; }; - patches = [ ./use-installed-xxhash.patch ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ opencl-headers xxHash ]; makeFlags = [ "PREFIX=${placeholder "out"}" - "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" "COMPTIME=1337" "VERSION_TAG=${version}" + "USE_SYSTEM_OPENCL=1" + "USE_SYSTEM_XXHASH=1" ]; postFixup = '' diff --git a/pkgs/tools/security/hashcat/use-installed-xxhash.patch b/pkgs/tools/security/hashcat/use-installed-xxhash.patch deleted file mode 100644 index d02303558ebb..000000000000 --- a/pkgs/tools/security/hashcat/use-installed-xxhash.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 3a1cd680..576353fe 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -189,7 +189,7 @@ endif - # brain and xxHash - ifeq ($(ENABLE_BRAIN),1) - CFLAGS += -DWITH_BRAIN --CFLAGS += -Ideps/git/xxHash -+LFLAGS += -lxxhash - endif - - ## -@@ -313,7 +313,7 @@ WIN_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.32.o) - WIN_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.64.o) - - ifeq ($(ENABLE_BRAIN),1) --OBJS_XXHASH := xxhash -+OBJS_XXHASH := - - NATIVE_STATIC_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.STATIC.o) - NATIVE_SHARED_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.SHARED.o) From b086b342bb5f443d3e98805eed60bbf76d37106c Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 15 Jan 2019 17:09:17 +0100 Subject: [PATCH 018/219] build-support/make-initrd: Don't derive derivation name from file name not all valid file names are valid derivation names. This can cause troubles when, for example, trying to place systemd template unit files, which contain an '@' in their name, in an initrd. Fixes #53987 --- pkgs/build-support/kernel/make-initrd.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 7ad1affb65a3..7a5642e565de 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -16,10 +16,16 @@ , name ? "initrd" , compressor ? "gzip -9n" , prepend ? [] +, lib }: +let + # !!! Move this into a public lib function, it is probably useful for others + toValidStoreName = x: with builtins; + lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x)); -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { inherit name; + builder = ./make-initrd.sh; makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage"; @@ -36,8 +42,12 @@ stdenv.mkDerivation rec { # Note: we don't use closureInfo yet, as that won't build with nix-1.x. # See #36268. exportReferencesGraph = - map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents; + lib.zipListsWith + (x: i: [("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") x.object]) + contents + (lib.range 0 (lib.length contents - 1)); pathsFromGraph = ./paths-from-graph.pl; inherit compressor prepend; } + From 67406e28692b9c121ce3c31506920dcf4beff7fb Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Wed, 29 May 2019 16:08:52 +0200 Subject: [PATCH 019/219] keybase,keybase-gui: 3.2.2 -> 4.0.0 --- pkgs/tools/security/keybase/default.nix | 4 ++-- pkgs/tools/security/keybase/gui.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index e07acd4566de..02a322a18021 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "3.2.2"; + version = "4.0.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -14,7 +14,7 @@ buildGoPackage rec { src = fetchurl { url = "https://github.com/keybase/client/archive/v${version}.tar.gz"; - sha256 = "ed977c45f3a888d291aaf46afc1e1e32e4851d44b26a39854f00a0003b7556b5"; + sha256 = "14c0876mxz3xa2k4d665kf8j6k3hc6qybkj0gr4pr9c9gs70cgjh"; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 0ca41fb7708d..bd9c1328d31c 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20190412141809.5262f90fd9"; + versionSuffix = "20190508150240.6614a49937"; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "3.2.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "4.0.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "20f0cbfae52a8afbc88c1130279b2c2ced21fd498eee7e43c88f5b88abd8f21b"; + sha256 = "1fj92gxwfd6909r79prsq760b9s50js1iip5c01621hz9y39jd6m"; }; nativeBuildInputs = [ From ea82b7f98d2e42d41c8d90223c71815d563906ad Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 30 May 2019 07:25:30 +0300 Subject: [PATCH 020/219] nixos/jack: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/audio/jack.nix | 275 ++++++++++++++++++++++++++ 2 files changed, 276 insertions(+) create mode 100644 nixos/modules/services/audio/jack.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 111addcc8790..5d77d7edbe86 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -180,6 +180,7 @@ ./services/amqp/activemq/default.nix ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix + ./services/audio/jack.nix ./services/audio/icecast.nix ./services/audio/liquidsoap.nix ./services/audio/mpd.nix diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix new file mode 100644 index 000000000000..1364abd40447 --- /dev/null +++ b/nixos/modules/services/audio/jack.nix @@ -0,0 +1,275 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.jack; + + pcmPlugin = cfg.jackd.enable && cfg.alsa.enable; + loopback = cfg.jackd.enable && cfg.loopback.enable; + + enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.alsaLib != null; + + umaskNeeded = versionOlder cfg.jackd.package.version "1.9.12"; + bridgeNeeded = versionAtLeast cfg.jackd.package.version "1.9.12"; +in { + options = { + services.jack = { + jackd = { + enable = mkEnableOption '' + JACK Audio Connection Kit. You need to add yourself to the "jackaudio" group + ''; + + package = mkOption { + # until jack1 promiscuous mode is fixed + internal = true; + type = types.package; + default = pkgs.jack2; + defaultText = "pkgs.jack2"; + example = literalExample "pkgs.jack1"; + description = '' + The JACK package to use. + ''; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = [ + "-dalsa" + ]; + example = literalExample '' + [ "-dalsa" "--device" "hw:1" ]; + ''; + description = '' + Specifies startup command line arguments to pass to JACK server. + ''; + }; + + session = mkOption { + type = types.lines; + description = '' + Commands to run after JACK is started. + ''; + }; + + }; + + alsa = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Route audio to/from generic ALSA-using applications using ALSA JACK PCM plugin. + ''; + }; + + support32Bit = mkOption { + type = types.bool; + default = false; + description = '' + Whether to support sound for 32-bit ALSA applications on 64-bit system. + ''; + }; + }; + + loopback = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Create ALSA loopback device, instead of using PCM plugin. Has broader + application support (things like Steam will work), but may need fine-tuning + for concrete hardware. + ''; + }; + + index = mkOption { + type = types.int; + default = 10; + description = '' + Index of an ALSA loopback device. + ''; + }; + + config = mkOption { + type = types.lines; + description = '' + ALSA config for loopback device. + ''; + }; + + session = mkOption { + type = types.lines; + description = '' + Additional commands to run to setup loopback device. + ''; + }; + }; + + }; + + }; + + config = mkMerge [ + + (mkIf pcmPlugin { + sound.extraConfig = '' + pcm_type.jack { + libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_jack.so ; + ${lib.optionalString enable32BitAlsaPlugins + "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_jack.so ;"} + } + pcm.!default { + @func getenv + vars [ PCM ] + default "plug:jack" + } + ''; + }) + + (mkIf loopback { + boot.kernelModules = [ "snd-aloop" ]; + boot.kernelParams = [ "snd-aloop.index=${toString cfg.loopback.index}" ]; + sound.extraConfig = cfg.loopback.config; + }) + + (mkIf cfg.jackd.enable { + services.jack.jackd.session = '' + ${lib.optionalString bridgeNeeded "${pkgs.a2jmidid}/bin/a2jmidid -e &"} + ''; + # https://alsa.opensrc.org/Jack_and_Loopback_device_as_Alsa-to-Jack_bridge#id06 + services.jack.loopback.config = '' + pcm.loophw00 { + type hw + card ${toString cfg.loopback.index} + device 0 + subdevice 0 + } + pcm.amix { + type dmix + ipc_key 219345 + slave { + pcm loophw00 + } + } + pcm.asoftvol { + type softvol + slave.pcm "amix" + control { name Master } + } + pcm.cloop { + type hw + card ${toString cfg.loopback.index} + device 1 + subdevice 0 + format S32_LE + } + pcm.loophw01 { + type hw + card ${toString cfg.loopback.index} + device 0 + subdevice 1 + } + pcm.ploop { + type hw + card ${toString cfg.loopback.index} + device 1 + subdevice 1 + format S32_LE + } + pcm.aduplex { + type asym + playback.pcm "asoftvol" + capture.pcm "loophw01" + } + pcm.!default { + type plug + slave.pcm aduplex + } + ''; + services.jack.loopback.session = '' + alsa_in -j cloop -dcloop & + alsa_out -j ploop -dploop & + while [ "$(jack_lsp cloop)" == "" ] || [ "$(jack_lsp ploop)" == "" ]; do sleep 1; done + jack_connect cloop:capture_1 system:playback_1 + jack_connect cloop:capture_2 system:playback_2 + jack_connect system:capture_1 ploop:playback_1 + jack_connect system:capture_2 ploop:playback_2 + ''; + + assertions = [ + { + assertion = !(cfg.alsa.enable && cfg.loopback.enable); + message = "For JACK both alsa and loopback options shouldn't be used at the same time."; + } + ]; + + users.users.jackaudio = { + group = "jackaudio"; + extraGroups = [ "audio" ]; + description = "JACK Audio system service user"; + }; + # http://jackaudio.org/faq/linux_rt_config.html + security.pam.loginLimits = [ + { domain = "@jackaudio"; type = "-"; item = "rtprio"; value = "99"; } + { domain = "@jackaudio"; type = "-"; item = "memlock"; value = "unlimited"; } + ]; + users.groups.jackaudio = {}; + + environment = { + systemPackages = [ cfg.jackd.package ]; + etc."alsa/conf.d/50-jack.conf".source = "${pkgs.alsaPlugins}/etc/alsa/conf.d/50-jack.conf"; + variables.JACK_PROMISCUOUS_SERVER = "jackaudio"; + }; + + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="sound", ATTRS{id}!="Loopback", TAG+="systemd", ENV{SYSTEMD_WANTS}="jack.service" + ''; + + systemd.services.jack = { + description = "JACK Audio Connection Kit"; + serviceConfig = { + User = "jackaudio"; + ExecStart = "${cfg.jackd.package}/bin/jackd ${lib.escapeShellArgs cfg.jackd.extraOptions}"; + LimitRTPRIO = 99; + LimitMEMLOCK = "infinity"; + } // optionalAttrs umaskNeeded { + UMask = "007"; + }; + path = [ cfg.jackd.package ]; + environment = { + JACK_PROMISCUOUS_SERVER = "jackaudio"; + JACK_NO_AUDIO_RESERVATION = "1"; + }; + restartIfChanged = false; + }; + systemd.services.jack-session = { + description = "JACK session"; + script = '' + jack_wait -w + ${cfg.jackd.session} + ${lib.optionalString cfg.loopback.enable cfg.loopback.session} + ''; + serviceConfig = { + RemainAfterExit = true; + User = "jackaudio"; + StateDirectory = "jack"; + LimitRTPRIO = 99; + LimitMEMLOCK = "infinity"; + }; + path = [ cfg.jackd.package ]; + environment = { + JACK_PROMISCUOUS_SERVER = "jackaudio"; + HOME = "/var/lib/jack"; + }; + wantedBy = [ "jack.service" ]; + partOf = [ "jack.service" ]; + after = [ "jack.service" ]; + restartIfChanged = false; + }; + }) + + ]; + + meta.maintainers = [ maintainers.gnidorah ]; +} From 366478088caa0d901a0a9c6a771e0528142ca815 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 29 May 2019 22:51:18 -0500 Subject: [PATCH 021/219] libertinus: 6.8 -> 6.9 https://github.com/alif-type/libertinus/releases/tag/v6.9 --- pkgs/data/fonts/libertinus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 578550bbe452..62aad87c902b 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "6.8"; + version = "6.9"; in fetchFromGitHub rec { name = "libertinus-${version}"; @@ -14,7 +14,7 @@ in fetchFromGitHub rec { install -m444 -Dt $out/share/fonts/opentype *.otf install -m444 -Dt $out/share/doc/${name} *.txt ''; - sha256 = "0iwbw3sw8rcsifpzw72g3cz0a960scv7cib8mwrw53282waqq2gc"; + sha256 = "0765a7w0askkhrjmjk638gcm9h6fcm1jpaza8iw9afr3sz1s0xlq"; meta = with lib; { description = "A fork of the Linux Libertine and Linux Biolinum fonts"; From a538159fbf971ee862aec13825ecb7d9e5173cf8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 29 May 2019 22:09:05 -0500 Subject: [PATCH 022/219] national-park-typeface: init at 206464 --- pkgs/data/fonts/national-park/default.nix | 24 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/data/fonts/national-park/default.nix diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix new file mode 100644 index 000000000000..bc8fc8041a81 --- /dev/null +++ b/pkgs/data/fonts/national-park/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchzip }: + +let + pname = "national-park-typeface"; + version = "206464"; +in fetchzip { + name = "${pname}-${version}"; + url = "https://files.cargocollective.com/c${version}/NationalPark.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile National\*.otf -d $out/share/fonts/opentype/ + ''; + + sha256 = "044gh4xcasp8i9ny6z4nmns1am2pk5krc4ann2afq35v9bnl2q5d"; + + meta = with lib; { + description = ''Typeface designed to mimic the national park service + signs that are carved using a router bit''; + homepage = https://nationalparktypeface.com/; + license = licenses.ofl; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1964eb4533a1..9075956fa8ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16388,6 +16388,8 @@ in nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { }; + national-park-typeface = callPackage ../data/fonts/national-park { }; + nordic = callPackage ../data/themes/nordic { }; nordic-polar = callPackage ../data/themes/nordic-polar { }; From ab4088c0a056f700277a94666e254ef6a2b3f193 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 30 May 2019 10:47:24 +0200 Subject: [PATCH 023/219] plex: 1.15.4.994 -> 1.15.6.1079 --- pkgs/servers/plex/raw.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 821bbc578dc9..082506cddfd7 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,14 +8,14 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.15.4.994-107756f7e"; + version = "1.15.6.1079-78232c603"; pname = "plexmediaserver"; name = "${pname}-${version}"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0jm1zzlazy41wnmyda8il03vmn9a5vvsfpxn3valkwiggsnvb2p8"; + sha256 = "1fvj58b91227wig51hi98rg9r48rdnd8s32xdajjgspxy923mp5a"; }; outputs = [ "out" "basedb" ]; From aa8a11c1b3197cd4d7bae56d7c62f790bc8a86a7 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 30 May 2019 22:57:45 +0300 Subject: [PATCH 024/219] unit: 1.8.0 -> 1.9.0 --- pkgs/servers/http/unit/default.nix | 7 ++----- pkgs/servers/http/unit/unit-rootless.patch | 24 ---------------------- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/servers/http/unit/unit-rootless.patch diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index d798d5d231ec..3f0567695fb8 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -16,14 +16,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.8.0"; + version = "1.9.0"; name = "unit-${version}"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = "${version}"; - sha256 = "1s5pfyhabnf9p5z2h1fh0wb4hqzkrha5bxahjnikmlkhw59s8zip"; + sha256 = "0f7smgshfzksks2jfhi53g87wiyy38vwgj6aa70ql61m135dx7b1"; }; nativeBuildInputs = [ which ]; @@ -40,9 +40,6 @@ stdenv.mkDerivation rec { ++ optional withRuby ruby ++ optional withSSL openssl; - # Used patch to enable work with unprivileged user - https://github.com/nginx/unit/issues/228 - patches = [ ./unit-rootless.patch ]; - configureFlags = [ "--control=unix:/run/unit/control.unit.sock" "--pid=/run/unit/unit.pid" diff --git a/pkgs/servers/http/unit/unit-rootless.patch b/pkgs/servers/http/unit/unit-rootless.patch deleted file mode 100644 index 36506847f915..000000000000 --- a/pkgs/servers/http/unit/unit-rootless.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/nxt_process.c b/src/nxt_process.c -index 5952029..7b29369 100644 ---- a/src/nxt_process.c -+++ b/src/nxt_process.c -@@ -136,7 +136,7 @@ nxt_process_start(nxt_task_t *task, nxt_process_t *process) - - nxt_random_init(&thread->random); - -- if (init->user_cred != NULL && getuid() == 0) { -+ if (init->user_cred != NULL) { - /* Super-user. */ - - ret = nxt_user_cred_set(task, init->user_cred); -@@ -434,9 +434,7 @@ nxt_user_cred_get(nxt_task_t *task, nxt_user_cred_t *uc, const char *group) - uc->base_gid = grp->gr_gid; - } - -- if (getuid() == 0) { - return nxt_user_groups_get(task, uc); -- } - - return NXT_OK; - } - From 292c1d37747db7a6319b0c7b57ce6d6d94ab9e50 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 May 2019 20:46:38 -0700 Subject: [PATCH 025/219] amazon-ecs-cli: 1.14.0 -> 1.14.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/amazon-ecs-cli/versions --- pkgs/tools/virtualization/amazon-ecs-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index d98064df5aae..1578a759ec7d 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "amazon-ecs-cli-${version}"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "1m0vj98sy06bx8wryy9zgsl8pm1zwmlwhi52mzd00fqdfq0haggl"; + sha256 = "12q167pbpxw38p1bzcy9z4ix7yh9giwkyrc4vq2qln3pjn9d31rj"; }; unpackPhase = ":"; From e69d8844b676997b3b458904e4a892b6696d3efc Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Fri, 31 May 2019 22:14:35 +0000 Subject: [PATCH 026/219] hplip-3.16.11: add aarch64-linux to platforms --- pkgs/misc/drivers/hplip/3.16.11.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index e99fe1a201d2..8f5004693eac 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -28,16 +28,17 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "armv6l-linux" = "arm32"; + "armv7l-linux" = "arm32"; + "aarch64-linux" = "arm64"; }; hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); - pluginArches = [ "x86_32" "x86_64" "arm32" ]; + pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; in @@ -186,7 +187,7 @@ pythonPackages.buildPythonApplication { license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; - platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ ttuegel ]; }; } From 9c6185f20b43b7815c592b9512c05582819c01dd Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Sat, 1 Jun 2019 04:06:39 +0000 Subject: [PATCH 027/219] hplip: add old version (from 18.09) with aarch64 support --- pkgs/misc/drivers/hplip/3.18.5.nix | 225 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 229 insertions(+) create mode 100644 pkgs/misc/drivers/hplip/3.18.5.nix diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix new file mode 100644 index 000000000000..2be65e40c45f --- /dev/null +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -0,0 +1,225 @@ +{ stdenv, fetchurl, substituteAll +, pkgconfig +, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends +, dbus, file, ghostscript, usbutils +, net_snmp, openssl, perl, nettools +, bash, coreutils, utillinux +, withQt5 ? true +, withPlugin ? false +, withStaticPPDInstall ? false +}: + +let + + name = "hplip-${version}"; + version = "3.18.5"; + + src = fetchurl { + url = "mirror://sourceforge/hplip/${name}.tar.gz"; + sha256 = "0xb7ga2wgbwjxsss67mjn2y6fmqsfwzmv11ivvfzhnl36lh22hkb"; + }; + + plugin = fetchurl { + url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; + sha256 = "1jf74jya071zqvwhy9n0c3007pzgcxydkw7qdh4sx70brly81i7p"; + }; + + hplipState = substituteAll { + inherit version; + src = ./hplip.state; + }; + + hplipPlatforms = { + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "armv6l-linux" = "arm32"; + "armv7l-linux" = "arm32"; + "aarch64-linux" = "arm64"; + }; + + hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); + + pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; + +in + +assert withPlugin -> builtins.elem hplipArch pluginArches + || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; + +pythonPackages.buildPythonApplication { + inherit name src; + format = "other"; + + buildInputs = [ + libjpeg + cups + libusb1 + sane-backends + dbus + file + ghostscript + net_snmp + openssl + perl + zlib + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + pythonPath = with pythonPackages; [ + dbus + pillow + pygobject2 + reportlab + usbutils + sip + ] ++ stdenv.lib.optionals withQt5 [ + pyqt5 + ]; + + makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ]; + + prePatch = '' + # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. + find . -type f -exec sed -i \ + -e s,/etc/hp,$out/etc/hp,g \ + -e s,/etc/sane.d,$out/etc/sane.d,g \ + -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0,g \ + -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor,g \ + -e s,/usr/lib/systemd/system,$out/lib/systemd/system,g \ + -e s,/var/lib/hp,$out/var/lib/hp,g \ + -e s,/usr/bin/perl,${perl}/bin/perl,g \ + -e s,/usr/bin/file,${file}/bin/file,g \ + -e s,/usr/bin/gs,${ghostscript}/bin/gs,g \ + -e s,/usr/share/cups/fonts,${ghostscript}/share/ghostscript/fonts,g \ + -e "s,ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer,ExecStart=$out/bin/hp-config_usb_printer,g" \ + {} + + ''; + + preConfigure = '' + export configureFlags="$configureFlags + --with-hpppddir=$out/share/cups/model/HP + --with-cupsfilterdir=$out/lib/cups/filter + --with-cupsbackenddir=$out/lib/cups/backend + --with-icondir=$out/share/applications + --with-systraydir=$out/xdg/autostart + --with-mimedir=$out/etc/cups + --enable-policykit + ${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} + --disable-qt4 + ${stdenv.lib.optionalString withQt5 "--enable-qt5"} + " + + export makeFlags=" + halpredir=$out/share/hal/fdi/preprobe/10osvendor + rulesdir=$out/etc/udev/rules.d + policykit_dir=$out/share/polkit-1/actions + policykit_dbus_etcdir=$out/etc/dbus-1/system.d + policykit_dbus_sharedir=$out/share/dbus-1/system-services + hplip_confdir=$out/etc/hp + hplip_statedir=$out/var/lib/hp + " + + # Prevent 'ppdc: Unable to find include file ""' which prevent + # generation of '*.ppd' files. + # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox. + # Could not find how to fix the problem in 'ppdc' so this is a workaround. + export CUPS_DATADIR="${cups}/share/cups" + ''; + + enableParallelBuilding = true; + + # + # Running `hp-diagnose_plugin -g` can be used to diagnose + # issues with plugins. + # + postInstall = stdenv.lib.optionalString withPlugin '' + sh ${plugin} --noexec --keep + cd plugin_tmp + + cp plugin.spec $out/share/hplip/ + + mkdir -p $out/share/hplip/data/firmware + cp *.fw.gz $out/share/hplip/data/firmware + + mkdir -p $out/share/hplip/data/plugins + cp license.txt $out/share/hplip/data/plugins + + mkdir -p $out/share/hplip/prnt/plugins + for plugin in lj hbpl1; do + cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins + chmod 0755 $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so + ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/prnt/plugins/$plugin.so + done + + mkdir -p $out/share/hplip/scan/plugins + for plugin in bb_soap bb_marvell bb_soapht bb_escl; do + cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins + chmod 0755 $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so + ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/scan/plugins/$plugin.so + done + + mkdir -p $out/share/hplip/fax/plugins + for plugin in fax_marvell; do + cp $plugin-${hplipArch}.so $out/share/hplip/fax/plugins + chmod 0755 $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so + ln -s $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/fax/plugins/$plugin.so + done + + mkdir -p $out/var/lib/hp + cp ${hplipState} $out/var/lib/hp/hplip.state + + rm $out/etc/udev/rules.d/56-hpmud.rules + ''; + + # The installed executables are just symlinks into $out/share/hplip, + # but wrapPythonPrograms ignores symlinks. We cannot replace the Python + # modules in $out/share/hplip with wrapper scripts because they import + # each other as libraries. Instead, we emulate wrapPythonPrograms by + # 1. Calling patchPythonProgram on the original script in $out/share/hplip + # 2. Making our own wrapper pointing directly to the original script. + dontWrapPythonPrograms = true; + preFixup = '' + buildPythonPath "$out $pythonPath" + + for bin in $out/bin/*; do + py=$(readlink -m $bin) + rm $bin + echo "patching \`$py'..." + patchPythonScript "$py" + echo "wrapping \`$bin'..." + makeWrapper "$py" "$bin" \ + --prefix PATH ':' "$program_PATH" \ + --set PYTHONNOUSERSITE "true" \ + $makeWrapperArgs + done + ''; + + postFixup = '' + substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out + '' + stdenv.lib.optionalString (!withPlugin) '' + # A udev rule to notify users that they need the binary plugin. + # Needs a lot of patching but might save someone a bit of confusion: + substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \ + --replace {,${bash}}/bin/sh \ + --replace {/usr,${coreutils}}/bin/nohup \ + --replace {,${utillinux}/bin/}logger \ + --replace {/usr,$out}/bin + ''; + + meta = with stdenv.lib; { + description = "Print, scan and fax HP drivers for Linux"; + homepage = https://developers.hp.com/hp-linux-imaging-and-printing; + license = if withPlugin + then licenses.unfree + else with licenses; [ mit bsd2 gpl2Plus ]; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ jgeerds ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bb2810c65e0..e6f0c3e3d188 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23202,6 +23202,10 @@ in hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; + hplip_3_18_5 = callPackage ../misc/drivers/hplip/3.18.5.nix { }; + + hplipWithPlugin_3_18_5 = hplip_3_18_5.override { withPlugin = true; }; + hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; }; From 2eea9636830461d8e2e65dd5cc8bc8c064e8ea1c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 30 May 2019 21:49:50 -0500 Subject: [PATCH 028/219] inter: 3.5 -> 3.6 --- pkgs/data/fonts/inter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index f11f13283d55..a2b1ef4e672c 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.5"; + version = "3.6"; in fetchzip { name = "inter-${version}"; @@ -12,14 +12,14 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0zqixzzbb3n1j4jvpjm0hlxc32j53hgq4j078gihjkhgvjhsklf2"; + sha256 = "0m0psphc4npxfn6cpvyx5xs54grwn3mjbj9yyipm0lbihq4mih7q"; meta = with lib; { homepage = https://rsms.me/inter/; description = "A typeface specially designed for user interfaces"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ demize ]; + maintainers = with maintainers; [ demize dtzWill ]; }; } From 138fd34f2433cf3f16b0fdaaceff04ebfcffe2ad Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 00:52:25 -0500 Subject: [PATCH 029/219] inter: 3.6 -> 3.7 https://github.com/rsms/inter/releases/tag/v3.7 --- pkgs/data/fonts/inter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index a2b1ef4e672c..589acbcee5cc 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.6"; + version = "3.7"; in fetchzip { name = "inter-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0m0psphc4npxfn6cpvyx5xs54grwn3mjbj9yyipm0lbihq4mih7q"; + sha256 = "1ja1v3605vp09azpabgmk710kic85zxwi4kksmqj9z805fmxddp6"; meta = with lib; { homepage = https://rsms.me/inter/; From f019fd9c2f7775edadd9c9277d069a046d32fb4c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 05:45:46 -0700 Subject: [PATCH 030/219] drawpile: 2.1.8 -> 2.1.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/drawpile/versions --- pkgs/applications/graphics/drawpile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index cba103b0e9e5..31a9fa57b500 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -59,11 +59,11 @@ let in stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.1.8"; + version = "2.1.10"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "1gm58zb7nh9h6v0i5pr49sfi17piik5jj757nhl0wrd10nwkipn5"; + sha256 = "074lp5z5kh6qwar3y4ik7gma5mdgafdsb50q425xcd3pv00gy0hm"; }; nativeBuildInputs = [ From 63395027a6cff9ceb9ff123315924c749f1e807b Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 1 Jun 2019 22:41:05 +0800 Subject: [PATCH 031/219] brook: 20190401 -> 20190601 --- pkgs/tools/networking/brook/default.nix | 4 +- pkgs/tools/networking/brook/deps.nix | 78 ++++--------------------- 2 files changed, 14 insertions(+), 68 deletions(-) diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index b840628e2151..dec74c72fbe7 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "brook"; - version = "20190401"; + version = "20190601"; goPackagePath = "github.com/txthinking/brook"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "txthinking"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0kx0dpvr3llpdzmw5bvzhdvwkmzrv6kqbsilx6rgrvyl61y9pyry"; + sha256 = "04gx1p447wabw3d18s9sm8ynlvj2bp8ac9dsgs08kd1dyrsjlljk"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/networking/brook/deps.nix b/pkgs/tools/networking/brook/deps.nix index 68fffd34e2a3..a9a8d5e43e3b 100644 --- a/pkgs/tools/networking/brook/deps.nix +++ b/pkgs/tools/networking/brook/deps.nix @@ -8,58 +8,13 @@ sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn"; }; } - { - goPackagePath = "github.com/bitly/go-simplejson"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-simplejson"; - rev = "9db4a59bd4d803ae0c173a7d8a538e056cd59d57"; - sha256 = "0cbnjzjq55jnzk07zdk7nb96yzgpyawm1r6km3xignn8ih4bnn6g"; - }; - } - { - goPackagePath = "github.com/fatih/structs"; - fetch = { - type = "git"; - url = "https://github.com/fatih/structs"; - rev = "878a968ab22548362a09bdb3322f98b00f470d46"; - sha256 = "15nkffa8ylr5kkv52gyry675l8bzv3c0xx39j0fzz0vp2kcjyy8x"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "93c3765e9bb2e29c6a63277c9f829dae34ec24eb"; - sha256 = "043yalxp97vc9xsd5npms0h6slxrlzf8dzvd9l0wcxa8v0cl9lp6"; - }; - } - { - goPackagePath = "github.com/jinzhu/inflection"; - fetch = { - type = "git"; - url = "https://github.com/jinzhu/inflection"; - rev = "04140366298a54a039076d798123ffa108fff46c"; - sha256 = "1s4qcnwaajp3c5ykwx4dfy32hykwsm0ki7kx8lcw8b0z0grkz6qh"; - }; - } - { - goPackagePath = "github.com/jmoiron/sqlx"; - fetch = { - type = "git"; - url = "https://github.com/jmoiron/sqlx"; - rev = "1d3423c595d749e4613fce663591b44ae539d377"; - sha256 = "0947211fqibv9sqsk22lfnk080vqnsxmsan9fff5phygbmzbhzzb"; - }; - } { goPackagePath = "github.com/mdp/qrterminal"; fetch = { type = "git"; url = "https://github.com/mdp/qrterminal"; - rev = "28b49810f53911623d0a538d8edc01b8cbe2bd0e"; - sha256 = "17dq5niw57r1iq1rn1crpgbq1ydrcxqpzc9gj7dd1snc0p9n1rv1"; + rev = "ee9ef6b3f704870848e4022c4bc8c4d8c192516c"; + sha256 = "19dwrmkd1hqjngpmz05y9d0gxzxmdx1plya91ja08s1c1nqc264f"; }; } { @@ -67,8 +22,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "73601d4aed9d844322611759d7f3619110b7c88e"; - sha256 = "1frnj97bbch1qhg55fx2yz6mdjsz8fw94sj7pkrjms239j7vqcvm"; + rev = "d16ecb693e3f8d524769fefce2192a4c92207ff9"; + sha256 = "0x0danna6nzkbiprwjpj0bix2m25lsbvna1bncdm233l3prh8sb1"; }; } { @@ -98,15 +53,6 @@ sha256 = "11rl8pqyd6jzi5alpymzi0i5q7pk2492di44v85g7r24y6livrjg"; }; } - { - goPackagePath = "github.com/txthinking/mailx"; - fetch = { - type = "git"; - url = "https://github.com/txthinking/mailx"; - rev = "ebc2af2e1aa8d2178c30786c18eb138fbe40010d"; - sha256 = "02h5b922savsljcgjz3gxkydk52zd2gbs51prz88l60n6miv9k70"; - }; - } { goPackagePath = "github.com/txthinking/socks5"; fetch = { @@ -121,8 +67,8 @@ fetch = { type = "git"; url = "https://github.com/txthinking/x"; - rev = "e13a838cdc21596c45b4e6b6fd15c822597c9ae3"; - sha256 = "0l5gzhy3h3qynfkgd789hxkv433yqdn1mmk945bwjha7vrm4rx2z"; + rev = "8956479d309307bcd91c2ec89370118aef61abf7"; + sha256 = "0vfsbm5025cpmqpc506vz1vqlzmcw5sc1zrjgx8z22kp1q1slylv"; }; } { @@ -130,8 +76,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f"; - sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb"; + rev = "20be4c3c3ed52bfccdb2d59a412ee1a936d175a7"; + sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; }; } { @@ -139,8 +85,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "eb5bcb51f2a31c7d5141d810b70815c05d9c9146"; - sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby"; + rev = "f3200d17e092c607f615320ecaad13d87ad9a2b3"; + sha256 = "1mskh7p80dd8j1ffy16917d3cyy7lfh1gb56n4rq9g1bwckz4lwy"; }; } { @@ -148,8 +94,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "31e7599a6c37728c25ca34167be099d072ad335d"; - sha256 = "18i17j7nkkc5dl9rpzm8l345r409hfj4knfnldar684337x1irrf"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; }; } { From e9d3a570a66e1f8075954202e3f6eae8eb94cbd2 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 1 Jun 2019 22:54:05 +0800 Subject: [PATCH 032/219] cargo-make: 0.19.3 -> 0.19.4 --- pkgs/development/tools/rust/cargo-make/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 78eb0aa3e94d..ab625d7ea357 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.19.3"; + version = "0.19.4"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "11mkfwvzsr86w9675zpq8gcq5avsfvwffca26h6gkc7ahqcsx3ac"; + sha256 = "019dn401p4bds144fbvqxbnn8vswcj0lxr8cvgpxb2y22640z60l"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/3592410d14443cc6be675553a9c228401114fa5f/cargo-make-Cargo.lock"; - sha256 = "0m8m2pn8y7n1js1kkva4lxahz5j4d73lj7l45h8dd30lw2w4n3hg"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/c5b9fde279a9f6d55d97e0ba4e0b4cd62e0ab2bf/cargo-make-Cargo.lock"; + sha256 = "1d5md3m8hxwf3pwvx059fsk1b3vvqm17pxbbyiisn9v4psrsmld5"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "00yvx87s8vngb97ldq2amdhdv3nn38liys7nilay73phx0xybx4p"; + cargoSha256 = "0wf60ck0w3m9fa19dz99q84kw05sxlj2pp6bd8r1db3cfy8f8h8j"; # Some tests fail because they need network access. # However, Travis ensures a proper build. From 08fd23cceb51516cbb748cf4c92164ffd72e5eb8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 11:15:20 -0700 Subject: [PATCH 033/219] gede: 2.13.1 -> 2.14.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/gede/versions --- pkgs/development/tools/misc/gede/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 3099bc38dc20..70a157bc0840 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gede-${version}"; - version = "2.13.1"; + version = "2.14.1"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "00qgp45hgcnmv8qj0vicqmiwa82rzyadcqy48xfxjd4xgf0qy5bk"; + sha256 = "1z7577zwz7h03d58as93hyx99isi3p4i3rhxr8l01zgi65mz0mr9"; }; nativeBuildInputs = [ qmake makeWrapper python ]; From 5624920de625f2d611f1c8990e62362752757dcc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:39:10 -0400 Subject: [PATCH 034/219] gnome3.gnome-maps: 3.32.2 -> 3.32.2.1 https://gitlab.gnome.org/GNOME/gnome-maps/blob/v3.32.2.1/NEWS --- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index a059ec3ac3ce..25faf2676b82 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.32.2"; + version = "3.32.2.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yvwzdfxjdgx4478l2i240ssvbr8hm5sg4krc1gw2ps08sgap7yx"; + sha256 = "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb"; }; doCheck = true; From 8d1292a48377c28e432aaf77d55a7189a33b5e6b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:40:02 -0400 Subject: [PATCH 035/219] gnome3.gnome-control-center: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-control-center/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index cfd20044c6c6..6331aa9eb149 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xpcmwgnn29syi2kfxc8233a5f3j8cij5wcn76xmsmwxvxz5r85l"; + sha256 = "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs"; }; nativeBuildInputs = [ From 6b01a3ca095d600559e783d3cadb095bb11340f2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:40:30 -0400 Subject: [PATCH 036/219] gnome3.gnome-software: 3.32.2 -> 3.32.3 https://gitlab.gnome.org/GNOME/gnome-software/blob/3.32.3/NEWS --- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index ab4b360221e5..4a5366a72e70 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.32.2"; + version = "3.32.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12kw5vyg8jy0xiq1shfh4ksar2dpyzcdxbyx8lrp9494d606nrlx"; + sha256 = "1r24q2c0i5xwp7dahw4wzycrhijix0nl7bxq1x0za57qm62ysfl9"; }; patches = [ From 4f692b1682a26047328b501ab2b0decfa08814e4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:41:28 -0400 Subject: [PATCH 037/219] gnome3.rygel: 0.38.0 -> 0.38.1 https://gitlab.gnome.org/GNOME/rygel/blob/rygel-0.38.1/NEWS --- pkgs/desktops/gnome-3/core/rygel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 5e701e488f26..c38e677a4217 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.38.0"; + version = "0.38.1"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03ky18hwcz362lbhqm1zm0ax2a075r69xms5cznchn9p9w8z5axc"; + sha256 = "1w8bi2rw91qyfny1zxhy32k4qn62hdjl2m38f75cp7wv6494d7w0"; }; nativeBuildInputs = [ From 4c37b4ae9c94260ab8c425323d3f19b3b4126f63 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:51:11 -0400 Subject: [PATCH 038/219] gitg: 3.30.1 -> 3.32.0 * adds libdazzle * intltool -> gettext * hicolor-icon-theme as native for setup-hook * re-enable tests https://gitlab.gnome.org/GNOME/gitg/blob/v3.32.0/NEWS --- pkgs/desktops/gnome-3/misc/gitg/default.nix | 25 ++++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index cb4c5c05cb0b..94703f375b21 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,8 +1,8 @@ { stdenv , fetchurl , fetchpatch -, vala_0_42 -, intltool +, vala +, gettext , pkgconfig , gtk3 , glib @@ -24,34 +24,35 @@ , meson , ninja , python3 +, hicolor-icon-theme +, libdazzle }: stdenv.mkDerivation rec { pname = "gitg"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss"; + sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81"; }; patches = [ - # Fix build with latest libgit2-glib + # https://gitlab.gnome.org/GNOME/gitg/issues/213 (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch; - sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw"; + url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch"; + sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z"; }) ]; postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" ''; - doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed + doCheck = true; enableParallelBuilding = true; @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { gtksourceview gtkspell3 json-glib + libdazzle libgee libgit2-glib libpeas @@ -72,12 +74,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - intltool + hicolor-icon-theme + gettext meson ninja pkgconfig python3 - vala_0_42 # fails build with 0.44, drop in >3.30.1 + vala wrapGAppsHook ]; From 027ccb8344579727571840e53c23a190f9efa1ed Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:54:03 -0400 Subject: [PATCH 039/219] gnome3.gnome-nettool: correct typo --- pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 00a76318b697..37401af3ce60 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnom3.gnome-nettool"; + attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; From 62e667f6ab51564a53ea2f4e50e0d4f6835f793a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 13:31:03 -0700 Subject: [PATCH 040/219] gtkwave: 3.3.100 -> 3.3.101 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gtkwave/versions --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index e4c743ccdef5..4830e2a032a9 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.100"; + version = "3.3.101"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1z60i5nh8dz8j9ii63fwaw7k0p3x0scp91478cxmdv4xhp4njlxa"; + sha256 = "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz"; }; nativeBuildInputs = [ pkgconfig ]; From 50dc9ded8d0b848f8f769f5c4f56d6403b6f4bbc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 15:41:41 -0700 Subject: [PATCH 041/219] irqbalance: 1.5.0 -> 1.6.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/irqbalance/versions --- pkgs/os-specific/linux/irqbalance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index c4a29d2d601d..e606e3db6ee6 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "irqbalance-${version}"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "1wdwch4nb479xhinin4yqvcjah6h09i4nh8fhnsfbn1mzl0hiv09"; + sha256 = "01r9s63yxaijg8jqcbkwqlyqq2z673szb0vzd7qb2y3gk5jlif2y"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From b30e1d6d9b93c393020955d95d7cb6fd562387df Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 1 Jun 2019 20:14:59 -0400 Subject: [PATCH 042/219] nodejs: use system icu Use the system icu for building nodejs. Fixes #62365 --- pkgs/development/web/nodejs/nodejs.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 7364789d505a..b4213c6ed944 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -4,7 +4,7 @@ , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , gnupg , darwin, xcbuild -, procps +, procps, icu }: with stdenv.lib; @@ -30,7 +30,9 @@ let * as that would put the paths into bin/nodejs. * Including pkgconfig in build inputs would also have the same effect! */ - ]) (builtins.attrNames sharedLibDeps); + ]) (builtins.attrNames sharedLibDeps) ++ [ + "--with-intl=system-icu" + ]; copyLibHeaders = map @@ -51,10 +53,10 @@ in }; buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] - ++ [ python2 zlib libuv openssl http-parser ]; + ++ [ python2 zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which utillinux ] - ++ optionals stdenv.isDarwin [ pkgconfig xcbuild ]; + nativeBuildInputs = [ which utillinux pkgconfig ] + ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags; From 9657693e2087c568dadf6bd4f3be2682d5bc6cf0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 18:29:38 -0700 Subject: [PATCH 043/219] ktlint: 0.32.0 -> 0.33.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/ktlint/versions --- pkgs/development/tools/ktlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index c46250142c9e..0bfe54508b81 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ktlint-${version}"; - version = "0.32.0"; + version = "0.33.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0ha4n2gsfvcycwammywqr7xg5ydlgpflmlm380v767178p5r5llm"; + sha256 = "11yh4d7ybmddw86n8ms259rwd3q0gx2qqir2x92dhywp6pb8g11b"; }; nativeBuildInputs = [ makeWrapper ]; From abf603b8bec73025998643948c05c2737d829e03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 18:52:21 -0700 Subject: [PATCH 044/219] kubernetes: 1.14.1 -> 1.14.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/kubernetes/versions --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 3967883af55e..3a1248f44177 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1cyln9nwry290fpffx6xxy0ll7ybib5ifja7nnq93f3f2p0sj421"; + sha256 = "17jb05c5i9y725jf5ad2ki99wyi2dv2jdhfgcxrki9fzjsx967g2"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From 7fa446d1d0a97983db01dce6b5d0ec11ca8c2e4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 19:33:28 -0700 Subject: [PATCH 045/219] libebml: 1.3.7 -> 1.3.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libebml/versions --- pkgs/development/libraries/libebml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 6a26910c8bd6..2d15e419a764 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libebml"; - version = "1.3.7"; + version = "1.3.9"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "0pdfl83nbbdddbxajx34srg4mcfcz8ca21qyvlnpw81hfnrhmjkv"; + sha256 = "0q2xfabaymrf0xkhwc9akx6m04lgra2b53wcn9mnh5dqiiazizi7"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 5c162f524e4073320a91b6f9c8d0defb79ba49b7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Jun 2019 22:32:22 -0500 Subject: [PATCH 046/219] pythonPackages.pglast: init at 1.4 --- .../python-modules/pglast/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pglast/default.nix diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix new file mode 100644 index 000000000000..bfa6c301a7ba --- /dev/null +++ b/pkgs/development/python-modules/pglast/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pythonOlder +, aenum +, pytest +, pytestcov +}: + +buildPythonPackage rec { + pname = "pglast"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1442ae2cfc6427e9a8fcc2dc18d9ecfcaa1b16eba237fdcf0b2b13912eab9a86"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.6") [ aenum ]; + + checkInputs = [ pytest pytestcov ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = "https://github.com/lelit/pglast"; + description = "PostgreSQL Languages AST and statements prettifier"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2df56150e16b..2ab21cfbe5be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3722,6 +3722,8 @@ in { pg8000 = callPackage ../development/python-modules/pg8000 { }; pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { }; + pglast = callPackage ../development/python-modules/pglast { }; + pgsanity = callPackage ../development/python-modules/pgsanity { }; pgspecial = callPackage ../development/python-modules/pgspecial { }; From fa1bbe69fb1f774a20b57cbde66fa9253927b976 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Jun 2019 08:09:17 +0200 Subject: [PATCH 047/219] maintainers/scripts/update.nix: Do not store updateScripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For update script parallelization, we have started calling builtins.toJSON on updateScripts, which triggers evaluation of paths and therefore their copying to Nix store. This breaks update scripts that assume that they exist in nixpkgs like dwarf-fortress. https://github.com/NixOS/nixpkgs/issues/61935 Let’s stringify the paths before JSONification to prevent the evaluation. --- maintainers/scripts/update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 120cd5552f48..61afb64f9fc7 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -122,7 +122,7 @@ let packageData = package: { name = package.name; pname = (builtins.parseDrvName package.name).name; - updateScript = pkgs.lib.toList package.updateScript; + updateScript = map builtins.toString (pkgs.lib.toList package.updateScript); }; in pkgs.stdenv.mkDerivation { From ea3ed0c3ae6a2f987910b53cfdbad06cb220aa26 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Jun 2019 08:19:19 +0200 Subject: [PATCH 048/219] doc: fix passthru.updateScript help command --- doc/stdenv.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 00d1ec870988..da72086640fe 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -715,13 +715,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] For information about how to run the updates, execute - - nix-shell - - maintainers/scripts/update.nix - - - . + nix-shell maintainers/scripts/update.nix. From 36b2012447b936a1a638e2ddae17507bab8fc839 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Jun 2019 08:55:29 +0200 Subject: [PATCH 049/219] maintainers/scripts/update.nix: ignore overlays It makes little sense for update.nix to try to update overlays; for most people, they will point to a read-only repository most of the cases. --- maintainers/scripts/update.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 61afb64f9fc7..2d1f152ed770 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -20,7 +20,9 @@ let in [x] ++ nubOn f xs; - pkgs = import ./../../default.nix { }; + pkgs = import ./../../default.nix { + overlays = []; + }; packagesWith = cond: return: set: nubOn (pkg: pkg.updateScript) From c3dd31f177b532e7e94b74afca7241778c23af6f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Jun 2019 09:03:41 +0200 Subject: [PATCH 050/219] maintainers/scripts/update.nix: handle null paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously we did not handle non-existant paths making the program crash. Let’s show a proper error. --- maintainers/scripts/update.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 2d1f152ed770..b980514cc094 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -69,9 +69,12 @@ let let attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." path) null pkgs; in - packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg) - (name: pkg: pkg) - attrSet; + if attrSet == null then + builtins.throw "Attribute path `${path}` does not exists." + else + packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg) + (name: pkg: pkg) + attrSet; packageByName = name: let From e98c804cc92cd3412ae6877e9014b3193a5aa3e6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Jun 2019 09:07:18 +0200 Subject: [PATCH 051/219] maintainers/scripts/update.nix: Clean up Make calling update.py a little nicer --- maintainers/scripts/update.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index b980514cc094..04723cb8a366 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -130,6 +130,14 @@ let updateScript = map builtins.toString (pkgs.lib.toList package.updateScript); }; + packagesJson = pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages)); + + optionalArgs = + pkgs.lib.optional (max-workers != null) "--max-workers=${max-workers}" + ++ pkgs.lib.optional (keep-going == "true") "--keep-going"; + + args = [ packagesJson ] ++ optionalArgs; + in pkgs.stdenv.mkDerivation { name = "nixpkgs-update-script"; buildCommand = '' @@ -144,6 +152,6 @@ in pkgs.stdenv.mkDerivation { ''; shellHook = '' unset shellHook # do not contaminate nested shells - exec ${pkgs.python3.interpreter} ${./update.py} ${pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages))}${pkgs.lib.optionalString (max-workers != null) " --max-workers=${max-workers}"}${pkgs.lib.optionalString (keep-going == "true") " --keep-going"} + exec ${pkgs.python3.interpreter} ${./update.py} ${builtins.concatStringsSep " " args} ''; } From 1b507bea4d181fb1fc15ddc6d3ac01aa5f8ab664 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Apr 2019 18:54:13 +0200 Subject: [PATCH 052/219] common-updater-scripts: keep the unescaped oldVersion Previously, we escaped the old version in place for use in sed commands, and then had to use that in error messages. We can do better. --- pkgs/common-updater/scripts/update-source-version | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index bc2c68feaeaa..e1eece1fbf40 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -109,13 +109,13 @@ if [ "$oldVersion" = "$newVersion" ]; then fi # Escape regex metacharacter that are allowed in store path names -oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') -oldUrl=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') +oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') +oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') -if [ $(grep -c -E "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersion\"" "$nixFile") = 1 ]; then - pattern="/\b$versionKey\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|" -elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersion\"" "$nixFile") = 1 ]; then - pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|" +if [ $(grep -c -E "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersionEscaped\"" "$nixFile") = 1 ]; then + pattern="/\b$versionKey\b\s*=/ s|\"$oldVersionEscaped\"|\"$newVersion\"|" +elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersionEscaped\"" "$nixFile") = 1 ]; then + pattern="/\bname\b\s*=/ s|-$oldVersionEscaped\"|-$newVersion\"|" else die "Couldn't figure out where out where to patch in new version in '$attr'!" fi @@ -128,7 +128,7 @@ fi # Replace new URL if [ -n "$newUrl" ]; then - sed -i "$nixFile" -re "s|\"$oldUrl\"|\"$newUrl\"|" + sed -i "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|" if cmp -s "$nixFile" "$nixFile.bak"; then die "Failed to replace source URL '$oldUrl' to '$newUrl' in '$attr'!" From 5751988b556ef354b3689e82406ddc9df8d39547 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Apr 2019 18:39:58 +0200 Subject: [PATCH 053/219] common-updater-scripts: simplify fetchgit fix No need to try evaluate the URL twice as introduced in the original fix https://github.com/NixOS/nixpkgs/commit/cce486838b6c52dedfec1c93f60ebadb72c48431 --- pkgs/common-updater/scripts/update-source-version | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index e1eece1fbf40..591ffa6ca5ba 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -86,14 +86,10 @@ if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" fi -oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt $attr.src.drvAttrs.urls 0" | tr -d '"') +oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"') if [ -z "$oldUrl" ]; then - oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.url" | tr -d '"') - - if [ -z "$oldUrl" ]; then - die "Couldn't evaluate source url from '$attr.src'!" - fi + die "Couldn't evaluate source url from '$attr.src'!" fi drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"') From 9f6a9ce3689a1bbaf271f31b93bd595fc8185187 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Jun 2019 09:40:55 +0200 Subject: [PATCH 054/219] gnome3.updateScript: clean up PATH grep was not actually properly included by common-updater-scripts before 01050586980a81e525428eb9e571a8b040f96b26 but I am not sure why would we ever need to add coreutils to PATH. --- pkgs/desktops/gnome-3/update.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix index 2ee72d46993d..f42b67239505 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome-3/update.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }: +{ stdenv, lib, writeScript, python3, common-updater-scripts }: { packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }: let @@ -9,7 +9,7 @@ let package_name="$1" attr_path="$2" version_policy="$3" - PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]} + PATH=${lib.makeBinPath [ common-updater-scripts python ]} latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable") update-source-version "$attr_path" "$latest_tag" ''; From 6fe1279fca04dd537aa6e1c6431cf3c65ce2622c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 01:20:36 -0700 Subject: [PATCH 055/219] now-cli: 15.0.10 -> 15.3.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/now-cli/versions --- pkgs/development/web/now-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 943fb457f008..025a7e15e294 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "15.0.10"; + version = "15.3.0"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "00w9bniz87jjvizl364hpfssvbl1y1fdzp0732j348x528px2krh"; + sha256 = "08bymzwx4biyqw3md8pa9q6lbnxlpxicrndp4b1hmhdf9i859w5l"; }; sourceRoot = "."; From 6d012050ca9477cdebdc8e008a50d82152d70965 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 03:52:03 -0700 Subject: [PATCH 056/219] opera: 58.0.3135.127 -> 60.0.3255.109 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opera/versions --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index e95e762a4149..e55e939dd4aa 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -40,7 +40,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "58.0.3135.127"; + version = "60.0.3255.109"; rpath = stdenv.lib.makeLibraryPath [ @@ -96,7 +96,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "1nk4zfmb2dv464r1q6n9b66zg7a8h5xfwypzqd791rhmsfjrxn51"; + sha256 = "0y3cjjzp41pa15sw8bp7n5ab8j8b1kk5h11b4pl6w8spsyk2cpqh"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; From 5215f3e081a13f67eb3e2a70d68cf5e862bc8c37 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 04:58:11 -0700 Subject: [PATCH 057/219] pdns-recursor: 4.1.12 -> 4.1.13 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pdns-recursor/versions --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 0e5ea98f30e8..a3c704ede7db 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.1.12"; + version = "4.1.13"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1j5hrpz4c9dqd30piqd8xyjmirdxp4dy71nx9rwq8l4i4nc0l774"; + sha256 = "0vs6sv8pyd69jrzzhbdzh6vgva64swypknwpl070ppzk3xdvfa0k"; }; nativeBuildInputs = [ pkgconfig ]; From 2998ac28b45723cc0ebcd44b49cf8307d1f0bc0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 05:31:59 -0700 Subject: [PATCH 058/219] picard-tools: 2.19.2 -> 2.20.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/picard-tools/versions --- 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 91468eaf819b..5fc222bb2993 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.19.2"; + version = "2.20.2"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0dfap1whga03r0fh3adi684dyp9agfdi96hb2aqskgr9jp0z69rb"; + sha256 = "0qpc6pi3fmzv8rs5cmk3dd4clrkzbrngsl384b5g0y7471lhavbi"; }; nativeBuildInputs = [ makeWrapper ]; From f77faebc7104720b61f02ebd7cf6c777fee51c03 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 2 Jun 2019 16:11:54 +0300 Subject: [PATCH 059/219] pulsemixer: 1.4.0 -> 1.5.0 --- pkgs/tools/audio/pulsemixer/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/tools/audio/pulsemixer/default.nix index 8251c7d5cfc9..051743b46e7a 100644 --- a/pkgs/tools/audio/pulsemixer/default.nix +++ b/pkgs/tools/audio/pulsemixer/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, python3, libpulseaudio }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pulsemixer"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "GeorgeFilipkin"; repo = pname; rev = version; - sha256 = "0l5zawv36d46sj3k31k5w6imnnxzyn62r83wdhr7fp5mi3ls1h5x"; + sha256 = "162nfpyqn4gp45x332a73n07c118vispz3jicin4p67x3f8f0g3j"; }; inherit libpulseaudio; From 826f8220ead9df81a9bb06b954db9c54a7215153 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 07:19:42 -0700 Subject: [PATCH 060/219] python27Packages.avro: 1.8.2 -> 1.9.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/python2.7-avro/versions --- pkgs/development/python-modules/avro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 045790b9bc2d..97ecb5a1127f 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro"; - version = "1.8.2"; + version = "1.9.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8f9ee40830b70b5fb52a419711c9c4ad0336443a6fba7335060805f961b04b59"; + sha256 = "0af72fcql34v30cvjqm9nmz68rl35znn5qbd4k3b9ks02xzy3b2y"; }; meta = with stdenv.lib; { From 31eaadc205734979c946d06f5c76e185957770be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 08:13:51 -0700 Subject: [PATCH 061/219] python37Packages.braintree: 3.53.0 -> 3.54.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/python3.7-braintree/versions --- pkgs/development/python-modules/braintree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 393285636b60..2d1ca0d5f787 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.53.0"; + version = "3.54.0"; src = fetchPypi { inherit pname version; - sha256 = "026apwkjn83la7jm0azz3qajg26nza3gh49zd37j0rsp6cgmfa24"; + sha256 = "09dbj04r55hnm8zvfz8wbnxkxb1pfy7g43pzcgs4hhh5xh45ppfd"; }; propagatedBuildInputs = [ requests ]; From b09734a65247505d76f496337c12e95740023bad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 08:32:09 -0700 Subject: [PATCH 062/219] python37Packages.bugwarrior: 1.6.0 -> 1.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/python3.7-bugwarrior/versions --- pkgs/development/python-modules/bugwarrior/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index b2b10671f2b9..74df8a6b628f 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "bugwarrior"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "cfa4fac19b4f4638928347b8fe192315f72813c3e8ed668867e5891338c7e4ec"; + sha256 = "1pmznka5dxcdjfak0p1yh7lhfbfazmx8g9ysv57lsrkqy4n61qks"; }; buildInputs = [ mock unittest2 nose /* jira megaplan */ ]; From a748ed5b9bf0fad71881bd112c407560323ebdc5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 09:58:24 -0700 Subject: [PATCH 063/219] python37Packages.distributed: 1.27.1 -> 1.28.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/python3.7-distributed/versions --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index ae309b49ccc5..2fd6829bc464 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "1.27.1"; + version = "1.28.1"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "117q16ha03m8y9ydxg5svwx2cv1r2703hcy4a0zgjh5nhx4rfhiy"; + sha256 = "12n487qn66jkgq4nd3vgyc9hfqw4i7zwr4dyybsqm4xmgs5kzn1v"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; From 550ec2fcdb15927f8efc79a274f2b4f43112ce17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 11:00:32 -0700 Subject: [PATCH 064/219] python37Packages.h11: 0.8.1 -> 0.9.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/python3.7-h11/versions --- pkgs/development/python-modules/h11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index ecfb37eeda5a..42ebf1b81da7 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "h11"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "acca6a44cb52a32ab442b1779adf0875c443c689e9e028f8d831a3769f9c5208"; + sha256 = "1qfad70h59hya21vrzz8dqyyaiqhac0anl2dx3s3k80gpskvrm1k"; }; checkInputs = [ pytest ]; From 03a32ec60b59d4e62b08cd1388049ad3d2fd1cfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 11:03:23 -0700 Subject: [PATCH 065/219] python37Packages.gsd: 1.6.2 -> 1.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/python3.7-gsd/versions --- pkgs/development/python-modules/gsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 38826a9b3f29..567cc6f8930d 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.6.2"; + version = "1.7.0"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "58a6669f2375936810d74c3ee7e62c5616acf9e15aa32603701e55ab6fada5f5"; + sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp"; }; propagatedBuildInputs = [ numpy ]; From 3207f7e1cea0026e5d6bd71a027fd16c5a30dce9 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 2 Jun 2019 14:16:31 -0400 Subject: [PATCH 066/219] compton: try not to conflict wintypes --- nixos/modules/services/x11/compton.nix | 36 ++++++++++++++++++-------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index 11db0a133d6d..d4357324c870 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -7,10 +7,19 @@ let cfg = config.services.compton; + literalAttrs = v: + if isString v then toString v + else if isAttrs v then "{\n" + + concatStringsSep "\n" (mapAttrsToList + (name: value: "${literalAttrs name} = ${literalAttrs value};") + v) + + "\n}" + else generators.toPretty {} v; + floatBetween = a: b: with lib; with types; addCheck str (x: versionAtLeast x a && versionOlder x b); - pairOf = x: with types; addCheck (listOf x) (y: lib.length y == 2); + pairOf = x: with types; addCheck (listOf x) (y: length y == 2); opacityRules = optionalString (length cfg.opacityRules != 0) (concatMapStringsSep ",\n" (rule: ''"${rule}"'') cfg.opacityRules); @@ -23,8 +32,7 @@ let fade-in-step = ${elemAt cfg.fadeSteps 0}; fade-out-step = ${elemAt cfg.fadeSteps 1}; fade-exclude = ${toJSON cfg.fadeExclude}; - '' + - optionalString cfg.shadow '' + '' + optionalString cfg.shadow '' # shadows shadow = true; @@ -39,10 +47,7 @@ let inactive-opacity = ${cfg.inactiveOpacity}; wintypes: - { - popup_menu = { opacity = ${cfg.menuOpacity}; } - dropdown_menu = { opacity = ${cfg.menuOpacity}; } - }; + ${literalAttrs cfg.wintypes}; opacity-rule = [ ${opacityRules} @@ -50,7 +55,7 @@ let # other options backend = ${toJSON cfg.backend}; - vsync = ${lib.boolToString cfg.vSync}; + vsync = ${boolToString cfg.vSync}; refresh-rate = ${toString cfg.refreshRate}; '' + cfg.extraOptions); @@ -98,7 +103,7 @@ in { example = [ "window_type *= 'menu'" "name ~= 'Firefox$'" - "focused = 1" + "focused = 1" ]; description = '' List of conditions of windows that should not be faded. @@ -138,7 +143,7 @@ in { example = [ "window_type *= 'menu'" "name ~= 'Firefox$'" - "focused = 1" + "focused = 1" ]; description = '' List of conditions of windows that should have no shadow. @@ -173,6 +178,15 @@ in { ''; }; + wintypes = mkOption { + type = types.attrs; + default = { popup_menu = { opacity = cfg.menuOpacity; }; dropdown_menu = { opacity = cfg.menuOpacity; }; }; + example = {}; + description = '' + Rules for specific window types. + ''; + }; + opacityRules = mkOption { type = types.listOf types.str; default = []; @@ -201,7 +215,7 @@ in { let res = x != "none"; msg = "The type of services.compton.vSync has changed to bool:" - + " interpreting ${x} as ${lib.boolToString res}"; + + " interpreting ${x} as ${boolToString res}"; in if isBool x then x else warn msg res; From c2b2bc48e0e6de085760eab3282c65c426daf76f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 12:31:31 -0700 Subject: [PATCH 067/219] python37Packages.numericalunits: 1.16 -> 1.23 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-numericalunits/versions --- pkgs/development/python-modules/numericalunits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 1212bf0039c9..41b4c1a8f318 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.16"; + version = "1.23"; pname = "numericalunits"; src = fetchPypi { inherit pname version; - sha256 = "71ae8e236c7a223bccefffb670dca68be476dd63b7b9009641fc64099455da25"; + sha256 = "1q1jrzxx0k7j82c5q061hd10mp965ra8813vb09ji326fbxzn2gy"; }; # no tests From 42186e38f446a4e7809f62620dc4c0805d91b2b2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 12:43:27 -0700 Subject: [PATCH 068/219] python37Packages.Nuitka: 0.6.3 -> 0.6.3.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/python3.7-nuitka/versions --- pkgs/development/python-modules/nuitka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 57b48f991891..bf5ca3d55830 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.3"; + version = "0.6.3.1"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0nzk6r724dyai33fi7xmc6jn57pkcwqm553vlv0r11blvc92d7pp"; + sha256 = "0h05krv871ymz55k6lrdlfyqndck6lwyy69dk5v4sakgfd5iawqf"; }; checkInputs = [ vmprof pyqt4 ]; From c3677ed0ef6856b393831c863795e58bb08ac19a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 2 Jun 2019 17:34:27 -0400 Subject: [PATCH 069/219] nodejs: use icu63 for nodejs12 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 06eb3e45e6fc..d56dc8666fad 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,7 +1,7 @@ -{ stdenv, callPackage, lib, openssl, enableNpm ? true }: +{ stdenv, callPackage, lib, openssl, icu, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; + buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; in buildNodejs { inherit enableNpm; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3888fe8dda3..89f421daf6b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4201,10 +4201,12 @@ in }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { openssl = openssl_1_1; + icu = icu63; }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; openssl = openssl_1_1; + icu = icu63; }; # Update this when adding the newest nodejs major version! From 99b760f4afc881332013ceedfca33a8101f00e8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 14:37:25 -0700 Subject: [PATCH 070/219] python37Packages.pytest-tornado: 0.7.0 -> 0.8.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/python3.7-pytest-tornado/versions --- pkgs/development/python-modules/pytest-tornado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index c03590f8de88..a5c351502683 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0jv7jhq6ddhsmnz67vc76r4kwac9k5a142968zppyw9av6qalbl4"; + sha256 = "0ncaq7icijls6qh66kv19w3i9av2wnmaycfr4yadyybajr8yvffz"; }; # package has no tests From cbb4aca34133d518c6221f677d38c2d8b9ddb292 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Sun, 2 Jun 2019 17:37:50 -0400 Subject: [PATCH 071/219] gzdoom: Fix wrong fluidsynth version --- pkgs/games/gzdoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 755781b8bd46..f64a392a6e40 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, openal, fluidsynth, soundfont-fluid, libGL, SDL2 +, openal, fluidsynth_1, soundfont-fluid, libGL, SDL2 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - SDL2 libGL openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 + SDL2 libGL openal fluidsynth_1 bzip2 zlib libjpeg libsndfile mpg123 game-music-emu ]; From 866157765e12805ec2454ecd0d7fe037d29cdf4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 15:08:15 -0700 Subject: [PATCH 072/219] python37Packages.rpyc: 4.0.2 -> 4.1.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/python3.7-rpyc/versions --- pkgs/development/python-modules/rpyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 982fd7fcf59b..b69bf1851a8b 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "rpyc"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "a0d87cbad152f25e3702a03cb7fd67f6b10c87680a60ec3aea8dca5a56307c10"; + sha256 = "1pz90h21f74n8i3cx5ndxm4r3rismkx5qbw1c0cmfci9a3009rq5"; }; propagatedBuildInputs = [ nose plumbum ]; From 431dc973a5b99de1f96365a373706440a8017385 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 3 Jun 2019 00:15:29 +0200 Subject: [PATCH 073/219] doc: document PWD for passthru.updateScript Make it clear that PWD is not fixed --- doc/stdenv.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index da72086640fe..a14d78afe71a 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -709,9 +709,12 @@ passthru.updateScript = writeScript "update-zoom-us" '' passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]; - Note that the update scripts will be run in parallel by default; you - should avoid running git commit or any other commands - that cannot handle that. + + + The script will be usually run from the root of the Nixpkgs repository + but you should not rely on that. Also note that the update scripts will + be run in parallel by default; you should avoid running git + commit or any other commands that cannot handle that. For information about how to run the updates, execute From 5caa17599c2216751b510edc8126dcffd52d085e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 16:30:37 -0700 Subject: [PATCH 074/219] python37Packages.twilio: 6.26.2 -> 6.27.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/python3.7-twilio/versions --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index f8fbf8e49f4a..d6fed4b9007f 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.26.2"; + version = "6.27.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0z0ahbckh5calwgkmd493znixclhjjrly8jfymhwlw6g0g79kavw"; + sha256 = "1yd4cpl4y01d3a956gsdg13vx02rb176wyh7mzr0aznkp38nyw5w"; }; buildInputs = [ nose mock ]; From eef54c2360bddf171b7b898c69a62c71fe757d4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 16:59:59 -0700 Subject: [PATCH 075/219] python37Packages.XlsxWriter: 1.1.7 -> 1.1.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-xlsxwriter/versions --- pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 096dfb6a7799..678141f394f9 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.1.7"; + version = "1.1.8"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "1zv5222bymfr7046ps5512x1kk7ipcx46jjxylaap1p6llqj7zlj"; + sha256 = "19qhdcycaiamd3bp8v2z9rpirxsr4c29fgs219k2766fpmfrgx40"; }; meta = { From e0a1dbd0c3e04e0858d4b31688c1dc96715e17b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 18:57:45 -0700 Subject: [PATCH 076/219] reaper: 5.974 -> 5.978 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/reaper/versions --- pkgs/applications/audio/reaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index fc6a78af0bcf..40e390ab3bbb 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.974"; + version = "5.978"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "0pmjdh4d1jsplv99nrgjn437bgjp7hqk6fynvqk3lbn1zw3wk0i9"; + sha256 = "0na7364zxxcic5mq4vaaj4va0g6rhwnwn9fg5gb421iba29ylmhg"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; From f6e96c3be44b1f71aca025618f6dcb7591c64d94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 19:01:01 -0700 Subject: [PATCH 077/219] rdma-core: 23.1 -> 24.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/rdma-core/versions --- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 02d628fdfbcd..6acd327ef0ed 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "23.1"; + version = "24.0"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "0blwqfj73bnk7byj2mavvnyh87mwhpzwgzg60s9vv9jnfcnbhlhk"; + sha256 = "038msip4fnd8fh6m0vhnqwsaarp86dbnc9hvf5n19aqhlqbabbdc"; }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; From 81eaee81432a1665d84cc9772e2a64aae252ea45 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 3 Jun 2019 10:07:38 +0800 Subject: [PATCH 078/219] just: 0.4.3 -> 0.4.4 --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index a819c157a57f..447cc51ac39b 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0zlxnbifmw1l3j4qw4l8d1mxyj0a7qw2fq90ffghf79f9zgrl4g3"; + sha256 = "06k1pl2qmmr9q0ffw6l0dzqqfgpckmrdzjpzn9cw23shhihv99a8"; }; - cargoSha256 = "0i7qa6qwvql9nv88vg6d7b1bh50xx53phd341fxba4a27kbmalqg"; + cargoSha256 = "1blsdl9dsq24vhm8cg1ja9m4b3h343lndibq6wz2kcwdq4i8jhd0"; checkInputs = [ coreutils bash dash ]; From af6001a0898cf55a120d2619cb61fdf4f19aa686 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 19:47:15 -0700 Subject: [PATCH 079/219] rspamd: 1.9.2 -> 1.9.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/rspamd/versions --- pkgs/servers/mail/rspamd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index d4eb09220824..25e7807659df 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.9.2"; + version = "1.9.4"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "1ygyqlm8x8d54g829pmd3x3qp4rsxj8nq25kgzrpkw73spi7bkkq"; + sha256 = "0b8n7xazmzjb6jf8sk0jg0x861nf1ayzxsvjaymw1qjgpn371r51"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; From b9023319f43bcc38c8e86fd7349479de2d6c089c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 19:51:44 -0700 Subject: [PATCH 080/219] rsyslog: 8.1904.0 -> 8.1905.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/rsyslog/versions --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 8544ee9225fc..729a90aa317e 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -11,11 +11,11 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.1904.0"; + name = "rsyslog-8.1905.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "0gcwzyq3i76vn49yb97gfsx18mllwxb4q4avbp1vzy63vxcv963h"; + sha256 = "1r0nf5j4y8p1hbay3kdgkggr76qm7sw10pnl4anxd3vninmlzgcn"; }; #patches = [ ./fix-gnutls-detection.patch ]; From dcbb0416362b40ec70ca367316482bad8c6f271c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 21:02:52 -0700 Subject: [PATCH 081/219] skypeforlinux: 8.44.0.40 -> 8.45.0.41 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/skypeforlinux/versions --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 71deacecea0e..0c1d307fa550 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.44.0.40"; + version = "8.45.0.41"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -58,7 +58,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "08b5nfx1c8czx5nga3zlg60rxnyg2iy627vnaq8cf9dv620vbrw8"; + sha256 = "1k54gpaphkjv5qhqlwm2vbxbbci7nra4a5l0bhylkkzhsip6cvcm"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From 856b121cd06c770d6b70c91ff0368bba4f8f4f47 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 21:39:10 -0700 Subject: [PATCH 082/219] solr: 8.1.0 -> 8.1.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/solr/versions --- pkgs/servers/search/solr/8.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix index 28808a00a7cf..3c21a2a77efb 100644 --- a/pkgs/servers/search/solr/8.x.nix +++ b/pkgs/servers/search/solr/8.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "1w8hc2694c3acs4hqk0rkl3lmv4sbnji9n5mzw1piq90azlmnb1a"; + sha256 = "18a6pgbvg6z38r3kqkhr152z7sa2hqip2g9fd26y4gzm2665j5dm"; }; nativeBuildInputs = [ makeWrapper ]; From 3803b5d7148f7ad0ce15c09a147e69c80b08f48b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 22:00:46 -0700 Subject: [PATCH 083/219] spice-up: 1.8.1 -> 1.8.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/spice-up/versions --- pkgs/applications/office/spice-up/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index c0ee9bc81b76..a99ac7e44b78 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "spice-up"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Spice-up"; rev = version; - sha256 = "0vgs2z6yr0d5vwb04wd2s22144pdrjhqik9xs69q4dxjxa84iw0h"; + sha256 = "1pix911l4ddn50026a5sbpqfzba6fmw40m1yzbknmkgd2ny28f0m"; }; USER = "pbuilder"; From 4478416816e752c1385bcd96e709896e3ca650b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 22:07:34 -0700 Subject: [PATCH 084/219] src: 1.25 -> 1.26 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/src/versions --- pkgs/applications/version-management/src/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index e41d40beb591..049f2756a551 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "src-${version}"; - version = "1.25"; + version = "1.26"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "0qd10w8fwbrgaj8sx49q6cfhqq3ylhwn7nl9v6kxi1yjlw2p098p"; + sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23"; }; nativeBuildInputs = [ makeWrapper ]; From 7080e6ec1db281f4c449143404f85638a1fa4d4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 23:40:13 -0700 Subject: [PATCH 085/219] tpm2-tss: 2.2.2 -> 2.2.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tpm2-tss/versions --- pkgs/development/libraries/tpm2-tss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index b092a973bc21..cb1052356786 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0bbi1vpca5j7jbvy2z76jilpf5km5as1k37bkb2mwzmpibnypmf1"; + sha256 = "1hwrka0g817a4d1177vv0z13gp66bxzxhflfxswjhcdk93kaws8k"; }; nativeBuildInputs = [ From 9e530fe285756877dbbe0d0ab2d14c0d3be9c450 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 Jun 2019 00:09:12 -0700 Subject: [PATCH 086/219] uget: 2.2.1 -> 2.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/uget/versions --- pkgs/tools/networking/uget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 41c39cd27c26..b35c3e8c883e 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "uget-${version}"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "mirror://sourceforge/urlget/${name}.tar.gz"; - sha256 = "0dlrjhnm1pg2vwmp7nl2xv1aia5hyirb3021rl46x859k63zap24"; + sha256 = "1hmzk907blgzc1z6wv4zbzqrwad06zfm1rqc3svh5garxw8z7xsw"; }; nativeBuildInputs = [ From c619bbbbef3a1a80171029314bf5c621386e4ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 2 Jun 2019 20:18:15 +0200 Subject: [PATCH 087/219] nixos/btsync: remove Remove the btsync module. Bittorrent Sync was renamed to Resilio Sync in 2016, which is supported by the resilio module. Since Resilio Sync had some security updates since 2016, it is not safe to run Bittorrent Sync anymore. --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/services/networking/btsync.nix | 324 ------------------- 3 files changed, 2 insertions(+), 327 deletions(-) delete mode 100644 nixos/modules/services/networking/btsync.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5b7fa5d2b98f..f1118f472e44 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -145,7 +145,7 @@ #notbit = 111; # unused aerospike = 111; ngircd = 112; - btsync = 113; + #btsync = 113; # unused minecraft = 114; vault = 115; rippled = 116; @@ -457,7 +457,7 @@ #notbit = 111; # unused aerospike = 111; #ngircd = 112; # unused - btsync = 113; + #btsync = 113; # unused #minecraft = 114; # unused vault = 115; #ripped = 116; # unused diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 49b5076aefde..2313f45b8e5e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -541,7 +541,6 @@ ./services/networking/autossh.nix ./services/networking/bird.nix ./services/networking/bitlbee.nix - ./services/networking/btsync.nix ./services/networking/charybdis.nix ./services/networking/chrony.nix ./services/networking/cjdns.nix diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix deleted file mode 100644 index 33e85ef58e6e..000000000000 --- a/nixos/modules/services/networking/btsync.nix +++ /dev/null @@ -1,324 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.btsync; - - bittorrentSync = cfg.package; - - listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort); - - optionalEmptyStr = b: v: optionalString (b != "") v; - - webUIConfig = optionalString cfg.enableWebUI - '' - "webui": - { - ${optionalEmptyStr cfg.httpLogin "\"login\": \"${cfg.httpLogin}\","} - ${optionalEmptyStr cfg.httpPass "\"password\": \"${cfg.httpPass}\","} - ${optionalEmptyStr cfg.apiKey "\"api_key\": \"${cfg.apiKey}\","} - ${optionalEmptyStr cfg.directoryRoot "\"directory_root\": \"${cfg.directoryRoot}\","} - "listen": "${listenAddr}" - } - ''; - - knownHosts = e: - optionalString (e ? "knownHosts") - (concatStringsSep "," (map (v: "\"${v}\"") e."knownHosts")); - - sharedFoldersRecord = - concatStringsSep "," (map (entry: - let helper = attr: v: - if (entry ? attr) then boolToString entry.attr else boolToString v; - in - '' - { - "secret": "${entry.secret}", - "dir": "${entry.directory}", - - "use_relay_server": ${helper "useRelayServer" true}, - "use_tracker": ${helper "useTracker" true}, - "use_dht": ${helper "useDHT" false}, - - "search_lan": ${helper "searchLAN" true}, - "use_sync_trash": ${helper "useSyncTrash" true}, - - "known_hosts": [${knownHosts entry}] - } - '') cfg.sharedFolders); - - sharedFoldersConfig = optionalString (cfg.sharedFolders != []) - '' - "shared_folders": - [ - ${sharedFoldersRecord} - ] - ''; - - configFile = pkgs.writeText "btsync.config" - '' - { - "device_name": "${cfg.deviceName}", - "storage_path": "${cfg.storagePath}", - "listening_port": ${toString cfg.listeningPort}, - "use_gui": false, - - "check_for_updates": ${boolToString cfg.checkForUpdates}, - "use_upnp": ${boolToString cfg.useUpnp}, - "download_limit": ${toString cfg.downloadLimit}, - "upload_limit": ${toString cfg.uploadLimit}, - "lan_encrypt_data": ${boolToString cfg.encryptLAN}, - - ${webUIConfig} - ${sharedFoldersConfig} - } - ''; -in -{ - options = { - services.btsync = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - If enabled, start the Bittorrent Sync daemon. Once enabled, you can - interact with the service through the Web UI, or configure it in your - NixOS configuration. Enabling the btsync service - also installs a systemd user unit which can be used to start - user-specific copies of the daemon. Once installed, you can use - systemctl --user start btsync as your user to start - the daemon using the configuration file located at - $HOME/.config/btsync.conf. - ''; - }; - - deviceName = mkOption { - type = types.str; - example = "Voltron"; - description = '' - Name of the Bittorrent Sync device. - ''; - }; - - listeningPort = mkOption { - type = types.int; - default = 0; - example = 44444; - description = '' - Listening port. Defaults to 0 which randomizes the port. - ''; - }; - - checkForUpdates = mkOption { - type = types.bool; - default = true; - description = '' - Determines whether to check for updates and alert the user - about them in the UI. - ''; - }; - - useUpnp = mkOption { - type = types.bool; - default = true; - description = '' - Use Universal Plug-n-Play (UPnP) - ''; - }; - - downloadLimit = mkOption { - type = types.int; - default = 0; - example = 1024; - description = '' - Download speed limit. 0 is unlimited (default). - ''; - }; - - uploadLimit = mkOption { - type = types.int; - default = 0; - example = 1024; - description = '' - Upload speed limit. 0 is unlimited (default). - ''; - }; - - httpListenAddr = mkOption { - type = types.str; - default = "0.0.0.0"; - example = "1.2.3.4"; - description = '' - HTTP address to bind to. - ''; - }; - - httpListenPort = mkOption { - type = types.int; - default = 9000; - description = '' - HTTP port to bind on. - ''; - }; - - httpLogin = mkOption { - type = types.str; - example = "allyourbase"; - default = ""; - description = '' - HTTP web login username. - ''; - }; - - httpPass = mkOption { - type = types.str; - example = "arebelongtous"; - default = ""; - description = '' - HTTP web login password. - ''; - }; - - encryptLAN = mkOption { - type = types.bool; - default = true; - description = "Encrypt LAN data."; - }; - - enableWebUI = mkOption { - type = types.bool; - default = false; - description = '' - Enable Web UI for administration. Bound to the specified - httpListenAddress and - httpListenPort. - ''; - }; - - package = mkOption { - type = types.package; - example = literalExample "pkgs.bittorrentSync20"; - description = '' - Branch of bittorrent sync to use. - ''; - }; - - storagePath = mkOption { - type = types.path; - default = "/var/lib/btsync/"; - description = '' - Where BitTorrent Sync will store it's database files (containing - things like username info and licenses). Generally, you should not - need to ever change this. - ''; - }; - - apiKey = mkOption { - type = types.str; - default = ""; - description = "API key, which enables the developer API."; - }; - - directoryRoot = mkOption { - type = types.str; - default = ""; - example = "/media"; - description = "Default directory to add folders in the web UI."; - }; - - sharedFolders = mkOption { - default = []; - example = - [ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y"; - directory = "/home/user/sync_test"; - useRelayServer = true; - useTracker = true; - useDHT = false; - searchLAN = true; - useSyncTrash = true; - knownHosts = - [ "192.168.1.2:4444" - "192.168.1.3:4444" - ]; - } - ]; - description = '' - Shared folder list. If enabled, web UI must be - disabled. Secrets can be generated using btsync - --generate-secret. Note that this secret will be - put inside the Nix store, so it is realistically not very - secret. - - If you would like to be able to modify the contents of this - directories, it is recommended that you make your user a - member of the btsync group. - - Directories in this list should be in the - btsync group, and that group must have - write access to the directory. It is also recommended that - chmod g+s is applied to the directory - so that any sub directories created will also belong to - the btsync group. Also, - setfacl -d -m group:btsync:rwx and - setfacl -m group:btsync:rwx should also - be applied so that the sub directories are writable by - the group. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - assertions = - [ { assertion = cfg.deviceName != ""; - message = "Device name cannot be empty."; - } - { assertion = cfg.enableWebUI -> cfg.sharedFolders == []; - message = "If using shared folders, the web UI cannot be enabled."; - } - { assertion = cfg.apiKey != "" -> cfg.enableWebUI; - message = "If you're using an API key, you must enable the web server."; - } - ]; - - services.btsync.package = mkOptionDefault pkgs.bittorrentSync14; - - users.users.btsync = { - description = "Bittorrent Sync Service user"; - home = cfg.storagePath; - createHome = true; - uid = config.ids.uids.btsync; - group = "btsync"; - }; - - users.groups = [ - { name = "btsync"; - }]; - - systemd.services.btsync = with pkgs; { - description = "Bittorrent Sync Service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "local-fs.target" ]; - serviceConfig = { - Restart = "on-abort"; - UMask = "0002"; - User = "btsync"; - ExecStart = - "${bittorrentSync}/bin/btsync --nodaemon --config ${configFile}"; - }; - }; - - systemd.user.services.btsync = with pkgs; { - description = "Bittorrent Sync user service"; - after = [ "network.target" "local-fs.target" ]; - serviceConfig = { - Restart = "on-abort"; - ExecStart = - "${bittorrentSync}/bin/btsync --nodaemon --config %h/.config/btsync.conf"; - }; - }; - - environment.systemPackages = [ cfg.package ]; - }; -} From 3093e35f8ff8be2d7ff508af6430dfce62f1151a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 3 Jun 2019 07:47:54 +0200 Subject: [PATCH 088/219] bittorrentSync: remove --- .../networking/bittorrentsync/1.4.x.nix | 9 ---- .../networking/bittorrentsync/2.0.x.nix | 9 ---- .../networking/bittorrentsync/generic.nix | 41 ------------------- pkgs/top-level/aliases.nix | 3 ++ pkgs/top-level/all-packages.nix | 4 -- 5 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 pkgs/applications/networking/bittorrentsync/1.4.x.nix delete mode 100644 pkgs/applications/networking/bittorrentsync/2.0.x.nix delete mode 100644 pkgs/applications/networking/bittorrentsync/generic.nix diff --git a/pkgs/applications/networking/bittorrentsync/1.4.x.nix b/pkgs/applications/networking/bittorrentsync/1.4.x.nix deleted file mode 100644 index 9d57cdaaf20d..000000000000 --- a/pkgs/applications/networking/bittorrentsync/1.4.x.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // { - version = "1.4.111"; - sha256s = { - "x86_64-linux" = "0bw3ds3ndcnkry5mpv645z2bfi5z387bh0f7b35blxq1yv93r83f"; - "i686-linux" = "1qwaj7l7nsd4afx7ksb4b1c22mki9qa40803v9x1a8bhbdfhkczk"; - }; -}) diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix deleted file mode 100644 index d2db3eec26e8..000000000000 --- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // { - version = "2.3.8"; - sha256s = { - "x86_64-linux" = "02n5s561cz3mprg682mrbmh3qai42dh64jgi05rqy9s6wgbn66ly"; - "i686-linux" = "118qrnxc7gvm30rsz0xfx6dlxmrr0dk5ajrvszhy06ww7xvqhzji"; - }; -}) diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix deleted file mode 100644 index 1075aea8db3a..000000000000 --- a/pkgs/applications/networking/bittorrentsync/generic.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, version, sha256s, ... }: - -let - arch = { - "x86_64-linux" = "x64"; - "i686-linux" = "i386"; - }.${stdenv.hostPlatform.system} or throwSystem; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; -in - -stdenv.mkDerivation rec { - name = "btsync-${version}"; - inherit version; - - src = fetchurl { - # annoyingly, downloads for 1.4 and 2.3 do not follow the same URL layout; this is - # a simple work-around, in place of overriding the url in the caller. - urls = [ - "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz" - "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz" - ]; - sha256 = sha256s.${stdenv.hostPlatform.system} or throwSystem; - }; - - dontStrip = true; # Don't strip, otherwise patching the rpaths breaks - sourceRoot = "."; - - installPhase = '' - install -D btsync "$out/bin/btsync" - patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync" - ''; - - meta = { - description = "Automatically sync files via secure, distributed technology"; - homepage = https://www.getsync.com/; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ domenkozar thoughtpolice cwoac ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index de397996b2aa..acd02e0d8f7b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -49,6 +49,9 @@ mapAliases ({ bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 + bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 + bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 + bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6246cc4a5fb5..3af78b9f552d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20043,10 +20043,6 @@ in resilio-sync = callPackage ../applications/networking/resilio-sync { }; - bittorrentSync = bittorrentSync14; - bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; - bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; - dropbox = callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; From 344ccd0d6ddc63e15feaa636fd99181500299bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 3 Jun 2019 08:40:37 +0200 Subject: [PATCH 089/219] nixos/release-notes: mention removal of Bittorrent Sync --- nixos/doc/manual/release-notes/rl-1909.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 097863f0f4b1..6c958583993a 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -112,6 +112,18 @@ + + + Since Bittorrent Sync was superseded by Resilio Sync in 2016, the + bittorrentSync, bittorrentSync14, + and bittorrentSync16 packages have been removed in + favor of resilio-sync. + + + The corresponding module, has been + replaced by the module. + + The limesurvey apache subservice was replaced with a full NixOS module. From 97903f3dc5bb9a8e03687a609d35ddcebc5ea942 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 Jun 2019 00:34:13 -0700 Subject: [PATCH 090/219] urlscan: 0.9.2 -> 0.9.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/urlscan/versions --- pkgs/applications/misc/urlscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 43861d9f60a6..87800cf90d6d 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "16cc1vvvhylrl9208d253k11rqzi95mg7hrf7xbd0bqxvd6rmxar"; + sha256 = "0z24k8sk2zfp2pwysyp844vmhr5vbkj74frwy4i0v5pj60i9jl0v"; }; propagatedBuildInputs = [ python3Packages.urwid ]; From fbda7ca802b371c089202bd49e8e7fb1de012027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 3 Jun 2019 09:52:52 +0200 Subject: [PATCH 091/219] ultrastardx: fixup compilation It starts for me now, so hopefully it's just OK. --- pkgs/games/ultrastardx/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 2e9b3cf8d8ca..f3eec52098d0 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -23,9 +23,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ fpc libpng ] ++ sharedLibs; + # https://github.com/UltraStar-Deluxe/USDX/issues/462 postPatch = '' - # autoconf substitutes strange things otherwise substituteInPlace src/config.inc.in \ + --subst-var-by lua_LIB_NAME liblua.so \ --subst-var-by libpcre_LIBNAME libpcre.so.1 ''; From e82ddcb684bf06f662f467be21bb0c31b580cc22 Mon Sep 17 00:00:00 2001 From: David Wood Date: Mon, 3 Jun 2019 08:57:01 +0100 Subject: [PATCH 092/219] franz: 5.0.0-beta.19 -> 5.1.0 --- .../networking/instant-messengers/franz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index d33761ba772e..2c692055f9ae 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,12 +3,12 @@ , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - version = "5.0.0-beta.19"; + version = "5.1.0"; in stdenv.mkDerivation rec { name = "franz-${version}"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "1b9b8y19iqx8bnax7hbh9rkjfxk8a9gqb1akrcxwwfi46l816gyy"; + sha256 = "a474d2e9c6fb99abfc4c7e9290a0e52eef62233fa25c962afdde75fe151277d0"; }; # don't remove runtime deps From 7ec20f99e65f75b224422b8cc98e3feda9bfb08b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 11:01:42 +0300 Subject: [PATCH 093/219] cppzmq: 4.2.3 -> 4.3.0 --- pkgs/development/libraries/cppzmq/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 9933d1034af8..4c63e93e5c41 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,18 +2,24 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "4.2.3"; + version = "4.3.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "1yjs25ra5s8zs0rhk50w3f1rrrl80hhq784lwdhh1m3risk740sa"; + sha256 = "1g45cdny1m08zw4l261bqcqfdb825mnwjwqcf35bkyc03fr4213l"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ zeromq ]; + cmakeFlags = [ + # Tests try to download googletest at compile time; there is no option + # to use a system one and no simple way to download it beforehand. + "-DCPPZMQ_BUILD_TESTS=OFF" + ]; + meta = with stdenv.lib; { homepage = https://github.com/zeromq/cppzmq; license = licenses.bsd2; From fa2e4bfb61cc5826d36833b12fda312ac1261137 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 10 May 2019 08:42:23 +0300 Subject: [PATCH 094/219] nixos/systemd-boot: don't remove directories from EFI dir This will only result in an error. These directories might be created by, for example, fwupdmgr. --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 940d4c0eb973..ebe37ca10a2d 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -154,7 +154,7 @@ def remove_old_entries(gens): except ValueError: pass for path in glob.iglob("@efiSysMountPoint@/efi/nixos/*"): - if not path in known_paths: + if not path in known_paths and not os.path.isdir(path): os.unlink(path) def get_profiles(): From 8f9a2f1358863f6ca8abb91a5c2f148486070a88 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 3 Jun 2019 05:57:15 -0400 Subject: [PATCH 095/219] dropbox: fix tray menu with StatusNotifierItem trays If dropbox can't load libappindicator, it will fallback to using the old xembed protocol. If you (or your Desktop Environment) are running something like KDE's XEmbed SNI Proxy, then you'll at least see an icon, but clicking the icon won't give you menu. Adding libappindicator to the env allows dropbox to fully integrate with contemporary status trays, while still falling back to xembed if the required DBus service is not present. --- pkgs/applications/networking/dropbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 47ae6307ce7e..d820d40f7a34 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -36,7 +36,7 @@ buildFHSUserEnv { libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXxf86vm libxcb xkeyboardconfig curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt - procps zlib mesa libxshmfence libpthreadstubs + procps zlib mesa libxshmfence libpthreadstubs libappindicator ]; extraInstallCommands = '' From ad3172922613f1dd0c16f0d0f67482955dbf916f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 24 May 2019 09:06:22 +0200 Subject: [PATCH 096/219] ocaml-ng.ocamlPackages_4_08.ocaml: 4.08.0+beta3 -> 4.08.0+rc1 --- pkgs/development/compilers/ocaml/4.08.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix index 53d4ceef92a7..a4172e8f2b7c 100644 --- a/pkgs/development/compilers/ocaml/4.08.nix +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "08"; - patch_version = "0+beta3"; - sha256 = "02pk4bxrgqb12hvpbxyqnl4nwr4g2h96wsfzfd1k8vj8h0jmxzc4"; + patch_version = "0+rc1"; + sha256 = "014yincnkfg0j2jy0cn30l5hb1y4sf2qf1gy9ix9ghgn32iw5ndk"; # If the executable is stripped it does not work dontStrip = true; From e80724f140afa6b51c9a9bfa54c4f374ba4c8269 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 Jun 2019 03:16:11 -0700 Subject: [PATCH 097/219] xterm: 345 -> 346 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xterm/versions --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index f91989e22a9b..ab33612ded97 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-345"; + name = "xterm-346"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "0dfmy9vgpmxi8rsnv2lb2lmq5ny26f0pjhcj348l0d3rs61afjb6"; + sha256 = "0xwamhawgh77q2nlibciv77hznirwhnbs3r52rl4sdaqq1rpscng"; }; buildInputs = From e20966d5f2ca221c4b6b092331c2622fa4ecce58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 Jun 2019 03:29:07 -0700 Subject: [PATCH 098/219] you-get: 0.4.1295 -> 0.4.1302 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/you-get/versions --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 2f009acc13a0..c32c141060a5 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1295"; + version = "0.4.1302"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "15p9ngscrn20shkg909hcnsizqpbl038zbnmxwbprj88lnn8xz9m"; + sha256 = "09iip5y5h6jv7wc38117wldnl91ndwgbnn1h8p890h0v25hk28vh"; }; meta = with stdenv.lib; { From 376b9675ebbcff46591a067a4cb98b5330a49f6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 Jun 2019 03:39:20 -0700 Subject: [PATCH 099/219] zim: 0.71.0 -> 0.71.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/zim/versions --- pkgs/applications/office/zim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index c31284c2747f..a41064666d58 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python3Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.71.0"; + version = "0.71.1"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "0mr3911ls5zp3z776ysrdm3sg89zg29r3ip23msydcdbl8wymw30"; + sha256 = "0d7whwpbklkhamlvysa0yyix1hchkpdynimf3gp1xbibg8mqzbxc"; }; buildInputs = [ gtk3 gobject-introspection wrapGAppsHook ]; From b906a4113366c2eb09a25c643a2d08e11442ed92 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 3 Jun 2019 12:54:31 +0200 Subject: [PATCH 100/219] cockroachdb: 1.19.0 -> 1.19.1 --- pkgs/servers/sql/cockroachdb/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 241ca9235c64..22ec301bceda 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "cockroach-${version}"; - version = "19.1.0"; + version = "19.1.1"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1kb93jxgxc54c23v72ka116b2j7m82c1jghm7njd64qkbbcgrkkw"; + sha256 = "1vbz5j0y9ri8c99k8fc5rnwigay478p1mac5g402639ilkqd41fc"; }; inherit nativeBuildInputs buildInputs; @@ -59,6 +59,6 @@ buildGoPackage rec { description = "A scalable, survivable, strongly-consistent SQL database"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ rushmorem thoughtpolice ]; + maintainers = with maintainers; [ rushmorem thoughtpolice rvolosatovs ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6246cc4a5fb5..a572601ec78c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14939,11 +14939,7 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; From e95fee8bb6227e834eaf9bced8e82f6fee2c0b0d Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Mon, 3 Jun 2019 13:20:26 +0300 Subject: [PATCH 101/219] cargo-web: 0.6.23 -> 0.6.25 --- pkgs/development/tools/cargo-web/default.nix | 21 +++++++++++--------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index f170780b6e3f..262a3d31742a 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,29 +1,32 @@ { stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform -, CoreServices, Security +, CoreServices, Security, cf-private }: rustPlatform.buildRustPackage rec { - name = "cargo-web-${version}"; - version = "0.6.23"; + pname = "cargo-web"; + version = "0.6.25"; src = fetchFromGitHub { owner = "koute"; - repo = "cargo-web"; + repo = pname; rev = version; - sha256 = "1qbi3z4x39il07xlhfvq5ckzjqrf0yf6p8qidf24fp92gb940zxr"; + sha256 = "0q77bryc7ap8gb4rzp9xk8ngqwxh106qn7899g30lwxycnyii0mf"; }; - cargoSha256 = "1ysp8y0s0ha5gffwkra2vd1qh5wmfy1678k9hsfals0ww2f79wii"; + cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn"; nativeBuildInputs = [ openssl perl pkgconfig ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + CoreServices Security + # Needed for CFURLResourceIsReachable symbols. + cf-private + ]; meta = with stdenv.lib; { description = "A Cargo subcommand for the client-side Web"; homepage = https://github.com/koute/cargo-web; - license = with licenses; [asl20 /* or */ mit]; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.kevincox ]; - broken = stdenv.isDarwin; # test with CoreFoundation 10.11 platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 215e487d2573..c95faba87a1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7966,6 +7966,7 @@ in cargo-web = callPackage ../development/tools/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin) cf-private; }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; From 80bf658eb822cd4e7643606f854b622cbb180b56 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 13:35:15 +0300 Subject: [PATCH 102/219] gbenchmark: 1.4.1 -> 1.5.0 --- pkgs/development/libraries/gbenchmark/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index dc5c2024c02a..7e35ed2e5309 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,20 +2,24 @@ stdenv.mkDerivation rec { name = "gbenchmark-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "0l1f6azka85fkb8kdmh4qmmpxhsv7lr7wvll6sld31mfz0cai1kd"; + sha256 = "0r9dbg4cbk47gwmayys31a83m3y67k0kh1f6pl8i869rbd609ndh"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ gtest ]; + postPatch = '' + cp -r ${gtest.src} googletest + chmod -R u+w googletest + ''; enableParallelBuilding = true; + doCheck = true; meta = with stdenv.lib; { description = "A microbenchmark support library"; From 43a65d7b7af2e988d4c2bb07e1a9d5a8f5ed7ebb Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Mon, 3 Jun 2019 12:51:25 +0200 Subject: [PATCH 103/219] paperkey: use HTTPS --- pkgs/tools/security/paperkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index 03af1b8a101a..d7d1f1c40d47 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.6"; src = fetchurl { - url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; + url = "https://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { retention qualities - far longer than the magnetic or optical means that are generally used to back up computer data. ''; - homepage = http://www.jabberwocky.com/software/paperkey/; + homepage = "https://www.jabberwocky.com/software/paperkey/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ skeidel ]; From 70204c2ab675d975fa73bb3b3239574c14fc91f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 17:37:34 -0700 Subject: [PATCH 104/219] qpdf: 8.4.1 -> 8.4.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/qpdf/versions --- pkgs/development/libraries/qpdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 156a8c4c15cb..dceda3c04bd4 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.4.1"; +let version = "8.4.2"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87"; + sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9"; }; nativeBuildInputs = [ perl ]; From fd9dec717710708cadbe0b1b9ae6bb1ac315c503 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Mon, 3 Jun 2019 22:19:44 +1000 Subject: [PATCH 105/219] nixos/grub: Add defaultText for font option Fixes #62602. --- nixos/modules/system/boot/loader/grub/grub.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 99aa7759c954..4e4d14985b0d 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -360,6 +360,7 @@ in font = mkOption { type = types.nullOr types.path; default = "${realGrub}/share/grub/unicode.pf2"; + defaultText = ''"''${pkgs.grub2}/share/grub/unicode.pf2"''; description = '' Path to a TrueType, OpenType, or pf2 font to be used by Grub. ''; From 25fb89009fd44221c31c9fb7dcc9bd1ac7db6b45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 16:10:49 -0700 Subject: [PATCH 106/219] python37Packages.stripe: 2.27.0 -> 2.29.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-stripe/versions --- .../development/python-modules/stripe/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index e69414735888..180ff7580806 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,9 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, unittest2, mock, requests, simplejson }: +{ lib, buildPythonPackage, fetchPypi, requests, toml, pytest, pytestcov, pytest-mock, pytest_xdist }: buildPythonPackage rec { pname = "stripe"; - version = "2.27.0"; + version = "2.29.3"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,12 +10,16 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0pvypngbmiji92nfs28bmiyl7brsm6cj18d9vhnwyydnzn3nlkl1"; + sha256 = "73f9af72ef8125e0d1c713177d006f1cbe95602beb3e10cb0b0a4ae358d1ae86"; }; - checkInputs = [ unittest2 mock ]; + postPatch = '' + substituteInPlace setup.py --replace "toml>=0.9,<0.10" "toml>=0.9" + ''; - propagatedBuildInputs = [ requests ] ++ lib.optional (!isPy3k) simplejson; + propagatedBuildInputs = [ toml requests ]; + + checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ]; meta = with lib; { description = "Stripe Python bindings"; From 4ae62e26ea333ef72dd4ea4ae3b0ac796ecef340 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 16:39:36 -0700 Subject: [PATCH 107/219] python37Packages.uncertainties: 3.0.3 -> 3.1.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/python3.7-uncertainties/versions --- pkgs/development/python-modules/uncertainties/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 2d7fdaa7eca5..6e357f307e3a 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.0.3"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1hp00k10d5n69s446flss8b4rd02wq8dscvakv7ylfyf2p8y564s"; + sha256 = "18b184110cbe31303d25a7bc7f73d51b9cb4e15563cb9aa25ccfbd0ebe07d448"; }; buildInputs = [ nose numpy ]; From d5b80803329cf0ec170efdc317c7f24944f4eec2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 16:46:05 +0300 Subject: [PATCH 108/219] libxls: 1.4.0 -> 1.5.1 --- pkgs/development/libraries/libxls/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 3a3d99b655da..a2a576edc0f7 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "libxls-1.4.0"; + name = "libxls-${version}"; + version = "1.5.1"; src = fetchurl { - url = "mirror://sourceforge/libxls/${name}.zip"; - sha256 = "1g8ds7wbhsa4hdcn77xc2c0l3vvz5bx2hx9ng9c9n7aii92ymfnk"; + url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; + sha256 = "0dam8qgbc5ykzaxmrjhpmfm8lnlcdk6cbpzyaya91qwwa80qbj1v"; }; nativeBuildInputs = [ unzip ]; From 28bd05ce62957f7a513ec6f79613b53e702b82a1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 16:56:19 +0300 Subject: [PATCH 109/219] libsForQt5.qtwebkit-plugins: 2015-05-09 -> 2017-01-25 --- pkgs/development/libraries/qtwebkit-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index 07209be0dce0..46a9785739a6 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }: stdenv.mkDerivation { - name = "qtwebkit-plugins-2015-05-09"; + name = "qtwebkit-plugins-2017-01-25"; src = fetchFromGitHub { owner = "QupZilla"; repo = "qtwebkit-plugins"; - rev = "4e2e0402abd847346bec704be5305ba849eb754b"; - sha256 = "0xyq25l56jgdxgqqv0380brhw9gg0hin5hyrf1j6d3c8k1gka20m"; + rev = "b58ee9d5b31977491662aa4e8bee16404638bf14"; + sha256 = "04wvlhdj45g1v1a3zl0pkf9r72i22h1br10lhhrgad7ypym974gw"; }; nativeBuildInputs = [ qmake ]; From a0d1442ed8a4c57c01bb813ebe2011c38d4e6612 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 14:47:23 -0700 Subject: [PATCH 110/219] python27Packages.python-stdnum: 1.10 -> 1.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python2.7-python-stdnum/versions --- .../python-modules/python-stdnum/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 582192113243..06577249a02d 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,14 +1,19 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.10"; + version = "1.11"; pname = "python-stdnum"; - # Failing tests and dependency issue on Py3k - disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0prs63q8zdgwr5cxc5a43zvsm66l0gf9jk19qdf85m6isnp5186a"; + sha256 = "d5f0af1bee9ddd9a20b398b46ce062dbd4d41fcc9646940f2667256a44df3854"; }; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + meta = { homepage = https://arthurdejong.org/python-stdnum/; description = "Python module to handle standardized numbers and codes"; From eb0d5fc3f076ad8fbac43158e77277066bbe28b9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 27 Apr 2019 19:28:20 -0400 Subject: [PATCH 111/219] pylint: remove pyenchant dependency pyenchant is broken on macOS and also no longer actively developed. pylint has made this an optional dependency that is no longer part of the default test suite. See this issue for more discussion: https://github.com/PyCQA/pylint/issues/1900 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 8f1f4378a394..64259872ce32 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, - isort, mccabe, pytest, pytestrunner, pyenchant }: + isort, mccabe, pytest, pytestrunner }: buildPythonPackage rec { pname = "pylint"; @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pytest pyenchant ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ astroid isort mccabe ]; From be705d8249218b1583c345fa3ca467bfffbfa8b5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 27 Apr 2019 19:31:20 -0400 Subject: [PATCH 112/219] pyenchant: mark broken on darwin/macOS --- pkgs/development/python-modules/pyenchant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 6b49c65faae0..40ac257cad10 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { description = "pyenchant: Python bindings for the Enchant spellchecker"; homepage = https://pythonhosted.org/pyenchant/; license = licenses.lgpl21; + badPlatforms = [ "x86_64-darwin" ]; }; } From 3e96aebf4ed7176acb5e94e9dcf62b64b0c1cf22 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 27 Apr 2019 19:36:52 -0400 Subject: [PATCH 113/219] enchant: 1.6.1 -> 2.2.3 Moves default enchant to 2.2.3. Release url: https://github.com/AbiWord/enchant/releases/tag/v2.0.0 Mostly need to verify no breakage occurs for packages using enchant. --- pkgs/applications/networking/irc/hexchat/default.nix | 4 ++-- pkgs/development/libraries/enchant/{default.nix => 1.x.nix} | 0 pkgs/development/python-modules/pyenchant/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/development/libraries/enchant/{default.nix => 1.x.nix} (100%) diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index f03e4c4e9e34..34c4fcf0c88c 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 , libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy -, libsexy, enchant, libnotify, openssl, intltool +, libsexy, enchant1, libnotify, openssl, intltool , desktop-file-utils, hicolor-icon-theme , autoconf, automake, autoconf-archive }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path patchPhase = '' - sed -i "s,libenchant.so.1,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c + sed -i "s,libenchant.so.1,${enchant1}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c ''; preConfigure = '' diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/1.x.nix similarity index 100% rename from pkgs/development/libraries/enchant/default.nix rename to pkgs/development/libraries/enchant/1.x.nix diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 40ac257cad10..8c240261463a 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"; }; - propagatedBuildInputs = [ pkgs.enchant ]; + propagatedBuildInputs = [ pkgs.enchant1 ]; patchPhase = let - path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|"; + path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant1}/lib/' + e_path)|"; in '' sed -i "${path_hack_script}" enchant/_enchant.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3af78b9f552d..63a906f97c5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10201,9 +10201,10 @@ in elastix = callPackage ../development/libraries/science/biology/elastix { }; - enchant = callPackage ../development/libraries/enchant { }; + enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; + enchant = enchant2; enet = callPackage ../development/libraries/enet { }; From ddaf94d80483c8989cd7e1569df40215fee7b16c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 May 2019 05:30:00 -0500 Subject: [PATCH 114/219] ocamlPackages.merlin: 3.2.2 -> 3.3.0 --- pkgs/development/tools/ocaml/merlin/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index e059a5d6a76c..ca98daa8c28c 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchzip, buildDunePackage, yojson }: +{ stdenv, fetchFromGitHub, buildDunePackage, yojson }: buildDunePackage rec { pname = "merlin"; - version = "3.2.2"; + version = "3.3.0"; - minimumOCamlVersion = "4.02"; + minimumOCamlVersion = "4.02.1"; - src = fetchzip { - url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = pname; + rev = "v${version}"; + sha256 = "1s4y7jz581hj4gqv4pkk3980khw4lm0qzcj416b4ckji40q7nf9d"; }; buildInputs = [ yojson ]; From 547466064e465f64474b0e0c299e5eb7310be984 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Thu, 23 May 2019 15:45:28 +0200 Subject: [PATCH 115/219] coqPackages.mathcomp: 1.8.0 -> 1.9.0 and adding real-closed --- .../coq-modules/mathcomp/default.nix | 26 ++++--- .../coq-modules/mathcomp/extra.nix | 70 +++++++++++++++---- pkgs/top-level/coq-packages.nix | 43 ++++++++---- 3 files changed, 104 insertions(+), 35 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index a9933692db3b..c769ab5521e8 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -5,12 +5,14 @@ with builtins // stdenv.lib; let # sha256 of released mathcomp versions mathcomp-sha256 = { + "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; "1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; }; # versions of coq compatible with released mathcomp versions mathcomp-coq-versions = { + "1.9.0" = flip elem ["8.7" "8.8" "8.9" "8.10"]; "1.8.0" = flip elem ["8.7" "8.8" "8.9"]; "1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"]; "1.6.1" = flip elem ["8.5"]; @@ -56,20 +58,22 @@ let echo "-I ." >> Make echo "-R . mathcomp.all" >> Make ''; + is-released = builtins.isString mathcomp-version; + custom-version = if is-released then mathcomp-version else "custom"; # the base set of attributes for mathcomp attrs = rec { - name = "coq${coq.coq-version}-${pkgname}-${mathcomp-version}"; + name = "coq${coq.coq-version}-${pkgname}-${custom-version}"; # used in ssreflect - version = mathcomp-version; + version = custom-version; - src = fetchFromGitHub { + src = if is-released then fetchFromGitHub { owner = "math-comp"; repo = "math-comp"; rev = "mathcomp-${mathcomp-version}"; sha256 = mathcomp-sha256.${mathcomp-version}; - }; + } else mathcomp-version; nativeBuildInputs = optionals withDoc [ graphviz ]; buildInputs = [ ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); @@ -117,6 +121,7 @@ getAttrOr = a: n: a."${n}" or (throw a.error); mathcompCorePkgs_1_7 = mathcompGen "1.7.0"; mathcompCorePkgs_1_8 = mathcompGen "1.8.0"; +mathcompCorePkgs_1_9 = mathcompGen "1.9.0"; mathcompCorePkgs = recurseIntoAttrs (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version)); @@ -126,6 +131,7 @@ in rec { inherit mathcompGenSingle; mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single"; mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single"; +mathcomp_1_9_single = getAttrOr (mathcompGenSingle "1.9.0") "single"; mathcomp_single = dontDistribute (getAttrOr (mathcompGenSingle default-mathcomp-version) "single"); @@ -133,15 +139,19 @@ mathcomp_single = dontDistribute # generates an attribute set {ssreflect = ; ... character = ; all = ;}. # each of these have a special attribute overrideMathcomp which # must be used instead of overrideAttrs in order to also fix the dependencies -inherit mathcompGen mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs; +inherit mathcompGen mathcompCorePkgs + mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9; + +mathcomp = getAttrOr mathcompCorePkgs "all"; mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all"; mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all"; -mathcomp = getAttrOr mathcompCorePkgs "all"; +mathcomp_1_9 = getAttrOr mathcompCorePkgs_1_9 "all"; -ssreflect = getAttrOr mathcompCorePkgs "ssreflect"; +ssreflect = getAttrOr mathcompCorePkgs "ssreflect"; } // (mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) // (mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) +(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) // +(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9) diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index 3666d54a7869..c30ba19b75a3 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -7,6 +7,7 @@ let param = { finmap = { version-sha256 = { + "1.2.1" = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf"; "1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4"; "1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; "1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; @@ -27,18 +28,42 @@ param = { }; analysis = { version-sha256 = { + "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk"; "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; }; description = "Analysis library compatible with Mathematical Components"; }; + real-closed = { + version-sha256 = { + "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb"; + "1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl"; + "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; + }; + description = "Mathematical Components Library on real closed fields"; + }; }; versions = { - "1.8.0" = { - finmap.version = "1.2.0"; + "1.9.0" = { + finmap.version = "1.2.1"; bigenough.version = "1.0.0"; analysis = { - version = "0.2.0"; + version = "0.2.2"; + core-deps = with coqPackages; [ mathcomp_1_9-field ]; + extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ]; + }; + multinomials = {}; + real-closed = { + version = "1.0.3"; + core-deps = with coqPackages; [ mathcomp_1_9-field ]; + extra-deps = with coqPackages; [ mathcomp_1_9-bigenough ]; + }; + }; + "1.8.0" = { + finmap.version = "1.2.1"; + bigenough.version = "1.0.0"; + analysis = { + version = "0.2.2"; core-deps = with coqPackages; [ mathcomp_1_8-field ]; extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ]; }; @@ -47,6 +72,11 @@ versions = { core-deps = with coqPackages; [ mathcomp_1_8-algebra ]; extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ]; }; + real-closed = { + version = "1.0.3"; + core-deps = with coqPackages; [ mathcomp_1_8-field ]; + extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ]; + }; }; "1.7.0" = { finmap.version = "1.1.0"; @@ -61,6 +91,11 @@ versions = { core-deps = with coqPackages; [ mathcomp_1_7-algebra ]; extra-deps = with coqPackages; [ mathcomp_1_7-finmap_1_0 mathcomp_1_7-bigenough ]; }; + real-closed = { + version = "1.0.1"; + core-deps = with coqPackages; [ mathcomp_1_8-field ]; + extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ]; + }; }; }; @@ -71,12 +106,17 @@ packageGen = { owner ? "math-comp", core-deps ? [ coqPackages.mathcomp-ssreflect ], extra-deps ? [], - coq-versions ? ["8.6" "8.7" "8.8" "8.9"], mathcomp ? current-mathcomp, + compatibleCoqVersions ? null, license ? mathcomp.meta.license, # mandatory package, version ? "broken", version-sha256, description }: + let + theCompatibleCoqVersions = if compatibleCoqVersions == null + then mathcomp.compatibleCoqVersions + else compatibleCoqVersions; + in { "${package}" = let from = src; in stdenv.mkDerivation rec { @@ -105,8 +145,8 @@ packageGen = { passthru = { inherit version-sha256; - compatibleCoqVersions = if meta.broken then _: false else - v: builtins.elem v coq-versions; + compatibleCoqVersions = if meta.broken then _: false + else theCompatibleCoqVersions; }; }; }; @@ -115,14 +155,16 @@ current-versions = versions."${current-mathcomp.version}" or {}; select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x); -all = (mapAttrs' (n: pkg: - {name = "mathcomp_1_7-${n}"; - value = (packageGen ({mathcomp = coqPackages.mathcomp_1_7;} // pkg))."${n}";}) - (select versions."1.7.0")) // - (mapAttrs' (n: pkg: - {name = "mathcomp_1_8-${n}"; - value = (packageGen ({mathcomp = coqPackages.mathcomp_1_8;} // pkg))."${n}";}) - (select versions."1.8.0")) // +for-version = v: suffix: (mapAttrs' (n: pkg: + {name = "mathcomp_${suffix}-${n}"; + value = (packageGen ({ + mathcomp = coqPackages."mathcomp_${suffix}"; + } // pkg))."${n}";}) + (select versions."${v}")); + +all = (for-version "1.7.0" "1_7") // + (for-version "1.8.0" "1_8") // + (for-version "1.9.0" "1_9") // (recurseIntoAttrs (mapDerivationAttrset dontDistribute ( mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg)."${n}";}) (select current-versions)))); diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 9a1bdb07d5b9..cc40f78875c8 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -36,21 +36,38 @@ let ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; inherit (callPackage ../development/coq-modules/mathcomp { }) - mathcompGen mathcompGenSingle mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs - mathcomp mathcomp_1_7 mathcomp_1_8 ssreflect - mathcomp-ssreflect mathcomp-ssreflect_1_7 mathcomp-ssreflect_1_8 - mathcomp-fingroup mathcomp-fingroup_1_7 mathcomp-fingroup_1_8 - mathcomp-algebra mathcomp-algebra_1_7 mathcomp-algebra_1_8 - mathcomp-solvable mathcomp-solvable_1_7 mathcomp-solvable_1_8 - mathcomp-field mathcomp-field_1_7 mathcomp-field_1_8 - mathcomp-character mathcomp-character_1_7 mathcomp-character_1_8; + mathcompGen mathcompGenSingle ssreflect + + mathcompCorePkgs mathcomp + mathcomp-ssreflect mathcomp-fingroup mathcomp-algebra + mathcomp-solvable mathcomp-field mathcomp-character + + mathcompCorePkgs_1_7 mathcomp_1_7 + mathcomp-ssreflect_1_7 mathcomp-fingroup_1_7 mathcomp-algebra_1_7 + mathcomp-solvable_1_7 mathcomp-field_1_7 mathcomp-character_1_7 + + mathcompCorePkgs_1_8 mathcomp_1_8 + mathcomp-ssreflect_1_8 mathcomp-fingroup_1_8 mathcomp-algebra_1_8 + mathcomp-solvable_1_8 mathcomp-field_1_8 mathcomp-character_1_8 + + mathcompCorePkgs_1_9 mathcomp_1_9 + mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9 + mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9; inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { }) - mathcompExtraGen - mathcomp-finmap mathcomp-bigenough mathcomp-analysis mathcomp-multinomials - mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis mathcomp_1_7-multinomials + mathcompExtraGen multinomials + + mathcomp-finmap mathcomp-bigenough mathcomp-analysis + mathcomp-multinomials mathcomp-real-closed + + mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis + mathcomp_1_7-multinomials mathcomp_1_7-real-closed mathcomp_1_7-finmap_1_0 - mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis mathcomp_1_8-multinomials - multinomials; + + mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis + mathcomp_1_8-multinomials mathcomp_1_8-real-closed + + mathcomp_1_9-finmap mathcomp_1_9-bigenough mathcomp_1_9-analysis + mathcomp_1_9-multinomials mathcomp_1_9-real-closed; metalib = callPackage ../development/coq-modules/metalib { }; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; From 1959799d517164fd3427bbc854afe14dee876066 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 3 Jun 2019 18:01:55 +0200 Subject: [PATCH 116/219] strongswan: 5.7.2 -> 5.8.0 --- .../strongswan-swanctl/swanctl-params.nix | 50 ++++++++++++++++- pkgs/tools/networking/strongswan/default.nix | 8 +-- .../networking/strongswan/modprobe-path.patch | 56 ------------------- 3 files changed, 50 insertions(+), 64 deletions(-) delete mode 100644 pkgs/tools/networking/strongswan/modprobe-path.patch diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index d4f7e95f859f..808cb863a9cf 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -6,7 +6,7 @@ # # git clone https://github.com/strongswan/strongswan.git # cd strongswan -# git diff 5.5.3..5.6.0 src/swanctl/swanctl.opt +# git diff 5.7.2..5.8.0 src/swanctl/swanctl.opt lib: with (import ./param-constructors.nix lib); @@ -227,6 +227,22 @@ in { irrespective of the value of this option (even when set to no). ''; + childless = mkEnumParam [ "allow" "force" "never" ] "allow" '' + Use childless IKE_SA initiation (RFC 6023) for IKEv2. Acceptable values + are allow (the default), force and + never. If set to allow, responders + will accept childless IKE_SAs (as indicated via notify in the IKE_SA_INIT + response) while initiators continue to create regular IKE_SAs with the + first CHILD_SA created during IKE_AUTH, unless the IKE_SA is initiated + explicitly without any children (which will fail if the responder does not + support or has disabled this extension). If set to + force, only childless initiation is accepted and the + first CHILD_SA is created with a separate CREATE_CHILD_SA exchange + (e.g. to use an independent DH exchange for all CHILD_SAs). Finally, + setting the option to never disables support for + childless IKE_SAs as responder. + ''; + send_certreq = mkYesNoParam yes '' Send certificate request payloads to offer trusted root CA certificates to the peer. Certificate requests help the peer to choose an appropriate @@ -350,6 +366,16 @@ in { name from either the pools section or an external pool. ''; + if_id_in = mkStrParam "0" '' + XFRM interface ID set on inbound policies/SA, can be overridden by child + config, see there for details. + ''; + + if_id_out = mkStrParam "0" '' + XFRM interface ID set on outbound policies/SA, can be overridden by child + config, see there for details. + ''; + mediation = mkYesNoParam no '' Whether this connection is a mediation connection, that is, whether this connection is used to mediate other connections using the IKEv2 Mediation @@ -799,7 +825,7 @@ in { Updown script to invoke on CHILD_SA up and down events. ''; - hostaccess = mkYesNoParam yes '' + hostaccess = mkYesNoParam no '' Hostaccess variable to pass to updown script. ''; @@ -960,6 +986,26 @@ in { mask requires at least Linux 4.19. ''; + if_id_in = mkStrParam "0" '' + XFRM interface ID set on inbound policies/SA. This allows installing + duplicate policies/SAs and associates them with an interface with the + same ID. The special value %unique sets a unique + interface ID on each CHILD_SA instance, beyond that the value + %unique-dir assigns a different unique interface ID + for each CHILD_SA direction (in/out). + ''; + + if_id_out = mkStrParam "0" '' + XFRM interface ID set on outbound policies/SA. This allows installing + duplicate policies/SAs and associates them with an interface with the + same ID. The special value %unique sets a unique + interface ID on each CHILD_SA instance, beyond that the value + %unique-dir assigns a different unique interface ID + for each CHILD_SA direction (in/out). + + The daemon will not install routes for CHILD_SAs that have this option set. + ''; + tfc_padding = mkParamOfType (with lib.types; either int (enum ["mtu"])) 0 '' Pads ESP packets with additional data to have a consistent ESP packet size for improved Traffic Flow Confidentiality. The padding defines the diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 8cd76b9ca4e6..1f0271c22573 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -19,11 +19,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "strongswan-${version}"; - version = "5.7.2"; + version = "5.8.0"; # Make sure to also update when upgrading! src = fetchurl { url = "https://download.strongswan.org/${name}.tar.bz2"; - sha256 = "0w6cks42lvvyj5ivyhqyqxya48x93yzfpz281q3xmqicdskkp3ih"; + sha256 = "0cq9m86ydd2i0awxkv4a256f4926p2f9pzlisyskl9fngl6f3c8m"; }; dontPatchELF = true; @@ -40,10 +40,6 @@ stdenv.mkDerivation rec { ./ext_auth-path.patch ./firewall_defaults.patch ./updown-path.patch - (optional stdenv.isLinux (substituteAll { - src = ./modprobe-path.patch; - inherit kmod; - })) ]; postPatch = optionalString stdenv.isLinux '' diff --git a/pkgs/tools/networking/strongswan/modprobe-path.patch b/pkgs/tools/networking/strongswan/modprobe-path.patch deleted file mode 100644 index 4c0cb59c13a1..000000000000 --- a/pkgs/tools/networking/strongswan/modprobe-path.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/src/starter/klips.c b/src/starter/klips.c -index 2216546..d626677 100644 ---- a/src/starter/klips.c -+++ b/src/starter/klips.c -@@ -30,7 +30,7 @@ bool starter_klips_init(void) - /* ipsec module makes the pf_key proc interface visible */ - if (stat(PROC_MODULES, &stb) == 0) - { -- ignore_result(system("modprobe -qv ipsec")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ipsec")); - } - - /* now test again */ -@@ -42,9 +42,9 @@ bool starter_klips_init(void) - } - - /* load crypto algorithm modules */ -- ignore_result(system("modprobe -qv ipsec_aes")); -- ignore_result(system("modprobe -qv ipsec_blowfish")); -- ignore_result(system("modprobe -qv ipsec_sha2")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ipsec_aes")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ipsec_blowfish")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ipsec_sha2")); - - DBG2(DBG_APP, "found KLIPS IPsec stack"); - return TRUE; -diff --git a/src/starter/netkey.c b/src/starter/netkey.c -index b150d3e..0a7c2ff 100644 ---- a/src/starter/netkey.c -+++ b/src/starter/netkey.c -@@ -30,7 +30,7 @@ bool starter_netkey_init(void) - /* af_key module makes the netkey proc interface visible */ - if (stat(PROC_MODULES, &stb) == 0) - { -- ignore_result(system("modprobe -qv af_key")); -+ ignore_result(system("@kmod@/bin/modprobe -qv af_key")); - } - - /* now test again */ -@@ -44,11 +44,11 @@ bool starter_netkey_init(void) - /* make sure that all required IPsec modules are loaded */ - if (stat(PROC_MODULES, &stb) == 0) - { -- ignore_result(system("modprobe -qv ah4")); -- ignore_result(system("modprobe -qv esp4")); -- ignore_result(system("modprobe -qv ipcomp")); -- ignore_result(system("modprobe -qv xfrm4_tunnel")); -- ignore_result(system("modprobe -qv xfrm_user")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ah4")); -+ ignore_result(system("@kmod@/bin/modprobe -qv esp4")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ipcomp")); -+ ignore_result(system("@kmod@/bin/modprobe -qv xfrm4_tunnel")); -+ ignore_result(system("@kmod@/bin/modprobe -qv xfrm_user")); - } - - DBG2(DBG_APP, "found netkey IPsec stack"); From 071167e6a93ef8e8aa9a2a29d81aadb68db1a8e1 Mon Sep 17 00:00:00 2001 From: Matthew Glazar Date: Fri, 3 May 2019 17:16:54 -0700 Subject: [PATCH 117/219] duplicity: enable tests * Install required tool dependencies ('tar', 'rdiff', etc.) * Run installed duplicity instead of source tree duplicity * Fix shebang of scripts in testing/overrides/bin/ * Disable some unhelpful developer-only tests * Disable a test broken on Linux (root cause unknown) * Work around low file descriptor soft limit for Darwin builders --- pkgs/tools/backup/duplicity/default.nix | 48 +++++++++++++++---- .../backup/duplicity/gnutar-in-test.patch | 18 +++++++ .../linux-disable-timezone-test.patch | 10 ++++ .../use-installed-scripts-in-test.patch | 13 +++++ 4 files changed, 81 insertions(+), 8 deletions(-) create mode 100644 pkgs/tools/backup/duplicity/gnutar-in-test.patch create mode 100644 pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch create mode 100644 pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index b5accb3b82b0..360fef6df38d 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper }: +{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg +, gnutar +, par2cmdline +, utillinux +, rsync, makeWrapper }: python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; @@ -8,16 +12,26 @@ python2Packages.buildPythonApplication rec { url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; sha256 = "0j37dgyji36hvb5dbzlmh5rj83jwhni02yq16g6rd3hj8f7qhdn2"; }; + patches = [ + ./gnutar-in-test.patch + ./use-installed-scripts-in-test.patch + ] ++ stdenv.lib.optionals stdenv.isLinux [ + ./linux-disable-timezone-test.patch + ]; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; propagatedBuildInputs = with python2Packages; [ boto cffi cryptography ecdsa enum idna pygobject3 fasteners ipaddress lockfile paramiko pyasn1 pycrypto six ]; - checkInputs = with python2Packages; [ lockfile mock pexpect ]; - - # lots of tests are failing, although we get a little further now with the bits in preCheck - doCheck = false; + checkInputs = [ + gnupg # Add 'gpg' to PATH. + gnutar # Add 'tar' to PATH. + librsync # Add 'rdiff' to PATH. + par2cmdline # Add 'par2' to PATH. + ] ++ stdenv.lib.optionals stdenv.isLinux [ + utillinux # Add 'setsid' to PATH. + ] ++ (with python2Packages; [ lockfile mock pexpect ]); postInstall = '' wrapProgram $out/bin/duplicity \ @@ -27,12 +41,30 @@ python2Packages.buildPythonApplication rec { ''; preCheck = '' - patchShebangs testing + wrapPythonProgramsIn "$PWD/testing/overrides/bin" "$pythonPath" - substituteInPlace testing/__init__.py \ - --replace 'mkdir testfiles' 'mkdir -p testfiles' + # Add 'duplicity' to PATH for tests. + # Normally, 'setup.py test' adds 'build/scripts-2.7/' to PATH before running + # tests. However, 'build/scripts-2.7/duplicity' is not wrapped, so its + # shebang is incorrect and it fails to run inside Nix' sandbox. + # In combination with use-installed-scripts-in-test.patch, make 'setup.py + # test' use the installed 'duplicity' instead. + PATH="$out/bin:$PATH" + + # Don't run developer-only checks (pep8, etc.). + export RUN_CODE_TESTS=0 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # Work around the following error when running tests: + # > Max open files of 256 is too low, should be >= 1024. + # > Use 'ulimit -n 1024' or higher to correct. + ulimit -n 1024 ''; + # TODO: Fix test failures on macOS 10.13: + # + # > OSError: out of pty devices + doCheck = !stdenv.isDarwin; + meta = with stdenv.lib; { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = https://www.nongnu.org/duplicity; diff --git a/pkgs/tools/backup/duplicity/gnutar-in-test.patch b/pkgs/tools/backup/duplicity/gnutar-in-test.patch new file mode 100644 index 000000000000..b2820feb0190 --- /dev/null +++ b/pkgs/tools/backup/duplicity/gnutar-in-test.patch @@ -0,0 +1,18 @@ +--- a/testing/functional/test_restart.py ++++ b/testing/functional/test_restart.py +@@ -323,14 +323,7 @@ class RestartTestWithoutEncryption(RestartTest): + https://launchpad.net/bugs/929067 + """ + +- if platform.system().startswith('Linux'): +- tarcmd = "tar" +- elif platform.system().startswith('Darwin'): +- tarcmd = "gtar" +- elif platform.system().endswith('BSD'): +- tarcmd = "gtar" +- else: +- raise Exception("Platform %s not supported by tar/gtar." % platform.platform()) ++ tarcmd = "tar" + + # Intial normal backup + self.backup("full", "testfiles/blocktartest") diff --git a/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch b/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch new file mode 100644 index 000000000000..b5e6df18a15b --- /dev/null +++ b/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch @@ -0,0 +1,10 @@ +--- a/testing/unit/test_statistics.py ++++ b/testing/unit/test_statistics.py +@@ -59,6 +59,7 @@ class StatsObjTest(UnitTestCase): + s1 = StatsDeltaProcess() + assert s1.get_stat('SourceFiles') == 0 + ++ @unittest.skip("Broken on Linux in Nix' build environment") + def test_get_stats_string(self): + """Test conversion of stat object into string""" + s = StatsObj() diff --git a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch new file mode 100644 index 000000000000..191808abc637 --- /dev/null +++ b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch @@ -0,0 +1,13 @@ +--- a/setup.py ++++ b/setup.py +@@ -92,10 +92,6 @@ class TestCommand(test): + except Exception: + pass + +- os.environ['PATH'] = "%s:%s" % ( +- os.path.abspath(build_scripts_cmd.build_dir), +- os.environ.get('PATH')) +- + test.run(self) + + def run_tests(self): From 74bb653916d4f7ccae975f5103ed7d6385a99e31 Mon Sep 17 00:00:00 2001 From: Matthew Glazar Date: Sun, 2 Jun 2019 23:13:21 -0700 Subject: [PATCH 118/219] duplicity: speed up testing Apply some upstream duplicity patches which optimize installCheckPhase. On my laptop, this lowers duplicity's total build time from 8 m 42 s to 6 m 50 s (-21%). --- pkgs/tools/backup/duplicity/default.nix | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 360fef6df38d..c2eb56986fd9 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg +{ stdenv, fetchpatch, fetchurl, python2Packages, librsync, ncftp, gnupg , gnutar , par2cmdline , utillinux @@ -15,6 +15,26 @@ python2Packages.buildPythonApplication rec { patches = [ ./gnutar-in-test.patch ./use-installed-scripts-in-test.patch + + # The following patches improve the performance of installCheckPhase: + # Ensure all duplicity output is captured in tests + (fetchpatch { + extraPrefix = ""; + sha256 = "07ay3mmnw8p2j3v8yvcpjsx0rf2jqly9ablwjpmry23dz9f0mxsd"; + url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.1"; + }) + # Minimize time spent sleeping between backups + (fetchpatch { + extraPrefix = ""; + sha256 = "0v99q6mvikb8sf68gh3s0zg12pq8fijs87fv1qrvdnc8zvs4pmfs"; + url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.2"; + }) + # Remove unnecessary sleeping after running backups in tests + (fetchpatch { + extraPrefix = ""; + sha256 = "1bmgp4ilq2gwz2k73fxrqplf866hj57lbyabaqpkvwxhr0ch1jiq"; + url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.3"; + }) ] ++ stdenv.lib.optionals stdenv.isLinux [ ./linux-disable-timezone-test.patch ]; From 9f7bb1f512ba305ed5b0bf0132dd3f50b158a517 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 3 Jun 2019 12:22:40 -0400 Subject: [PATCH 119/219] python27: add override to build statically --- pkgs/development/interpreters/python/cpython/2.7/default.nix | 4 +++- pkgs/top-level/static.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 894a9b084c68..bc90d93a7e3d 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -22,6 +22,7 @@ , sourceVersion , sha256 , passthruFun +, static ? false }: assert x11Support -> tcl != null @@ -164,7 +165,8 @@ let ] # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. - ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; + ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" + ++ optional static "LDFLAGS=-static"; buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index ada3c2a5034c..43220f724bec 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -161,4 +161,6 @@ in { }; }; + python27 = super.python27.override { static = true; }; + } From 6c9977f753698f23e505441038d0077420bc2757 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 3 Jun 2019 12:23:02 -0400 Subject: [PATCH 120/219] waf: only add crossFlags when hostPlatform.system == targetPlatform waf fails otherwise in some weird CHECK_UNAME things Fixes #62540 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3af78b9f552d..731cdb9b1483 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6716,7 +6716,7 @@ in deps = [ python ]; substitutions = { inherit waf; - crossFlags = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) + crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; }; } ../development/tools/build-managers/waf/setup-hook.sh; From cc582920f27383bb45f5f381b528d31400cc7db4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 3 Jun 2019 12:27:21 -0400 Subject: [PATCH 121/219] proot: 20190305 -> 20190510 --- pkgs/tools/system/proot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index c8028ed74a7c..79b86f1383c0 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "proot"; - version = "5.1.0.20190305"; + version = "20190510"; src = fetchFromGitHub { repo = "proot"; owner = "proot-me"; - rev = "ff61c86cb26f71c06af22574d9d4cc3a77292781"; - sha256 = "0qink34bjv0lshf3c8997w39r8yxgbhxpjbxw47l5xkvimlpc0dl"; + rev = "803e54d8a1b3d513108d3fc413ba6f7c80220b74"; + sha256 = "0gwzqm5wpscj3fchlv3qggf3zzn0v00s4crb5ciwljan1zrqadhy"; }; postPatch = '' From 9af84fe525bdea23c3b8c09717c8ac6963b4b5c4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 3 Jun 2019 12:32:17 -0400 Subject: [PATCH 122/219] julia: strip out gfortran refs Fixes #62588 --- pkgs/development/compilers/julia/shared.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index 6706cf1e2bd4..131b72624842 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -173,16 +173,11 @@ stdenv.mkDerivation rec { "USE_SYSTEM_ZLIB=1" ]; - NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm openspecfun pcre2 ]; - dontStrip = true; - dontPatchELF = true; - enableParallelBuilding = true; doCheck = !stdenv.isDarwin; From 6eb0be091cdfbb3312f79671aaf7b0baa7a0404c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 18:42:05 -0700 Subject: [PATCH 123/219] rabbitmq-server: 3.7.14 -> 3.7.15 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rabbitmq-server/versions --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 37a2e6369d47..3d36202e8616 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.14"; + version = "3.7.15"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "12lx4ij89khg9nfiq5l9bijgm7yjrw9kh7y09wqjhv2ws0mq3437"; + sha256 = "14ipnvcrwln9mwr4r32461js2gdlrr4h4hy92393ixbkscf9wdir"; }; buildInputs = From ba76fa91c762160e0d75a4cba74b44a0c3f911e7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 3 Jun 2019 10:54:36 -0400 Subject: [PATCH 124/219] treewide: handle enchant = enchant2 patch or provide backup to enchant1 where necessary --- pkgs/desktops/gnome-2/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix | 4 ++-- pkgs/desktops/gnome-3/default.nix | 2 +- pkgs/desktops/gnome-3/misc/gtkhtml/default.nix | 2 +- pkgs/development/libraries/gtkspell/3.nix | 6 +++--- pkgs/tools/inputmethods/fcitx/unwrapped.nix | 4 ++-- pkgs/top-level/all-packages.nix | 9 ++++++--- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index b1a2d6ae7faf..95e6d0f12b03 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -47,9 +47,9 @@ lib.makeScope pkgs.newScope (self: with self; { libbonoboui = callPackage ./platform/libbonoboui { }; - gtkhtml = callPackage ./platform/gtkhtml { }; + gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; }; - gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; + gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant1; }; gtkglext = callPackage ./platform/gtkglext { }; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 493f88290f3a..f38ad7f24911 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool, -GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: +{ stdenv, fetchurl, pkgconfig, gtk3, intltool, fetchpatch +, GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "4.10.0"; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 8680e3ed81da..151581b73eb9 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -347,7 +347,7 @@ lib.makeScope pkgs.newScope (self: with self; { pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; - gtkhtml = callPackage ./misc/gtkhtml { }; + gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; }; pomodoro = callPackage ./misc/pomodoro { }; diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 543453a2bd31..b8cce222f939 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool +{ stdenv, fetchurl, pkgconfig, gtk3, intltool, fetchpatch , gnome3, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 6d4288376800..f0baecb19904 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant2, isocodes, intltool, gobject-introspection, vala}: +{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}: stdenv.mkDerivation rec { name = "gtkspell-${version}"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ]; - buildInputs = [ aspell gtk3 enchant2 isocodes ]; - propagatedBuildInputs = [ enchant2 ]; + buildInputs = [ aspell gtk3 enchant isocodes ]; + propagatedBuildInputs = [ enchant ]; configureFlags = [ "--enable-introspection" diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 50cc06d20593..b32368c93d3c 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext -, libxml2, enchant, isocodes, icu, libpthreadstubs +, libxml2, enchant1, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules , xkeyboard_config, pcre, libuuid @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ]; buildInputs = [ - xkeyboard_config enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile + xkeyboard_config enchant1 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63a906f97c5c..67b5a0d62052 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10802,7 +10802,7 @@ in gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; - gtkspell2 = callPackage ../development/libraries/gtkspell { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { enchant = enchant1; }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; @@ -13282,7 +13282,7 @@ in subdl = callPackage ../applications/video/subdl { }; - subtitleeditor = callPackage ../applications/video/subtitleeditor { }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; }; suil = callPackage ../development/libraries/audio/suil { }; @@ -20992,7 +20992,9 @@ in xmind = callPackage ../applications/misc/xmind { }; - xneur = callPackage ../applications/misc/xneur { }; + xneur = callPackage ../applications/misc/xneur { + enchant = enchant1; + }; gxneur = callPackage ../applications/misc/gxneur { inherit (gnome2) libglade GConf; @@ -21003,6 +21005,7 @@ in inherit (gnome2) libglade scrollkeeper; gtkhtml = gnome2.gtkhtml4; python = python27; + enchant = enchant1; }; xournal = callPackage ../applications/graphics/xournal { From 9d65bb588fadd355eae487c5f842f2af28b02aaa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 3 Jun 2019 13:08:45 -0400 Subject: [PATCH 125/219] zoom-us: set LD_PRELOAD=.../v4l2convert.so MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was needed for my webcam to work with zoom-us. v4l2convert is a wrapper for apps that only support simple bgr24 or yuv420. For these apps to support webcams that don’t use those formats, we need to use LD_PRELOAD to get those symbols. Taken from archlinux wiki: https://wiki.archlinux.org/index.php/Webcam_setup#V4L1_support --- .../networking/instant-messengers/zoom-us/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b477a194faf1..2ce42fd9f835 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -4,7 +4,7 @@ , qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel, qtwebengine # Runtime -, coreutils, libjpeg_turbo, pciutils, procps, utillinux +, coreutils, libjpeg_turbo, pciutils, procps, utillinux, libv4l , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -72,6 +72,7 @@ in stdenv.mkDerivation { makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix PATH : "${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}" \ + --prefix LD_PRELOAD : "${libv4l}/lib/libv4l/v4l2convert.so" \ --run "cd $packagePath" runHook postInstall From d3a4a5bd95b74e26411c7cad5dd2733deae8c2e1 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Mon, 3 Jun 2019 18:01:30 +0100 Subject: [PATCH 126/219] localtime: set geoclue config The geoclue module now lets us set application config. This should make it more robust in environments that don't provide a geoclue agent. Fixes #44725. --- nixos/modules/services/system/localtime.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix index c7e897c96448..8e9286b94078 100644 --- a/nixos/modules/services/system/localtime.nix +++ b/nixos/modules/services/system/localtime.nix @@ -20,7 +20,13 @@ in { }; config = mkIf cfg.enable { - services.geoclue2.enable = true; + services.geoclue2 = { + enable = true; + appConfig."localtime" = { + isAllowed = true; + isSystem = true; + }; + }; # so polkit will pick up the rules environment.systemPackages = [ pkgs.localtime ]; From 01d06dc35f836cce945f522913f2a00a61b29c2d Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Mon, 3 Jun 2019 18:03:30 +0100 Subject: [PATCH 127/219] redshift: add geoclue config The geoclue module now lets us set application config. This should make it more robust in desktop environments that don't define a geoclue agent. Fixes #45994. --- nixos/modules/services/x11/redshift.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index b7dd7debcb63..4345a3348081 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -119,7 +119,13 @@ in { # needed so that .desktop files are installed, which geoclue cares about environment.systemPackages = [ cfg.package ]; - services.geoclue2.enable = mkIf (cfg.provider == "geoclue2") true; + services.geoclue2 = mkIf (cfg.provider == "geoclue2") { + enable = true; + appConfig."redshift" = { + isAllowed = true; + isSystem = true; + }; + }; systemd.user.services.redshift = let From 9c85185b1ee0ed39de179175d7943065c16597b8 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 3 Jun 2019 21:58:35 +0300 Subject: [PATCH 128/219] phpPackages.event: 2.5.0 -> 2.5.1 --- 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 127b326f0410..0870eee8239e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -143,10 +143,10 @@ let }; event = buildPecl rec { - version = "2.5.0"; + version = "2.5.1"; pname = "event"; - sha256 = "1igbxla4s784z7lw1jar6pjyfn596040a52kfmawwclqf9qcvx0v"; + sha256 = "0hnvmlbl994fjliqc3c65gv6f6syh9zmlfcbizqs3k67bbmkhiad"; configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; From 0854eb5504697978c8ed037bf3dcb1542cbc9fee Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 3 Jun 2019 21:59:32 +0300 Subject: [PATCH 129/219] phpPackages.imagick: 3.4.3 -> 3.4.4 --- 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 0870eee8239e..f633429e387b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -174,10 +174,10 @@ let }; imagick = buildPecl rec { - version = "3.4.3"; + version = "3.4.4"; pname = "imagick"; - sha256 = "0z2nc92xfc5axa9f2dy95rmsd2c81q8cs1pm4anh0a50x9g5ng0z"; + sha256 = "0xvhaqny1v796ywx83w7jyjyd0nrxkxf34w9zi8qc8aw8qbammcd"; configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; From d56f064e03d9e248b397b4d8fd1e9dcea795d2a9 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 3 Jun 2019 22:01:07 +0300 Subject: [PATCH 130/219] phpPackages.php-cs-fixer: 2.14.2 -> 2.15.1 --- 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 f633429e387b..638d9a279c10 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -237,12 +237,12 @@ let }; php-cs-fixer = mkDerivation rec { - version = "2.14.2"; + version = "2.15.1"; pname = "php-cs-fixer"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1d5msgrkiim8iwkkrq3m1cnx7wfi96m1qs6rbh279kw5ysvzkaj9"; + sha256 = "0qbqdki6vj8bgj5m2k4mi0qgj17r6s2v2q7yc30hhgvksf7vamlc"; }; phases = [ "installPhase" ]; From 6128cfac0ebbdca8e3487afd776e3f16a47dad92 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 3 Jun 2019 22:02:29 +0300 Subject: [PATCH 131/219] phpPackages.protobuf: 3.7.1 -> 3.8.0 --- 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 638d9a279c10..f41db50f2d86 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -445,10 +445,10 @@ let }; protobuf = buildPecl rec { - version = "3.7.1"; + version = "3.8.0"; pname = "protobuf"; - sha256 = "0fbf29851dpgjfdgi6i1dgy047dfiazm6qh943w22zbj35l7g2yc"; + sha256 = "09zs7w9iv6432i0js44ihxymbd4pcxlprlzqkcjsxjpbprs4qpv2"; buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ]; From 3e567d25671651bf33cc0d14828c149b4db6cf1a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 3 Jun 2019 22:03:22 +0300 Subject: [PATCH 132/219] phpPackages.couchbase: 2.6.0 -> 2.6.1 --- 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 f41db50f2d86..119b99c3a56e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -102,7 +102,7 @@ let }; couchbase = buildPecl rec { - version = "2.6.0"; + version = "2.6.1"; pname = "couchbase"; buildInputs = [ pkgs.libcouchbase pkgs.zlib igbinary pcs ]; @@ -111,7 +111,7 @@ let owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; - sha256 = "0lhcvgd4a0wvxniinxajj48p5krbp44h8932021qq14rv94r4k0b"; + sha256 = "0jdzgcvab1vpxai23brmmvizjjq2d2dik9aklz6bzspfb512qjd6"; }; configureFlags = [ "--with-couchbase" ]; From 39a3ad3dce63929549741adbd48be657a1f03532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Mon, 3 Jun 2019 19:32:37 +0200 Subject: [PATCH 133/219] gildas: 20190501_a -> 20190601_b --- pkgs/applications/science/astronomy/gildas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 592225b16966..e5a9fca33374 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "may19a"; - version = "20190501_a"; + srcVersion = "jun19b"; + version = "20190601_b"; name = "gildas-${version}"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "f6132116bce0ea716a6eb13a63f538d27567a8bfb159f7d567abb9dac5429e30"; + sha256 = "363d191afdb1fda12ec19d6b9c3ab4189e7c3b036e78f7359d17671d846118ce"; }; enableParallelBuilding = true; From e151c5927a8ee334ed8b9e9d7dd76d17ea42f212 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 4 Jun 2019 00:25:23 +0300 Subject: [PATCH 134/219] hexyl: 0.5.0 -> 0.5.1 --- pkgs/tools/misc/hexyl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index dac369d99aa7..f6b0649e4046 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1b5y2lwcv802hjp105h35vda1d6rgysm9qvrm0v96srm0qqh8rq3"; + sha256 = "0511ikhfc0fa6cfp02n49zlzyqgwf7ymgn911y8fnjlaf6grsh67"; }; - cargoSha256 = "0z7dg098ivyvf4782hy8hc5c1ddj3qrrnrqhgpwcdbx3xlwn8p8x"; + cargoSha256 = "126hq802hncji4yvkf7jvaq2njzw8kwzvc7fqw99nrdn4k56xig7"; meta = with stdenv.lib; { description = "A command-line hex viewer"; From 9835414c07374ebc94eaa002d0fc51f92672fd9e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 17:20:51 +0300 Subject: [PATCH 135/219] python3.pkgs.hmmlearn: 0.2.1 -> 0.2.2 --- pkgs/development/python-modules/hmmlearn/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index db8ff5726ab9..9938d4053879 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchurl, buildPythonPackage, numpy, scikitlearn }: +{ lib, fetchurl, buildPythonPackage, numpy, scikitlearn, setuptools_scm, cython, pytest }: buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.1"; + version = "0.2.2"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${name}.tar.gz"; - sha256 = "d43f5b25f9019ef5d01914d0972a5fa0594e82ab75d2c6aec26d682e47bd553c"; + sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4"; }; + buildInputs = [ setuptools_scm cython ]; propagatedBuildInputs = [ numpy scikitlearn ]; + checkInputs = [ pytest ]; - doCheck = false; + checkPhase = '' + pytest --doctest-modules --pyargs hmmlearn + ''; meta = with lib; { description = "Hidden Markov Models in Python with scikit-learn like API"; From d29a39d7d527b9a6a43da5f275eb4974094209de Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 17:23:11 +0300 Subject: [PATCH 136/219] python3.pkgs.PyChromecast: 3.2.1 -> 3.2.2 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index ff4059d862ee..ef5996f32c78 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "3.2.1"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - sha256 = "e1e71e30581e1021b6bdd50a80cfcdcfa86d9082171fdd719c5ca6a77b8a9699"; + sha256 = "17l7nlnpqjgnrw4hzs52lbzmdxa1vm3v51mm33l4c43c1md5m2ns"; }; disabled = !isPy3k; From c5ed8dd610129197dd113a5c98ef375d89624b5c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 17:46:45 +0300 Subject: [PATCH 137/219] python3.pkgs.typesentry: init at 0.2.7 --- .../python-modules/typesentry/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/typesentry/default.nix diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix new file mode 100644 index 000000000000..3aeb84113c2d --- /dev/null +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, colorama +, pytest +, pytestcov +}: + +buildPythonPackage rec { + pname = "typesentry"; + version = "0.2.7"; + + # Only wheel distribution is available on PyPi. + src = fetchFromGitHub { + owner = "h2oai"; + repo = "typesentry"; + rev = "0ca8ed0e62d15ffe430545e7648c9a9b2547b49c"; + sha256 = "0z615f9dxaab3bay3v27j7q99qm6l6q8xv872yvsp87sxj7apfki"; + }; + + propagatedBuildInputs = [ colorama ]; + checkInputs = [ pytest pytestcov ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python 2.7 & 3.5+ runtime type-checker"; + homepage = "https://github.com/h2oai/typesentry"; + license = licenses.asl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 46de38b0bf35..9443cdcb968f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4306,6 +4306,8 @@ in { typeguard = callPackage ../development/python-modules/typeguard { }; + typesentry = callPackage ../development/python-modules/typesentry { }; + s3transfer = callPackage ../development/python-modules/s3transfer { }; seqdiag = callPackage ../development/python-modules/seqdiag { }; From 3c6f43f5cd59e9df5e21a42eb4e75a979c33e1d2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 18:12:25 +0300 Subject: [PATCH 138/219] python3.pkgs.datatable: init at 0.8.0 --- .../python-modules/datatable/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/datatable/default.nix diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix new file mode 100644 index 000000000000..3ea926ac23be --- /dev/null +++ b/pkgs/development/python-modules/datatable/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, llvm +, typesentry +, blessed +, pytest +}: + +buildPythonPackage rec { + pname = "datatable"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s8z81zffrckvdwrrl0pkjc7gsdvjxw59xgg6ck81dl7gkh5grjk"; + }; + + disabled = pythonOlder "3.5"; + + propagatedBuildInputs = [ typesentry blessed ]; + buildInputs = [ llvm ]; + checkInputs = [ pytest ]; + + LLVM = llvm; + + checkPhase = '' + # py.test adds local datatable to path, which doesn't contain built native library. + mv datatable datatable.hidden + pytest + ''; + + meta = with lib; { + description = "data.table for Python"; + homepage = "https://github.com/h2oai/datatable"; + license = licenses.mpl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9443cdcb968f..ff22e0cfa6fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -345,6 +345,8 @@ in { btchip = callPackage ../development/python-modules/btchip { }; + datatable = callPackage ../development/python-modules/datatable { }; + datamodeldict = callPackage ../development/python-modules/datamodeldict { }; datasette = callPackage ../development/python-modules/datasette { }; From 1f65bb626df4e0b7c96572e0fb9e08fe9f34a0a0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 18:17:47 +0300 Subject: [PATCH 139/219] swarm: 3.1 -> 2019-03-11 --- .../tools/analysis/swarm/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index a67d9b8d42e8..86e4d6ef5f69 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -1,23 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "swarm-${version}"; - version = "3.1"; + name = "swarm-2019-03-11"; - src = fetchurl { - url = "http://www.spinroot.com/swarm/swarm${version}.tar"; - sha256 = "12hi6wy0v0jfbrmgfxpnz7vxfzz3g1c6z7dj8p8kc2nm0q5bii47"; + src = fetchFromGitHub { + owner = "nimble-code"; + repo = "swarm"; + rev = "4b36ed83c8fbb074f2dc5777fe1c0ab4d73cc7d9"; + sha256 = "18zwlwsiiksivjpg6agmbmg0zsw2fl9475ss66b6pgcsya2q4afs"; }; - sourceRoot = "."; - - buildPhase = '' - gcc -O2 -lm swarm.c -o swarm - ''; - installPhase = '' - install -Dm755 swarm $out/bin/swarm - install -Dm644 swarm.1 $out/share/man/man1/swarm.1 + install -Dm755 Src/swarm $out/bin/swarm + install -Dm644 Doc/swarm.1 $out/share/man/man1/swarm.1 ''; meta = with stdenv.lib; { From e188f6765a0100a95026d688005630fc99b07823 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 18:18:03 +0300 Subject: [PATCH 140/219] xgboost: 0.72 -> 0.90 --- .../development/libraries/xgboost/default.nix | 4 ++-- .../python-modules/xgboost/default.nix | 8 ++++++- .../xgboost/lib-path-for-python.patch | 21 ------------------- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index b4c79d7f8164..37e55afc4e9f 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -8,13 +8,13 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { name = "xgboost-${version}"; - version = "0.72"; + version = "0.90"; # needs submodules src = fetchgit { url = "https://github.com/dmlc/xgboost"; rev = "refs/tags/v${version}"; - sha256 = "1d4kw2jm7d12g8qwi7p9r3429y7sjks9xp9yhvfpx5jh7qakkxj6"; + sha256 = "1zs15k9crkiq7bnr4gqq53mkn3w8z9dq4nwlavmfcr5xr5gw2pw4"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index d9b8fc892c16..559789149736 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,9 +1,15 @@ { stdenv , buildPythonPackage +, pytest , nose , scipy +, scikitlearn , xgboost , substituteAll +, pandas +, matplotlib +, graphviz +, datatable }: buildPythonPackage rec { @@ -21,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ scipy ]; buildInputs = [ xgboost ]; - checkInputs = [ nose ]; + checkInputs = [ nose pytest scikitlearn pandas matplotlib graphviz datatable ]; checkPhase = '' ln -sf ../demo . diff --git a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch index 68b39dee53e9..86c628c694bf 100644 --- a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch +++ b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch @@ -1,24 +1,3 @@ -diff --git a/python-package/setup.py b/python-package/setup.py -index e6c3386f..4ed0a8bd 100644 ---- a/python-package/setup.py -+++ b/python-package/setup.py -@@ -16,8 +16,6 @@ libpath_py = os.path.join(CURRENT_DIR, 'xgboost/libpath.py') - libpath = {'__file__': libpath_py} - exec(compile(open(libpath_py, "rb").read(), libpath_py, 'exec'), libpath, libpath) - --LIB_PATH = [os.path.relpath(libfile, CURRENT_DIR) for libfile in libpath['find_lib_path']()] --print("Install libxgboost from: %s" % LIB_PATH) - # Please use setup_pip.py for generating and deploying pip installation - # detailed instruction in setup_pip.py - setup(name='xgboost', -@@ -35,7 +33,6 @@ setup(name='xgboost', - # this will use MANIFEST.in during install where we specify additional files, - # this is the golden line - include_package_data=True, -- data_files=[('xgboost', LIB_PATH)], - license='Apache-2.0', - classifiers=['License :: OSI Approved :: Apache Software License'], - url='https://github.com/dmlc/xgboost') diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py index d87922c0..859a30fb 100644 --- a/python-package/xgboost/libpath.py From 0f8b2fac5ffa48f02aa002e1b03e6c2f48dd9a81 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 18:23:43 +0300 Subject: [PATCH 141/219] onscripter-en: update URL --- pkgs/games/onscripter-en/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index cc337f58f735..921ed8a72f33 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { name = "onscripter-en-20110930"; src = fetchurl { - url = "http://unclemion.com/dev/attachments/download/36/${name}-src.tar.bz2"; + # The website is not available now. + url = "https://www.dropbox.com/s/ag21owy9poyr2oy/onscripter-en-20110930-src.tar.bz2"; sha256 = "1kzm6d894c0ihgkwhd03x3kaqqz0sb6kf0r86xrrz12y309zfam6"; }; From 1f6caaa218c51a01df1e687e965c292e0ee37b54 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 18:30:20 +0300 Subject: [PATCH 142/219] openspades: 0.1.2 -> 0.1.3 Also add Noto Fonts by default. --- pkgs/games/openspades/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index f218ba762ca9..e0acf60144ed 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { name = "openspades-${version}"; - version = "0.1.2"; + version = "0.1.3"; devPakVersion = "33"; src = fetchFromGitHub { owner = "yvt"; repo = "openspades"; rev = "v${version}"; - sha256 = "1mfj46c3pnn1f6awy3b6faxs26i93a5jsrvkdlr12ndsykvi6ng6"; + sha256 = "1fvmqbif9fbipd0vphp57pk6blb4yp8xvqlc2ppipk5pjv6a3d2h"; }; nativeBuildInputs = [ cmake imagemagick unzip zip file ]; @@ -41,11 +41,20 @@ stdenv.mkDerivation rec { sha256 = "1bd2fyn7mlxa3xnsvzj08xjzw02baimqvmnix07blfhb78rdq9q9"; }; + notoFont = fetchurl { + url = "https://github.com/yvt/openspades/releases/download/v0.1.1b/NotoFonts.pak"; + sha256 = "0kaz8j85wjjnf18z0lz69xr1z8makg30jn2dzdyicd1asrj0q1jm"; + }; + postPatch = '' sed -i 's,^wget .*,cp $devPak "$PAK_NAME",' Resources/downloadpak.sh patchShebangs Resources ''; + postInstall = '' + cp $notoFont $out/share/games/openspades/Resources/ + ''; + enableParallelBuilding = true; NIX_CFLAGS_LINK = [ "-lopenal" ]; @@ -55,5 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/yvt/openspades/"; license = licenses.gpl3; platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; }; } From b5a53655be1ea21c6fb64cb5a16252abbc43d357 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 18:38:23 +0300 Subject: [PATCH 143/219] ioquake3: 2018-12-14 -> 2019-05-29 --- pkgs/games/quake3/ioquake/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 0a3256976755..7bc0863a33f8 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, which, pkgconfig, SDL2, libGLU_combined, openalSoft +{ stdenv, fetchFromGitHub, which, pkgconfig, SDL2, libGL, openalSoft , curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype }: stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2018-12-14"; + version = "2019-05-29"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "b0d2b141e702aafc3dcf77a026e12757f00e45ed"; + rev = "350b8f9c7c88c002dccea4f0350f1919b86d3b4e"; sha256 = "17qkqi22f2fyh6bnfcf1zz2lycgv08d6aw52sf0hqw7r3qq86d08"; }; nativeBuildInputs = [ which pkgconfig ]; buildInputs = [ - SDL2 libGLU_combined openalSoft curl speex opusfile libogg libvorbis libopus libjpeg + SDL2 libGL openalSoft curl speex opusfile libogg libvorbis libopus libjpeg freetype mumble ]; From 048e0b6331cd1dd4e89388f9de55330ea717e569 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 18:42:59 +0300 Subject: [PATCH 144/219] unnethack: 5.3.3 -> 5.2.0 This is actually an update. I remember their version numbers used to be a mess. --- pkgs/games/unnethack/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index a1a8272fd0f9..be1b5bd11956 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchgit, utillinux, ncurses, flex, bison }: stdenv.mkDerivation rec { - name = "unnethack-5.3.1"; + name = "unnethack-${version}"; + version = "5.2.0"; src = fetchgit { url = "https://github.com/UnNetHack/UnNetHack"; - rev = "63677eb256b5a75430f190cfb0f76bdd9bd0b9dd"; - sha256 = "0w6vyg0j2xdvr5vdlyf3dwliyxjzcr5fdbx5maygxiql44j104v3"; + rev = "refs/tags/${version}"; + sha256 = "088gd2c7v95f2pm9ky38i28sz73mnsksr2p2hhhflkchxncd21f1"; }; buildInputs = [ ncurses ]; @@ -22,6 +23,8 @@ stdenv.mkDerivation rec { makeFlags = [ "GAMEPERM=744" ]; + enableParallelBuilding = true; + postInstall = '' cp -r /tmp/unnethack $out/share/unnethack/profile mv $out/bin/unnethack $out/bin/.wrapped_unnethack From bb0fc95a8953762d1b923525e05595cbd1c9b0c7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 18:51:05 +0300 Subject: [PATCH 145/219] citra: 2018-06-09 -> 2019-05-25 --- pkgs/misc/emulators/citra/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index 1845757fb308..b0d422385424 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -2,19 +2,18 @@ stdenv.mkDerivation rec { name = "citra-${version}"; - version = "2018-06-09"; + version = "2019-05-25"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "cf9bfe0690f1934847500cc5079b1aaf3299a507"; - sha256 = "1ryc5d3fnhzlrzh1yljbq9x5n79dsb5hgqdba8z4x56iccx0kd0p"; + rev = "186ffc235f744dad315a603a98cce4597ef0f65f"; + sha256 = "0w24an80yjmkfcxjzdvsbpahx46bmd90liq5m6qva5pgnpmxx7pn"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 qtbase qtmultimedia boost curl gtest ]; - cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ]; + buildInputs = [ SDL2 qtbase qtmultimedia boost ]; preConfigure = '' # Trick configure system. From fe3333273bde149dc8f7f1ce6bbc79bf12b1fa52 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 18:54:24 +0300 Subject: [PATCH 146/219] android-udev-rules: 20190114 -> 20190315 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index bfacdd4a2f42..b03636d6f7f6 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20190114"; + version = "20190315"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "1x3vaq8jpnfhxc2lzz5jnlz219w66sn151v5fkdgv68pya4nzhjj"; + sha256 = "1w8zkww3cj6yzcsfzwvj1gkf4dfflhp1vd9fixnmlbm43kwkqrdr"; }; installPhase = '' From dff950155e209f523a49f9e2752f6f68d832b24b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 19:17:03 +0300 Subject: [PATCH 147/219] rpcs3: 0.0.5-6980-81e5f3b7f -> 0.0.6-8187-790962425 Clean whitespaces. --- pkgs/misc/emulators/rpcs3/default.nix | 52 +++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 732a5971ed3c..4c44377c11e6 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,29 +1,29 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig, git -, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 -, pulseaudioSupport ? true, libpulseaudio -, waylandSupport ? true, wayland -, alsaSupport ? true, alsaLib -}: - -let - majorVersion = "0.0.5"; - gitVersion = "6980-81e5f3b7f"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) -in -stdenv.mkDerivation rec { - name = "rpcs3-${version}"; - version = "${majorVersion}-${gitVersion}"; - - src = fetchgit { - url = "https://github.com/RPCS3/rpcs3"; - rev = "81e5f3b7f299942f56bcfdde54edd09c722b32d8"; - sha256 = "0czj6ga1nccqgcvi58sjnv1cc4k7qvwijp4warml463hpsmbd9r0"; - }; - - preConfigure = '' - cat > ./rpcs3/git-version.h < ./rpcs3/git-version.h < Date: Mon, 3 Jun 2019 19:17:31 +0300 Subject: [PATCH 148/219] nfs-utils: 2.3.3 -> 2.3.4 --- pkgs/os-specific/linux/nfs-utils/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 19a5184f8962..29b47f29ed24 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { name = "nfs-utils-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz"; - sha256 = "08k36d7l8yqylscnln3p85lcfwi7r7g6n3bnslgmzc1i71wk92zn"; + sha256 = "1kcn11glc3rma1gvykbk1s542mgz36ipi7yqxlk9jyh8hsiqncpq"; }; # libnfsidmap is built together with nfs-utils from the same source, @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { --replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config ''; - #configureScript = "bash -x configure"; - configureFlags = [ "--enable-gss" "--with-statedir=/var/lib/nfs" @@ -100,7 +98,9 @@ stdenv.mkDerivation rec { ''; # One test fails on mips. - doCheck = !stdenv.isMips; + # doCheck = !stdenv.isMips; + # https://bugzilla.kernel.org/show_bug.cgi?id=203793 + doCheck = false; disallowedReferences = [ (lib.getDev kerberos) ]; From 52f171064c45603090bb3561bdd5f28b423d3397 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 19:19:43 +0300 Subject: [PATCH 149/219] schedtool: update URL --- pkgs/os-specific/linux/schedtool/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix index f24996562d8b..2c02ef924c3f 100644 --- a/pkgs/os-specific/linux/schedtool/default.nix +++ b/pkgs/os-specific/linux/schedtool/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "schedtool-1.3.0"; + name = "schedtool-${version}"; + version = "1.3.0"; - src = fetchurl { - url = "http://freequaos.host.sk/schedtool/${name}.tar.bz2"; - sha256 = "1ky8q3jg4lsxbnlmm51q3jkxh160zy0l6a4xkdy2yncxc4m2l02f"; + src = fetchFromGitHub { + owner = "freequaos"; + repo = "schedtool"; + rev = name; + sha256 = "1wdw6fnf9a01xfjhdah3mn8bp1bvahf2lfq74i6hk5b2cagkppyp"; }; makeFlags = [ "DESTDIR=$(out)" "DESTPREFIX=" ]; From 87626411997d033a284ab0a5f1e7e0fdfe3f37b6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 19:24:38 +0300 Subject: [PATCH 150/219] virtualglLib: 2.5.2 -> 2.6.2 --- pkgs/tools/X11/virtualgl/lib.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 4c911e756330..47b54bec312c 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, cmake, libGLU_combined, libX11, libXv, libjpeg_turbo, fltk }: +{ stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }: stdenv.mkDerivation rec { name = "virtualgl-lib-${version}"; - version = "2.5.2"; + version = "2.6.2"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "0f1jp7r4vajiksbiq08hkxd5bjj0jxlw7dy5750s52djg1v3hhsg"; + sha256 = "0ngqwsm9bml6lis0igq3bn92amh04rccd6jhjibj3418hrbzipvr"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg_turbo libGLU_combined fltk libX11 libXv ]; + buildInputs = [ libjpeg_turbo libGL libGLU fltk libX11 libXv libXtst ]; enableParallelBuilding = true; From 5eeb15983813f30296f5a4d1466dd78d470a0f3e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 19:28:01 +0300 Subject: [PATCH 151/219] grub4dos: 0.4.6a-2018-02-20 -> 0.4.6a-2019-05-12 --- pkgs/tools/misc/grub4dos/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 9719ea6fe554..ec77f3965273 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2018-02-20"; + version = "0.4.6a-2019-05-12"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "74f6c862c73a4d21e61832174f4ab2f1d7f8b12a"; - sha256 = "0p85y5adnlcs4cdi9dg6f5fzzc1y12bmfhx13qs0576izx2rma3q"; + rev = "e8224a2d20760139ffaeafa07838e2c3c54de783"; + sha256 = "0i7n71za43qnlsxfvjrv1z5g1w5jl9snpbnas7rw97rry7cgyswf"; }; nativeBuildInputs = [ nasm ]; @@ -30,6 +30,9 @@ in stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; + # make[2]: *** No rule to make target 'pre_stage2_fullsize', needed by 'all-am'. Stop. + enableParallelBuilding = false; + meta = with stdenv.lib; { homepage = http://grub4dos.chenall.net/; description = "GRUB for DOS is the dos extension of GRUB"; From 304f0501bf23a4d099d03422b225119a2d0a9d3e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Jun 2019 19:31:36 +0300 Subject: [PATCH 152/219] sdl-jstest: 2016-03-29 -> 2018-06-15 --- pkgs/tools/misc/sdl-jstest/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index f15d3f7162b8..6a2ed3bcb911 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,18 +1,18 @@ -{ fetchFromGitHub, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }: +{ stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }: stdenv.mkDerivation rec { name = "sdl-jstest-${version}"; - version = "2016-03-29"; + version = "2018-06-15"; - src = fetchFromGitHub { - owner = "Grumbel"; - repo = "sdl-jstest"; - rev = "301a0e8cf3f96de4c5e58d9fe4413e5cd2b4e6d4"; - sha256 = "1qrz09by5snc3n1wppf2y0pj7rx29dlh1g84glga8vvb03n3yb14"; + # Submodules + src = fetchgit { + url = "https://github.com/Grumbel/sdl-jstest"; + rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b"; + sha256 = "0p4cjzcq0bbkzad19jwdklylqhq2q390q7dpg8bfzl2rwls883rk"; }; buildInputs = [ SDL SDL2 ncurses ]; - nativeBuildInputs = [ cmake pkgconfig docbook_xsl ]; + nativeBuildInputs = [ cmake pkgconfig docbook_xsl git ]; meta = with stdenv.lib; { homepage = https://github.com/Grumbel/sdl-jstest; From a69bf37d978812771d72310ae92cb5f46c3771f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 Jun 2019 16:42:59 -0700 Subject: [PATCH 153/219] python37Packages.awkward: 0.9.0 -> 0.10.3 (#62512) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-awkward/versions --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 057f20fce526..5de1f9fa8488 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.9.0"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "140fdncibnlpdqr6hk8lhgkv7m2v8786rips5qp92r05agfzbhs0"; + sha256 = "0vq27db5k8cc5jpbdrl531gjhig0f9iy0i7z6ks81lz1a2mkvjik"; }; nativeBuildInputs = [ pytestrunner ]; From 25b2a5eba686db0aed1f082fc2395837b56cc3a8 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 1 Mar 2019 08:18:57 +0100 Subject: [PATCH 154/219] grafana-loki: init at 0.1.0 --- pkgs/servers/monitoring/loki/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/monitoring/loki/default.nix diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix new file mode 100644 index 000000000000..63bded64a36e --- /dev/null +++ b/pkgs/servers/monitoring/loki/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "0.1.0"; + name = "grafana-loki-${version}"; + goPackagePath = "github.com/grafana/loki"; + + doCheck = true; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "loki"; + sha256 = "18iysr8p84vd1sdjdnpc9cydd5rpw0azdjzpz8yjqhscqw9gk4w2"; + }; + + meta = with stdenv.lib; { + description = "Like Prometheus, but for logs."; + license = licenses.asl20; + homepage = https://grafana.com/loki; + maintainers = with maintainers; [ willibutz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1be0e068691..bd61c2b72410 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14196,6 +14196,8 @@ in grafana = callPackage ../servers/monitoring/grafana { }; + grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; h2o = callPackage ../servers/http/h2o { }; From 98f452602285c3f5e6927554e31d9f49651d5e1e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 3 Jun 2019 19:52:22 -0400 Subject: [PATCH 155/219] emacsMac: use llvm6 to build for unclear reasons, using llvm7 crashes emacs macport. llvm6 seems to work fine. Fixes #61596 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f89abd88584..b9f74c60d7d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17364,6 +17364,7 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { From cedfbdf81c48e397046843998e2d1f97ccc9f84a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 Jun 2019 01:49:48 -0700 Subject: [PATCH 156/219] vips: 8.7.4 -> 8.8.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/vips/versions --- pkgs/tools/graphics/vips/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 77f15aa99b6d..f5311d378d7e 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -10,13 +10,18 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.7.4"; + version = "8.8.0"; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "0mcax1qg5i4iqlvgkz3s0c938d7ymx24pv3q2n3w2pjylnnd489s"; + sha256 = "17wz4rxn3jb171lrh8v3dxiykjhzwwzs5r7ly651dspcbi6s3r6c"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -r $out/test/test-suite/images/ + ''; }; nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ]; @@ -30,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.vips.ecs.soton.ac.uk; + homepage = "https://libvips.github.io/libvips/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ kovirobi ]; From d9db5c0f90dc9d817d6328a5a104ff2516120f04 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 3 Jun 2019 18:51:52 -0500 Subject: [PATCH 157/219] nip2: 8.3.0 -> 8.7.1 --- pkgs/tools/graphics/nip2/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index d0ad0c27f20d..ac4d8441bf59 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -2,11 +2,12 @@ fftw, gsl, goffice, libgsf }: stdenv.mkDerivation rec { - name = "nip2-8.3.0"; + pname = "nip2"; + version = "8.7.1"; src = fetchurl { - url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz"; - sha256 = "0vr12gyfvhxx2a28y74lzfg379d1fk0g9isc69k0vdgpn4y1i8aa"; + url = "https://github.com/libvips/nip2/releases/download/v${version}/nip2-${version}.tar.gz"; + sha256 = "0l7n427njif53npqn02gfjjly8y3khbrkzqxp10j5vp9h97psgiw"; }; buildInputs = @@ -15,10 +16,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.vips.ecs.soton.ac.uk; + homepage = "https://github.com/libvips/nip2"; description = "Graphical user interface for VIPS image processing system"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kovirobi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 2b040c57ddf9c08bf65d4d888462e45021cdfca4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 3 Jun 2019 20:21:56 -0400 Subject: [PATCH 158/219] p11-kit: disable tests on darwin These probably never passed. The test suite was enabled in c739b09d85d0dab23a9d6ffaef2ec525c28e7086, but fails on macOS/darwin. Fixes #62614 --- pkgs/development/libraries/p11-kit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 28645c545cd7..0e1be8633468 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.isDarwin; installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; From bd7aafce8dbd131a364ab31b8a1d11b66a0ec96e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 May 2019 01:00:00 -0500 Subject: [PATCH 159/219] pythonPackages.apprise: init at 0.7.7 --- .../python-modules/apprise/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/apprise/default.nix diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix new file mode 100644 index 000000000000..632600a8fe34 --- /dev/null +++ b/pkgs/development/python-modules/apprise/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, Babel, decorator, requests, requests_oauthlib, oauthlib, urllib3, six, click, markdown, pyyaml +, pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox +}: + +buildPythonPackage rec { + pname = "apprise"; + version = "0.7.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "c3c7922f7b80107620f541a6c16435485e7045771b3ecfb998deacee0eb90753"; + }; + + nativeBuildInputs = [ Babel ]; + + propagatedBuildInputs = [ + decorator requests requests_oauthlib oauthlib urllib3 six click markdown pyyaml + ]; + + checkInputs = [ + pytestrunner coverage flake8 mock pytest pytestcov tox + ]; + + meta = with lib; { + homepage = "https://github.com/caronc/apprise"; + description = "Push Notifications that work with just about every platform!"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f7cba80ca1b..575237b1ebf2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -187,6 +187,8 @@ in { aplpy = callPackage ../development/python-modules/aplpy { }; + apprise = callPackage ../development/python-modules/apprise { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; asana = callPackage ../development/python-modules/asana { }; From c4fc74b19cae7f30151be743f3e2dca43f33ca0f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 3 Jun 2019 21:42:59 -0400 Subject: [PATCH 160/219] =?UTF-8?q?qtwebengine:=20don=E2=80=99t=20use=20gn?= =?UTF-8?q?=20configure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtwebengine has its own configure script, so don’t try to use gn. --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 86897cb3f16f..aa9cdb4d5ae7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -33,6 +33,9 @@ qtModule { enableParallelBuilding = true; + # Don’t use the gn setup hook + dontUseGnConfigure = true; + # ninja builds some components with -Wno-format, # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; From 6c4bceef05c9d2daead63babdca458f684595656 Mon Sep 17 00:00:00 2001 From: Rail Aliiev Date: Tue, 4 Jun 2019 00:03:08 -0400 Subject: [PATCH 161/219] skopeo: fix man installation path This fixes the man installation path and so it's properly linked to `/run/current-system/sw/share/man/man1/skopeo.1.gz`. --- pkgs/development/tools/skopeo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 66941ca281ef..6dfda2bbfe6c 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -44,7 +44,7 @@ buildGoPackage rec { postBuild = '' # depends on buildGoPackage not changing … pushd ./go/src/${goPackagePath} - make install-docs MANINSTALLDIR="$man" + make install-docs MANINSTALLDIR="$man/share/man" popd ''; From 692252d76a20fb3d450791762bb9827955e372b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 12:36:02 -0700 Subject: [PATCH 162/219] python37Packages.nibabel: 2.3.3 -> 2.4.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/python3.7-nibabel/versions --- pkgs/development/python-modules/nibabel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index da664d9a8d0f..76494c70b2ea 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "nibabel"; - version = "2.3.3"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "b6366634c65b04464e62f3a9a8df1faa172f780ed7f1af1c6818b3dc2f1202c3"; + sha256 = "f165ff1cb4464902d6594eb2694e2cfb6f8b9fe233b856c976c3cff623ee0e17"; }; propagatedBuildInputs = [ From 962d49aec80fffb13734ab08472475ed196e6c2e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 30 May 2019 20:42:22 -0500 Subject: [PATCH 163/219] xorg.xorgserver: 1.20.4 -> 1.20.5 https://lists.x.org/archives/xorg-announce/2019-May/002993.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 44d4aad947d3..34aa18465c86 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.4"; + name = "xorg-server-1.20.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2; - sha256 = "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy"; + url = mirror://xorg/individual/xserver/xorg-server-1.20.5.tar.bz2; + sha256 = "17dc3g8cc55nbkx3np64dsz04n621dnzjmcc9wys0xbyyd1q47d8"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index c1ffd610eb1b..5326ab5a55a6 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -217,4 +217,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.5.tar.bz2 From 976264d57030c9c86501d959ccc7b37a0bc60632 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 01:38:47 -0500 Subject: [PATCH 164/219] txr: limit to linux for now, dunno why Darwin build is problematic --- pkgs/tools/misc/txr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index cf5588209a47..4618324a75ab 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; homepage = http://nongnu.org/txr; maintainers = with stdenv.lib.maintainers; [ dtzWill ]; + platforms = platforms.linux; # Darwin fails although it should work AFAIK }; } From 45d727057958d911453b7401482157c874d2e95a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 1 Jun 2019 16:33:17 +0200 Subject: [PATCH 165/219] haskellPackages.heap: Fix build --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f5c6f3da14aa..8d61454a5f68 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1282,4 +1282,8 @@ self: super: { ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_23_0; }; dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_23_0; }; + # Test suite doesn't work with current QuickCheck + # https://github.com/pruvisto/heap/issues/11 + heap = dontCheck super.heap; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6a1ba4da69f5..871ad5c3ab3e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5430,7 +5430,6 @@ broken-packages: - hdr-histogram - HDRUtils - headergen - - heap - heartbeat-streams - heatitup - heatitup-complete From 441ef28ac5a3d15e6914e2e9ba0b9ed3a7677de3 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Jun 2019 18:00:25 +0900 Subject: [PATCH 166/219] luarocks-nix: update that fixes indentation Finally fixes indentation. - removed buildType as it was not used - doesn't crash on missing description anymore --- pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 198da09e1d06..d9f481425b62 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -4,7 +4,7 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "teto"; repo = "luarocks"; - rev = "ca52159dcb544161e5bef1e4e366f3da31fa4555"; - sha256 = "13g7vpyirq51qmmnjsqhhiia9wdnq9aw4da0n3r7l1ar95q168sn"; + rev = "595456f1246d66e5bdce0de838d0d6188274991c"; + sha256 = "14nn0n5a0m516lnbwljy85h7y98zwnfbcyz7hgsm6fn4p8316yz2"; }; }) From cf45c7857ad71363eede99c245e97f7204a8d519 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Jun 2019 18:06:08 +0900 Subject: [PATCH 167/219] update-luarocks: doesn't crash when no arguments define print_help function before it gets called. --- maintainers/scripts/update-luarocks-packages | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index e7ab61b1a9c7..f4b8eeac3d89 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -12,11 +12,6 @@ # stop the script upon C-C set -eu -o pipefail -if [ $# -lt 1 ]; then - print_help - exit 1 -fi - CSV_FILE="maintainers/scripts/luarocks-packages.csv" TMP_FILE="$(mktemp)" @@ -25,16 +20,21 @@ exit_trap() local lc="$BASH_COMMAND" rc=$? test $rc -eq 0 || echo -e "*** error $rc: $lc.\nGenerated temporary file in $TMP_FILE" >&2 } -trap exit_trap EXIT print_help() { echo "Usage: $0 " echo "(most likely pkgs/development/lua-modules/generated-packages.nix)" - echo "" - echo " -c to set the list of luarocks package to generate" - exit 1 + echo "" + echo " -c to set the list of luarocks package to generate" + exit 1 } +if [ $# -lt 1 ]; then + print_help + exit 1 +fi + +trap exit_trap EXIT while getopts ":hc:" opt; do case $opt in From e96712105379c375e0fc4c33d5c7340d71a695fd Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Jun 2019 18:43:28 +0900 Subject: [PATCH 168/219] update-luarocks: contact only the specified server use --server-only instead of --server, I haven't run any testing but it should be a bit faster as well as more deterministic. --- maintainers/scripts/update-luarocks-packages | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index f4b8eeac3d89..8f00a5a2f9c4 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -78,6 +78,7 @@ function convert_pkg () { lua_pkg_name="$2" server="${3:+--server=$3}" version="${4:-}" + server="${3:+--only-server=$3}" echo "looking at $lua_pkg_name (version $version) from server [$server]" >&2 cmd="luarocks nix $server $lua_pkg_name $version" From 6402fbb6b8db304a3ddab03c34591f5f8747fd9a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Jun 2019 18:48:44 +0900 Subject: [PATCH 169/219] update-luarocks: can install for a different lua the recent luarocks can install for a different interpreter than the one running luarocks. Due to the way the update is done on nix, it seems more practical to use this feature than running the script with different luarocks-nix ? --- maintainers/scripts/update-luarocks-packages | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 8f00a5a2f9c4..e2f2cc6bbd2e 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -76,16 +76,16 @@ FOOTER=" function convert_pkg () { nix_pkg_name="$1" lua_pkg_name="$2" - server="${3:+--server=$3}" - version="${4:-}" server="${3:+--only-server=$3}" + pkg_version="${4:-}" + lua_version="${5:+--lua-dir=$(nix path-info nixpkgs.$5)/bin}" - echo "looking at $lua_pkg_name (version $version) from server [$server]" >&2 - cmd="luarocks nix $server $lua_pkg_name $version" + echo "looking at $lua_pkg_name (version $pkg_version) from server [$server]" >&2 + cmd="luarocks nix $server $lua_version $lua_pkg_name $pkg_version" + echo "Running $cmd" >&2 drv="$nix_pkg_name = $($cmd)" if [ $? -ne 0 ]; then echo "Failed to convert $pkg" >&2 - echo "$drv" >&2 else echo "$drv" | tee -a "$TMP_FILE" fi @@ -95,8 +95,7 @@ function convert_pkg () { echo "$HEADER" | tee "$TMP_FILE" # list of packages with format -# name,server,version -while IFS=, read -r nix_pkg_name lua_pkg_name server version +while IFS=, read -r nix_pkg_name lua_pkg_name server pkg_version luaversion do if [ "${nix_pkg_name:0:1}" == "#" ]; then echo "Skipping comment ${nix_pkg_name}" >&2 @@ -106,7 +105,7 @@ do echo "Using nix_name as lua_pkg_name" >&2 lua_pkg_name="$nix_pkg_name" fi - convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$version" + convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$pkg_version" "$luaversion" done < "$CSV_FILE" # close the set From 6736cc3e3a9337ec86badb2610751a09fc3f2e4d Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Jun 2019 18:49:42 +0900 Subject: [PATCH 170/219] luarocks-packages.csv: Support luaversion Opened with libreoffice calc which added the different commas --- maintainers/scripts/luarocks-packages.csv | 82 +++++++++++------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a7989c74b21a..08413cf2f0d2 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,41 +1,41 @@ -# nix name, luarocks name, server, version/additionnal args -ansicolors, -argparse, -basexx, -binaryheap, -dkjson -fifo -http -inspect -ldoc -lgi -lpeg_patterns -lpty -lrexlib-gnu, -lrexlib-posix, -ltermbox, -lua-cmsgpack, -lua_cliargs, -lua-iconv, -lua-messagepack, -lua-term, -lua-toml, -luabitop, -luaevent, -luacheck -luaffi,,http://luarocks.org/dev, -luuid, -markdown, -penlight, -rapidjson, -say, -std__debug,std._debug, -std_normalize,std.normalize, -luv, -luasystem, -mediator_lua,,http://luarocks.org/manifests/teto -mpack,,http://luarocks.org/manifests/teto -nvim-client,,http://luarocks.org/manifests/teto -busted,,http://luarocks.org/manifests/teto -luassert,,http://luarocks.org/manifests/teto -coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1 +# nix name, luarocks name, server, version,luaversion +ansicolors,,,, +argparse,,,, +basexx,,,, +binaryheap,,,, +dkjson,,,, +fifo,,,, +http,,,, +inspect,,,, +ldoc,,,, +lgi,,,, +lpeg_patterns,,,, +lpty,,,, +lrexlib-gnu,,,, +lrexlib-posix,,,, +ltermbox,,,, +lua-cmsgpack,,,, +lua_cliargs,,,, +lua-iconv,,,, +lua-messagepack,,,, +lua-term,,,, +lua-toml,,,, +luabitop,,,, +luaevent,,,, +luacheck,,,, +luaffi,,http://luarocks.org/dev,, +luuid,,,, +markdown,,,, +penlight,,,, +rapidjson,,,, +say,,,, +std__debug,std._debug,,, +std_normalize,std.normalize,,, +luv,,,, +luasystem,,,, +mediator_lua,,http://luarocks.org/manifests/teto,, +mpack,,http://luarocks.org/manifests/teto,, +nvim-client,,http://luarocks.org/manifests/teto,, +busted,,http://luarocks.org/manifests/teto,, +luassert,,http://luarocks.org/manifests/teto,, +coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1, From 79627f2ba906e6f2c43bdb8b010d8b7b4ddac9d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 10:17:18 -0700 Subject: [PATCH 171/219] python37Packages.fasteners: 0.14.1 -> 0.15 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-fasteners/versions --- .../python-modules/fasteners/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 77a6f9b04088..50a6dbf40df6 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -4,30 +4,30 @@ , six , monotonic , testtools -, python , isPy3k +, nose +, futures }: buildPythonPackage rec { pname = "fasteners"; - version = "0.14.1"; + version = "0.15"; src = fetchPypi { inherit pname version; - sha256 = "063y20kx01ihbz2mziapmjxi2cd0dq48jzg587xdsdp07xvpcz22"; + sha256 = "3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef"; }; - propagatedBuildInputs = [ six monotonic testtools ]; + propagatedBuildInputs = [ six monotonic ]; + + checkInputs = [ testtools nose ] ++ stdenv.lib.optionals (!isPy3k) [ futures ]; checkPhase = '' - ${python.interpreter} -m unittest discover + nosetests ''; - # Tests are written for Python 3.x only (concurrent.futures) - doCheck = isPy3k; - meta = with stdenv.lib; { - description = "Fasteners"; + description = "A python package that provides useful locks"; homepage = https://github.com/harlowja/fasteners; license = licenses.asl20; }; From 87d1ab09058dc2a6ac493c1e4c7690b0ea9f2081 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Jun 2019 19:11:42 +0900 Subject: [PATCH 172/219] luarocks-packages.csv: remove unnecessary servers Now that luarocks-nix supports installation from rockspecs, it's possible to remove some server specifications. --- maintainers/scripts/luarocks-packages.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 08413cf2f0d2..0d6dcf13e792 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -35,7 +35,7 @@ luv,,,, luasystem,,,, mediator_lua,,http://luarocks.org/manifests/teto,, mpack,,http://luarocks.org/manifests/teto,, -nvim-client,,http://luarocks.org/manifests/teto,, +nvim-client,,,, busted,,http://luarocks.org/manifests/teto,, -luassert,,http://luarocks.org/manifests/teto,, +luassert,,,, coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1, From 95d036e042d4183171e72ef0875fd237c7a7388c Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Jun 2019 19:13:24 +0900 Subject: [PATCH 173/219] lua: update generated packages.nix basically update nvim-client and luassert --- .../lua-modules/generated-packages.nix | 180 +++++++----------- 1 file changed, 66 insertions(+), 114 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 922f698ffbcb..5d27d7360f37 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1,7 +1,7 @@ /* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! Regenerate it with: -nixpkgs$ ./maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix +nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix These packages are manually refined in lua-overrides.nix */ @@ -18,9 +18,8 @@ ansicolors = buildLuarocksPackage { url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/kikito/ansicolors.lua"; @@ -38,9 +37,8 @@ argparse = buildLuarocksPackage { url = https://luarocks.org/argparse-0.6.0-1.src.rock; sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/argparse"; @@ -64,9 +62,8 @@ basexx = buildLuarocksPackage { sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/aiq/basexx"; @@ -81,16 +78,15 @@ binaryheap = buildLuarocksPackage { version = "0.4-1"; src = fetchurl { - url = https://luarocks.org/binaryheap-0.4-1.src.rock; - sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; + url = https://luarocks.org/binaryheap-0.4-1.src.rock; + sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - buildType = "builtin"; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/Tieske/binaryheap.lua"; - description="Binary heap implementation in pure Lua"; + description = "Binary heap implementation in pure Lua"; license = { fullName = "MIT/X11"; }; @@ -104,9 +100,8 @@ dkjson = buildLuarocksPackage { url = https://luarocks.org/dkjson-2.5-2.src.rock; sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; @@ -124,9 +119,7 @@ fifo = buildLuarocksPackage { url = https://luarocks.org/fifo-0.2-0.src.rock; sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; }; - propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/daurnimator/fifo.lua"; @@ -141,16 +134,15 @@ http = buildLuarocksPackage { version = "0.3-0"; src = fetchurl { - url = https://luarocks.org/http-0.3-0.src.rock; - sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; + url = https://luarocks.org/http-0.3-0.src.rock; + sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; - buildType = "builtin"; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; meta = { homepage = "https://github.com/daurnimator/lua-http"; - description="HTTP library for Lua"; + description = "HTTP library for Lua"; license = { fullName = "MIT"; }; @@ -164,9 +156,8 @@ inspect = buildLuarocksPackage { url = https://luarocks.org/inspect-3.1.1-0.src.rock; sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/kikito/inspect.lua"; @@ -191,7 +182,6 @@ ldoc = buildLuarocksPackage { }; propagatedBuildInputs = [ penlight markdown ]; - buildType = "builtin"; meta = { homepage = "http://stevedonovan.github.com/ldoc"; @@ -209,9 +199,8 @@ lgi = buildLuarocksPackage { url = https://luarocks.org/lgi-0.9.2-1.src.rock; sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "make"; meta = { homepage = "http://github.com/pavouk/lgi"; @@ -229,9 +218,7 @@ lpeg_patterns = buildLuarocksPackage { url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; }; - propagatedBuildInputs = [ lua lpeg ]; - buildType = "builtin"; meta = { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; @@ -249,9 +236,8 @@ lpty = buildLuarocksPackage { url = https://luarocks.org/lpty-1.2.2-1.src.rock; sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "make"; meta = { homepage = "http://www.tset.de/lpty/"; @@ -269,9 +255,8 @@ lrexlib-gnu = buildLuarocksPackage { url = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock; sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://github.com/rrthomas/lrexlib"; @@ -289,9 +274,8 @@ lrexlib-posix = buildLuarocksPackage { url = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock; sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://github.com/rrthomas/lrexlib"; @@ -309,9 +293,8 @@ ltermbox = buildLuarocksPackage { url = https://luarocks.org/ltermbox-0.2-1.src.rock; sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://code.google.com/p/termbox"; @@ -331,16 +314,16 @@ lua-cmsgpack = buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/antirez/lua-cmsgpack.git", - "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", - "date": "2018-06-14T11:56:56+02:00", - "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", - "fetchSubmodules": true - } '') ["date"]) ; + "url": "git://github.com/antirez/lua-cmsgpack.git", + "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", + "date": "2018-06-14T11:56:56+02:00", + "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", + "fetchSubmodules": true +} + '') ["date"]) ; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://github.com/antirez/lua-cmsgpack"; @@ -358,9 +341,8 @@ lua_cliargs = buildLuarocksPackage { url = https://luarocks.org/lua_cliargs-3.0-2.src.rock; sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/amireh/lua_cliargs"; @@ -378,9 +360,8 @@ lua-iconv = buildLuarocksPackage { url = https://luarocks.org/lua-iconv-7-3.src.rock; sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://ittner.github.com/lua-iconv/"; @@ -398,9 +379,8 @@ lua-messagepack = buildLuarocksPackage { url = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock; sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://fperrad.frama.io/lua-MessagePack/"; @@ -424,7 +404,6 @@ lua-term = buildLuarocksPackage { sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; }; - buildType = "builtin"; meta = { homepage = "https://github.com/hoelzro/lua-term"; @@ -442,9 +421,8 @@ lua-toml = buildLuarocksPackage { url = https://luarocks.org/lua-toml-2.0-1.src.rock; sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/jonstoler/lua-toml"; @@ -464,16 +442,16 @@ luabitop = buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/LuaDist/luabitop.git", - "rev": "81bb23b0e737805442033535de8e6d204d0e5381", - "date": "2013-02-18T16:36:42+01:00", - "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", - "fetchSubmodules": true - } '') ["date"]) ; + "url": "git://github.com/LuaDist/luabitop.git", + "rev": "81bb23b0e737805442033535de8e6d204d0e5381", + "date": "2013-02-18T16:36:42+01:00", + "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", + "fetchSubmodules": true +} + '') ["date"]) ; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.3" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://bitop.luajit.org/"; @@ -491,9 +469,8 @@ luaevent = buildLuarocksPackage { url = https://luarocks.org/luaevent-0.4.6-1.src.rock; sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/harningt/luaevent"; @@ -511,9 +488,8 @@ luacheck = buildLuarocksPackage { url = https://luarocks.org/luacheck-0.23.0-1.src.rock; sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua argparse luafilesystem ]; - buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/luacheck"; @@ -531,9 +507,8 @@ luaffi = buildLuarocksPackage { url = http://luarocks.org/dev/luaffi-scm-1.src.rock; sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/facebook/luaffifb"; @@ -551,9 +526,8 @@ luuid = buildLuarocksPackage { url = https://luarocks.org/luuid-20120509-2.src.rock; sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; }; - disabled = ( luaOlder "5.2" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; @@ -571,9 +545,8 @@ markdown = buildLuarocksPackage { url = https://luarocks.org/markdown-0.33-1.src.rock; sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/markdown"; @@ -598,7 +571,6 @@ penlight = buildLuarocksPackage { }; propagatedBuildInputs = [ luafilesystem ]; - buildType = "builtin"; meta = { homepage = "http://stevedonovan.github.com/Penlight"; @@ -616,9 +588,8 @@ rapidjson = buildLuarocksPackage { url = https://luarocks.org/rapidjson-0.5.1-1.src.rock; sha256 = "0hnqsixnbz95cvm9q5dn0lr0qjvhqw4llw6l1sjswwk0am4yybay"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "cmake"; meta = { homepage = "https://github.com/xpol/lua-rapidjson"; @@ -642,9 +613,8 @@ say = buildLuarocksPackage { sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; @@ -662,9 +632,8 @@ std__debug = buildLuarocksPackage { url = https://luarocks.org/std._debug-1.0.1-1.src.rock; sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.5" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://lua-stdlib.github.io/_debug"; @@ -682,9 +651,8 @@ std_normalize = buildLuarocksPackage { url = https://luarocks.org/std.normalize-2.0.2-1.src.rock; sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua std__debug ]; - buildType = "builtin"; meta = { homepage = "https://lua-stdlib.github.io/normalize"; @@ -696,15 +664,14 @@ std_normalize = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.28.0-1"; + version = "1.29.1-1"; src = fetchurl { - url = https://luarocks.org/luv-1.28.0-1.src.rock; - sha256 = "15m946p982bk4apig7yf07jm25ck26v2qxcvnrfh60vrbaw6gihw"; + url = https://luarocks.org/luv-1.29.1-1.src.rock; + sha256 = "0x801pp8h2035lbncsb6vkwgxqrai69ri3sp9g1dwnfnipsfsvrg"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "cmake"; meta = { homepage = "https://github.com/luvit/luv"; @@ -722,9 +689,8 @@ luasystem = buildLuarocksPackage { url = https://luarocks.org/luasystem-0.2.1-0.src.rock; sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/luasystem/"; @@ -742,9 +708,8 @@ mediator_lua = buildLuarocksPackage { url = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock; sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/mediator_lua/"; @@ -763,8 +728,6 @@ mpack = buildLuarocksPackage { sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; }; - buildType = "builtin"; - meta = { homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; description = "Lua binding to libmpack"; @@ -775,18 +738,17 @@ mpack = buildLuarocksPackage { }; nvim-client = buildLuarocksPackage { pname = "nvim-client"; - version = "0.1.0-1"; + version = "0.2.0-1"; src = fetchurl { - url = https://luarocks.org/nvim-client-0.1.0-1.src.rock; - sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma"; + url = https://luarocks.org/nvim-client-0.2.0-1.src.rock; + sha256 = "1ah9mjvz28hrbwnyb5n60znz3m0m41rn7jpnxwfx773cys3skidx"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua mpack luv coxpcall ]; - buildType = "builtin"; meta = { - homepage = "https://github.com/neovim/lua-client/archive/0.1.0-1.tar.gz"; + homepage = "https://github.com/neovim/lua-client/archive/0.2.0-1.tar.gz"; description = "Lua client to Nvim"; license = { fullName = "Apache"; @@ -795,21 +757,14 @@ nvim-client = buildLuarocksPackage { }; busted = buildLuarocksPackage { pname = "busted"; - version = "2.0.rc13-0"; - - knownRockspec = (fetchurl { - url = https://luarocks.org/busted-2.0.rc13-0.rockspec; - sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; - }).outPath; + version = "2.0.rc12-1"; src = fetchurl { - url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; - sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; + url = http://luarocks.org/manifests/teto/busted-2.0.rc12-1.src.rock; + sha256 = "18fzdc7ww4nxwinnw9ah5hi329ghrf0h8xrwcy26lk9qcs9n079z"; }; - - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; - buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; @@ -833,9 +788,8 @@ luassert = buildLuarocksPackage { sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua say ]; - buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; @@ -854,8 +808,6 @@ coxpcall = buildLuarocksPackage { sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; }; - buildType = "builtin"; - meta = { homepage = "http://keplerproject.github.io/coxpcall"; description = "Coroutine safe xpcall and pcall"; From 2b1eabc14507be020d52c2ecb08da7a0f217a82f Mon Sep 17 00:00:00 2001 From: justinwoo Date: Mon, 3 Jun 2019 09:06:46 +0200 Subject: [PATCH 174/219] purescript: 0.12.5 -> 0.13.0 https://github.com/purescript/purescript/releases/v0.13.0 --- .../development/compilers/purescript/purescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 67818bfa1dc9..8f017e0e2ced 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.12.5"; + version = "0.13.0"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "15j9lkrl15dicx37bmh0199b3qdixig7w24wvdzi20jqbacz8nkn"; + sha256 = "0xpisy38gj6fgyyzm6fdl0v819dhjmil4634xxangvhvs7jf5il0"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "07dva5gxq77g787krscv4dsz5088fzkvpmm9fwxw9a59jszzs7kq"; + sha256 = "06g5q69yv6c3alq9vr8zjqqzamlii7xf6vj9j52akjq5lww214ba"; }; From 6b4279e792e6e03e9142e072cb4472ba88aa92f4 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 4 Jun 2019 12:34:24 +0200 Subject: [PATCH 175/219] terraform-provider-elasticsearch: 0.6.0 -> 0.7.0 --- .../elasticsearch/default.nix | 20 +++-- .../elasticsearch/deps.nix | 75 ------------------- 2 files changed, 9 insertions(+), 86 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index b9f28cbd6cb0..ae456185a80d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: -buildGoPackage rec { +{ stdenv, fetchFromGitHub, buildGoModule }: +buildGoModule rec { name = "terraform-provider-elasticsearch-${version}"; - version = "0.6.0"; - - goPackagePath = "github.com/phillbaker/terraform-provider-elasticsearch"; - - # ./deps.nix was generated using the work-around described in: - # https://github.com/kamilchm/go2nix/issues/19 - goDeps = ./deps.nix; + version = "0.7.0"; src = fetchFromGitHub { owner = "phillbaker"; repo = "terraform-provider-elasticsearch"; rev = "v${version}"; - sha256 = "04i7jwhm1mg4m8p7y6yg83j76fx0ncallzbza1g1wc5cjjbkvgs2"; + sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v"; }; + modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p"; + + subPackages = [ "." ]; + # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-elasticsearch{,_v${version}}"; + postInstall = "mv $out/bin/terraform-provider-elasticsearch{,_v${version}}"; meta = with stdenv.lib; { description = "Terraform provider for elasticsearch"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix deleted file mode 100644 index b89e20cd4864..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "512bdaf8bec30abd545b440447cebb57b53d3af9"; - sha256 = "1j7kjk6i8vg4nwlsxjypqz3gc9j1a9x8r3bg99w1x2ap3vrh7sl8"; - }; - } - { - goPackagePath = "github.com/deoxxa/aws_signing_client"; - fetch = { - type = "git"; - url = "https://github.com/deoxxa/aws_signing_client"; - rev = "c20ee106809eacdffcc81ac7cb984261f8e3067e"; - sha256 = "01cw1f6hzgx1df730vdwd7vhbn7yl6zv3sr42iz4sd1dcdqwzlkq"; - }; - } - { - goPackagePath = "github.com/hashicorp/terraform"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/terraform"; - rev = "dbce85d85ff0beebc660b3d1805b4ef15361af00"; - sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; - }; - } - { - goPackagePath = "github.com/olivere/elastic"; - fetch = { - type = "git"; - url = "https://github.com/olivere/elastic"; - rev = "2a5234d20b058173aaea6835e671fc83eee777b0"; - sha256 = "08r62d29m6f7d5hwb9zm5b612wbvzd9sn97nb48q174gbk8685yw"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; - sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; - }; - } - { - goPackagePath = "gopkg.in/olivere/elastic.v5"; - fetch = { - type = "git"; - url = "https://gopkg.in/olivere/elastic.v5"; - rev = "b708306d715bea9b983685e94ab4602cdc9f988b"; - sha256 = "0ks0h0ik0aqjm8dm2imbyd1z7rfmqiwilf3bc9nnplp9hc07471y"; - }; - } - { - goPackagePath = "gopkg.in/olivere/elastic.v6"; - fetch = { - type = "git"; - url = "https://gopkg.in/olivere/elastic.v6"; - rev = "e6cae211ee802eab70248a68fe2cb03b616744c9"; - sha256 = "0nbf4mr31gxm4zn5w362y22mh98ckl3d0bxli4f3rwx6zw12arfg"; - }; - } -] From 7ba247ccb12b601aa70286aaa2dd93f9fa948dd0 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 23 May 2019 22:03:34 +0200 Subject: [PATCH 176/219] gitlab-runner: 11.10.1 -> 11.11.0 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index a8f4336cf71e..42e8f26970f5 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.10.1"; + version = "11.11.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "120gpyim54mc8z84gzpbms5hkg2xg4sgzdvkrn1fis9myvd55bav"; + sha256 = "0h35y3ifqqsirkbgg75jj30n1ggyyncbwjnnxwdhc3r9hbbc545y"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0qfqsi1fm94sxv7g975fw0av871f677rp48yv8q5669ipm16n9qk"; + sha256 = "1lphzy5xxyc4qgmnf7rrplida2zdn2mfl9p9fr3gyjs7gbcr92d7"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1nxv783rdzdwm0qq3li893p7q3n8gg7abla2961f3n735gjlnibx"; + sha256 = "0i45p4z8f7ggdh7624473d8qhz7d75hlhz98p3z69dggx38vv49y"; }; patches = [ ./fix-shell-path.patch ]; From bc1cb3a6f40873863a118cc11ec3649c0c60fdec Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 4 Jun 2019 13:48:51 +0200 Subject: [PATCH 177/219] kronometer: adding homepage and description --- pkgs/tools/misc/kronometer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 7fb4077e5367..0307cd86df88 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -17,6 +17,8 @@ mkDerivation rec { }; meta = with lib; { + homepage = "https://kde.org/applications/utilities/kronometer/"; + description = "A stopwatch application"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; From f71bdfd5ab8f63b82989b3a6ebf47c61787581e3 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 4 Jun 2019 12:55:45 +0200 Subject: [PATCH 178/219] purescript: add test that compiles & runs a minimal module This ensures the compiler actually works. `console.log` is wrapped in a purescript function and everything is run with nodejs. --- .../compilers/purescript/purescript/default.nix | 7 ++++++- .../purescript/purescript/test-minimal-module/Main.js | 8 ++++++++ .../purescript/test-minimal-module/Main.purs | 9 +++++++++ .../purescript/test-minimal-module/default.nix | 11 +++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js create mode 100644 pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs create mode 100644 pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 8f017e0e2ced..d25cd9fee770 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, gmp, ncurses5, lib }: +{ stdenv, pkgs, fetchurl, zlib, gmp, ncurses5, lib }: # from justinwoo/easy-purescript-nix # https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix @@ -50,6 +50,11 @@ in stdenv.mkDerivation rec { mkdir -p $out/etc/bash_completion.d/ $PURS --bash-completion-script $PURS > $out/etc/bash_completion.d/purs-completion.bash ''; + + passthru.tests = { + minimal-module = pkgs.callPackage ./test-minimal-module {}; + }; + meta = with stdenv.lib; { description = "A strongly-typed functional programming language that compiles to JavaScript"; homepage = http://www.purescript.org/; diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js new file mode 100644 index 000000000000..a3547e206b7c --- /dev/null +++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js @@ -0,0 +1,8 @@ +"use strict" + +exports.log = function (s) { + return function () { + console.log(s); + return {}; + }; +}; diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs new file mode 100644 index 000000000000..8bf5a23f3469 --- /dev/null +++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs @@ -0,0 +1,9 @@ +module Main where + +foreign import data Effect :: Type -> Type +data Unit = Unit + +foreign import log :: String -> Effect Unit + +main :: Effect Unit +main = log "hello world" diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix new file mode 100644 index 000000000000..5f01298960cd --- /dev/null +++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix @@ -0,0 +1,11 @@ +{ runCommand, purescript, nodejs }: + +runCommand "purescript-test-minimal-module" {} '' + ${purescript}/bin/purs compile -o ./output ${./.}/Main.purs + + echo 'require("./output/Main/index.js").main()' > node.js + + ${nodejs}/bin/node node.js | grep "hello world" || echo "did not output hello world" + + touch $out +'' From d1cd9ff16c30567565c17992285e49b75b754bf1 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 4 Jun 2019 13:09:09 +0000 Subject: [PATCH 179/219] croaring: init at 0.2.61 --- .../libraries/croaring/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/croaring/default.nix diff --git a/pkgs/development/libraries/croaring/default.nix b/pkgs/development/libraries/croaring/default.nix new file mode 100644 index 000000000000..6e6ee2479d44 --- /dev/null +++ b/pkgs/development/libraries/croaring/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: + +stdenv.mkDerivation rec { + pname = "croaring"; + version = "0.2.61"; + + src = fetchFromGitHub { + owner = "RoaringBitmap"; + repo = "CRoaring"; + rev = "v${version}"; + sha256 = "14y8iwv6b6gg7hgs00yqg8rwx4vwbb1zs2s99lxa51zx9vp1alcn"; + }; + + patches = fetchpatch { + url = "https://github.com/RoaringBitmap/CRoaring/commit/8d8c60736f506b2b8f1c365148a8a541b26a55f2.patch"; + sha256 = "1y2mbn4i8lj3lkn5s8zziyr9pl1fq9hndzz9c01dkv3s8sn7f55s"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Compressed bitset library for C and C++"; + homepage = http://roaringbitmap.org/; + license = licenses.asl20; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c494496641c..f3605dcbe54e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10091,6 +10091,8 @@ in cre2 = callPackage ../development/libraries/cre2 { }; + croaring = callPackage ../development/libraries/croaring { }; + cryptopp = callPackage ../development/libraries/crypto++ { }; cryptominisat = callPackage ../applications/science/logic/cryptominisat { }; From b2732a541da008dacd85e293f693acfb95976321 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 Jun 2019 00:31:13 -0700 Subject: [PATCH 180/219] urh: 2.5.7 -> 2.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/urh/versions --- pkgs/applications/radio/urh/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index ced3bccd7b67..11a132ba06f7 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -2,14 +2,14 @@ , hackrf, rtl-sdr, airspy, limesuite }: python3Packages.buildPythonApplication rec { - name = "urh-${version}"; - version = "2.5.7"; + pname = "urh"; + version = "2.7.0"; src = fetchFromGitHub { owner = "jopohl"; - repo = "urh"; + repo = pname; rev = "v${version}"; - sha256 = "110fwlj2fw8jgrsgqfkha7lx8f06w0ymh51mgpckx8a0wycznhcy"; + sha256 = "0yxv38p8a2srk9c55jj96vcib6m6pb6m485ysfg2ilwjzipx2ab0"; }; buildInputs = [ hackrf rtl-sdr airspy limesuite ]; @@ -20,9 +20,9 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/jopohl/urh"; description = "Universal Radio Hacker: investigate wireless protocols like a boss"; - license = licenses.asl20; + license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; }; From b13df4545ca3b123db9f860c0f3fe4aed88b65ad Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 28 May 2019 20:39:26 +0200 Subject: [PATCH 181/219] trinity: small clean up --- pkgs/os-specific/linux/trinity/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index cc85740afddc..b855f0547ba0 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "trinity-${version}"; + pname = "trinity"; version = "1.9"; src = fetchFromGitHub { @@ -11,16 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv"; }; - # Fails on 32-bit otherwise - NIX_CFLAGS_COMPILE = [ - "-Wno-error=int-to-pointer-cast" - "-Wno-error=pointer-to-int-cast" - "-Wno-error=incompatible-pointer-types" - ]; - postPatch = '' - patchShebangs ./configure - patchShebangs ./scripts/ + patchShebangs configure + patchShebangs scripts ''; enableParallelBuilding = true; From 67f340ec00c8d28d9b6c79e710f4b350351e61eb Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 3 Jun 2019 15:24:50 +0200 Subject: [PATCH 182/219] wlroots: 0.5 -> 0.6 --- pkgs/development/libraries/wlroots/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index d3b2d78bf0a6..47e1c37492c1 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -4,17 +4,15 @@ , libpng, ffmpeg_4 }: -let +stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.5.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.6.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1phiidyddzgaxy4gbqwmykxn0y8za6y5mp66l9dpd9i6fml153yq"; + sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4"; }; # $out for the library, $bin for rootston, and $examples for the example From 9ab064b8d943fdece05996004773dfc5ef954bde Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 3 Jun 2019 15:25:00 +0200 Subject: [PATCH 183/219] sway: 1.0 -> 1.1.1 --- .../window-managers/sway/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 3299811c4978..f0f319ed39bb 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,35 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub, makeWrapper , meson, ninja , pkgconfig, scdoc , wayland, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk_pixbuf -, wlroots, wayland-protocols +, wlroots, wayland-protocols, swaybg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "sway"; - version = "1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx"; + sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776"; }; patches = [ - # Fix for a compiler warning that causes a build failure - # (see https://github.com/swaywm/sway/issues/3862): - (fetchpatch { - url = "https://github.com/swaywm/sway/commit/bcde298a719f60b9913133dbd2a169dedbc8dd7d.patch"; - sha256 = "0r583nmqvq43ib93yv6flw8pj833v32lbs0q0xld56s3rnzvvdcp"; - }) ./sway-config-no-nix-store-references.patch ./load-configuration-from-etc.patch ]; - nativeBuildInputs = [ pkgconfig meson ninja scdoc ]; + nativeBuildInputs = [ pkgconfig meson ninja scdoc makeWrapper ]; buildInputs = [ wayland libxkbcommon pcre json_c dbus libevdev @@ -44,6 +37,10 @@ stdenv.mkDerivation rec { "-Dtray=enabled" "-Dman-pages=enabled" ]; + postInstall = '' + wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin" + ''; + meta = with stdenv.lib; { description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; From 321ca827f4ed5a897452c053d6027d8b43e9fd42 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 4 Jun 2019 10:00:00 -0500 Subject: [PATCH 184/219] nodejs-12_x: 12.3.1 -> 12.4.0 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index d56dc8666fad..1e68714f8c14 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.3.1"; - sha256 = "1zhb5nq9s6cshbm6lf7qsy310fcsiy9wdr869vs6hw76zyn50axs"; + version = "12.4.0"; + sha256 = "1qwcv8m1m3293vmb4x2xrpqlpaa1r1951gf0mva60b2hsdk27d90"; } From 2fc71c7404c556c720f214a3dfc872b624bff617 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 5 Jun 2019 00:01:42 +0900 Subject: [PATCH 185/219] luaPackages.digestif: init at scm-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 0d6dcf13e792..cda369a1348f 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -3,6 +3,7 @@ ansicolors,,,, argparse,,,, basexx,,,, binaryheap,,,, +digestif,,http://luarocks.org/dev,,lua5_3 dkjson,,,, fifo,,,, http,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 5d27d7360f37..c85e5f31d2a0 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -92,6 +92,35 @@ binaryheap = buildLuarocksPackage { }; }; }; +digestif = buildLuarocksPackage { + pname = "digestif"; + version = "scm-1"; + + knownRockspec = (fetchurl { + url = http://luarocks.org/dev/digestif-scm-1.rockspec; + sha256 = "18rixbni4hmrmh3qj3vpjbsphzdvchswajphc9ysm52ccpyzh687"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/astoff/digestif", + "rev": "19442554ae18607707f09e6663d65bb8bb4ebb58", + "date": "2019-06-01T15:41:36+02:00", + "sha256": "1sglkgx2s1xc725h9b97jhfbi3scs32si83xss5m3n0xidwmlbzb", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = (luaOlder "5.3"); + propagatedBuildInputs = [ lua lpeg dkjson ]; + + meta = { + homepage = "https://github.com/astoff/digestif/"; + description = "Code analyzer for TeX."; + license = { + fullName = "MIT"; + }; + }; +}; dkjson = buildLuarocksPackage { pname = "dkjson"; version = "2.5-2"; From 741d20c900025c4e5bc6f14a5703bd9340461640 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 Jun 2019 08:02:45 -0700 Subject: [PATCH 186/219] qbs: 1.13.0 -> 1.13.1 (#62549) * qbs: 1.13.0 -> 1.13.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/qbs/versions * qbs: add meta.homepage --- pkgs/development/tools/build-managers/qbs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 196a5d2a7fc9..266dff8cf6ce 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "qbs-${version}"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "12zzbhddsgfxyzglknvim0bb7rrnifawnx18g35g1105ybfak607"; + sha256 = "1a9mydfsax5pzbnx8g8f9blc4xpk5rdjq8fvkdaiwapdczban1ya"; }; nativeBuildInputs = [ qmake ]; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool that helps simplify the build process for developing projects across multiple platforms"; + homepage = "https://wiki.qt.io/Qbs"; license = licenses.lgpl3; maintainers = with maintainers; [ expipiplus1 ]; platforms = platforms.linux; From 40271ae1382b14673b7b3f9edb6c1f9bba1bbe47 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 4 Jun 2019 11:09:43 -0400 Subject: [PATCH 187/219] systems: remove forMeta This is unused now. --- lib/systems/default.nix | 1 - lib/systems/for-meta.nix | 38 -------------------------------------- 2 files changed, 39 deletions(-) delete mode 100644 lib/systems/for-meta.nix diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 5e6d277be7d5..ea18904cc635 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -3,7 +3,6 @@ rec { doubles = import ./doubles.nix { inherit lib; }; - forMeta = import ./for-meta.nix { inherit lib; }; parse = import ./parse.nix { inherit lib; }; inspect = import ./inspect.nix { inherit lib; }; platforms = import ./platforms.nix { inherit lib; }; diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix deleted file mode 100644 index 17ae94deb7d1..000000000000 --- a/lib/systems/for-meta.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib }: -let - inherit (lib.systems) parse; - inherit (lib.systems.inspect) patterns; - - abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) parse.abis; - -in rec { - all = [ {} ]; # `{}` matches anything - none = []; - - arm = [ patterns.isAarch32 ]; - aarch64 = [ patterns.isAarch64 ]; - x86 = [ patterns.isx86 ]; - i686 = [ patterns.isi686 ]; - x86_64 = [ patterns.isx86_64 ]; - mips = [ patterns.isMips ]; - riscv = [ patterns.isRiscV ]; - - cygwin = [ patterns.isCygwin ]; - darwin = [ patterns.isDarwin ]; - freebsd = [ patterns.isFreeBSD ]; - # Should be better, but MinGW is unclear. - gnu = [ - { kernel = parse.kernels.linux; abi = abis.gnu; } - { kernel = parse.kernels.linux; abi = abis.gnueabi; } - { kernel = parse.kernels.linux; abi = abis.gnueabihf; } - ]; - illumos = [ patterns.isSunOS ]; - linux = [ patterns.isLinux ]; - netbsd = [ patterns.isNetBSD ]; - openbsd = [ patterns.isOpenBSD ]; - unix = patterns.isUnix; # Actually a list - windows = [ patterns.isWindows ]; - wasi = [ patterns.isWasi ]; - - inherit (lib.systems.doubles) mesaPlatforms; -} From 021e04d0eb5da9ce085e279a7f9c787339a68181 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 5 Jun 2019 00:11:56 +0900 Subject: [PATCH 188/219] luaPackages.lpeglabel: init at 1.5.0 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index cda369a1348f..aa8f32786817 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -11,6 +11,7 @@ inspect,,,, ldoc,,,, lgi,,,, lpeg_patterns,,,, +lpeglabel,,,, lpty,,,, lrexlib-gnu,,,, lrexlib-posix,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c85e5f31d2a0..65df0a3ed94f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -257,6 +257,25 @@ lpeg_patterns = buildLuarocksPackage { }; }; }; +lpeglabel = buildLuarocksPackage { + pname = "lpeglabel"; + version = "1.5.0-1"; + + src = fetchurl { + url = https://luarocks.org/lpeglabel-1.5.0-1.src.rock; + sha256 = "068mwvwwn5n69pdm04qnk354391w9mk34jsczxql0xi5qgmz6w8j"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/sqmedeiros/lpeglabel/"; + description = "Parsing Expression Grammars For Lua with Labeled Failures"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lpty = buildLuarocksPackage { pname = "lpty"; version = "1.2.2-1"; From 1b2e667ad6859fc7251029f9f93fde86fd755f0b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 5 Jun 2019 00:12:15 +0900 Subject: [PATCH 189/219] luaPackages.lua-lsp: init at scm-2 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index aa8f32786817..0c52faef1bff 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -19,6 +19,7 @@ ltermbox,,,, lua-cmsgpack,,,, lua_cliargs,,,, lua-iconv,,,, +lua-lsp,,http://luarocks.org/dev,, lua-messagepack,,,, lua-term,,,, lua-toml,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 65df0a3ed94f..e7557930f110 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -419,6 +419,35 @@ lua-iconv = buildLuarocksPackage { }; }; }; +lua-lsp = buildLuarocksPackage { + pname = "lua-lsp"; + version = "scm-2"; + + knownRockspec = (fetchurl { + url = http://luarocks.org/dev/lua-lsp-scm-2.rockspec; + sha256 = "0qk3i6j0km4d1fs61fxhkmnbxmgpq24nygr8wknl6hbj2kya25rb"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/Alloyed/lua-lsp", + "rev": "0de511803ed616214333210a2d003cf05a64dc18", + "date": "2018-09-08T10:11:54-04:00", + "sha256": "15dnsyh5664vi7qn73y2r114rhs5l9lfi84pwqkq5cafkiiy49qa", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua dkjson lpeglabel inspect ]; + + meta = { + homepage = "https://github.com/Alloyed/lua-lsp"; + description = "No summary"; + license = { + fullName = "MIT"; + }; + }; +}; lua-messagepack = buildLuarocksPackage { pname = "lua-messagepack"; version = "0.5.1-2"; From 35442093e160b8047ae2ec39a555ba76c42ce215 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Fri, 17 May 2019 14:22:30 +0200 Subject: [PATCH 190/219] pythonPackages.flask-swagger: init at 0.2.14 --- .../python-modules/flask-swagger/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/flask-swagger/default.nix diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix new file mode 100644 index 000000000000..808d6ea67367 --- /dev/null +++ b/pkgs/development/python-modules/flask-swagger/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, flask, pyyaml }: + +buildPythonPackage rec { + version = "0.2.14"; + pname = "flask-swagger"; + + src = fetchPypi { + inherit pname version; + sha256 = "b4085f5bc36df4c20b6548cd1413adc9cf35719b0f0695367cd542065145294d"; + }; + + doCheck = true; + + propagatedBuildInputs = [ + flask + pyyaml + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/gangverk/flask-swagger"; + license = licenses.mit; + description = "Extract swagger specs from your flask project"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 575237b1ebf2..6951e72677f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2719,6 +2719,8 @@ in { flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; + flask-swagger = callPackage ../development/python-modules/flask-swagger { }; + flask_testing = callPackage ../development/python-modules/flask-testing { }; flask_wtf = callPackage ../development/python-modules/flask-wtf { }; From 635b7625690d9f8f61da0a187e7ed4a7ec274fdc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 4 Jun 2019 11:10:03 -0400 Subject: [PATCH 191/219] systems: allow passing in string for cross/localSystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes things a little bit more convenient. Just pass in like: $ nix-build ’’ -A hello --argstr localSystem x86_64-linux --argstr crossSystem aarch64-linux --- lib/systems/default.nix | 4 +++- pkgs/top-level/default.nix | 4 ++-- pkgs/top-level/impure.nix | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index ea18904cc635..8aa413f53817 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -14,7 +14,9 @@ rec { # `parsed` is inferred from args, both because there are two options with one # clearly prefered, and to prevent cycles. A simpler fixed point where the RHS # always just used `final.*` would fail on both counts. - elaborate = args: let + elaborate = args': let + args = if lib.isString args' then { system = args'; } + else args'; final = { # Prefer to parse `config` as it is strictly more informative. parsed = parse.mkSystemFromString (if args ? config then args.config else args.system); diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index b6de076a570c..904ef8d39796 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -57,11 +57,11 @@ in let # From a minimum of `system` or `config` (actually a target triple, *not* # nixpkgs configuration), infer the other one and platform as needed. - localSystem = lib.systems.elaborate ( + localSystem = lib.systems.elaborate (if builtins.isAttrs args.localSystem then ( # Allow setting the platform in the config file. This take precedence over # the inferred platform, but not over an explicitly passed-in one. builtins.intersectAttrs { platform = null; } config1 - // args.localSystem); + // args.localSystem) else args.localSystem); crossSystem = if crossSystem0 == null then localSystem else lib.systems.elaborate crossSystem0; diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index da288f15d2e2..3ba6c08a140b 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -85,6 +85,7 @@ import ./. (builtins.removeAttrs args [ "system" "platform" ] // { inherit config overlays crossSystem crossOverlays; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. - localSystem = (if args ? localSystem then {} - else { system = builtins.currentSystem; }) // localSystem; + localSystem = if builtins.isString localSystem then localSystem + else (if args ? localSystem then {} + else { system = builtins.currentSystem; }) // localSystem; }) From 9120dbf180fd173d8aa95ca4a89ac2ab529b675c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 18 Jan 2019 15:44:41 +0000 Subject: [PATCH 192/219] ocamlPackages.alcotest: 0.8.2 -> 0.8.5 --- pkgs/development/ocaml-modules/alcotest/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 8723b6a1f1ff..c43ad10d7d82 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, dune -, cmdliner, astring, fmt, result +, cmdliner, astring, fmt, result, uuidm }: let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "0.8.2"; - sha256 = "1zpg079v89mz2dpnh59f9hk5r03wl26skfn43llrv3kg24abjfpf"; + version = "0.8.5"; + sha256 = "1mhckvdcxkikbzgvy24kjz4265l15b86a6swz7m3ynbgvqdcfzqn"; buildInputs = [ dune ]; + propagatedBuildInputs = [ uuidm ]; buildPhase = "dune build -p alcotest"; inherit (dune) installPhase; } else { @@ -28,7 +29,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ] ++ param.buildInputs; - propagatedBuildInputs = [ cmdliner astring fmt result ]; + propagatedBuildInputs = [ cmdliner astring fmt result ] + ++ (param.propagatedBuildInputs or []); createFindlibDestdir = true; From a3da901ec7df21ff7dd1a72ed056efe26ce5d5db Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 19 May 2019 15:15:32 +0300 Subject: [PATCH 193/219] mariadb: 10.2.17 -> 10.3.15 --- .../sql/mariadb/cmake-plugin-includedir.patch | 16 ++++++++++++++++ pkgs/servers/sql/mariadb/default.nix | 8 +++++--- pkgs/servers/sql/mariadb/include-dirs-path.patch | 13 ------------- pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch delete mode 100644 pkgs/servers/sql/mariadb/include-dirs-path.patch diff --git a/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch b/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch new file mode 100644 index 000000000000..d2a4535f7ba9 --- /dev/null +++ b/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake +index 31291d26..fad52814 100644 +--- a/cmake/plugin.cmake ++++ b/cmake/plugin.cmake +@@ -34,6 +34,11 @@ MACRO(MYSQL_ADD_PLUGIN) + "LINK_LIBRARIES;DEPENDENCIES" + ${ARGN} + ) ++ ++ IF(WITHOUT_SERVER OR ARG_CLIENT) ++ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ++ ENDIF() ++ + IF(NOT WITHOUT_SERVER OR ARG_CLIENT) + + # Add common include directories diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 0eac14023644..00a2d28ac6c1 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ galeraLibs = buildEnv { }; common = rec { # attributes common to both builds - version = "10.2.17"; + version = "10.3.15"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "09xy6mgnz22mz8zgqlnddn8nzgs9xlz8lai4a7aa8x78in7hgcz7"; + sha256 = "0s399nxk2z8fgdr527p64y74zwjc3gpv7psf1n2r6ksl9njr3wr7"; name = "mariadb-${version}.tar.gz"; }; @@ -44,7 +44,7 @@ common = rec { # attributes common to both builds sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; - patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ] + patches = [ ./cmake-includedir.patch ] ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; cmakeFlags = [ @@ -100,6 +100,8 @@ client = stdenv.mkDerivation (common // { propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc + patches = [ ./cmake-plugin-includedir.patch ]; + cmakeFlags = common.cmakeFlags ++ [ "-DWITHOUT_SERVER=ON" "-DWITH_WSREP=OFF" diff --git a/pkgs/servers/sql/mariadb/include-dirs-path.patch b/pkgs/servers/sql/mariadb/include-dirs-path.patch deleted file mode 100644 index 8d468cf546a4..000000000000 --- a/pkgs/servers/sql/mariadb/include-dirs-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in -index 45d2f4e..e5666db 100644 ---- a/libmariadb/mariadb_config/mariadb_config.c.in -+++ b/libmariadb/mariadb_config/mariadb_config.c.in -@@ -5,7 +5,7 @@ - - static char *mariadb_progname; - --#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" -+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql" - #define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@" - #define LIBS_SYS "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ea68589358b..786ffa0d9ce3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14358,7 +14358,9 @@ in mariadb = callPackage ../servers/sql/mariadb { asio = asio_1_10; - jemalloc = jemalloc.override ({ disableInitExecTls = true; }); + # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4". + # https://jira.mariadb.org/browse/MDEV-15034 + jemalloc = jemalloc450.override ({ disableInitExecTls = true; }); inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; From 2fa256bd553e96209821ef0b1890c77f765c3cf1 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 29 Mar 2019 15:51:07 +0100 Subject: [PATCH 194/219] nixos/deluge: add authFile, config & port options --- nixos/modules/services/torrent/deluge.nix | 154 ++++++++++++++++++++-- nixos/tests/deluge.nix | 49 +++++-- 2 files changed, 184 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index 84f0437b9411..01a5890a7845 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -5,8 +5,33 @@ with lib; let cfg = config.services.deluge; cfg_web = config.services.deluge.web; - openFilesLimit = 4096; + openFilesLimit = 4096; + listenPortsDefault = [ 6881 6889 ]; + + listToRange = x: { from = elemAt x 0; to = elemAt x 1; }; + + configDir = "${cfg.dataDir}/.config/deluge"; + configFile = pkgs.writeText "core.conf" (builtins.toJSON cfg.config); + declarativeLockFile = "${configDir}/.declarative"; + + preStart = if cfg.declarative then '' + if [ -e ${declarativeLockFile} ]; then + # Was declarative before, no need to back up anything + ln -sf ${configFile} ${configDir}/core.conf + ln -sf ${cfg.authFile} ${configDir}/auth + else + # Declarative for the first time, backup stateful files + ln -sb --suffix=.stateful ${configFile} ${configDir}/core.conf + ln -sb --suffix=.stateful ${cfg.authFile} ${configDir}/auth + echo "Autogenerated file that signifies that this server configuration is managed declaratively by NixOS" \ + > ${declarativeLockFile} + fi + '' else '' + if [ -e ${declarativeLockFile} ]; then + rm ${declarativeLockFile} + fi + ''; in { options = { services = { @@ -15,42 +40,151 @@ in { openFilesLimit = mkOption { default = openFilesLimit; - example = 8192; description = '' Number of files to allow deluged to open. ''; }; + + config = mkOption { + type = types.attrs; + default = {}; + example = literalExample '' + { + download_location = "/srv/torrents/"; + max_upload_speed = "1000.0"; + share_ratio_limit = "2.0"; + allow_remote = true; + daemon_port = 58846; + listen_ports = [ ${toString listenPortsDefault} ]; + } + ''; + description = '' + Deluge core configuration for the core.conf file. Only has an effect + when is set to + true. String values must be quoted, integer and + boolean values must not. See + + for the availaible options. + ''; + }; + + declarative = mkOption { + type = types.bool; + default = false; + description = '' + Whether to use a declarative deluge configuration. + Only if set to true, the options + , + and + will be + applied. + ''; + }; + + openFirewall = mkOption { + default = false; + type = types.bool; + description = '' + Whether to open the firewall for the ports in + . It only takes effet if + is set to + true. + + It does NOT apply to the daemon port nor the web UI port. To access those + ports secuerly check the documentation + + or use a VPN or configure certificates for deluge. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/deluge"; + description = '' + The directory where deluge will create files. + ''; + }; + + authFile = mkOption { + type = types.path; + example = "/run/keys/deluge-auth"; + description = '' + The file managing the authentication for deluge, the format of this + file is straightforward, each line contains a + username:password:level tuple in plaintext. It only has an effect + when is set to + true. + See for + more informations. + ''; + }; }; - deluge.web.enable = mkEnableOption "Deluge Web daemon"; + deluge.web = { + enable = mkEnableOption "Deluge Web daemon"; + port = mkOption { + type = types.port; + default = 8112; + description = '' + Deluge web UI port. + ''; + }; + }; }; }; config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ "d '${configDir}' 0770 deluge deluge" ] + ++ optional (cfg.config ? "download_location") + "d '${cfg.config.download_location}' 0770 deluge deluge" + ++ optional (cfg.config ? "torrentfiles_location") + "d '${cfg.config.torrentfiles_location}' 0770 deluge deluge" + ++ optional (cfg.config ? "move_completed_path") + "d '${cfg.config.move_completed_path}' 0770 deluge deluge"; + systemd.services.deluged = { after = [ "network.target" ]; description = "Deluge BitTorrent Daemon"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.deluge ]; serviceConfig = { - ExecStart = "${pkgs.deluge}/bin/deluged -d"; - # To prevent "Quit & shutdown daemon" from working; we want systemd to manage it! + ExecStart = '' + ${pkgs.deluge}/bin/deluged \ + --do-not-daemonize \ + --config ${configDir} + ''; + # To prevent "Quit & shutdown daemon" from working; we want systemd to + # manage it! Restart = "on-success"; User = "deluge"; Group = "deluge"; + UMask = "0002"; LimitNOFILE = cfg.openFilesLimit; }; + preStart = preStart; }; systemd.services.delugeweb = mkIf cfg_web.enable { - after = [ "network.target" ]; + after = [ "network.target" "deluged.service"]; + requires = [ "deluged.service" ]; description = "Deluge BitTorrent WebUI"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.deluge ]; - serviceConfig.ExecStart = "${pkgs.deluge}/bin/deluge --ui web"; - serviceConfig.User = "deluge"; - serviceConfig.Group = "deluge"; + serviceConfig = { + ExecStart = '' + ${pkgs.deluge}/bin/deluge-web \ + --config ${configDir} \ + --port ${toString cfg.web.port} + ''; + User = "deluge"; + Group = "deluge"; + }; + }; + + networking.firewall = mkIf (cfg.declarative && cfg.openFirewall && !(cfg.config.random_port or true)) { + allowedTCPPortRanges = singleton (listToRange (cfg.config.listen_ports or listenPortsDefault)); + allowedUDPPortRanges = singleton (listToRange (cfg.config.listen_ports or listenPortsDefault)); }; environment.systemPackages = [ pkgs.deluge ]; @@ -58,7 +192,7 @@ in { users.users.deluge = { group = "deluge"; uid = config.ids.uids.deluge; - home = "/var/lib/deluge/"; + home = cfg.dataDir; createHome = true; description = "Deluge Daemon user"; }; diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix index b4be5e465cc0..22ad84e7bff1 100644 --- a/nixos/tests/deluge.nix +++ b/nixos/tests/deluge.nix @@ -5,25 +5,56 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - server = + simple = { + services.deluge = { + enable = true; + web.enable = true; + }; + networking.firewall.allowedTCPPorts = [ 8112 ]; + }; + + declarative = { ... }: - { services.deluge = { + { + services.deluge = { enable = true; - web.enable = true; + openFirewall = true; + declarative = true; + config = { + allow_remote = true; + download_location = "/var/lib/deluge/my-download"; + daemon_port = 58846; + listen_ports = [ 6881 6889 ]; + }; + web = { + enable = true; + port = 3142; + }; + authFile = pkgs.writeText "deluge-auth" '' + localclient:a7bef72a890:10 + andrew:password:10 + user3:anotherpass:5 + ''; }; - networking.firewall.allowedTCPPorts = [ 8112 ]; + environment.systemPackages = [ pkgs.deluge ]; }; - client = { }; }; testScript = '' startAll; - $server->waitForUnit("deluged"); - $server->waitForUnit("delugeweb"); - $client->waitForUnit("network.target"); - $client->waitUntilSucceeds("curl --fail http://server:8112"); + $simple->waitForUnit("deluged"); + $simple->waitForUnit("delugeweb"); + $simple->waitForOpenPort("8112"); + $declarative->waitForUnit("network.target"); + $declarative->waitUntilSucceeds("curl --fail http://simple:8112"); + + $declarative->waitForUnit("deluged"); + $declarative->waitForUnit("delugeweb"); + $declarative->waitUntilSucceeds("curl --fail http://declarative:3142"); + $declarative->succeed("deluge-console 'help' | grep -q 'rm - Remove a torrent'"); + $declarative->succeed("deluge-console 'connect 127.0.0.1:58846 andrew password; help' | grep -q 'rm - Remove a torrent'"); ''; }) From 70a6962d064c4ad48fe44abe57735de5ab57f1e6 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 30 May 2019 17:23:56 -0400 Subject: [PATCH 195/219] pythonPackages.packet-python: 1.37.1 -> 1.38.2 --- .../python-modules/packet-python/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 5811d510dff9..e233dfeb086a 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -3,29 +3,25 @@ , fetchPypi , requests , python -, fetchpatch + +# For tests/setup.py +, pytestrunner }: buildPythonPackage rec { pname = "packet-python"; - version = "1.37.1"; + version = "1.38.2"; src = fetchPypi { inherit pname version; - sha256 = "316941d2473c0f42ac17ac89e9aa63a023bb96f35cf8eafe9e091ea424892778"; + sha256 = "1lh97la51fa3nxjl4ngsanrxw6qq5jwwn0dxj2f0946m043200xl"; }; + nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ requests ]; checkPhase = '' ${python.interpreter} -m unittest discover -s test ''; - patches = [ - (fetchpatch { - url = https://github.com/packethost/packet-python/commit/361ad0c60d0bfce2a992eefd17e917f9dcf36400.patch; - sha256 = "1cmzyq0302y4cqmim6arnvn8n620qysq458g2w5aq4zj1vz1q9g1"; - }) - ]; - # Not all test files are included in archive doCheck = false; @@ -35,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ dipinhora ]; }; -} \ No newline at end of file +} From a02dfde07417ead2ab9b24443f195dc8532b409c Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 30 May 2019 17:24:38 -0400 Subject: [PATCH 196/219] pythonPackages.packet-python: enable tests --- .../python-modules/packet-python/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index e233dfeb086a..61d387590480 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -5,7 +5,9 @@ , python # For tests/setup.py +, pytest , pytestrunner +, requests-mock }: buildPythonPackage rec { @@ -17,14 +19,16 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ requests ]; + checkInputs = [ + pytest + pytestrunner + requests-mock + ]; checkPhase = '' - ${python.interpreter} -m unittest discover -s test + ${python.interpreter} setup.py test ''; - # Not all test files are included in archive - doCheck = false; - meta = { description = "A Python client for the Packet API."; homepage = "https://github.com/packethost/packet-python"; From e7be5691bab4a4637ab77a7b108b0eff374cef96 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 4 Jun 2019 19:28:44 +0200 Subject: [PATCH 197/219] sway: manually update version in meson.build This wasn't done upstream. Adapted from: https://github.com/primeos/nixpkgs-primeos/blob/5956e993dd320183f943e72fd6ec200232900249/default.nix#L32-L34 Co-Authored-By: Michael Weiss --- pkgs/applications/window-managers/sway/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index f0f319ed39bb..7d5c4c05131d 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin" ''; + postPatch = '' + sed -i "s/version: '1.0'/version: '${version}'/" meson.build + ''; + meta = with stdenv.lib; { description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; From f7c7207a3fb69a00faf6aad5a165e3c53c1c1c6c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 4 Jun 2019 13:34:40 -0400 Subject: [PATCH 198/219] systems: add missing doubles in https://github.com/NixOS/nixpkgs/pull/60349, the attr handling was removed. This means we rely on these double values for determing what we are compatible with. This adds some of the missing doubles to this list. https://hydra.nixos.org/eval/1523389#tabs-removed --- lib/systems/doubles.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index ff071c182d4f..68c5a1aa815e 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -20,7 +20,11 @@ let "wasm64-wasi" "wasm32-wasi" + "powerpc64le-linux" + "riscv32-linux" "riscv64-linux" + + "aarch64-none" "avr-none" "arm-none" "i686-none" "x86_64-none" "ppc-none" "msp430-none" ]; allParsed = map parse.mkSystemFromString all; From de70b767796bfa3545d5fa565022d47b65eab8bc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 4 Jun 2019 13:42:14 -0400 Subject: [PATCH 199/219] systems: fixup from last commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit it’s powerpc-none not ppc-none --- lib/systems/doubles.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 68c5a1aa815e..f215090f06c1 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -24,7 +24,7 @@ let "riscv32-linux" "riscv64-linux" - "aarch64-none" "avr-none" "arm-none" "i686-none" "x86_64-none" "ppc-none" "msp430-none" + "aarch64-none" "avr-none" "arm-none" "i686-none" "x86_64-none" "powerpc-none" "msp430-none" ]; allParsed = map parse.mkSystemFromString all; From 3d0028e7353d3323b93bd1659a4067c77b55d877 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 3 Jun 2019 20:12:56 +0200 Subject: [PATCH 200/219] wasabiwallet: init at 1.1.5 --- .../altcoins/wasabiwallet/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/altcoins/wasabiwallet/default.nix diff --git a/pkgs/applications/altcoins/wasabiwallet/default.nix b/pkgs/applications/altcoins/wasabiwallet/default.nix new file mode 100644 index 000000000000..9eef471adad2 --- /dev/null +++ b/pkgs/applications/altcoins/wasabiwallet/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, makeDesktopItem, openssl_1_1, xorg, curl, fontconfig, krb5, zlib, dotnet-sdk }: + +stdenv.mkDerivation rec { + pname = "wasabiwallet"; + version = "1.1.5"; + + src = fetchurl { + url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; + sha256 = "1iq7qkpq073yq1bz8pam4cbm2myznhpjr3g9afblvmxwgbdjxak0"; + }; + + dontBuild = true; + dontPatchELF = true; + + desktopItem = makeDesktopItem { + name = "wasabi"; + exec = "wasabiwallet"; + desktopName = "Wasabi"; + genericName = "Bitcoin wallet"; + comment = meta.description; + categories = "Application;Network;Utility;"; + }; + + installPhase = '' + mkdir -p $out/opt/${pname} $out/bin $out/share/applications + cp -Rv . $out/opt/${pname} + cd $out/opt/${pname} + for i in $(find . -type f -name '*.so') wassabee + do + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl_1_1 stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i + done + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee + ln -s $out/opt/${pname}/wassabee $out/bin/${pname} + cp -v $desktopItem/share/applications/* $out/share/applications + ''; + + meta = with stdenv.lib; { + description = "Privacy focused Bitcoin wallet"; + homepage = "https://wasabiwallet.io/"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3af78b9f552d..30828f385080 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6503,6 +6503,8 @@ in wal_e = callPackage ../tools/backup/wal-e { }; + wasabiwallet = callPackage ../applications/altcoins/wasabiwallet { }; + watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) CoreServices; }; From 0fef9f89e4cedfa87d44b814629a9b94af8667a9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 4 Jun 2019 14:49:58 -0400 Subject: [PATCH 201/219] systems: fix lib-tests These were broken by the added system doubles. This just adds those to the lib-tests. --- lib/systems/doubles.nix | 2 ++ lib/systems/inspect.nix | 1 + lib/tests/systems.nix | 10 +++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index f215090f06c1..09e9089aa6fd 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -57,5 +57,7 @@ in rec { wasi = filterDoubles predicates.isWasi; windows = filterDoubles predicates.isWindows; + embedded = filterDoubles predicates.isNone; + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"]; } diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 1c90af88879a..9a12e3c3926d 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -44,6 +44,7 @@ rec { isCygwin = { kernel = kernels.windows; abi = abis.cygnus; }; isMinGW = { kernel = kernels.windows; abi = abis.gnu; }; isWasi = { kernel = kernels.wasi; }; + isNone = { kernel = kernels.none; }; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 161e3e7d07ac..7fc4b2eabcfd 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -12,19 +12,19 @@ let expected = lib.sort lib.lessThan y; }; in with lib.systems.doubles; lib.runTests { - testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows); + testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded); - testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; - testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" ]; + testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" "arm-none" ]; + testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" ]; testmips = mseteq mips [ "mipsel-linux" ]; - testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" ]; + testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]; testdarwin = mseteq darwin [ "x86_64-darwin" ]; testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ]; testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; From ceee96308007d4c9f547b97ec811d0cd7bb8101c Mon Sep 17 00:00:00 2001 From: Kai Harries Date: Tue, 4 Jun 2019 20:52:06 +0200 Subject: [PATCH 202/219] tor-browser-bundle: set default value for XAUTHORITY XAUTHORITY is not set on systems using wayland. Therefore set a default value for XAUTHORITY. --- .../networking/browsers/tor-browser-bundle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 834be5cd3020..80879baa2835 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -280,7 +280,7 @@ stdenv.mkDerivation rec { TZ=":" \ \ DISPLAY="\$DISPLAY" \ - XAUTHORITY="\$XAUTHORITY" \ + XAUTHORITY="\''${XAUTHORITY:-}" \ DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ \ HOME="\$HOME" \ From df3cdc29be85d726c7bade1f985cbe0da240fc83 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 Jun 2019 12:24:04 -0700 Subject: [PATCH 203/219] quantum-espresso: 6.4 -> 6.4.1 (#62556) --- .../science/chemistry/quantum-espresso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 777b3499bedc..5e1c77e24751 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "6.4"; + version = "6.4.1"; name = "quantum-espresso-${version}"; src = fetchurl { url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; - sha256 = "1zjblzf0xzwmhmpjm56xvv8wsv5jmp5a204irzyicmd77p86c4vq"; + sha256 = "027skhp2zzx0f4mh6azqjljdimchak5cdn13v4x7aj5q2zvfkmxh"; }; passthru = { From 4713af7b492358f79f937a501291975d44fd5a6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 Jun 2019 12:24:46 -0700 Subject: [PATCH 204/219] qjackctl: 0.5.7 -> 0.5.8 (#62550) --- pkgs/applications/audio/qjackctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 018dd39580f5..fbb2f498c0b1 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.7"; + version = "0.5.8"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1g6a5j74p45yisl28bw4fcc9nr6b710ikk459p4mp6djh9gs8v95"; + sha256 = "1r5hf3hcr20n93jrrm7xk2zf6yx264pcr4d10cpybhrancxh602n"; }; buildInputs = [ From 984120f4c957f75216bd157c24ea38d8f9730411 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 Jun 2019 12:25:35 -0700 Subject: [PATCH 205/219] sabnzbd: 2.3.8 -> 2.3.9 (#62565) --- pkgs/servers/sabnzbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 12253d740b7b..364fcb118ce4 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -4,7 +4,7 @@ let 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.8"; + version = "2.3.9"; pname = "sabnzbd"; name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "1kdm2gv4mpdmyzfm9mfv26yxvjks8ii7c12hprp1zrmcindxg03g"; + sha256 = "06ln00rqz4xpsqhq0f495893xq1w5dfjawb8dgfyjjfds8627p16"; }; buildInputs = [ pythonEnv makeWrapper ]; From 7eb8534c72f6fb33bd3d0a38f977a1092ed16dae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 03:53:02 -0500 Subject: [PATCH 206/219] vale: 1.4.0 -> 1.4.2 https://github.com/errata-ai/vale/releases/tag/v1.4.2 https://github.com/errata-ai/vale/releases/tag/v1.4.1 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 7c21e621ea6d..3d911271ba91 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vale-${version}"; - version = "1.4.0"; + version = "1.4.2"; goPackagePath = "github.com/errata-ai/vale"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "05vrnmw7kpgxf2989jvmkwj9c3mv3zkr4z5rpmsplnhvgsnidg4g"; + sha256 = "180532jp6m2ryppkjszs8b8gmvx9h54c8423par3907bgdxyzqj8"; }; meta = with stdenv.lib; { From 5cb9d4d62e2aa569af3f547729565fbfce58d1e8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 03:52:51 -0500 Subject: [PATCH 207/219] jdupes: 1.12 -> 1.13 https://github.com/jbruchon/jdupes/releases/tag/v1.13 --- pkgs/tools/misc/jdupes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 9ce06c9cf438..8fbd0a461d09 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jdupes-${version}"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1m5506scjbf2820p7mbsdsb2acg9jm74sb1604m9iz8v3dcn9dm6"; + sha256 = "1apqc4ylx6jmpkaypi8323063g5685kl8nbjna2291lzf2pc4r9f"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; # broken Makefile, the above also removes tests postInstall = '' - install -Dm644 -t $out/share/doc/jdupes CHANGES LICENSE README + install -Dm644 -t $out/share/doc/jdupes CHANGES LICENSE README.md ''; meta = with stdenv.lib; { From 5ae032bedae95204cb6690efa932e8bd06461244 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 3 Jun 2019 21:56:57 -0500 Subject: [PATCH 208/219] skype: 8.45.0.41 -> 8.46.0.60 https://support.skype.com/en/faq/FA34778/release-notes-for-skype-for-windows-mac-linux-and-web --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 0c1d307fa550..92416dce6c8a 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.45.0.41"; + version = "8.46.0.60"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -58,7 +58,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1k54gpaphkjv5qhqlwm2vbxbbci7nra4a5l0bhylkkzhsip6cvcm"; + sha256 = "0v7a28zmgx1mxqgyfrj8byvjs9ibnirqplly8ll221gns8qjvrls"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From ebff44554922ef5f85db8cd104bca84a6d107871 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 3 Jun 2019 21:24:48 -0500 Subject: [PATCH 209/219] calibre: 3.42.0 -> 3.44.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 99e71d769bea..c05b98a07283 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.42.0"; + version = "3.44.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0ymdhws3cb44p3fb24vln1wx6s7qnb8rr241jvm6qbj5rnp984dm"; + sha256 = "13d3cbn8qbjd8a19qprra6gmib1d818c3zgf3q70kx6b2fq58lzi"; }; patches = [ From a14dc648a9631d5ef3fddffc64aa4c48624ff952 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 3 Jun 2019 21:24:06 -0500 Subject: [PATCH 210/219] klavaro: 3.05 -> 3.07 --- pkgs/games/klavaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index aed61f40b177..9fc7d0c3a7da 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "klavaro-${version}"; - version = "3.05"; + version = "3.07"; src = fetchurl { url = "mirror://sourceforge/klavaro/${name}.tar.bz2"; - sha256 = "046xc7is1jz5azkwrb7i9wdqkz8hdm68ga02g6whmi53130wd0py"; + sha256 = "1zz7kr3rhprn1ixmh58x8sdmdfl42lki7vgbina3sgnamx31zia5"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; From f8d26961de4e4e20811c4eed0db0412abc84c505 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 4 Jun 2019 20:20:06 +0200 Subject: [PATCH 211/219] wallutils: 5.7.2 -> 5.8.0 --- pkgs/tools/graphics/wallutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 25ef433304c9..2d14c0809721 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { name = "wallutils-${version}"; - version = "5.7.2"; + version = "5.8.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "1q4487s83iwwgd40hkihpns84ya8mg54zp63ag519cdjizz38xyi"; + sha256 = "1s9k2fwckpm1zpdxywckwbql38h0sp6y9ji88rxss7yjc2g12zaf"; }; - modSha256 = "0kj9s9ymd99a5w9r1d997qysnzlgpnmh5dnki33h1jlwz47nwkld"; + modSha256 = "0rfmqmm0jld7zrv192dqv7khwb2xm9i77sa1wgr7q6afdhbkrm21"; patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ]; From 28556f054f37510da5a0ebfe7fd2af7c20d3e8e3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 1 Jun 2019 14:35:49 +0200 Subject: [PATCH 212/219] tdesktop: 1.7.0 -> 1.7.3 GCC 8.x is required to avoid the following error: cc1plus: error: -Werror=class-memaccess: no option -Wclass-memaccess If we build without "-Wno-error=class-memaccess" the build should fail and the upstream requirements were raised from GCC 7 to GCC 8 anyway: https://github.com/telegramdesktop/tdesktop/commit/b2f821d3deb65ade7416d28a18148176f6c40b34 The two additional patches are required to avoid build errors like this: /build/source/Telegram/ThirdParty/qtlottie/src/bodymovin/bmbase.cpp:123:12: error: invalid use of incomplete type 'class QDebug' qWarning() ^ In file included from /nix/store/1qk60bhxcf95iicms7mkyjq3h7lz136p-qtbase-5.12.0-dev/include/QtCore/qglobal.h:1200, from /nix/store/1qk60bhxcf95iicms7mkyjq3h7lz136p-qtbase-5.12.0-dev/include/QtCore/qalgorithms.h:43, from /nix/store/1qk60bhxcf95iicms7mkyjq3h7lz136p-qtbase-5.12.0-dev/include/QtCore/qlist.h:43, from /nix/store/1qk60bhxcf95iicms7mkyjq3h7lz136p-qtbase-5.12.0-dev/include/QtCore/QList:1, from /build/source/Telegram/ThirdParty/qtlottie/src/bodymovin/bmbase.h:31, from /build/source/Telegram/ThirdParty/qtlottie/src/bodymovin/bmbase.cpp:29: /nix/store/1qk60bhxcf95iicms7mkyjq3h7lz136p-qtbase-5.12.0-dev/include/QtCore/qlogging.h:57:7: note: forward declaration of 'class QDebug' class QDebug; ^~~~~~ --- .../instant-messengers/telegram/tdesktop/default.nix | 8 ++++---- .../instant-messengers/telegram/tdesktop/generic.nix | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c7b990db6022..f906d4712f99 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,11 +4,11 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.7.0"; - sha256Hash = "1plfby243hf65wjmppq1qnqmp25pgi4x3awqd4h83ly9hn8qdwfk"; + version = "1.7.3"; + sha256Hash = "0y0chdfxq75ydx8lz40yfpbx8ycm8vdkl5dvll6glxjq5m21kxf9"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "464796"; - archPatchesHash = "1bq7r69k3i9p1csdsca0w41jyz6fbyn4qriv3lg7s28j9s803kw8"; + archPatchesRevision = "476826"; + archPatchesHash = "1vnlvba60hxd5jlh0fvsa50xmb9xgcphdsx6j1ld7f12m7ik68zr"; }; in { stable = mkTelegram stableVersion; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index c32e6b186b7a..8276e839940f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -1,7 +1,7 @@ { stable, version, sha256Hash, archPatchesRevision, archPatchesHash }: { mkDerivation, lib, fetchFromGitHub, fetchsvn -, pkgconfig, pythonPackages, cmake, wrapGAppsHook +, pkgconfig, pythonPackages, cmake, wrapGAppsHook, gcc8 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -29,7 +29,8 @@ mkDerivation rec { }; # TODO: libtgvoip.patch no-gtk2.patch - patches = [ "${archPatches}/tdesktop.patch" ]; + # TODO: Avoid tdesktop_lottie_animation_qtdebug.patch and tdesktop_qtlottie_qtdebug.patch + patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" ]; postPatch = '' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ @@ -38,7 +39,7 @@ mkDerivation rec { --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; - nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook gcc8 ]; # We want to run wrapProgram manually (with additional parameters) dontWrapGApps = true; @@ -77,6 +78,9 @@ mkDerivation rec { pushd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "${archPatches}/libtgvoip.patch" popd + pushd "Telegram/ThirdParty/qtlottie" + patch -Np1 -i "${archPatches}/tdesktop_qtlottie_qtdebug.patch" + popd sed -i Telegram/gyp/telegram_linux.gypi \ -e 's,/usr,/does-not-exist,g' \ From 2acfae695a23c8ad1937fd423d357be9459ccb31 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 3 Jun 2019 20:31:54 -0500 Subject: [PATCH 213/219] public-sans: 1.003 -> 1.004 https://github.com/uswds/public-sans/releases/tag/v1.004 --- pkgs/data/fonts/public-sans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index cfcf25633406..ae9cf31e30d8 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.003"; + version = "1.004"; in fetchzip rec { name = "public-sans-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip $downloadedFile fonts/{otf,variable}/\*.\[ot\]tf -d $out/share/ ''; - sha256 = "02ranwr1bw4n9n1ljw234nzhj2a0hgradniib37nh10maark5wg3"; + sha256 = "1d9ll6gvvlmlykv868lq7xmwldlfjp94k0rjqifipg3q1qv051lg"; meta = with lib; { description = "A strong, neutral, principles-driven, open source typeface for text or display"; From b5f80fdd4c4847795e293357bfdb8831e038e112 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 15:10:49 -0500 Subject: [PATCH 214/219] networkmanagerapplet: 1.8.20 -> 1.8.22 --- pkgs/tools/networking/network-manager/applet.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index d9f9e6570acb..f7df0740ba17 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -6,13 +6,13 @@ let pname = "network-manager-applet"; - version = "1.8.20"; + version = "1.8.22"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1v1lvw9ak37gxha11rv49sai1vdyv128hdy0kliibiv6alavn385"; + sha256 = "1vbyhxknixyrf75pbjl3rxcy32m8y9cx5s30s3598vgza081rvzb"; }; mesonFlags = [ From a712174a6a81e8563a4b7e416c6cc9c771ca1a45 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 4 Jun 2019 22:13:36 +0200 Subject: [PATCH 215/219] gitRepo: 1.13.2 -> 1.13.3 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index b629c8fe9109..04ae45f75b39 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "git-repo-${version}"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0ll1yzwgpayps7c05j8kf1m4zvww7crmlyy7xa0w5g2krbjvjzvi"; + sha256 = "0wyr6fyc9kzzw6y2cxvri35ib1sh156n6lnv119j5r1rzvc2lg6r"; }; nativeBuildInputs = [ makeWrapper ]; From 51f4e7502516d6d42841f0b78da0c138a88d8a8d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 4 Jun 2019 08:28:04 +0000 Subject: [PATCH 216/219] websocat: add support for wss:// --- pkgs/tools/misc/websocat/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 48983fc85e13..a276b13a59ca 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security +{ stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security }: rustPlatform.buildRustPackage rec { @@ -12,9 +12,11 @@ rustPlatform.buildRustPackage rec { sha256 = "1gf2snr12vnx2mhsrwkb5274r1pvdrf8m3bybrqbh8s9wd83nrh6"; }; + cargoBuildFlags = [ "--features=ssl" ]; cargoSha256 = "1zqfvbihf8xwgh092n9wzm3mdgbv0n99gjsfk9przqj2vh7wfvh2"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "Command-line client for WebSockets (like netcat/socat)"; From fbc96ad9e0b08eae079a2e771dcabaad714b3e90 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 4 Jun 2019 11:23:13 -0700 Subject: [PATCH 217/219] lutris: add hicolor theme --- pkgs/applications/misc/lutris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index e659ed2322ed..3ccceb0e9220 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -31,7 +31,7 @@ let graphite2 gtk2 gtk3 udev ncurses wayland libglvnd vulkan-loader # Lutris - gobjectIntrospection gdk_pixbuf pango openssl sqlite xterm libnotify procps + gobject-introspection gdk_pixbuf hicolor-icon-theme pango openssl sqlite xterm libnotify procps # Adventure Game Studio allegro dumb @@ -47,7 +47,7 @@ let # DOSBox SDL_net SDL_sound - + # GOG glib-networking From a08d4625636fd53a7195a825254a25666a2f6ec3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 4 Jun 2019 22:45:11 -0400 Subject: [PATCH 218/219] unix-tools: default when no provider exists --- pkgs/top-level/unix-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index beb2a996a5ef..56bab2fe4116 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -16,7 +16,7 @@ let version = "1003.1-2008"; singleBinary = cmd: providers: let - provider = providers.${stdenv.hostPlatform.parsed.kernel.name}; + provider = providers.${stdenv.hostPlatform.parsed.kernel.name} or providers.linux; bin = "${getBin provider}/bin/${cmd}"; manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz"; in runCommand "${cmd}-${version}" { From 447011a9b858b044f48533570dfc5e40ee719cd1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 5 Jun 2019 00:05:56 -0400 Subject: [PATCH 219/219] pythonPackages.flask-swagger: disable checkPhase --- pkgs/development/python-modules/flask-swagger/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix index 808d6ea67367..c690e4e64ae5 100644 --- a/pkgs/development/python-modules/flask-swagger/default.nix +++ b/pkgs/development/python-modules/flask-swagger/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { sha256 = "b4085f5bc36df4c20b6548cd1413adc9cf35719b0f0695367cd542065145294d"; }; - doCheck = true; + # No Tests + doCheck = false; propagatedBuildInputs = [ flask