diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
| commit | 9be40841ea4251a09ae7a1023abc1b6d191f61bb (patch) | |
| tree | f45a3e2cc682740887b81517eca4bd4fecd6c1c2 /pkgs/development/libraries/libidn2/default.nix | |
| parent | 8ce4780eff33591ed54b2fb97ca96108e4e7a740 (diff) | |
| parent | ac4c567c3603c5106862f144c21037f6ad76c0ad (diff) | |
| download | nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.gz nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.bz2 nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.lz nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.xz nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.zst nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.zip | |
Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/build-support/gcc-wrapper-old/builder.sh pkgs/build-support/trivial-builders.nix pkgs/desktops/kde-4.14/kde-package/default.nix pkgs/development/compilers/openjdk-darwin/8.nix pkgs/development/compilers/openjdk-darwin/default.nix pkgs/development/compilers/openjdk/7.nix pkgs/development/compilers/openjdk/8.nix pkgs/development/compilers/oraclejdk/jdk-linux-base.nix pkgs/development/compilers/zulu/default.nix pkgs/development/haskell-modules/generic-builder.nix pkgs/misc/misc.nix pkgs/stdenv/generic/builder.sh pkgs/stdenv/generic/setup.sh
Diffstat (limited to 'pkgs/development/libraries/libidn2/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libidn2/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 61926dad24d1..e3e4e0007730 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,21 +1,21 @@ -{ fetchurl, stdenv, libiconv, libunistring, help2man }: +{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn }: with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-${version}"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; - sha256 = "1azfhz8zj1c27a5k2cspnkzkyfhcsqx2yc2sygh720dbn8l2imlc"; + sha256 = "1k88acdf242a6lbznr0h6f02frsqyqw4smw1nznibim5wyf18da3"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; patches = optional stdenv.isDarwin ./fix-error-darwin.patch; - buildInputs = [ libunistring ] + buildInputs = [ libunistring ronn ] ++ optionals stdenv.isDarwin [ libiconv help2man ]; meta = { |