diff options
Diffstat (limited to 'pkgs')
20 files changed, 101 insertions, 53 deletions
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index cb44e79839b0c..d6b775107d06d 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; configureFlags = [ + "--enable-default-colors" "--enable-widec" "--enable-ipv6" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 9c1a2e2028237..e2e4ba63b07e0 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, bash, cmake -, opencv, gtest, openblas, liblapack, perl +, opencv3, gtest, openblas, liblapack, perl , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: @@ -8,24 +8,22 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { name = "mxnet-${version}"; - version = "1.2.1"; + version = "1.4.1"; - # Fetching from git does not work at the time (1.2.1) due to an - # incorrect hash in one of the submodules. The provided tarballs - # contain all necessary sources. src = fetchurl { url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - sha256 = "053zbdgs4j8l79ipdz461zc7wyfbfcflmi5bw7lj2q08zm1glnb2"; + sha256 = "1d0lhlpdaxycjzpwwrpgjd3v2q2ka89v5rr13ddxayy7ld2hxiaj"; }; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv gtest openblas liblapack ] + buildInputs = [ opencv3 gtest openblas liblapack ] ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; cmakeFlags = - (if cudaSupport then [ + [ "-DUSE_MKL_IF_AVAILABLE=OFF" ] + ++ (if cudaSupport then [ "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix index 8c4c4ea87735d..496354971ee72 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,12 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "1.15.2"; + version = "1.16.1"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "1if44rfzmrw9m2k47kiplccby1lfdrlq82jlz4p91wwqc1vs4xi5"; + sha256 = "6ca409d1f22d444af427fb023a33ca8b69625d508a50e1b7eaabd59247c93043"; }; propagatedBuildInputs = [ diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index 1aa103adefbbc..553c1dbde221f 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -2,23 +2,19 @@ stdenv.mkDerivation rec { name = "xits-math-${version}"; - version = "1.108"; + version = "1.200"; src = fetchFromGitHub { - owner = "khaledhosny"; - repo = "xits-math"; + owner = "alif-type"; + repo = "xits"; rev = "v${version}"; - sha256 = "08nn676c41a7gmmhrzi8mm0g74z8aiaafjk48pqcwxvjj9av7xjg"; + sha256 = "0s1qqqg3zv9k4wqn1vkx0z895fjccg96n58syc1d5f2wba9kyfcm"; }; nativeBuildInputs = [ fontforge ] ++ (with python2Packages; [ python fonttools ]); postPatch = '' rm *.otf - - substituteInPlace tools/postprocess.py --replace \ - 'font = ttLib.TTFont(sys.argv[1])' \ - 'font = ttLib.TTFont(sys.argv[1], recalcTimestamp=False)' ''; installPhase = '' diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 1a20fd7947506..fb4b1ac54a9fa 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -47,11 +47,6 @@ let in { - libressl_2_7 = generic { - version = "2.7.5"; - sha256 = "0h60bcx7k72171dwpx4vsbsrxxz9c18v75lh5fj600gghn6h7rdy"; - }; - libressl_2_8 = generic { version = "2.8.3"; sha256 = "0xw4z4z6m7lyf1r4m2w2w1k7as791c04ygnfk4d7d0ki0h9hnr4v"; diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix index 0a8972d4876d6..aa1f8d10ba975 100644 --- a/pkgs/development/libraries/pybind11/default.nix +++ b/pkgs/development/libraries/pybind11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, catch, python, eigen }: +{ stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }: stdenv.mkDerivation rec { name = "pybind-${version}"; @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { # Disable test_cmake_build test, as it fails in sandbox # https://github.com/pybind/pybind11/issues/1355 - patches = [ ./no_test_cmake_build.patch ]; + patches = [ + ./no_test_cmake_build.patch + (fetchurl { # Remove on bump to v2.2.5 + name = "pytest_namespace_to_configure.patch"; + url = "https://github.com/pybind/pybind11/commit/e7ef34f23f194cfa40bdbf967c6d34712261a4ee.patch"; + sha256 = "1dhv6p0b5fxzxc8j3sfy8kvfmdshczk22xfxh6bk0cfnfdy9iqrq"; + }) + ]; doCheck = true; diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/pkgs/development/python-modules/aspy.yaml/default.nix index c6d06772c9ba5..1a91033823274 100644 --- a/pkgs/development/python-modules/aspy.yaml/default.nix +++ b/pkgs/development/python-modules/aspy.yaml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aspy.yaml"; - version = "1.1.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "5eaaacd0886e8b581f0e4ff383fb6504720bb2b3c7be17307724246261a41adf"; + sha256 = "0i9z2jm2hjwdxdv4vw4kbs70h2ciz49rv8w73zbawb7z5qw45iz7"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index bc635461f528b..24146306af711 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "2.5.3"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0ljyfbpg34n7b8k31xc4q9c922p836km9wxh0algdxxfkam7z667"; + sha256 = "0b11nkcviwv5dqnlmv63bgzciczb51wairm8b6wr6sda4p7y5wzb"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 5622ee1669df8..f7ac30c28c519 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "0.8.6"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "1m35m9z4vy480d2200nd4lk9n5s4z3zcnq0d9rdlh4yv5264mrgf"; + sha256 = "1klcx333kpgb5gbaasmz07brqjxvls3l5dpj0kv9cfsd76cq17yh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 2c8ea30345f3c..f2e38a0e9b3b8 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace python/setup.py \ --replace "graphviz<0.9.0," "graphviz" \ - --replace "numpy<=1.15.0," "numpy" \ + --replace "numpy<=1.15.2," "numpy" \ --replace "requests<2.19.0," "requests" ''; diff --git a/pkgs/servers/mxisd/default.nix b/pkgs/servers/mxisd/default.nix index 9d26ecb6ab16b..9baf5ffdc52ca 100644 --- a/pkgs/servers/mxisd/default.nix +++ b/pkgs/servers/mxisd/default.nix @@ -2,14 +2,14 @@ let name = "mxisd-${version}"; - version = "1.4.3"; - rev = "cd890d114a46e4a3792c57cc7a35b95b2c466a16"; + version = "1.4.4"; + rev = "92f10347d1c8495b7409360c927ccc0ce3586064"; src = fetchFromGitHub { inherit rev; owner = "kamax-matrix"; repo = "mxisd"; - sha256 = "05plcf6bq19fmx528fgnib4bw9gz36irwlnfsykys1bpmi60wj69"; + sha256 = "06j4wh4vx5gziiifyaaijz2nlaa2yah8gzvf7ykfcm72m878rrkl"; }; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 4c4733bc9cd8a..8a5956161e0d7 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "1jcrrgybcyq9kwyqxshsfm5fy3sa77h3795xx3rvrs8k434nl1yb" - else if stdenv.isLinux then "1hlis827wmnjcy4h8va50093pmnqdhkbnbimmkymzmcvmkbmi9nx" + platformSha = if stdenv.isDarwin then "0w4dvkbi9jbybq7kvcgdccv8byp4ahlah45w2z8fwq961h3qnhg1" + else if stdenv.isLinux then "19dagxqvw0fpsjm6vbimqbax3bkmdm6wwifkfaq3ylrk0a9wwsrm" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.2.0"; + version = "6.2.1"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 0b8f69c349ace..c8d4ffc38f961 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-28"; + version = "2019-06-01"; name = "oh-my-zsh-${version}"; - rev = "9930dd6e49df5630ac23c68b85465f0bb801d17f"; + rev = "27228d83fe403cf664c0c8626a3874ed3989d084"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1gncl7irz0drlg7rrnb9iqzslflhrpfgsjg7kmdkchp8gj7750hl"; + sha256 = "1ffh4md48wn16zaacn76323iyj2kc592ggglx83mi7qsk4zgaa7z"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index f511e013f3688..7fb4077e5367b 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -6,14 +6,14 @@ let pname = "kronometer"; - version = "2.2.1"; + version = "2.2.2"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "18b2qi5b9hn8jy3yhav72n14z5l9w3p5fv5kslhbxc7rfvjr4h3x"; + sha256 = "142f1kqygil6d4pvh6pallin355h2rq5s1hs6gd11plcin6rkg2j"; }; meta = with lib; { diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 6f16890858523..a537e4dfb2667 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,17 +2,19 @@ buildGoPackage rec { name = "wireguard-go-${version}"; - version = "0.0.20181222"; + version = "0.0.20190517"; goPackagePath = "git.zx2c4.com/wireguard-go"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "00m1r97qrr4l21s5jk5m3xfpiybqbzgxp9failsy1nmx27wrdiky"; + sha256 = "0ir3dp13vkkqr76q0jvw610qw40053ngk51psqhqxfaw3jicdqgr"; }; goDeps = ./deps.nix; + passthru.updateScript = ./update.sh; + meta = with stdenv.lib; { description = "Userspace Go implementation of WireGuard"; homepage = https://git.zx2c4.com/wireguard-go/about/; diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix index 32f8cd2ebc29e..6ebef971e5998 100644 --- a/pkgs/tools/networking/wireguard-go/deps.nix +++ b/pkgs/tools/networking/wireguard-go/deps.nix @@ -1,12 +1,30 @@ # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.12"; + sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a9"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + rev = "a29dc8fdc734"; + sha256 = "07f0jj4haqs0ywc1akk1qjwn5msl2j0pry1rxjkkbfcq4r6ihc1p"; }; } { @@ -14,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "610586996380"; - sha256 = "1sqwmvf70rq1j65lv5jzyiy7gd53l37dxlnjf2xj6p2i4fcwkk4z"; + rev = "7f726cade0ab"; + sha256 = "0zv5var5agbhd2mcn7lciwip0j49gxka73f0csvh3hvb1di068gn"; }; } { @@ -23,8 +41,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "2a47403f2ae5"; - sha256 = "0ww1iz1zcw995957h32289yascl37pkvfj3qcvyghvnzf7xg9v6z"; + rev = "a43fa875dd82"; + sha256 = "0xvwwaqcj02a9n8izs4zrlg8vvz7wffli955i93nc34m1f0w8vyg"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } ] diff --git a/pkgs/tools/networking/wireguard-go/update.sh b/pkgs/tools/networking/wireguard-go/update.sh new file mode 100755 index 0000000000000..2b6b8317a1e88 --- /dev/null +++ b/pkgs/tools/networking/wireguard-go/update.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused common-updater-scripts vgo2nix + +set -eu -o pipefail + +basedir="$(git rev-parse --show-toplevel)" +version="$(curl -sL https://build.wireguard.com/distros.txt | sed -n 's/^upstream\tgo\t\([^\t]\+\)\t.*/\1/p')" +update-source-version wireguard-go "$version" + +vgo2nix -dir $(nix-build -A wireguard-go.src) -outfile "$basedir/pkgs/tools/networking/wireguard-go/deps.nix" + +if [[ -f "$basedir/wireguard-go.log" ]];then + rm "$basedir/wireguard-go.log" +fi diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 4b4ecb6695037..eef34c53f192e 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { done ''; + passthru.updateScript = ./update.sh; + meta = with stdenv.lib; { description = "Tools for the WireGuard secure network tunnel"; downloadPage = https://git.zx2c4.com/WireGuard/refs/; diff --git a/pkgs/tools/networking/wireguard-tools/update.sh b/pkgs/tools/networking/wireguard-tools/update.sh new file mode 100755 index 0000000000000..e549228e8f1fb --- /dev/null +++ b/pkgs/tools/networking/wireguard-tools/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused common-updater-scripts + +set -eu -o pipefail + +version="$(curl -sL https://build.wireguard.com/distros.txt | sed -n 's/^upstream\tkmodtools\t\([^\t]\+\)\t.*/\1/p')" +update-source-version wireguard-tools "$version" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 215e487d25733..6246cc4a5fb54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12471,11 +12471,10 @@ in openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_2_7 libressl_2_8 libressl_2_9; - libressl = libressl_2_8; + libressl = libressl_2_9; boringssl = callPackage ../development/libraries/boringssl { }; |