diff options
Diffstat (limited to 'pkgs/development/libraries')
295 files changed, 2340 insertions, 1408 deletions
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 56701e80b1f3..961a0a7f5aab 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://www.libsdl.org/projects/SDL_image/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + license = licenses.zlib; }; } diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index d328d80d3898..887319062be9 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + license = licenses.zlib; }; } diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 0a71186cd4c7..0a7f02f17e59 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}: +{ stdenv, fetchurl +, imake, gccmakedep, bison, flex, pkgconfig +, xlibsWrapper, libXmu, libXpm, libXp }: stdenv.mkDerivation { name = "Xaw3d-1.6.3"; @@ -6,12 +8,13 @@ stdenv.mkDerivation { url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2; sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [imake gccmakedep libXpm libXp bison flex]; - propagatedBuildInputs = [xlibsWrapper libXmu]; + nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ]; + buildInputs = [ libXpm libXp ]; + propagatedBuildInputs = [ xlibsWrapper libXmu ]; - meta = { + meta = with stdenv.lib; { description = "3D widget set based on the Athena Widget set"; platforms = stdenv.lib.platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix index b90db614e4a1..9e28bfd4fe2c 100644 --- a/pkgs/development/libraries/aacskeys/default.nix +++ b/pkgs/development/libraries/aacskeys/default.nix @@ -38,9 +38,10 @@ stdenv.mkDerivation { install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName} ''; - meta = { + meta = with stdenv.lib; { homepage = http://forum.doom9.org/showthread.php?t=123311; description = "A library and program to retrieve decryption keys for HD discs"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.publicDomain; }; } diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 0209c41abee3..8b1878b0cc30 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; - configureFlags = "--without-x --with-ncurses=${ncurses.dev}"; + configureFlags = [ "--without-x" "--with-ncurses=${ncurses.dev}" ]; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index d1ddb17ba2fc..a1741513642f 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "0mzkyn7bjw3h8q22ajg765dflwxnsz6b20ql23gcbqkxfjvvdyyv"; + sha256 = "1vwhyk0lrpnn78xx212d16lf7vl2q6651wc8vxqbd296x6wbnh2y"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index b398af0db344..a1c466605228 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl -, autoreconfHook, python +, autoreconfHook, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ zlib curl expat fuse openssl python ]; + buildInputs = [ zlib curl expat fuse openssl python3 ]; meta = { homepage = http://afflib.sourceforge.net/; diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 331039ec329f..bd4270e8b935 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "0.15"; + version = "0.16"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "0c2vfib4fmljy98c3s3s7jmpjlqxvsbv7wf6qxr38kamwzbryrjj"; + sha256 = "0kqfx6742vbyyr8glqm5bkvj0z0y0dkaajlw10p3pzidrc17767r"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index ab3098580950..c0539aeed476 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib --enable-examples=no"; + configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" "--enable-examples=no" ]; # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o # libtool: error: cannot find the library 'libexamples.la' diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 3a0868ccecb4..48dfe9ad894e 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib , gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant -, sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42 +, sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42 , libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.9"; + name = "appstream-glib-0.7.10"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "10b32qw7iy0v1jvmf18wqgs8d1cpy52zm5rzw0wv421n90qiyidk"; + sha256 = "1m4gww09id7hwzh4hri1y3hp7p0mdrf6fk9f924r2w66hlsdil0d"; }; nativeBuildInputs = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gettext sqlite libsoup - gcab attr acl libuuid json-glib + attr acl libuuid json-glib libarchive gobjectIntrospection gperf ]; propagatedBuildInputs = [ gtk3 ]; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 61ee182ce627..5e4218852e51 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,36 +1,27 @@ { stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection -, pcre, itstool +, pcre, itstool, gperf, vala }: stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.11.8"; + version = "0.12.2"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "07vzz57g1p5byj2jfg17y5n3il0g07d9wkiynzwra71mcxar1p08"; + sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb"; }; - patches = [ - # drop this in version 0.11.9 and above - (fetchpatch { - name = "define-location-and-soname.patch"; - url = "https://github.com/ximion/appstream/commit/3e58f9c9.patch"; - sha256 = "1ffgbdfg80yq5vahjrvdd4f8xsp32ksm9vyasfmc7hzhx294s78w"; - }) - ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 - gobjectIntrospection itstool + gobjectIntrospection itstool vala ]; - buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ]; + buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ]; prePatch = '' substituteInPlace meson.build \ @@ -43,7 +34,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dapidocs=false" "-Ddocs=false" - "-Dgir=false" + "-Dvapi=true" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index beff83f2365b..c5a251cd5f9f 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "appstream-qt-${version}"; - inherit (appstream) version src patches prePatch; + inherit (appstream) version src prePatch; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index ecdeb35f6eda..7d7acf90a95c 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; + # This test needs the net + postPatch = '' + rm test/testsock.* + ''; + outputs = [ "out" "dev" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index ea70e6454536..bca519c76283 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arb"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = "${pname}"; rev = "${version}"; - sha256 = "1fl9gmxf6c1cphk5r8jbys5pywj2rfm705kv0055i0aqc6hrv303"; + sha256 = "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554"; }; buildInputs = [mpir gmp mpfr flint]; configureFlags = [ @@ -17,19 +17,11 @@ stdenv.mkDerivation rec { "--with-flint=${flint}" ]; doCheck = true; - patches = [ - # https://github.com/fredrik-johansson/arb/pull/210, included in next release - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/fredrik-johansson/arb/pull/210.patch"; - name = "return-exact-zero-where-possible.patch"; - sha256 = "01j9npnpmwh4dla9i05qdn606hy34gy9bz7c9bbsqm7az3n7pxjg"; - }) - ]; - meta = { + meta = with stdenv.lib; { inherit version; description = ''A library for arbitrary-precision interval arithmetic''; license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = with maintainers; [ raskin timokau ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/arb/git.nix b/pkgs/development/libraries/arb/git.nix index 87b884fece10..a281e2a085fe 100644 --- a/pkgs/development/libraries/arb/git.nix +++ b/pkgs/development/libraries/arb/git.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { rev = "10bc615ce5999caf4723444b2b1219b74781d8a4"; sha256 = "1xb40x3hv9nh76aizhskj5gdhalgn7r95a7zji2nn4ih3lmh40hl"; }; - buildInputs = [mpir gmp mpfr flint]; - configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-flint=${flint}"; + buildInputs = [ mpir gmp mpfr flint ]; + configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-flint=${flint}" ]; meta = { inherit version; description = ''A library for arbitrary-precision interval arithmetic''; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 952f7435c069..8e89aeb21a24 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy"; + sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll"; }; sourceRoot = "apache-arrow-${version}/cpp"; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 096ac80e5a70..d62e22fe0e00 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -109,110 +109,110 @@ in rec { ### Languages - ca = buildDict { + ca = buildDict rec { shortName = "ca-2.1.5-1"; fullName = "Catalan"; src = fetchurl { - url = mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2; + url = "mirror://gnu/aspell/dict/ca/aspell6-${shortName}.tar.bz2"; sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; }; }; - cs = buildDict { + cs = buildDict rec { shortName = "cs-20040614-1"; fullName = "Czech"; src = fetchurl { - url = mirror://gnu/aspell/dict/cs/aspell6-cs-20040614-1.tar.bz2; + url = "mirror://gnu/aspell/dict/cs/aspell6-${shortName}.tar.bz2"; sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; }; }; - da = buildDict { + da = buildDict rec { shortName = "da-1.4.42-1"; fullName = "Danish"; src = fetchurl { - url = mirror://gnu/aspell/dict/da/aspell5-da-1.4.42-1.tar.bz2; + url = "mirror://gnu/aspell/dict/da/aspell5-${shortName}.tar.bz2"; sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; }; }; - de = buildDict { + de = buildDict rec { shortName = "de-20030222-1"; fullName = "German"; src = fetchurl { - url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2; + url = "mirror://gnu/aspell/dict/de/aspell6-${shortName}.tar.bz2"; sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; }; - en = buildDict { + en = buildDict rec { shortName = "en-2016.06.26-0"; fullName = "English"; src = fetchurl { - url = mirror://gnu/aspell/dict/en/aspell6-en-2016.06.26-0.tar.bz2; + url = "mirror://gnu/aspell/dict/en/aspell6-${shortName}.tar.bz2"; sha256 = "1clzsfq2cbgp6wvfr2qwfsd2nziipml5m5vqm45r748wczlxihv1"; }; }; - es = buildDict { + es = buildDict rec { shortName = "es-1.11-2"; fullName = "Spanish"; src = fetchurl { - url = mirror://gnu/aspell/dict/es/aspell6-es-1.11-2.tar.bz2; + url = "mirror://gnu/aspell/dict/es/aspell6-${shortName}.tar.bz2"; sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; }; - eo = buildDict { + eo = buildDict rec { shortName = "eo-2.1.20000225a-2"; fullName = "Esperanto"; src = fetchurl { - url = mirror://gnu/aspell/dict/eo/aspell6-eo-2.1.20000225a-2.tar.bz2; + url = "mirror://gnu/aspell/dict/eo/aspell6-${shortName}.tar.bz2"; sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; }; }; - fr = buildDict { + fr = buildDict rec { shortName = "fr-0.50-3"; fullName = "French"; src = fetchurl { - url = mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2; + url = "mirror://gnu/aspell/dict/fr/aspell-${shortName}.tar.bz2"; sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; }; }; - it = buildDict { + it = buildDict rec { shortName = "it-2.2_20050523-0"; fullName = "Italian"; src = fetchurl { - url = mirror://gnu/aspell/dict/it/aspell6-it-2.2_20050523-0.tar.bz2; + url = "mirror://gnu/aspell/dict/it/aspell6-${shortName}.tar.bz2"; sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; }; - la = buildDict { + la = buildDict rec { shortName = "la-20020503-0"; fullName = "Latin"; src = fetchurl { - url = mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2; + url = "mirror://gnu/aspell/dict/la/aspell6-${shortName}.tar.bz2"; sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; }; - nb = buildDict { + nb = buildDict rec { shortName = "nb-0.50.1-0"; fullName = "Norwegian Bokmal"; src = fetchurl { - url = "mirror://gnu/aspell/dict/nb/aspell-nb-0.50.1-0.tar.bz2"; + url = "mirror://gnu/aspell/dict/nb/aspell-${shortName}.tar.bz2"; sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; }; }; - nl = buildDict { + nl = buildDict rec { shortName = "nl-0.50-2"; fullName = "Dutch"; src = fetchurl { - url = mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2; + url = "mirror://gnu/aspell/dict/nl/aspell-${shortName}.tar.bz2"; sha256 = "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4"; }; # Emacs expects a language called "nederlands". @@ -221,92 +221,92 @@ in rec { ''; }; - nn = buildDict { - shortName = "nn-0.50.1-0"; + nn = buildDict rec { + shortName = "nn-0.50.1-1"; fullName = "Norwegian Nynorsk"; src = fetchurl { - url = "mirror://gnu/aspell/dict/nn/aspell-nn-0.50.1-1.tar.bz2"; + url = "mirror://gnu/aspell/dict/nn/aspell-${shortName}.tar.bz2"; sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; }; }; - pl = buildDict { + pl = buildDict rec { shortName = "pl-6.0_20061121-0"; fullName = "Polish"; src = fetchurl { - url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2; + url = "mirror://gnu/aspell/dict/pl/aspell6-${shortName}.tar.bz2"; sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; }; - pt_BR = buildDict { - shortName = "pt_BR-20090702"; + pt_BR = buildDict rec { + shortName = "pt_BR-20090702-0"; fullName = "Brazilian Portuguese"; src = fetchurl { - url = mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20090702-0.tar.bz2; + url = "mirror://gnu/aspell/dict/pt_BR/aspell6-${shortName}.tar.bz2"; sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; }; }; - pt_PT = buildDict { - shortName = "pt_PT-20070510"; + pt_PT = buildDict rec { + shortName = "pt_PT-20070510-0"; fullName = "Portuguese"; src = fetchurl { - url = mirror://gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2; + url = "mirror://gnu/aspell/dict/pt_PT/aspell6-${shortName}.tar.bz2"; sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; }; }; - ro = buildDict { + ro = buildDict rec { shortName = "ro-3.3-2"; fullName = "Romanian"; src = fetchurl { - url = mirror://gnu/aspell/dict/ro/aspell5-ro-3.3-2.tar.bz2; + url = "mirror://gnu/aspell/dict/ro/aspell5-${shortName}.tar.bz2"; sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; }; }; - ru = buildDict { + ru = buildDict rec { shortName = "ru-0.99f7-1"; fullName = "Russian"; src = fetchurl { - url = mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2; + url = "mirror://gnu/aspell/dict/ru/aspell6-${shortName}.tar.bz2"; sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; }; - sv = buildDict { + sv = buildDict rec { shortName = "sv-0.51-0"; fullName = "Swedish"; src = fetchurl { - url = mirror://gnu/aspell/dict/sv/aspell-sv-0.51-0.tar.bz2; + url = "mirror://gnu/aspell/dict/sv/aspell-${shortName}.tar.bz2"; sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; }; }; - sk = buildDict { + sk = buildDict rec { shortName = "sk-2.01-2"; fullName = "Slovak"; src = fetchurl { - url = mirror://gnu/aspell/dict/sk/aspell6-sk-2.01-2.tar.bz2; + url = "mirror://gnu/aspell/dict/sk/aspell6-${shortName}.tar.bz2"; sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; }; }; - tr = buildDict { + tr = buildDict rec { shortName = "tr-0.50-0"; fullName = "Turkish"; src = fetchurl { - url = mirror://gnu/aspell/dict/tr/aspell-tr-0.50-0.tar.bz2; + url = "mirror://gnu/aspell/dict/tr/aspell-${shortName}.tar.bz2"; sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; }; }; - uk = buildDict { + uk = buildDict rec { shortName = "uk-1.4.0-0"; fullName = "Ukrainian"; src = fetchurl { - url = mirror://gnu/aspell/dict/uk/aspell6-uk-1.4.0-0.tar.bz2; + url = "mirror://gnu/aspell/dict/uk/aspell6-${shortName}.tar.bz2"; sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; }; }; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index a9652f4da3ee..f1db64cc9ea5 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -10,6 +10,7 @@ , dbus , glib , libxml2 +, fixDarwinDylibNames , gnome3 # To pass updateScript }: @@ -24,7 +25,9 @@ stdenv.mkDerivation rec { sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ] + # Fixup rpaths because of meson, remove with meson-0.47 + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; doCheck = false; # fails with "No test data file provided" diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 9bbde08023ba..d9251c2bdc5d 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -11,6 +11,7 @@ , libX11 , libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case , libXi +, fixDarwinDylibNames , gnome3 # To pass updateScript }: @@ -27,7 +28,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ] + # Fixup rpaths because of meson, remove with meson-0.47 + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ dbus glib libX11 libXtst libXi ]; doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 710c5b1a92cb..f28e374c852a 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lilv-${version}"; - version = "0.24.2"; + version = "0.24.4"; src = fetchurl { url = "https://download.drobilla.net/${name}.tar.bz2"; - sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p"; + sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 844028008b02..1e341d3124b4 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.52"; + name = "babl-0.1.56"; src = fetchurl { url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0v7pkr3qd5jnn0pra88d90ixkl5h9ngg6w660nn1cgh4zjh19xs0"; + sha256 = "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla"; }; doCheck = true; diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index a48de9a03f21..d7d6ef545163 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -6,10 +6,11 @@ stdenv.mkDerivation { url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz; sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8"; }; - buildInputs = [m4]; - configureFlags = "--disable-optimized --enable-static"; + buildInputs = [ m4 ]; + configureFlags = [ "--disable-optimized" "--enable-static" ]; meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix new file mode 100644 index 000000000000..081b105e2d20 --- /dev/null +++ b/pkgs/development/libraries/boost/1.68.nix @@ -0,0 +1,11 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, hostPlatform, buildPlatform, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.68_0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_68_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_68_0.html + sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7"; + }; +}) diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 00e236eba8c3..a8555a349d08 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; patches = [ ./gcc-4.3.3-fixes.patch ]; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3"; + configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ]; doCheck = true; meta = { diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 6f9b94fc872b..176245491179 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeTextDir }: +{ targetPlatform, stdenv, fetchurl, writeTextDir }: let self = stdenv.mkDerivation rec { @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"; }; + # ares_android.h header is missing + # see issue https://github.com/c-ares/c-ares/issues/216 + postPatch = if stdenv.hostPlatform.isAndroid then '' + cp ${fetchurl { + url = "https://raw.githubusercontent.com/c-ares/c-ares/cares-1_14_0/ares_android.h"; + sha256 = "1aw8y6r5c8zq6grjwf4mcm2jj35r5kgdklrp296214s1f1827ps8"; + }} ares_android.h + '' else null; + meta = with stdenv.lib; { description = "A C library for asynchronous DNS requests"; homepage = https://c-ares.haxx.se; @@ -27,12 +36,12 @@ stdenv.mkDerivation rec { set_target_properties(c-ares::cares PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${self}/include" - INTERFACE_LINK_LIBRARIES "nsl;rt" + ${stdenv.lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''} ) set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(c-ares::cares PROPERTIES - IMPORTED_LOCATION_RELEASE "${self}/lib/libcares.so.2.2.0" - IMPORTED_SONAME_RELEASE "libcares.so.2" + IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${targetPlatform.extensions.sharedLibrary}" + IMPORTED_SONAME_RELEASE "libcares${targetPlatform.extensions.sharedLibrary}" ) add_library(c-ares::cares_shared INTERFACE IMPORTED) set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 3793b70de4b5..c52d7c2756dc 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "c-blosc-${version}"; - version = "1.14.3"; + version = "1.14.4"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "051x2hh0yq1zhiyjmiarvc2radi59v03vzs2sa4hmgfhfaxcklld"; + sha256 = "195w96gl75mkxxqq6qjsmb2s1lq8z95qlc71fr5a7sckslcwglh0"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index ee56b50e1da5..68d34c75c010 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -1,55 +1,33 @@ { stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub , gmp , autoreconfHook +, texlive }: stdenv.mkDerivation rec { name = "cddlib-${version}"; - version = "0.94i"; - src = let - fileVersion = stdenv.lib.replaceStrings ["."] [""] version; - in fetchurl { - # Might switch to github in the future, see - # https://trac.sagemath.org/ticket/21952#comment:20 - urls = [ - "http://archive.ubuntu.com/ubuntu/pool/universe/c/cddlib/cddlib_${fileVersion}.orig.tar.gz" - "ftp://ftp.math.ethz.ch/users/fukudak/cdd/cddlib-${fileVersion}.tar.gz" - ]; - sha256 = "00zdgiqb91vx6gd2103h3ijij0llspsxc6zz3iw2bll39fvkl4xq"; + version = "0.94j"; + src = fetchFromGitHub { + owner = "cddlib"; + repo = "cddlib"; + rev = "${version}"; + sha256 = "1z03ljy3rrr0qq5gq54vynnif6fn0xhn05g90nnv0dpyc3ps8lzp"; }; buildInputs = [gmp]; nativeBuildInputs = [ autoreconfHook + texlive.combined.scheme-small # for building the documentation ]; - # compute reduced H and V representation of polytope - # this patch is included by most distributions (Debian, Conda, ArchLinux, SageMath) - # proposed upstream (no answer yet): https://github.com/cddlib/cddlib/pull/3 - both_reps_c = (fetchurl { - name = "cdd_both_reps.c"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/cddlib/files/cdd_both_reps.c?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; - sha256 = "0r9yc5bgiz8i72c6vsn2y2mjk5581iw94gji9v7lg16kzzgrk9x0"; - }); - preAutoreconf = '' - # Required by sage.geometry.polyhedron - cp ${both_reps_c} src/cdd_both_reps.c - cp ${both_reps_c} src-gmp/cdd_both_reps.c - ''; - patches = [ - # add the cdd_both_reps binary - (fetchpatch { - name = "add-cdd_both_reps-binary.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch?id=78e3a61a68c916450aa4e5ceecd20041583af901"; - sha256 = "162ni2fr7dpbdkz0b5nizxq7qr5k1i1d75g0smiylpzfb0hb761a"; - }) - ]; - meta = { + # No actual checks yet (2018-05-05), but maybe one day. + # Requested here: https://github.com/cddlib/cddlib/issues/25 + doCheck = true; + meta = with stdenv.lib; { inherit version; description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [raskin timokau]; + platforms = platforms.unix; homepage = https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html; }; } diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 32a4a574ed6c..d329b1945fc7 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation { buildInputs = [ pcre ]; - configureFlags = '' - --enable-namespace --enable-flexible-member - ''; + configureFlags = [ + "--enable-namespace" "--enable-flexible-member" + ]; meta = { homepage = http://www.cs.wisc.edu/condor/classad/; diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index cd1789a13bbd..fd4d8d5ca31b 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -10,7 +10,14 @@ stdenv.mkDerivation rec { PYTHON_SITE = "$(out)/site-packages"; - configureFlags = "--with-python=${python}/bin/python --disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp"; + configureFlags = [ + "--with-python=${python}/bin/python" + "--disable-apache" + "--disable-perl" + "--disable-ruby" + "--disable-java" + "--disable-csharp" + ]; preInstall = '' mkdir -p $out diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index 0ce0af97ec94..47037339d417 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-ppl-version.patch ]; - configureFlags = "--with-ppl=${ppl}"; + configureFlags = [ "--with-ppl=${ppl}" ]; preAutoreconf = '' touch NEWS ChangeLog AUTHORS diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 0ba9e1545fbf..0db253bbec26 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { $out/lib/libclucene-core.1.dylib ''; + doCheck = false; # fails with "Unable to find executable: /build/clucene-core-2.3.3.4/build/bin/cl_test" + meta = { description = "Core library for full-featured text search engine"; longDescription = '' diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix new file mode 100644 index 000000000000..9f4c4c3b6b36 --- /dev/null +++ b/pkgs/development/libraries/codec2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchsvn, cmake } : + +let + version = "0.8"; + +in stdenv.mkDerivation { + name = "codec2-${version}"; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}"; + sha256 = "0qbyaqdn37253s30n6m2ric8nfdsxhkslb9h572kdx18j2yjccki"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Speech codec designed for communications quality speech at low data rates"; + homepage = http://www.rowetel.com/blog/?page_id=452; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 0690bd425aec..3f8b2d896ac6 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"; }; - meta = { + meta = with stdenv.lib; { homepage = https://freedesktop.org/wiki/Software/cppunit/; description = "C++ unit testing framework"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.lgpl21; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index aa8b4231a869..b75f03fab7c7 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/cracklib/cracklib; description = "A library for checking the strength of passwords"; + license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 2d31f734166e..6cb003720bb1 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cutelyst-${version}"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1kfapd5dkyw02g3j4gshxl16b90xdf5vgfhqrkdzix072f7hy5sl"; + sha256 = "0iamavr5gj213c8knrh2mynhn8wcrv83x6s46jq93x93kc5127ks"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 606058da8545..ee646b24c81a 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = "--without-python"; + configureFlags = [ "--without-python" ]; prePatch = '' sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 051405811438..6190f6ddc52a 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus glib expat ]; - configureFlags = "--disable-ecore"; + configureFlags = [ "--disable-ecore" ]; meta = with stdenv.lib; { homepage = http://dbus-cplusplus.sourceforge.net; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index ade6c98df942..3ca2bdd9abef 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.12.8"; - sha256 = "1cvfi7jiby12h0f5gbysphhk99m6mch87ab3cqxkj0w36gkrkp72"; + version = "1.12.10"; + sha256 = "1xywijmgfad4m3cxp0b4l6kvypwc53ckmhwwzbrc6n32jwj3ssab"; self = stdenv.mkDerivation { name = "dbus-${version}"; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 5f70a7571bae..5cd004c8d136 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.8.0"; + version = "2.8.2"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "06rf6yzrszfqm74sq3485c7h6m0xjnz35sm31xkk70fxgk129fp0"; + sha256 = "0aki7llrdfj6273yjy8yv0d027sdbv8xs3iv68fb69s0clyygrin"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 62014489f30c..2a43cbe8ee53 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -16,7 +16,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20180710"; # upgrade might break the sage interface + version = "20180815"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -25,16 +25,8 @@ stdenv.mkDerivation rec { owner = "JohnCremona"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1kmwpw971sipb4499c9b35q5pz6sms5qndqrvq7396d8hhwjg1i2"; + sha256 = "12syn83lnzx0xc4r1v3glfimbzndyilkpdmx50xrihbjz1hzczif"; }; - patches = [ - # One of the headers doesn't get installed. - # See https://github.com/NixOS/nixpkgs/pull/43476. - (fetchpatch { - url = "https://github.com/JohnCremona/eclib/pull/42/commits/c9b96429815e31a6e3372c106e31eef2a96431f9.patch"; - sha256 = "0cw26h94m66rbh8jjsfnb1bvc6z7ybh8zcp8xl5nhxjxiawhcl73"; - }) - ]; buildInputs = [ pari ntl diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 7f5f19035179..c26a2a20a814 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,11 +1,15 @@ -{ stdenv, fetchurl, fetchpatch, zlib, expat, gettext }: +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, zlib, expat, gettext +, autoconf }: stdenv.mkDerivation rec { - name = "exiv2-0.26"; + name = "exiv2-0.26.2018.06.09"; - src = fetchurl { - url = "http://www.exiv2.org/builds/${name}-trunk.tar.gz"; - sha256 = "1yza317qxd8yshvqnay164imm0ks7cvij8y8j86p1gqi1153qpn7"; + #url = "http://www.exiv2.org/builds/${name}-trunk.tar.gz"; + src = fetchFromGitHub rec { + owner = "exiv2"; + repo = "exiv2"; + rev = "4aa57ad"; + sha256 = "1kblpxbi4wlb0l57xmr7g23zn9adjmfswhs6kcwmd7skwi2yivcd"; }; patches = [ @@ -16,25 +20,36 @@ stdenv.mkDerivation rec { + "/sha512/${sha512}/${patchname}"; sha512 = "3f9242dbd4bfa9dcdf8c9820243b13dc14990373a800c4ebb6cf7eac5653cfef" + "e6f2c47a94fbee4ed24f0d8c2842729d721f6100a2b215e0f663c89bfefe9e32"; - }) - (fetchpatch { - # many CVEs - see https://github.com/Exiv2/exiv2/pull/120 - url = "https://patch-diff.githubusercontent.com/raw/Exiv2/exiv2/pull/120.patch"; - sha256 = "1szl22xmh12hibzaqf2zi8zl377x841m52x4jm5lziw6j8g81sj8"; - excludes = [ "test/bugfixes-test.sh" ]; - }) + }) + # Two backports from master, submitted as https://github.com/Exiv2/exiv2/pull/398 + (fetchpatch { + name = "CVE-2018-12264.diff"; + url = "https://github.com/vcunat/exiv2/commit/fd18e853.diff"; + sha256 = "0y7ahh45lpaiazjnfllndfaa5pyixh6z4kcn2ywp7qy4ra7qpwdr"; + }) + (fetchpatch { + name = "CVE-2018-12265.diff"; + url = "https://github.com/vcunat/exiv2/commit/9ed1671bd4.diff"; + sha256 = "1cn446pfcgsh1bn9vxikkkcy1cqq7ghz2w291h1094ydqg6w7q6w"; + }) ]; postPatch = "patchShebangs ./src/svn_version.sh"; + preConfigure = "make config"; # needed because not using tarball + outputs = [ "out" "dev" ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ + gettext + autoconf # needed because not using tarball + ]; propagatedBuildInputs = [ zlib expat ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.exiv2.org/; description = "A library and command-line utility to manage image metadata"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 79b29a90463e..7e4d46c012dd 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "expat-2.2.5"; + name = "expat-2.2.6"; src = fetchurl { url = "mirror://sourceforge/expat/${name}.tar.bz2"; - sha256 = "1xpd78sp7m34jqrw5x13bz7kgz0n6aj15wn4zj4gfx3ypbpk5p6r"; + sha256 = "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index 05088df52105..bac867978f43 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { - version = "0.99.4"; + version = "0.99.8"; name = "fastjson-${version}"; src = fetchFromGitHub { repo = "libfastjson"; owner = "rsyslog"; - rev = "6e057a094cb225c9d80d8d6e6b1f36ca88a942dd"; - sha256 = "1pn207p9zns0aqm6z5l5fdgb94wyyhaw83lyvyfdxmai74nbqs65"; + rev = "v${version}"; + sha256 = "0qhs0g9slj3p0v2z4s3cnsx44msrlb4k78ljg7714qiziqbrbwyl"; }; buildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix index 5efa378ff5fa..eae0326c832f 100644 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/pkgs/development/libraries/fflas-ffpack/1.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ givaro_3_7 openblas gmpxx]; - configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}"; + configureFlags = [ + "--with-blas=-lopenblas" + "--with-gmp=${gmpxx.dev}" + "--with-givaro=${givaro_3_7}" + ]; meta = { inherit version; description = ''Finite Field Linear Algebra Subroutines''; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 5f99f35a1599..bf7630608f7d 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas , gmpxx , optimize ? false # impure }: @@ -6,23 +6,30 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fflas-ffpack"; version = "2.3.2"; + src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; rev = "v${version}"; sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl"; }; + checkInputs = [ gmpxx ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig ] ++ stdenv.lib.optionals doCheck checkInputs; - buildInputs = [ givaro openblas]; + + buildInputs = [ givaro blas ]; + configureFlags = [ - "--with-blas-libs=-lopenblas" - "--with-lapack-libs=-lopenblas" + "--with-blas-libs=-l${blas.linkName}" + "--with-lapack-libs=-l${blas.linkName}" ] ++ stdenv.lib.optionals (!optimize) [ # disable SIMD instructions (which are enabled *when available* by default) "--disable-sse" @@ -36,13 +43,15 @@ stdenv.mkDerivation rec { "--disable-fma" "--disable-fma4" ]; + doCheck = true; + meta = { inherit version; description = ''Finite Field Linear Algebra Subroutines''; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = https://linbox-team.github.io/fflas-ffpack/; }; } diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e763e5c1159c..4bb995ff0743 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -194,11 +194,11 @@ stdenv.mkDerivation rec { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = http://www.ffmpeg.org/; longDescription = '' - FFmpeg is the leading multimedia framework, able to decode, encode, transcode, - mux, demux, stream, filter and play pretty much anything that humans and machines - have created. It supports the most obscure ancient formats up to the cutting edge. - No matter if they were designed by some standards committee, the community or - a corporation. + FFmpeg is the leading multimedia framework, able to decode, encode, transcode, + mux, demux, stream, filter and play pretty much anything that humans and machines + have created. It supports the most obscure ancient formats up to the cutting edge. + No matter if they were designed by some standards committee, the community or + a corporation. ''; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 12b30cf0349f..bc5de5f9730f 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, lib, precision ? "double" }: +{ fetchurl, stdenv, lib, precision ? "double", perl }: with lib; @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + checkInputs = [ perl ]; + meta = with stdenv.lib; { description = "Fastest Fourier Transform in the West library"; homepage = http://www.fftw.org/; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 2b3f75b80dbd..d92a0c61aab8 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; # issues with ntl -- https://github.com/wbhart/flint2/issues/487 - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + NIX_CXXSTDLIB_COMPILE = [ "-std=c++11" ]; patches = [ (fetchpatch { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = ''Fast Library for Number Theory''; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://www.flintlib.org/; downloadPage = "http://www.flintlib.org/downloads.html"; updateWalker = true; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 2b6a949c2326..d188cb9810a7 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.07.09.00"; + version = "2018.08.13.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "08irwa2pb3f2gnk31rq31jjrqk2xxx0a0m72gf0bsv2w9fgn5sfm"; + sha256 = "1lhq3l7rirhi4vwgiym0r3rff1i69c7bdpi1hm8r4axs2dfjvxdr"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix index a2e5f69202c4..9aeb12344ece 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/default.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -38,4 +38,11 @@ stdenv.mkDerivation { cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms ''; + + meta = with stdenv.lib; { + description = "Font configuration files, patches, scripts and source packages (Infinality & friends)"; + homepage = https://github.com/bohoomil/fontconfig-ultimate; + license = licenses.mit; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 52d439918aa3..4f07316bd3f1 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.91"; + version = "1.00.94"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "04c344xdvh2j36r01ph7yhy5rb1668il0z9vyphwdy6qqwywh622"; + sha256 = "1r03ns0jp2sbbivys5bks376vbdqbnx8v764kjh74gpbajjmkksz"; }; buildInputs = [ diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 208d88ed18e3..08b0a87e3e20 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fribidi"; - version = "1.0.4"; + version = "1.0.5"; outputs = [ "out" "devdoc" ]; - # NOTE: 2018-06-06 v1.0.4: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. + # NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl"; + sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"; }; postPatch = '' diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index d0850128ebcc..100c00eea497 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook unzip ]; - meta = { + meta = with stdenv.lib; { description = "SyncML client sdk by Funambol project"; homepage = http://www.funambol.com; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.agpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 2af7bbce18bc..4cff22457403 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -14,7 +14,11 @@ stdenv.mkDerivation (rec { # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from # <sys/socket.h> with Glibc 2.9. - configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE"; + configureFlags = [ + "--disable-debug" + "--with-python=${python}" + "CPPFLAGS=-D_GNU_SOURCE" + ]; patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) @@ -30,6 +34,7 @@ stdenv.mkDerivation (rec { homepage = https://people.gnome.org/~veillard/gamin/; description = "A file and directory monitoring system"; maintainers = with maintainers; [ lovek323 ]; + license = licenses.gpl2; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0758d1252274..dc0ca5fffa3a 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig, meson, ninja, glibcLocales, git, vala, glib, zlib }: +{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig +, meson, ninja, glibcLocales, git, vala, glib, zlib +}: stdenv.mkDerivation rec { name = "gcab-${version}"; @@ -22,6 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; + license = licenses.lgpl21; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index 0a29ab6927f7..ef605d8702fa 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -46,22 +46,16 @@ stdenvNoLibs.mkDerivation rec { mkdir -p "$buildRoot/gcc" cd "$buildRoot/gcc" ( - export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD - export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD - export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD - export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD - export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD - export AS=$AS_FOR_BUILD export CC=$CC_FOR_BUILD export CPP=$CPP_FOR_BUILD export CXX=$CXX_FOR_BUILD export LD=$LD_FOR_BUILD - export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS - export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC - export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP - export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD + export AS_FOR_TARGET=$AS + export CC_FOR_TARGET=$CC + export CPP_FOR_TARGET=$CPP + export LD_FOR_TARGET=$LD export NIX_BUILD_CFLAGS_COMPILE+=' -DGENERATOR_FILE=1' @@ -87,23 +81,6 @@ stdenvNoLibs.mkDerivation rec { cd "$buildRoot/gcc/${hostPlatform.config}/libgcc" configureScript=$sourceRoot/configure chmod +x "$configureScript" - - export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD - export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD - export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD - export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD - export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD - - export AS=${stdenvNoLibs.cc}/bin/$AS - export CC=${stdenvNoLibs.cc}/bin/$CC - export CPP=${stdenvNoLibs.cc}/bin/$CPP - export CXX=${stdenvNoLibs.cc}/bin/$CXX - export LD=${stdenvNoLibs.cc.bintools}/bin/$LD - - export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS_FOR_TARGET - export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC_FOR_TARGET - export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP_FOR_TARGET - export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD_FOR_TARGET ''; gccConfigureFlags = [ diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 77fe948e003a..5ceded0546c5 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = false; # fails 2 tests + meta = with stdenv.lib; { homepage = https://libgd.github.io/; description = "A dynamic image creation library"; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 813ea0504653..f6d8cd6fa4c2 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,38 +1,29 @@ { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl -, libpng, sqlite, libspatialite, poppler, hdf4 +, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv -, netcdfSupport ? true, netcdf, hdf5 , curl +, netcdfSupport ? true, netcdf, hdf5, curl }: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.0"; name = "gdal-${version}"; + version = "2.3.1"; src = fetchurl { url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg"; + sha256 = "0nkjnznrp7dr41zsh8j923c9zpc3i5vj3wjfc2df9rrybb22ailw"; }; - patches = [ - # fix build with recent Poppler - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/124f0343436d1267319ac627fc220530091b41ea.diff"; - stripLen = 2; - extraPrefix = ""; - sha256 = "1v6iiy4cgrdcfas3iva5swh9446pqfjh5p6bcab6y49hyjhpsgfy"; - }) - ]; - buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite - libspatialite poppler hdf4 ] + libspatialite poppler hdf4 qhull giflib expat ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; configureFlags = [ + "--with-expat=${expat.dev}" "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) "--with-png=${libpng.dev}" # optional @@ -44,7 +35,7 @@ stdenv.mkDerivation rec { "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" "--with-python" # optional - "--with-static-proj4=${proj}" # optional + "--with-proj=${proj}" # optional "--with-geos=${geos}/bin/geos-config"# optional "--with-hdf4=${hdf4.dev}" # optional (if netcdfSupport then "--with-netcdf=${netcdf}" else "") diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 7d0b70ec627e..84d130c3865e 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -3,12 +3,12 @@ , libpng }: stdenv.mkDerivation rec { - version = "1.11.3"; name = "gdal-${version}"; + version = "1.11.5"; src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "561588bdfd9ca91919d4679a77a2b44214b158934ee8b425295ca5be33a1014d"; + url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl"; }; buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./python.patch ]; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" "fortify" ]; # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. @@ -51,11 +51,13 @@ stdenv.mkDerivation rec { export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir ''; + enableParallelBuilding = true; + meta = { description = "Translator library for raster geospatial data formats"; homepage = http://www.gdal.org/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 40e9b0ed90d5..a9b79dac7b88 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -34,6 +34,8 @@ in stdenv.mkDerivation rec { The Google Data APIs provide a simple protocol for reading and writing data on the web. ''; + + license = licenses.asl20; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index a1980d62490a..bbebcca6e2f0 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,11 +1,13 @@ { stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.15"; + name = "gdbm-1.17"; + # FIXME: remove on update to > 1.17 + NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "03nwsbixdp3nx3fzn3gjy0n7rcppmkkxb2nxbmd8mvb7gwhf7zgr"; + sha256 = "0zcp2iv5dbab18859a5fvacg8lkp8k4pr9af13kfvami6lpcrn3w"; }; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index a4eab462046c..cba31f45d557 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -26,14 +26,15 @@ stdenv.mkDerivation rec { buildInputs = [ cmake vtk ]; propagatedBuildInputs = [ ]; - meta = { + meta = with stdenv.lib; { description = "The grassroots cross-platform DICOM implementation"; longDescription = '' Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. ''; homepage = http://gdcm.sourceforge.net/; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ bsd3 asl20 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 94536f8f5b69..3fb50e98c1c8 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -116,6 +116,7 @@ stdenv.mkDerivation rec { description = "A library for image loading and manipulation"; homepage = http://library.gnome.org/devel/gdk-pixbuf/; maintainers = [ maintainers.eelco ]; + license = licenses.lgpl21; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 287c33243865..54ee7662d06e 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # needs fonts otherwise don't know how to pass them - configureFlags = "--disable-docs"; + configureFlags = [ "--disable-docs" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index f32bc120170c..c8b7b3b8eca5 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -3,18 +3,18 @@ , libwebp, gnome3, libintl }: let - version = "0.4.4"; + version = "0.4.8"; in stdenv.mkDerivation rec { name = "gegl-${version}"; + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; + src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "143qwn92xc5wm09p9iwrpw9y0ahha5lcyx1bb0lzwcb1fgd4bjzq"; + sha256 = "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i"; }; - # needs fonts otherwise, don't know how to pass them - configureFlags = [ "--disable-docs" ]; - enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index ccfa7e536111..e90cc257e7e8 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { })]; # needs fonts otherwise don't know how to pass them - configureFlags = "--disable-docs"; + configureFlags = [ "--disable-docs" ]; buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 2588d7f3d547..8417719b7063 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -7,17 +7,19 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "geoclue-${version}"; - version = "2.4.10"; + version = "2.4.12"; src = fetchurl { url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0h4n8jf7w457sglfdhghkyf8n4v4a5jrx8dgdy5zn35nbscx24l4"; + sha256 = "1jnad1f3rf8h05sz1lc172jnqdhqdpz76ff6m7i5ss3s0znf5l05"; }; outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig intltool gtk-doc docbook_xsl docbook_xml_dtd_412 wrapGAppsHook gobjectIntrospection + pkgconfig intltool wrapGAppsHook gobjectIntrospection + # devdoc + gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ @@ -41,11 +43,6 @@ stdenv.mkDerivation rec { "--disable-nmea-source" ]; - # https://gitlab.freedesktop.org/geoclue/geoclue/issues/73 - postInstall = '' - sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" - ''; - meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 83030a7a0142..c1b4c88aa479 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.6.2"; + name = "geos-3.6.3"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4"; + sha256 = "0jrypv61rbyp7vi9qpnnaiigjj8cgdqvyk8ymik8h1ppcw5am7mb"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 07db27dcc791..469dcbf75bbe 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Well integrated set of translation tools and documentation"; longDescription = '' @@ -76,8 +76,9 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gettext/; - maintainers = with lib.maintainers; [ zimbatm vrthra ]; - platforms = lib.platforms.all; + maintainers = with maintainers; [ zimbatm vrthra ]; + license = licenses.gpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 0d0fa0b2ca5d..a00e07376c7b 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -1,19 +1,33 @@ -{stdenv, fetchurl}: +{ stdenv +, lib +, fetchurl +, optimize ? false # impure hardware optimizations +}: stdenv.mkDerivation rec { name = "gf2x-${version}"; - version = "1.2"; + version = "1.2"; # remember to also update the url src = fetchurl { # find link to latest version (with file id) here: https://gforge.inria.fr/projects/gf2x/ - url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-1.2.tar.gz"; + # Requested a predictable link: + # https://gforge.inria.fr/tracker/index.php?func=detail&aid=21704&group_id=1874&atid=6982 + url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-${version}.tar.gz"; sha256 = "0d6vh1mxskvv3bxl6byp7gxxw3zzpkldrxnyajhnl05m0gx7yhk1"; }; - meta = with stdenv.lib; { + # no actual checks present yet (as of 1.2), but can't hurt trying + # for an indirect test, run ntl's test suite + doCheck = true; + + configureFlags = lib.optionals (!optimize) [ + "--disable-hardware-specific-code" + ]; + + meta = with lib; { description = ''Routines for fast arithmetic in GF(2)[x]''; homepage = http://gf2x.gforge.inria.fr; license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + maintainers = with maintainers; [ raskin timokau ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix index c70bda034871..941a7c27feaf 100644 --- a/pkgs/development/libraries/giflib/4.1.nix +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { + description = "A library for reading and writing gif images"; branch = "4.1"; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index 804da49fda93..b0a115eb4a51 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GIO API bindings"; + homepage = https://github.com/mono/gio-sharp; + license = licenses.mit; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/git2/0.27.nix b/pkgs/development/libraries/git2/0.27.nix index 8d9ff3cfe43c..bafd6be37df6 100644 --- a/pkgs/development/libraries/git2/0.27.nix +++ b/pkgs/development/libraries/git2/0.27.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.27.3"; + version = "0.27.4"; name = "libgit2-${version}"; src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "044dzwgl8zf1i1mk2g1z07hzxz46gma9sh63x09hswhw8j6zqx61"; + sha256 = "1cmc8ldhpyp62pswb7dmjjya3ng0ssaggcsxs1labvp6xyxjvp6s"; }; cmakeFlags = [ "-DTHREADSAFE=ON" ]; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 2da1a9ba2a64..48d595137b3d 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation (rec { name = "libgit2-${version}"; - version = "0.26.0"; + version = "0.26.6"; # keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "0zrrmfkfhd2xb4879z5khjb6xsdklrm01f1lscrs2ks68v25fk78"; + sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3"; }; cmakeFlags = [ "-DTHREADSAFE=ON" ]; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 3556acb0590d..0773daa2d09a 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -11,8 +11,12 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "199p8wyj5i63jbnk7j8qbdbfp5rm2lpmcxyk3mdjy9bz7ygx3hhy"; }; + + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool gmpxx]; + configureFlags = [ "--disable-optimization" ] ++ stdenv.lib.optionals (!optimize) [ @@ -28,12 +32,18 @@ stdenv.mkDerivation rec { "--disable-fma" "--disable-fma4" ]; - doCheck = true; + + # On darwin, tests are linked to dylib in the nix store, so we need to make + # sure tests run after installPhase. + doInstallCheck = true; + installCheckTarget = "check"; + doCheck = false; + meta = { inherit version; description = ''A C++ library for arithmetic and algebraic computations''; license = stdenv.lib.licenses.cecill-b; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 8a07a9f9f227..428b9ee482ec 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -3,9 +3,10 @@ # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null -# this is just for tests (not in closure of any regular package) -, coreutils, dbus, libxml2, tzdata, desktop-file-utils -, shared-mime-info, doCheck ? false +# this is just for tests (not in the closure of any regular package) +, doCheck ? stdenv.config.doCheckByDefault or false +, coreutils, dbus, libxml2, tzdata +, desktop-file-utils, shared-mime-info }: with stdenv.lib; @@ -66,8 +67,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; buildInputs = [ libelf setupHook pcre ] - ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount - ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; + ++ optionals stdenv.isLinux [ utillinuxMinimal ]; # for libmount nativeBuildInputs = [ pkgconfig perl python gettext ]; @@ -114,7 +114,8 @@ stdenv.mkDerivation rec { -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c ''; - inherit doCheck; + checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; + preCheck = optionalString doCheck '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" @@ -139,6 +140,8 @@ stdenv.mkDerivation rec { sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c ''; + inherit doCheck; + passthru = { gioModuleDir = "lib/gio/modules"; inherit flattenInclude; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 3c3b49e66161..ee77f4b498e4 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib libsigcxx ]; enableParallelBuilding = true; - #doCheck = true; # some tests need network + + doCheck = false; # fails. one test needs the net, another /etc/fstab meta = with stdenv.lib; { description = "C++ interface to the GLib library"; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 93e94fc8c42b..b030eab7c3ad 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, perl }: stdenv.mkDerivation rec { name = "glog-${version}"; @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + checkInputs = [ perl ]; + doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm" + meta = with stdenv.lib; { homepage = https://github.com/google/glog; license = licenses.bsd3; diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index 7d5eeb29997b..b25f5c90bfae 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, libgpgerror, gobjectIntrospection }: stdenv.mkDerivation rec { version = "2.6.23"; @@ -15,6 +15,17 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib zlib libgpgerror ]; configureFlags = [ "--enable-introspection=yes" ]; + postPatch = '' + substituteInPlace tests/testsuite.c \ + --replace /bin/rm rm \ + --replace /bin/mkdir mkdir + + substituteInPlace tests/test-pkcs7.c \ + --replace /bin/mkdir mkdir + ''; + + checkInputs = [ gnupg ]; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 124fc08cf3bd..65c99610a5c7 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, gpgme, libidn, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn, gobjectIntrospection }: stdenv.mkDerivation rec { version = "3.2.0"; @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; configureFlags = [ "--enable-introspection=yes" ]; + postPatch = '' + substituteInPlace tests/testsuite.c \ + --replace /bin/rm rm + ''; + + checkInputs = [ gnupg ]; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index 36067cc0786d..939f769b4570 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -27,8 +27,12 @@ let self = stdenv.mkDerivation rec { then "ln -sf configfsf.guess config.guess" else ''echo "Darwin host is `./config.guess`."''; - configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") + - stdenv.lib.optionalString stdenv.isDarwin " ac_cv_build=x86_64-apple-darwin13.4.0 ac_cv_host=x86_64-apple-darwin13.4.0"; + configureFlags = [ + (stdenv.lib.enableFeature cxx "cxx") + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "ac_cv_build=x86_64-apple-darwin13.4.0" + "ac_cv_host=x86_64-apple-darwin13.4.0" + ]; # The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8. # Newer versions of GMP don't have that issue anymore. diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 57204776decd..3b9fbc35a768 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -20,18 +20,17 @@ let self = stdenv.mkDerivation rec { patches = if stdenv.isDarwin then [ ./need-size-t.patch ] else null; - configureFlags = + configureFlags = [ + "--with-pic" + (stdenv.lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". # See <http://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like - optional (!stdenv.isSunOS) "--enable-fat" - ++ (if cxx then [ "--enable-cxx" ] - else [ "--disable-cxx" ]) - ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" - ++ optional stdenv.isDarwin "ABI=64" - ++ optional stdenv.is64bit "--with-pic" + (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" + ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" ; # The config.guess in GMP tries to runtime-detect various diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index f62883529fc9..04c57d94666f 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -21,18 +21,17 @@ let self = stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ m4 ]; - configureFlags = + configureFlags = [ + "--with-pic" + (stdenv.lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". # See <http://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like - optional (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "--enable-fat" - ++ (if cxx then [ "--enable-cxx" ] - else [ "--disable-cxx" ]) - ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" + (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" - ++ optional stdenv.is64bit "--with-pic" ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly" ; diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index c9431420194a..0b2fb9fef6c3 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A network library, written in C, object-oriented, and built upon GLib"; homepage = https://developer.gnome.org/gnet/; + license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index e7da60a9d1a2..b3b00a1c7226 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + checkInputs = [ which ]; + + doCheck = false; # fails 8 out of 26 tests with "GPGME: Decryption failed". Spooky! + meta = with stdenv.lib; { homepage = https://gnupg.org/software/gpgme/index.html; description = "Library for making GnuPG easier to use"; diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 8243775c6bc1..b8f35c8539ac 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { name = "granite-${version}"; - version = "0.5"; + version = "5.0"; src = fetchFromGitHub { owner = "elementary"; repo = "granite"; rev = version; - sha256 = "15l8z1jkqhvappnr8jww27lfy3dwqybgsxk5iccyvnvzpjdh2s0h"; + sha256 = "015hkclcxirssg7a8s6mkns5xdk77m1jnkshlyfdw041nzyc5jh1"; }; cmakeFlags = [ @@ -17,18 +17,18 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - vala - pkgconfig cmake - ninja - perl gettext gobjectIntrospection + ninja + perl + pkgconfig + vala_0_40 ]; buildInputs = [ glib - gtk3 gnome3.libgee + gtk3 ]; meta = with stdenv.lib; { @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/elementary/granite; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = [ maintainers.vozz ]; + maintainers = with maintainers; [ vozz worldofpeace ]; }; } diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index fc1f186a219e..7f680b6b59bf 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; + cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package" @@ -16,11 +17,19 @@ stdenv.mkDerivation rec { "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" ]; + + # CMake creates a build directory by default, this conflicts with the + # basel BUILD file on case-insensitive filesystems. + preConfigure = '' + rm -vf BUILD + ''; + enableParallelBuilds = true; meta = with stdenv.lib; { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; + maintainers = [ maintainers.lnl7 ]; homepage = https://grpc.io/; }; } diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 9c19bdbdc29a..71da2c716f84 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libidn kerberos ]; - configureFlags = "--with-gssapi-impl=mit"; + configureFlags = [ "--with-gssapi-impl=mit" ]; doCheck = true; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 49216b70fe12..dd4007bd142b 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = false; # fails, wants DRI access for OpenGL + patches = [ (fetchpatch { url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370414"; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index ad7309be0445..99d27523b1c9 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -54,4 +54,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; + # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" + doCheck = false; + } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 95b394a6d4b7..9c9243a1c683 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Upstream strongly recommends against using --with-system-ffmpeg, # but we do it anyway because we're so hardcore (and we don't want # multiple copies of ffmpeg). - configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg"; + configureFlags = stdenv.lib.optional (!useInternalFfmpeg) "--with-system-ffmpeg"; buildInputs = [ pkgconfig bzip2 gst-plugins-base orc ] diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 9c47ef0260b4..7ecb6c34b432 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -36,6 +36,9 @@ stdenv.mkDerivation rec { --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" ''; + # fails 1 out of 65 tests with "Could not read TLS certificate from '../../tests/files/test-cert.pem': TLS support is not available" + doCheck = false; + meta = { homepage = https://gstreamer.freedesktop.org; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index e46ecfb76127..d4d4082509e4 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -17,18 +17,21 @@ stdenv.mkDerivation rec { buildInputs = [ perl bison flex ]; propagatedBuildInputs = [ glib libxml2 ]; - patchPhase = '' + # See https://trac.macports.org/ticket/40783 for explanation of patch + patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + + postPatch = '' sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in - '' - + stdenv.lib.optionalString stdenv.isDarwin '' - # Applying this patch manually to avoid a rebuild on Linux. Feel free to refactor later - # See https://trac.macports.org/ticket/40783 for explanation of patch - patch -p1 < ${./darwin.patch} ''; - configureFlags = '' - --disable-examples --enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook - ''; + configureFlags = [ + "--disable-examples" + "--localstatedir=/var" + "--disable-gtk-doc" + "--disable-docbook" + ]; + + doCheck = false; # fails. 2 tests crash postInstall = '' # Hm, apparently --disable-gtk-doc is ignored... diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index a384e46fb147..4bf42e1b5b65 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -2,7 +2,7 @@ , gdk_pixbuf, xlibsWrapper, gobjectIntrospection , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null -, gdktarget ? "x11" +, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch }: diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 21f9adfdc8e3..27052d1922f6 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection -, xorg, epoxy, json-glib, libxkbcommon, gmp +, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3 +, x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null -, darwin, gnome3 +, AppKit, Cocoa }: assert cupsSupport -> cups != null; @@ -36,12 +37,13 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ libxkbcommon epoxy json-glib ]; + buildInputs = [ libxkbcommon epoxy json-glib ] + ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] + ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; #TODO: colord? @@ -55,9 +57,9 @@ stdenv.mkDerivation rec { "--disable-debug" "--disable-dependency-tracking" "--disable-glibtest" - "--with-gdktarget=quartz" + ] ++ optional (stdenv.isDarwin && !x11Support) "--enable-quartz-backend" - ] ++ optional stdenv.isLinux [ + ++ optional x11Support [ "--enable-x11-backend" ] ++ optional waylandSupport [ "--enable-wayland-backend" diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index a0160a8440da..383f7f60f9bf 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. +, ApplicationServices, CoreText +, withCoreText ? false , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it +, python }: let - version = "1.8.2"; + version = "1.8.8"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,23 +17,35 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "0my6m9aqv4a8fc2pjwqx9pfdfh3a9mqvas4si4psi1b1867zi8y8"; + sha256 = "1ag3scnm1fcviqgx2p4858y433mr0ndqw6zccnccrqcr9mpcird8"; }; + postPatch = '' + patchShebangs src/gen-def.py + patchShebangs test + ''; + outputs = [ "out" "dev" ]; outputBin = "dev"; configureFlags = [ - ( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default - ( "--with-icu=" + (if withIcu then "yes" else "no") ) - ]; + # not auto-detected by default + "--with-graphite2=${if withGraphite2 then "yes" else "no"}" + "--with-icu=${if withIcu then "yes" else "no"}" + ] + ++ stdenv.lib.optional withCoreText "--with-coretext=yes"; nativeBuildInputs = [ pkgconfig libintl ]; - buildInputs = [ glib freetype cairo ]; # recommended by upstream + + buildInputs = [ glib freetype cairo ] # recommended by upstream + ++ stdenv.lib.optionals withCoreText [ ApplicationServices CoreText ]; + propagatedBuildInputs = [] ++ optional withGraphite2 graphite2 - ++ optionals withIcu [ icu harfbuzz ] - ; + ++ optionals withIcu [ icu harfbuzz ]; + + checkInputs = [ python ]; + doInstallCheck = false; # fails, probably a bug # Slightly hacky; some pkgs expect them in a single directory. postInstall = optionalString withIcu '' diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index ecbfbb7da0b8..b3914a4438b3 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + patchShebangs tests + ''; + autoreconfFlags = "-vfi"; configureFlags = [ "--with-ui" "--with-readline" ]; diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 705fb816b2e5..b8ad48326b2b 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -36,9 +36,9 @@ let sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; - configureFlags = "--disable-debug" + - stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath" + - stdenv.lib.optionalString (buildPlatform != hostPlatform) " --with-cross-build=${nativeBuildRoot}"; + configureFlags = [ "--disable-debug" ] + ++ stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath" + ++ stdenv.lib.optional (buildPlatform != hostPlatform) "--with-cross-build=${nativeBuildRoot}"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index 0213148d6930..99f6df9c5f06 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -14,9 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ directfb libsigcxx libxml2 fontconfig ]; - configureFlags = '' - --enable-log-debug --enable-debug --enable-trace --with-examples - ''; + configureFlags = [ + "--enable-log-debug" + "--enable-debug" + "--enable-trace" + "--with-examples" + ]; meta = with stdenv.lib; { description = "Lightweight C++ GUI toolkit for embedded Linux systems"; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 624e401b62f7..2b95742c44c0 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -7,10 +7,11 @@ stdenv.mkDerivation { sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; - configureFlags = " - --disable-shm - --x-includes=${libX11.dev}/include - --x-libraries=${libX11.out}/lib"; + configureFlags = [ + "--disable-shm" + "--x-includes=${libX11.dev}/include" + "--x-libraries=${libX11.out}/lib" + ]; buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 3d7c20691ab5..023572976351 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -1,39 +1,30 @@ -{ stdenv, fetchurl, lib, file -, pkgconfig, autoconf +{ stdenv, fetchbzr +, pkgconfig, systemd, autoreconfHook , glib, dbus-glib, json-glib , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: -with lib; - stdenv.mkDerivation rec { - name = "indicator-application-gtk3-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "12.10"; - versionMinor = "0"; - - src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/indicator-application-${version}.tar.gz"; - sha256 = "1z8ar0k47l4his7zvffbc2kn658nid51svqnfv0dms601w53gbpr"; + pname = "indicator-application"; + version = "12.10.1"; + + name = "${pname}-gtk3-${version}"; + + src = fetchbzr { + url = "https://code.launchpad.net/~indicator-applet-developers/${pname}/trunk.17.04"; + rev = "260"; + sha256 = "1f0jdyqqb5g86zdpbcyn16x94yjigsfiv2kf73dvni5rp1vafbq1"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - glib dbus-glib json-glib + glib dbus-glib json-glib systemd gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3 ]; postPatch = '' - substituteInPlace configure.ac \ - --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \ - "DBUSSERVICEDIR=$out/share/dbus-1/services" - autoconf - for f in {configure,ltmain.sh,m4/libtool.m4}; do - substituteInPlace $f \ - --replace /usr/bin/file ${file}/bin/file - done - substituteInPlace src/Makefile.in \ - --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib" + substituteInPlace data/Makefile.am \ + --replace "/etc/xdg/autostart" "$out/etc/xdg/autostart" ''; configureFlags = [ @@ -47,7 +38,16 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = { + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user"; + PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR = "$(out)/lib/indicators3/7/"; + + # Upstart is not used in NixOS + postFixup = '' + rm -rf $out/share/indicator-application/upstart + rm -rf $out/share/upstart + ''; + + meta = with stdenv.lib; { description = "Indicator to take menus from applications and place them in the panel"; homepage = https://launchpad.net/indicator-application; license = licenses.gpl3; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index bc18a13884b5..de4848c7dda4 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ libjpeg ]; - configureFlags = "--enable-shared"; + configureFlags = [ "--enable-shared" ]; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index c39478e590dd..e28925c65bb2 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index b9dcc927172f..cc838be0f4f0 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, python }: stdenv.mkDerivation rec { name = "jbig2dec-0.14"; @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0k01hp0q4275fj4rbr1gy64svfraw5w7wvwl08yjhvsnpb1rid11"; }; + postPatch = '' + patchShebangs test_jbig2dec.py + ''; + + checkInputs = [ python ]; + doCheck = false; # fails 1 of 4 tests + meta = { homepage = https://www.ghostscript.com/jbig2dec.html; description = "Decoder implementation of the JBIG2 image compression format"; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 1d389f914ddf..48f009f8d3e0 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.48/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.49/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 1ad2254ccf89..4f866974b61b 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,627 +3,627 @@ { attica = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/attica-5.48.0.tar.xz"; - sha256 = "1q2133gmhfi3wd9978556syzzqc1s6zgjc0p1353w6dmfwxfyzq8"; - name = "attica-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/attica-5.49.0.tar.xz"; + sha256 = "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn"; + name = "attica-5.49.0.tar.xz"; }; }; baloo = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/baloo-5.48.0.tar.xz"; - sha256 = "0rgz2gx99c1k8vgfskx7w6q1sjf98wcvybv88djdlj2s6h2qn8lj"; - name = "baloo-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/baloo-5.49.0.tar.xz"; + sha256 = "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph"; + name = "baloo-5.49.0.tar.xz"; }; }; bluez-qt = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz"; - sha256 = "149px5gnplk0y7cl3cz258qks3rq5p0kkk9rc48y59zvlxiyy949"; - name = "bluez-qt-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/bluez-qt-5.49.0.tar.xz"; + sha256 = "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard"; + name = "bluez-qt-5.49.0.tar.xz"; }; }; breeze-icons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/breeze-icons-5.48.0.tar.xz"; - sha256 = "1p0krrxfz6p0qhy79lnjyi0xsrprw1q4z65xah89kj0wmfriiyqh"; - name = "breeze-icons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/breeze-icons-5.49.0.tar.xz"; + sha256 = "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph"; + name = "breeze-icons-5.49.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/extra-cmake-modules-5.48.0.tar.xz"; - sha256 = "1675xnc9hv8z8gp95ici2zqmbv7i6f65g0kln4fskxmlxnfplnzw"; - name = "extra-cmake-modules-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/extra-cmake-modules-5.49.0.tar.xz"; + sha256 = "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0"; + name = "extra-cmake-modules-5.49.0.tar.xz"; }; }; frameworkintegration = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/frameworkintegration-5.48.0.tar.xz"; - sha256 = "1na913ndc55nlmfc61122b1p29h4prxnpc5pqvh6drsgfyacnm8y"; - name = "frameworkintegration-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/frameworkintegration-5.49.0.tar.xz"; + sha256 = "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx"; + name = "frameworkintegration-5.49.0.tar.xz"; }; }; kactivities = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kactivities-5.48.0.tar.xz"; - sha256 = "1zxdzwz8j43hh8d7v1qfihf95kwxvsbqki0zgdhlnj7s0xds0yz8"; - name = "kactivities-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kactivities-5.49.0.tar.xz"; + sha256 = "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim"; + name = "kactivities-5.49.0.tar.xz"; }; }; kactivities-stats = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kactivities-stats-5.48.0.tar.xz"; - sha256 = "11r61qnrjpc4ls18apb4a13j1lizjq48bxfw3f8p8hjxxxh8z0j6"; - name = "kactivities-stats-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kactivities-stats-5.49.0.tar.xz"; + sha256 = "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f"; + name = "kactivities-stats-5.49.0.tar.xz"; }; }; kapidox = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kapidox-5.48.0.tar.xz"; - sha256 = "1b22np0lygnm2r2q1anh0f4b7dh2h0lccx767g4r2w0fw5r1bbb4"; - name = "kapidox-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kapidox-5.49.0.tar.xz"; + sha256 = "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559"; + name = "kapidox-5.49.0.tar.xz"; }; }; karchive = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/karchive-5.48.0.tar.xz"; - sha256 = "10qbx8k1yqqfp1pq5yj8ln3gpj2wnfnlln99gczf99f51fqd65p6"; - name = "karchive-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/karchive-5.49.0.tar.xz"; + sha256 = "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0"; + name = "karchive-5.49.0.tar.xz"; }; }; kauth = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kauth-5.48.0.tar.xz"; - sha256 = "00mpbs24dm9ycabpcm2wwlv1vdq4dq5qr2zw6bbqpgj3jplakbs7"; - name = "kauth-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kauth-5.49.0.tar.xz"; + sha256 = "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8"; + name = "kauth-5.49.0.tar.xz"; }; }; kbookmarks = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kbookmarks-5.48.0.tar.xz"; - sha256 = "11ics7gbdkx1f0pxryf2xwjq4fyqh6a3gzcizymm1m7gmygggqar"; - name = "kbookmarks-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kbookmarks-5.49.0.tar.xz"; + sha256 = "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53"; + name = "kbookmarks-5.49.0.tar.xz"; }; }; kcmutils = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcmutils-5.48.0.tar.xz"; - sha256 = "0nvlzvv2gmc2hz11w6bixz4mccnj09g69byrnvsrwh0psf1kqlmw"; - name = "kcmutils-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcmutils-5.49.0.tar.xz"; + sha256 = "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q"; + name = "kcmutils-5.49.0.tar.xz"; }; }; kcodecs = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcodecs-5.48.0.tar.xz"; - sha256 = "1pz0s3krb4vv01hvpjdr5ngnw1ndxgsfln944fm9pfj0pmk7p92n"; - name = "kcodecs-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcodecs-5.49.0.tar.xz"; + sha256 = "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz"; + name = "kcodecs-5.49.0.tar.xz"; }; }; kcompletion = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcompletion-5.48.0.tar.xz"; - sha256 = "129mmh46y0r6dcnbxf5yswsr48qj5l25n930nlx7wzaav28y55lp"; - name = "kcompletion-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcompletion-5.49.0.tar.xz"; + sha256 = "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi"; + name = "kcompletion-5.49.0.tar.xz"; }; }; kconfig = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kconfig-5.48.0.tar.xz"; - sha256 = "1g640cnd9j2jp35bb5zgjfxskbg3fj9p03r0yf3dkm1d1681x9a3"; - name = "kconfig-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kconfig-5.49.0.tar.xz"; + sha256 = "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf"; + name = "kconfig-5.49.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kconfigwidgets-5.48.0.tar.xz"; - sha256 = "0xlnbw34zbmy7fwsi9iks4iv7shki4fqs7wd3yblmyxa2l18ldh9"; - name = "kconfigwidgets-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kconfigwidgets-5.49.0.tar.xz"; + sha256 = "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz"; + name = "kconfigwidgets-5.49.0.tar.xz"; }; }; kcoreaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcoreaddons-5.48.0.tar.xz"; - sha256 = "157k4l67iswny5krinfigfc6pabqfyfzya6hc5gcjrdplmnccy1f"; - name = "kcoreaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcoreaddons-5.49.0.tar.xz"; + sha256 = "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj"; + name = "kcoreaddons-5.49.0.tar.xz"; }; }; kcrash = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcrash-5.48.0.tar.xz"; - sha256 = "0qqwdx7piz4wfm4lh41kknfcyw5saw17qh07ghhi7j80whpkazk8"; - name = "kcrash-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcrash-5.49.0.tar.xz"; + sha256 = "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3"; + name = "kcrash-5.49.0.tar.xz"; }; }; kdbusaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdbusaddons-5.48.0.tar.xz"; - sha256 = "0vpd4cij52v43fsifbk3nnmi5csik8h4avima6jw0b09s8xdz8rr"; - name = "kdbusaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdbusaddons-5.49.0.tar.xz"; + sha256 = "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh"; + name = "kdbusaddons-5.49.0.tar.xz"; }; }; kdeclarative = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdeclarative-5.48.0.tar.xz"; - sha256 = "09nfp6vrj6dc3kfknicr8629ifz976wi4wxdh5bfx15z9296l8pd"; - name = "kdeclarative-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdeclarative-5.49.0.tar.xz"; + sha256 = "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9"; + name = "kdeclarative-5.49.0.tar.xz"; }; }; kded = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kded-5.48.0.tar.xz"; - sha256 = "13527iv6cf44wgxpqfhmkhryihjfi02fi78lf2bnvgwmhd2nl954"; - name = "kded-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kded-5.49.0.tar.xz"; + sha256 = "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc"; + name = "kded-5.49.0.tar.xz"; }; }; kdelibs4support = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kdelibs4support-5.48.0.tar.xz"; - sha256 = "058s5h6sfhi1i3pa59hwpyxzd01jgpb8r68nnbphmryimi5nazqf"; - name = "kdelibs4support-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kdelibs4support-5.49.0.tar.xz"; + sha256 = "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi"; + name = "kdelibs4support-5.49.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdesignerplugin-5.48.0.tar.xz"; - sha256 = "1kswvxgjpyi1p1kg4z5x5df8yqhrwhcpavzx4a83dg6hp5xk0l2l"; - name = "kdesignerplugin-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdesignerplugin-5.49.0.tar.xz"; + sha256 = "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd"; + name = "kdesignerplugin-5.49.0.tar.xz"; }; }; kdesu = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdesu-5.48.0.tar.xz"; - sha256 = "14ka3h06xbfv357z29zgbwnjcfwspi42f0fm3m7lszqhz9skj4v5"; - name = "kdesu-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdesu-5.49.0.tar.xz"; + sha256 = "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k"; + name = "kdesu-5.49.0.tar.xz"; }; }; kdewebkit = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdewebkit-5.48.0.tar.xz"; - sha256 = "0wf2prv85sayz1mqq0ymrqw3p0f3ikakhgzy01pixrp7qgwqkkrv"; - name = "kdewebkit-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdewebkit-5.49.0.tar.xz"; + sha256 = "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n"; + name = "kdewebkit-5.49.0.tar.xz"; }; }; kdnssd = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdnssd-5.48.0.tar.xz"; - sha256 = "01hra59b0sm82j7ry78f3clrypc80q59vx9h0ahacbab4pzq41p5"; - name = "kdnssd-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdnssd-5.49.0.tar.xz"; + sha256 = "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr"; + name = "kdnssd-5.49.0.tar.xz"; }; }; kdoctools = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdoctools-5.48.0.tar.xz"; - sha256 = "0v8x198kfgz2p56nyy9cb6lks5yazdbdg55c4ps5bw36dbmpd3v8"; - name = "kdoctools-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdoctools-5.49.0.tar.xz"; + sha256 = "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl"; + name = "kdoctools-5.49.0.tar.xz"; }; }; kemoticons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kemoticons-5.48.0.tar.xz"; - sha256 = "166sjwrn9dm4km8sypdwcfsylcamhl1gfl28h8hrv498zhnyrfb9"; - name = "kemoticons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kemoticons-5.49.0.tar.xz"; + sha256 = "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn"; + name = "kemoticons-5.49.0.tar.xz"; }; }; kfilemetadata = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kfilemetadata-5.48.0.tar.xz"; - sha256 = "0krn53a2s950fb980gdap5hwf994kxfd4h8zk7a4s9cick957z5f"; - name = "kfilemetadata-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kfilemetadata-5.49.0.tar.xz"; + sha256 = "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80"; + name = "kfilemetadata-5.49.0.tar.xz"; }; }; kglobalaccel = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kglobalaccel-5.48.0.tar.xz"; - sha256 = "15dlpm69d38bsgl6hc7f1mjjq8qyxac010whx4rcsk4vsrwdfnm7"; - name = "kglobalaccel-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kglobalaccel-5.49.0.tar.xz"; + sha256 = "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl"; + name = "kglobalaccel-5.49.0.tar.xz"; }; }; kguiaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kguiaddons-5.48.0.tar.xz"; - sha256 = "0viqq9qg448fh12isc1kkmzcnnsjqw5fx4wlshyza19gfr4ym0dz"; - name = "kguiaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kguiaddons-5.49.0.tar.xz"; + sha256 = "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk"; + name = "kguiaddons-5.49.0.tar.xz"; }; }; kholidays = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kholidays-5.48.0.tar.xz"; - sha256 = "04vjp2jm2c6qgj50jbqkkgqh8b759pd4dpsczfkyq30p03vybxr4"; - name = "kholidays-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kholidays-5.49.0.tar.xz"; + sha256 = "0yc4i4qsk3w1v0andw737ps1ad70696q140k0ycfhk6qmv1wvsdp"; + name = "kholidays-5.49.0.tar.xz"; }; }; khtml = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/khtml-5.48.0.tar.xz"; - sha256 = "1zrilnvvvvjq82hm6gbh5pvzfygy8w7a0140d3l74jjgy01394m1"; - name = "khtml-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/khtml-5.49.0.tar.xz"; + sha256 = "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64"; + name = "khtml-5.49.0.tar.xz"; }; }; ki18n = { - version = "5.48.1"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/ki18n-5.48.1.tar.xz"; - sha256 = "0m9x6bagviqrnm0hx7ykggqiykxv3qi11bmi0xz2f02y78q89f3h"; - name = "ki18n-5.48.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/ki18n-5.49.0.tar.xz"; + sha256 = "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz"; + name = "ki18n-5.49.0.tar.xz"; }; }; kiconthemes = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kiconthemes-5.48.0.tar.xz"; - sha256 = "1xqbg10qlk1zdha4kfyya1471r35gnz63iyj0ks3gzyfjvbivpy4"; - name = "kiconthemes-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kiconthemes-5.49.0.tar.xz"; + sha256 = "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m"; + name = "kiconthemes-5.49.0.tar.xz"; }; }; kidletime = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kidletime-5.48.0.tar.xz"; - sha256 = "184b1qdh4bwsdg9lyl4d8rcs833fqcmfvbb5qmdd3mqvvg8xv9mm"; - name = "kidletime-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kidletime-5.49.0.tar.xz"; + sha256 = "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv"; + name = "kidletime-5.49.0.tar.xz"; }; }; kimageformats = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kimageformats-5.48.0.tar.xz"; - sha256 = "1myxp583gw5d50ddkkv6ipbdzf6k3sdk9gambklay1dzmy4b91sc"; - name = "kimageformats-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kimageformats-5.49.0.tar.xz"; + sha256 = "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4"; + name = "kimageformats-5.49.0.tar.xz"; }; }; kinit = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kinit-5.48.0.tar.xz"; - sha256 = "08sf3j1bpxzqjim777d6znn8f7rzs5vpm4wz21s1ng3f32z2km9a"; - name = "kinit-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kinit-5.49.0.tar.xz"; + sha256 = "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95"; + name = "kinit-5.49.0.tar.xz"; }; }; kio = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kio-5.48.0.tar.xz"; - sha256 = "0am03nwbfidb5dxs8j8qaan4mcs7xv75sk135rslwfp5q56v1fa0"; - name = "kio-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kio-5.49.0.tar.xz"; + sha256 = "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k"; + name = "kio-5.49.0.tar.xz"; }; }; kirigami2 = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kirigami2-5.48.0.tar.xz"; - sha256 = "0f01rnzzv2w7mmb0war8kph46c3wbdbz7s9i6rwh6g7kg6zvzn52"; - name = "kirigami2-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kirigami2-5.49.0.tar.xz"; + sha256 = "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz"; + name = "kirigami2-5.49.0.tar.xz"; }; }; kitemmodels = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kitemmodels-5.48.0.tar.xz"; - sha256 = "13b0fqy4yg4zahqq8376gnna36mfg94yb5d1fz0cgw7fk9d920gf"; - name = "kitemmodels-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kitemmodels-5.49.0.tar.xz"; + sha256 = "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg"; + name = "kitemmodels-5.49.0.tar.xz"; }; }; kitemviews = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kitemviews-5.48.0.tar.xz"; - sha256 = "0cdyw0gy67yhhxv44j1bhhd4qnj7rwi0fjzf275532bf3js1j12w"; - name = "kitemviews-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kitemviews-5.49.0.tar.xz"; + sha256 = "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp"; + name = "kitemviews-5.49.0.tar.xz"; }; }; kjobwidgets = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kjobwidgets-5.48.0.tar.xz"; - sha256 = "0a5awpbka6mk4r4m5if7s9i5ybysykpcmlj69liabzcv0k1x5y6w"; - name = "kjobwidgets-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kjobwidgets-5.49.0.tar.xz"; + sha256 = "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g"; + name = "kjobwidgets-5.49.0.tar.xz"; }; }; kjs = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kjs-5.48.0.tar.xz"; - sha256 = "0ysbf6m63cw2iywwr7p5ngsh7s7ml9sc1sqkhnbh7racn0pzc1l4"; - name = "kjs-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kjs-5.49.0.tar.xz"; + sha256 = "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0"; + name = "kjs-5.49.0.tar.xz"; }; }; kjsembed = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kjsembed-5.48.0.tar.xz"; - sha256 = "0j74g3xb23k55pixk76z2ib6yyc7f2iwvwqvvw1f907rn43g6qqx"; - name = "kjsembed-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kjsembed-5.49.0.tar.xz"; + sha256 = "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m"; + name = "kjsembed-5.49.0.tar.xz"; }; }; kmediaplayer = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kmediaplayer-5.48.0.tar.xz"; - sha256 = "1kw35c5dmwsrkinfgmylzgvw3zcg0yimlfcl52bhdg0x7sgdbjkq"; - name = "kmediaplayer-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kmediaplayer-5.49.0.tar.xz"; + sha256 = "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx"; + name = "kmediaplayer-5.49.0.tar.xz"; }; }; knewstuff = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/knewstuff-5.48.0.tar.xz"; - sha256 = "0g2sxk6wqqgynmqgz6jxknlrsmpj4y94cn7vpw84isd9brsr5hfv"; - name = "knewstuff-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/knewstuff-5.49.0.tar.xz"; + sha256 = "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk"; + name = "knewstuff-5.49.0.tar.xz"; }; }; knotifications = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/knotifications-5.48.0.tar.xz"; - sha256 = "11p03jgkw8zvfsal6q3yxz5shkpxiknnryw2a120sjmsab87imzb"; - name = "knotifications-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/knotifications-5.49.0.tar.xz"; + sha256 = "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9"; + name = "knotifications-5.49.0.tar.xz"; }; }; knotifyconfig = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/knotifyconfig-5.48.0.tar.xz"; - sha256 = "1rlzmp1lzrniav2d5sjzh43mdm47i5dpa2rlsqppqq5887wjphcm"; - name = "knotifyconfig-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/knotifyconfig-5.49.0.tar.xz"; + sha256 = "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa"; + name = "knotifyconfig-5.49.0.tar.xz"; }; }; kpackage = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kpackage-5.48.0.tar.xz"; - sha256 = "18q6gp1gmzjyid803j7mcm9dbqg4bcd059qlp6sb6rkllygv4pcr"; - name = "kpackage-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kpackage-5.49.0.tar.xz"; + sha256 = "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd"; + name = "kpackage-5.49.0.tar.xz"; }; }; kparts = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kparts-5.48.0.tar.xz"; - sha256 = "1p4xdrxfvq5xj17zf8gfxc0c9lryp8n9ahinardlb3rnb1wcw4hv"; - name = "kparts-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kparts-5.49.0.tar.xz"; + sha256 = "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k"; + name = "kparts-5.49.0.tar.xz"; }; }; kpeople = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kpeople-5.48.0.tar.xz"; - sha256 = "1gddld3phsqknm3x0k0wnhgqid5dqsqbw06v91vbl8746np04zf7"; - name = "kpeople-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kpeople-5.49.0.tar.xz"; + sha256 = "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv"; + name = "kpeople-5.49.0.tar.xz"; }; }; kplotting = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kplotting-5.48.0.tar.xz"; - sha256 = "17f78wppaj433x6fm108z5zw849qvnjsxisa92rxmkm9c64wzijg"; - name = "kplotting-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kplotting-5.49.0.tar.xz"; + sha256 = "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0"; + name = "kplotting-5.49.0.tar.xz"; }; }; kpty = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kpty-5.48.0.tar.xz"; - sha256 = "0ywkiw7gpqx7zrj6wrvfsn2sjkyxzsmqn8p91z0kz1s3id2s04fk"; - name = "kpty-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kpty-5.49.0.tar.xz"; + sha256 = "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg"; + name = "kpty-5.49.0.tar.xz"; }; }; kross = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kross-5.48.0.tar.xz"; - sha256 = "0zxhn8wai71ll1113k47xmcspbp16iz1rybm6m2qs6f4j5ghif8q"; - name = "kross-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kross-5.49.0.tar.xz"; + sha256 = "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz"; + name = "kross-5.49.0.tar.xz"; }; }; krunner = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/krunner-5.48.0.tar.xz"; - sha256 = "0mdwyvx656ba8pwvg4qw8jr268iffqrp9ipr28m71hkx0sh7k6hn"; - name = "krunner-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/krunner-5.49.0.tar.xz"; + sha256 = "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19"; + name = "krunner-5.49.0.tar.xz"; }; }; kservice = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kservice-5.48.0.tar.xz"; - sha256 = "1r5d3cdvmbyqn8hm2hjalgg1ncnpdh1w7fd5rr0k97j5qj29ypis"; - name = "kservice-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kservice-5.49.0.tar.xz"; + sha256 = "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z"; + name = "kservice-5.49.0.tar.xz"; }; }; ktexteditor = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/ktexteditor-5.48.0.tar.xz"; - sha256 = "1fnq6d3ky277rbg3ngq55gdswrgfxsn19c43s23xcbfaymmhapj7"; - name = "ktexteditor-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/ktexteditor-5.49.0.tar.xz"; + sha256 = "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj"; + name = "ktexteditor-5.49.0.tar.xz"; }; }; ktextwidgets = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/ktextwidgets-5.48.0.tar.xz"; - sha256 = "0hf4rpnkc9qfpnpfm6bsrrjrvvkr6785pnakqyfbjcgbyavp58hg"; - name = "ktextwidgets-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/ktextwidgets-5.49.0.tar.xz"; + sha256 = "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1"; + name = "ktextwidgets-5.49.0.tar.xz"; }; }; kunitconversion = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kunitconversion-5.48.0.tar.xz"; - sha256 = "0hipqjj82zkq8ysvg304m5jblxxrvjh8vfc3wgl93zvj0mwx06db"; - name = "kunitconversion-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kunitconversion-5.49.0.tar.xz"; + sha256 = "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79"; + name = "kunitconversion-5.49.0.tar.xz"; }; }; kwallet = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwallet-5.48.0.tar.xz"; - sha256 = "047jp26igla05isq6hg5bq9l3xd3dfa3v8dq3rz4im7dwa10hshr"; - name = "kwallet-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwallet-5.49.0.tar.xz"; + sha256 = "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z"; + name = "kwallet-5.49.0.tar.xz"; }; }; kwayland = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwayland-5.48.0.tar.xz"; - sha256 = "1qcb2kg1a23fvl6i0xky6mzmn3f6pqkvpv0dy245bd01x7q4csg4"; - name = "kwayland-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwayland-5.49.0.tar.xz"; + sha256 = "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6"; + name = "kwayland-5.49.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwidgetsaddons-5.48.0.tar.xz"; - sha256 = "079f28ifadxhvk4miwlnhw3dvg7bmb6gjiqcg2w65bmp21rsywb7"; - name = "kwidgetsaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwidgetsaddons-5.49.0.tar.xz"; + sha256 = "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92"; + name = "kwidgetsaddons-5.49.0.tar.xz"; }; }; kwindowsystem = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwindowsystem-5.48.0.tar.xz"; - sha256 = "1b6cvx3yqkqmvji2y7ys421hmj98xhww1rlgphfdvrdaqzl4579n"; - name = "kwindowsystem-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwindowsystem-5.49.0.tar.xz"; + sha256 = "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp"; + name = "kwindowsystem-5.49.0.tar.xz"; }; }; kxmlgui = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kxmlgui-5.48.0.tar.xz"; - sha256 = "0n38bxxip1c4fgj00jvph98qhb11ifx40z4m0pjafm52bg0kaa2h"; - name = "kxmlgui-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kxmlgui-5.49.0.tar.xz"; + sha256 = "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa"; + name = "kxmlgui-5.49.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kxmlrpcclient-5.48.0.tar.xz"; - sha256 = "0s0xrx2p0jngk83zb8zjn4vkwnj46wzbxzj904g71ca428nmfx40"; - name = "kxmlrpcclient-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kxmlrpcclient-5.49.0.tar.xz"; + sha256 = "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06"; + name = "kxmlrpcclient-5.49.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/modemmanager-qt-5.48.0.tar.xz"; - sha256 = "17pnzpv3g3g25vnh9jjjk3fk6i3lhk6icl56ifcsmpj09nlw41im"; - name = "modemmanager-qt-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/modemmanager-qt-5.49.0.tar.xz"; + sha256 = "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2"; + name = "modemmanager-qt-5.49.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/networkmanager-qt-5.48.0.tar.xz"; - sha256 = "15qikndykampl63bnp6rik1vkmwpivqf1krbsb0r29fmwyzhy38v"; - name = "networkmanager-qt-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/networkmanager-qt-5.49.0.tar.xz"; + sha256 = "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z"; + name = "networkmanager-qt-5.49.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/oxygen-icons5-5.48.0.tar.xz"; - sha256 = "08y1gy2xgzby9wxbh90cfzly1aym9nym5r8m7z848a4v7chp0wpw"; - name = "oxygen-icons5-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/oxygen-icons5-5.49.0.tar.xz"; + sha256 = "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g"; + name = "oxygen-icons5-5.49.0.tar.xz"; }; }; plasma-framework = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/plasma-framework-5.48.0.tar.xz"; - sha256 = "1hl1q1v8kmq20bzm2bfrpjx1f1rljg2akib0sc65nw6vclrcgh82"; - name = "plasma-framework-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/plasma-framework-5.49.0.tar.xz"; + sha256 = "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv"; + name = "plasma-framework-5.49.0.tar.xz"; }; }; prison = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/prison-5.48.0.tar.xz"; - sha256 = "04asjh9k6qhz6mzqvcw5famjh8fdfrjj5gwhar9lpzvl53k9236q"; - name = "prison-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/prison-5.49.0.tar.xz"; + sha256 = "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d"; + name = "prison-5.49.0.tar.xz"; }; }; purpose = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/purpose-5.48.0.tar.xz"; - sha256 = "015dcsz2pybfl13dq0fhja7j05bvchjd6bcwmniq8cwc2dg2qxyp"; - name = "purpose-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/purpose-5.49.0.tar.xz"; + sha256 = "014izz6vvk3vqw7s2qy33dqfflyylk8vqr9srkf391f6yfld9ygz"; + name = "purpose-5.49.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/qqc2-desktop-style-5.48.0.tar.xz"; - sha256 = "1wc4vxjipdw3zq1lqwz3s7f0gzrcvs8svy9ip5r40qcz2w55s4an"; - name = "qqc2-desktop-style-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/qqc2-desktop-style-5.49.0.tar.xz"; + sha256 = "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj"; + name = "qqc2-desktop-style-5.49.0.tar.xz"; }; }; solid = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/solid-5.48.0.tar.xz"; - sha256 = "0fy070kbqs9hvi1ngmqzfz8a9vnry0mrin51z1yfdc44806bk2ns"; - name = "solid-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/solid-5.49.0.tar.xz"; + sha256 = "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp"; + name = "solid-5.49.0.tar.xz"; }; }; sonnet = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/sonnet-5.48.0.tar.xz"; - sha256 = "1mzl2a61jrqflnlkkrp079z428sf2bc811qwfx0rdh0jp7bc7sq4"; - name = "sonnet-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/sonnet-5.49.0.tar.xz"; + sha256 = "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3"; + name = "sonnet-5.49.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/syntax-highlighting-5.48.0.tar.xz"; - sha256 = "03cfljg90iszpxmx6f0dv1w1r451yqzi9bk27x56s5xzsghj8bv5"; - name = "syntax-highlighting-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/syntax-highlighting-5.49.0.tar.xz"; + sha256 = "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v"; + name = "syntax-highlighting-5.49.0.tar.xz"; }; }; threadweaver = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/threadweaver-5.48.0.tar.xz"; - sha256 = "0pks8sddqdhlcrqgb106b6jy0gh3gfcss2rdavqfck6d9780v125"; - name = "threadweaver-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/threadweaver-5.49.0.tar.xz"; + sha256 = "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7"; + name = "threadweaver-5.49.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 5110908e0f27..20ab104874dc 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk-doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk2, python2Packages, lua, gobjectIntrospection }: let - inherit (python2Packages) python pygobject3 pygtk; + inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { name = "keybinder-${version}"; version = "0.3.0"; @@ -16,8 +16,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool gnome3.gnome-common gtk-doc gnome3.gtk3 - python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2 + autoconf automake libtool gnome3.gnome-common gtk-doc gtk2 + python pygtk lua gobjectIntrospection ]; preConfigure = '' diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index e9d81d3ab785..c4120e5bb0eb 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, openssl, perl, dns-root-data }: +{ stdenv, fetchurl, fetchpatch, openssl, perl, which, dns-root-data }: stdenv.mkDerivation rec { pname = "ldns"; @@ -45,6 +45,9 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; + checkInputs = [ which ]; + doCheck = false; # fails. missing some files + postInstall = '' moveToOutput "bin/ldns-config" "$dev" diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index e9ba4ae5ac21..21cdd9cd0964 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib zlib libpng cmake gnumake3 ]; - configureFlags = "-v"; + configureFlags = [ "-v" ]; meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ enzime ]; license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; homepage = http://lensfun.sourceforge.net/; diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index dea102774d09..c1e9ba7d1c73 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cat configure.in | ${bsdbuild}/bin/mkconfigure > configure ''; - configureFlags = "--with-agar=${libagar}"; + configureFlags = [ "--with-agar=${libagar}" ]; buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index ef5838188593..6f12bf891b01 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; - configureFlags = if stdenv.is64bit then "--enable-64bit" else ""; + configureFlags = stdenv.lib.optional stdenv.is64bit "--enable-64bit"; meta = with stdenv.lib; { description = "C runtime libraries of ANTLR v3"; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 71c388be6ea5..8bf0e4bcb93c 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -61,6 +61,8 @@ in stdenv.mkDerivation rec { --replace /usr/bin/file ${file}/bin/file ''; + doCheck = false; # generates shebangs in check phase, too lazy to fix + installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index b5402984d16f..585f6f18bbab 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.18"; + version = "2.19"; in stdenv.mkDerivation rec { name = "libblockdev-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "03gbmji401nz1sff2zp61dhal80qls4blqwadj2p4ckbxdlmid4i"; + sha256 = "1ny31vaarzbpw0h863p2r5cvjsfs77d33nnisf8bhjc6ps6js3ys"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index d2e4fe90d2cf..d8f2426e477b 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index f1dcf60b3b94..724e9f1b74a3 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.3"; + version = "1.4"; in stdenv.mkDerivation rec { name = "libbytesize-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libbytesize"; rev = version; - sha256 = "1ys5d8rya8x4q34gn1hr96z7797s9gdzah0y0d7g84x5x6k50p30"; + sha256 = "1yxlc0f960rhqmh3fs3p0hvw0y2cikplgc27zsz6rn4h5dlrfmi2"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 0d1772d0c549..8addb6128f0c 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux libcap ++ lib.optional withAlsa alsaLib; - configureFlags = "--disable-oss"; + configureFlags = [ "--disable-oss" ]; patchFlags = "-p0"; patches = stdenv.lib.optional stdenv.isDarwin diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index 5ae17fe78f05..218eaeea571a 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -9,5 +9,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index bb81721feeae..9dc3c1d11ba1 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -8,12 +8,15 @@ stdenv.mkDerivation rec { sha256 = "0jr8ppdm80c533nzmrpz3iffnpc6nhvsria1di9f4jg1l19a03fd"; }; + postPatch = '' + patchShebangs . + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libcddb ncurses help2man ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; - # Disabled due to several spurious test failures. - # doCheck = true; + doCheck = true; meta = with stdenv.lib; { description = "A library for OS-independent CD-ROM and CD image access"; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 8b5130b0eac8..5e46f4dc699d 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in ''; - configureFlags = if stdenv.cc.isClang - then [ "--disable-werror" ] else null; + configureFlags = stdenv.lib.optional stdenv.cc.isClang "--disable-werror"; CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h @@ -27,5 +26,6 @@ stdenv.mkDerivation rec { description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; homepage = http://www.freedesktop.org/wiki/Software/libcdr; platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.mpl20; }; } diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 9ab42c7fd1dd..d62d1a802645 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ boost libxml2 curl ]; - configureFlags = "--without-man --with-boost=${boost.dev} --disable-werror --disable-tests"; + configureFlags = [ "--without-man" "--with-boost=${boost.dev}" "--disable-werror" "--disable-tests" ]; # Cppcheck cannot find all the include files (use --check-config for details) doCheck = false; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 220cc5a2eeb4..730cef6f6960 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { "--disable-scrollkeeper" ] ++ optional (gtkVersion != "2") "--disable-dumper"; + doCheck = false; # generates shebangs in check phase, too lazy to fix + installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index f88d20bee703..78e7490cd992 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -42,6 +42,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = '' + for a in test/Makefile.in test/format_test/format_checks.sh.in ; do + substituteInPlace $a \ + --replace /bin/bash ${stdenv.shell} + done + ''; + meta = with stdenv.lib; { homepage = http://openil.sourceforge.net/; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index f8d896bda376..7fe7319ff15e 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -2,22 +2,18 @@ stdenv.mkDerivation rec { - version = "3.10.1.1212"; + version = "3.10.4"; name = "libdigidoc-${version}"; - + src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidoc/libdigidoc_3.10.1.1212.orig.tar.xz"; - sha256 = "ad5e0603aea2e02977f17318cc93a53c3a19a815e57b2347d97136d11c110807"; + url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz"; + sha256 = "0w5wsaj2a5wss1r9j39bfsrkp3xz0w3v1gnr190v6k7l74l453w1"; }; - unpackPhase = '' - mkdir src - tar xf $src -C src - cd src - ''; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl pcsclite opensc libxml2 ]; - buildInputs = [ cmake openssl pcsclite opensc libxml2 ]; - meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; homepage = http://www.id.ee/; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 6ff8a03175e8..3df820bc1263 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,26 +1,22 @@ { stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl -, xercesc, xml-security-c, pkgconfig, xsd, zlib, vim }: +, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - - version = "3.13.3.1365"; + version = "3.13.6"; name = "libdigidocpp-${version}"; src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.3.1365.orig.tar.xz"; - sha256 = "1xmvjh5xzspm6ja8hz6bzblwly7yn2jni2m6kx8ny9g65zjrj2iw"; + url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; + sha256 = "1sdrj7664737k3kbnj2xrnilnx5ifj8hg42z8pxagb0j81x0pnqj"; }; - unpackPhase = '' - mkdir src - tar xf $src -C src - cd src - ''; + nativeBuildInputs = [ cmake pkgconfig xxd ]; + + buildInputs = [ + libdigidoc minizip pcsclite opensc openssl xercesc + xml-security-c xsd zlib xalanc + ]; - buildInputs = [ cmake libdigidoc minizip pcsclite opensc openssl xercesc - xml-security-c pkgconfig xsd zlib vim - ]; - meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; homepage = http://www.id.ee/; diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 390bb4ea9e45..f5248dfc79e6 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://libdmtx.org; platforms = stdenv.lib.platforms.all; maintainers = [ ]; + license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 93ef1957d2cd..5107d8898d46 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.92"; + name = "libdrm-2.4.93"; src = fetchurl { url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1yirzx8hmlvv6r0l7lb3zxmgy5la2mri9al0k16xqfg19pdqzr79"; + sha256 = "0g6d9wsnb7lx8r1m4kq8js0wsc5jl20cz1csnlh6z9s8jpfd313f"; }; outputs = [ "out" "dev" "bin" ]; @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; + postPatch = '' + for a in */*-symbol-check ; do + patchShebangs $a + done + ''; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index e76308d22acb..649541e22627 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libelf }: let - version = "20180527"; + version = "20180809"; src = fetchurl { url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; # Upstream displays this hash broken into three parts: @@ -12,6 +12,7 @@ let meta = { homepage = https://www.prevanders.net/dwarf.html; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl21Plus; }; in rec { diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index 7eb5df4c7ecb..7255b3fece42 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { homepage = http://www.libee.org/; description = "An Event Expression Library inspired by CEE"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 88b15b58c43d..e3f3604f94e3 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -27,10 +27,12 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; - configureFlags = "--disable-ltdl-install " - + "--with-ltdl-include=${libtool}/include " - + "--with-ltdl-lib=${libtool.lib}/lib " - + "--enable-xpdf"; + configureFlags = [ + "--disable-ltdl-install" + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool.lib}/lib" + "--enable-xpdf" + ]; # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index cedd5f98027a..cc9db8f7e661 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, bash, perl }: stdenv.mkDerivation rec { name = "libfaketime-${version}"; @@ -13,10 +13,20 @@ stdenv.mkDerivation rec { ./no-date-in-gzip-man-page.patch ]; + postPatch = '' + patchShebangs test src + for a in test/functests/test_exclude_mono.sh src/faketime.c ; do + substituteInPlace $a \ + --replace /bin/bash ${stdenv.shell} + done + ''; + preBuild = '' makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib) ''; + checkInputs = [ perl ]; + meta = with stdenv.lib; { description = "Report faked system time to programs without having to change the system-wide time"; homepage = "https://github.com/wolfcw/libfaketime/"; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 638dec302b77..d8708114c8e6 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optional enableCapabilities libcap; - preConfigure = stdenv.lib.optionalString stdenv.isCross '' + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # This is intentional: gpg-error-config is a shell script that will work during the build mkdir -p "$NIX_BUILD_TOP"/bin ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin" diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 7e1a2b549681..27c1cb0e390a 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -16,11 +16,18 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; buildInputs = [ libX11 libXext glproto ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/GLX/Makefile.am \ + --replace "-Wl,-Bsymbolic " "" + substituteInPlace src/EGL/Makefile.am \ + --replace "-Wl,-Bsymbolic " "" + ''; + NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" # FHS paths are added so that non-NixOS applications can find vendor files. "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" - ]; + ] ++ lib.optional stdenv.cc.isClang "-Wno-error"; # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; @@ -40,6 +47,6 @@ in stdenv.mkDerivation rec { description = "The GL Vendor-Neutral Dispatch library"; homepage = https://github.com/NVIDIA/libglvnd; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 2fcf6701ab8f..ccac20c90774 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -34,6 +34,8 @@ in stdenv.mkDerivation (rec { postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure + '' + lib.optionalString (stdenv.hostPlatform.isArm && stdenv.buildPlatform != stdenv.hostPlatform ) '' + ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h '' + lib.optionalString stdenv.hostPlatform.isMusl '' ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h ''; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index c6056ee49fbf..74aee0f39c7e 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -25,8 +25,8 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ]; - nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl - libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; + nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl] ++ + lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; meta = { homepage = http://gtkpod.sourceforge.net/; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 90daf2ddf743..20a08885142a 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool libintl ]; - buildInputs = [ gettext bzip2 zlib python ] - ++ stdenv.lib.optional doCheck perl; + buildInputs = [ gettext bzip2 zlib python ]; + checkInputs = [ perl ]; propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ]; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index e9010852eb33..6001946cb970 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -11,11 +11,11 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.38.3"; + version = "1.38.4"; src = fetchurl { url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; - sha256 = "130nc9v9f8k5kwz9hzqd43fjxg01hl7jh0jw1fhs4ah5hmg71v34"; + sha256 = "1xsazw6yrbgmc647j8l896fzv534157sqmdzac09rxkxwiy0wm16"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index d1b779627c69..f4eafcdaace4 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,32 +1,46 @@ -{ stdenv, fetchurl, fetchpatch, python2, pkgconfig, usbmuxd, glib, libgcrypt, - libtasn1, libplist, readline, libusbmuxd, openssl }: +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, gnutls +, libgcrypt, libtasn1, glib, libplist, libusbmuxd }: stdenv.mkDerivation rec { - name = "libimobiledevice-1.2.0"; - - nativeBuildInputs = [ python2 libplist.swig pkgconfig ]; - buildInputs = [ readline ]; - propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ]; - - patches = [ - ./disable_sslv3.patch - (fetchpatch { - name = "CVE-2016-5104.patch"; - url = "https://github.com/libimobiledevice/libimobiledevice/commit/df1f5c4d70d0c19ad40072f5246ca457e7f9849e.patch"; - sha256 = "06ygb9aqcvm4v08wrldsddjgyqv5bkpq6lxzq2a1nwqp9mq4a4k1"; - }) - ]; + pname = "libimobiledevice"; + version = "2018-07-24"; - postPatch = ''sed -e 's@1\.3\.21@@' -i configure''; - passthru.swig = libplist.swig; + name = "${pname}-${version}"; - src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; - sha256 = "0dqhy4qwj30mw8pwckvjmgnj1qqrh6p8c6jknmhvylshhzh0ssvq"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "d7a2e04d2e7880c56116fd35489a7f98755501b7"; + sha256 = "0cj0j10lmfr28c7nh79n2mcmy31xx50g93h0bqs0l7y76ph4dqkc"; }; - meta = { - homepage = http://www.libimobiledevice.org; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkgconfig + ]; + propagatedBuildInputs = [ + glib + gnutls + libgcrypt + libplist + libtasn1 + libusbmuxd + ]; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + + configureFlags = [ + "--disable-static" + "--disable-openssl" + "--without-cython" + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libimobiledevice/libimobiledevice; description = "A software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux"; longDescription = '' libimobiledevice is a software library that talks the protocols to support @@ -38,7 +52,10 @@ stdenv.mkDerivation rec { installed applications, retrieve addressbook/calendars/notes and bookmarks and synchronize music and video to the device. The library is in development since August 2007 with the goal to bring support for these - devices to the Linux Desktop.''; - inherit (usbmuxd.meta) platforms maintainers; + devices to the Linux Desktop. + ''; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 208e01110625..78c0fd6fb26c 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -1,52 +1,53 @@ { gtkWidgets ? false # build GTK widgets for libinfinity -, daemon ? false # build infinote daemon -, documentation ? false # build documentation , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl -, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss +, gobjectIntrospection +, gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss , libintl }: -let - edf = flag: feature: (if flag then "--with-" else "--without-") + feature; - optional = cond: elem: assert cond -> elem != null; if cond then [elem] else []; - -in stdenv.mkDerivation rec { - - name = "libinfinity-${version}"; - version = "0.7.1"; - src = fetchurl { - url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; - }; +assert avahiSupport -> avahi != null; +assert gtkWidgets -> gtk3 != null; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 gsasl libidn gss libintl ] - ++ optional gtkWidgets gtk2 - ++ optional documentation gtkdoc - ++ optional avahiSupport avahi - ++ optional daemon libdaemon; - - propagatedBuildInputs = [ gnutls ]; - - configureFlags = '' - ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"} - ${edf gtkWidgets "inftextgtk"} - ${edf gtkWidgets "infgtk"} - ${edf daemon "infinoted"} - ${edf daemon "libdaemon"} - ${edf avahiSupport "avahi"} - ''; - - passthru = { - inherit version; - }; - - meta = { - homepage = http://gobby.0x539.de/; - description = "An implementation of the Infinote protocol written in GObject-based C"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.phreedom ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; +let + mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; + + self = stdenv.mkDerivation rec { + name = "libinfinity-${version}"; + version = "0.7.1"; + src = fetchurl { + url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; + sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; + }; + + outputs = [ "bin" "out" "dev" "man" "devdoc" ]; + + nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobjectIntrospection ]; + buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ] + ++ stdenv.lib.optional gtkWidgets gtk3 + ++ stdenv.lib.optional avahiSupport avahi; + + propagatedBuildInputs = [ gnutls ]; + + configureFlags = [ + "--enable-gtk-doc" + "--enable-introspection" + (mkFlag gtkWidgets "inftextgtk") + (mkFlag gtkWidgets "infgtk") + "--with-infinoted" + "--with-libdaemon" + (mkFlag avahiSupport "avahi") + ]; + + passthru = { + infinoted = "${self.bin}/bin/infinoted-${stdenv.lib.versions.majorMinor version}"; + }; + + meta = { + homepage = http://gobby.0x539.de/; + description = "An implementation of the Infinote protocol written in GObject-based C"; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.phreedom ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; }; - -} +in self diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix new file mode 100644 index 000000000000..6fc507daf641 --- /dev/null +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "libinotify-kqueue-${version}"; + version = "20180201"; + + src = fetchzip { + url = "https://github.com/libinotify-kqueue/libinotify-kqueue/archive/${version}.tar.gz"; + sha256 = "0dkh6n0ghhcl7cjkjmpin118h7al6i4vlkmw57vip5f6ngr6q3pl"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + doCheck = true; + checkFlags = [ "test" ]; + + meta = with stdenv.lib; { + description = "Inotify shim for macOS and BSD"; + homepage = https://github.com/libinotify-kqueue/libinotify-kqueue; + license = licenses.mit; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = with platforms; darwin ++ freebsd ++ netbsd ++ openbsd; + }; +} diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index bf08db6d3b7b..5498a32e7091 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.11.0"; + version = "1.11.3"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "04mwl1v51b785h7q3v23hahr0qzr48qq1jzj7d3msjvgh97nr8v4"; + sha256 = "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index 81490ccd5390..a21b65170d39 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libestr, json_c, pcre }: +{ stdenv, fetchurl, pkgconfig, libestr, json_c, pcre, fastJson }: stdenv.mkDerivation rec { - name = "liblognorm-1.1.2"; - + name = "liblognorm-2.0.5"; + src = fetchurl { url = "http://www.liblognorm.com/files/download/${name}.tar.gz"; - sha256 = "0v2k5awr6vsbp36gybrys3zfkl675sywhsh4lnm7f21inlpi2nlk"; + sha256 = "145i1lrl2n145189i7l2a62yazjg9rkyma5jic41y0r17fl1s5f8"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libestr json_c pcre ]; - + buildInputs = [ libestr json_c pcre fastJson ]; + configureFlags = [ "--enable-regexp" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 431770ef12d1..d07840977795 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.16.0"; + name = "libmbim-1.16.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "1hpsjc7bzmakzvj8z9fffvqknc38fa8ridpmklq46jyxxnz51jn8"; + sha256 = "0qmjvjbgs9m8qsaiq5arikzglgaas9hh1968bi7sy3905kp4yjgb"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index ddab3439f02a..1e13f3238222 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -14,21 +14,26 @@ stdenv.mkDerivation rec { sha256 = "0mn4n3ihzcr1jw2g1vy6c8p4lkc88jwljk04argmj7k4djrgpxpa"; }; + postPatch = '' + patchShebangs . + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib netcdf nifticlib hdf5 ]; - cmakeFlags = [ "-DBUILD_TESTING=${if doCheck then "TRUE" else "FALSE"}" - "-DLIBMINC_MINC1_SUPPORT=TRUE" - "-DLIBMINC_BUILD_SHARED_LIBS=TRUE" - "-DLIBMINC_USE_SYSTEM_NIFTI=TRUE" ]; - + cmakeFlags = [ + "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" + "-DLIBMINC_MINC1_SUPPORT=ON" + "-DLIBMINC_BUILD_SHARED_LIBS=ON" + "-DLIBMINC_USE_SYSTEM_NIFTI=ON" + ]; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; checkPhase = '' export LD_LIBRARY_PATH="$(pwd)" # see #22060 ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure # ezminc_rw_test can't find libminc_io.so.5.2.0; minc_conversion hits netcdf compilation issue ''; - doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 7e5ac2a2297c..af8297e98549 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool ]; buildInputs = [ libmad libid3tag ]; - configureFlags = "--disable-pcre"; + configureFlags = [ "--disable-pcre" ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/mp3splt/; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index ef250441daba..2cb4cd3cd9bf 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libmspack-0.6alpha"; + name = "libmspack-0.7.1alpha"; src = fetchurl { url = "https://www.cabextract.org.uk/libmspack/${name}.tar.gz"; - sha256 = "08gr2pcinas6bdqz3k0286g5cnksmcx813skmdwyca6bmj1fxnqy"; + sha256 = "0zn4vwzk5ankgd0l88cipan19pzbzv0sm3fba17lvqwka3dp1acp"; }; meta = { diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 79439f822696..b53920f60b8b 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -31,6 +31,10 @@ in stdenv.mkDerivation rec { }) ]; + postPatch = '' + patchShebangs test + ''; + preAutoreconf = '' substituteInPlace configure.ac --replace "which" "${which}/bin/which" substituteInPlace git-version --replace /bin/bash ${stdenv.shell} diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index c177f7ba58ee..ca026811d69b 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses perl ]; - configureFlags = stdenv.lib.optionalString (perl == null) "--with-perl-bindings=no"; + configureFlags = stdenv.lib.optional (perl == null) "--with-perl-bindings=no"; meta = with stdenv.lib; { description = "C library to generate ICMP echo requests (a.k.a. ping packets)"; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 0175e21bbc72..111bea61eb65 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig vala intltool gobjectIntrospection gtk-doc docbook_xsl - ] ++ stdenv.lib.optionals doCheck checkInputs; - checkInputs = [ check curl perl ]; + ]; buildInputs = [ glib libsoup libxml2 libxslt ]; + checkInputs = [ check curl perl ]; patches = [ ./osinfo-db-data-dir.patch diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index ddfc2a5132c7..952509acc2ee 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -10,7 +10,11 @@ stdenv.mkDerivation { sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; }; - configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + configureFlags = [ + "ac_cv_va_copy=yes" + ] ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + + patches = [ ./shtool.patch ]; meta = with stdenv.lib; { homepage = http://www.ossp.org/pkg/lib/uuid/; diff --git a/pkgs/development/libraries/libossp-uuid/shtool.patch b/pkgs/development/libraries/libossp-uuid/shtool.patch new file mode 100644 index 000000000000..f0c7cc485f50 --- /dev/null +++ b/pkgs/development/libraries/libossp-uuid/shtool.patch @@ -0,0 +1,11 @@ +--- a/shtool 2008-07-05 05:43:08.000000000 +0800 ++++ b/shtool 2018-07-25 15:45:40.559587471 +0800 +@@ -1400,7 +1400,7 @@ + if [ ".$opt_t" = .yes ]; then + echo "strip $dsttmp" 1>&2 + fi +- strip $dsttmp || shtool_exit $? ++ $STRIP $dsttmp || shtool_exit $? + fi + if [ ".$opt_o" != . ]; then + if [ ".$opt_t" = .yes ]; then diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix new file mode 100644 index 000000000000..4cb327ff527b --- /dev/null +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkgconfig, protobuf, icu }: + +let + version = "8.9.9"; +in +stdenv.mkDerivation { + name = "phonenumber-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "googlei18n"; + repo = "libphonenumber"; + rev = "v${version}"; + sha256 = "005visnfnr84blgdi0yp4hrzskwbsnawrzv6lqfi9f073l6w5j6w"; + }; + + nativeBuildInputs = [ + cmake + gmock + pkgconfig + ]; + + buildInputs = [ + boost + protobuf + icu + ]; + + cmakeDir = "../cpp"; + + checkPhase = "./libphonenumber_test"; + + meta = with stdenv.lib; { + description = "Google's i18n library for parsing and using phone numbers"; + license = licenses.asl20; + maintainers = with maintainers; [ illegalprime ]; + }; +} diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 8dc64f2c2b57..0d6e3b8db6e0 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,31 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, swig2, python2Packages, glib }: +{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, python2Packages, glib }: let inherit (python2Packages) python cython; -in stdenv.mkDerivation rec { - name = "libplist-${version}"; - version = "2.0.0"; - - nativeBuildInputs = [ pkgconfig swig2 python cython ]; +in +stdenv.mkDerivation rec { + pname = "libplist"; + version = "2018-07-25"; + + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "db68a9d1070b363eee93147f072f46526064acbc"; + sha256 = "0lxyb35jjg31m8dxhsv1jr2ccy5s19fsqzisy7lfjk46w7brs4h5"; + }; - propagatedBuildInputs = [ glib ]; + outputs = ["bin" "dev" "out" "py"]; - passthru.swig = swig2; + nativeBuildInputs = [ + pkgconfig + python + cython + autoreconfHook + ]; - outputs = ["bin" "dev" "out" "py"]; + propagatedBuildInputs = [ glib ]; postFixup = '' moveToOutput "lib/${python.libPrefix}" "$py" ''; - src = fetchurl { - url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; - sha256 = "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis"; - }; - - meta = { - homepage = https://github.com/JonathanBeck/libplist; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + description = "A library to handle Apple Property List format in binary or XML"; + homepage = https://github.com/libimobiledevice/libplist; + license = licenses.lgpl21Plus; maintainers = [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 01a828f95da5..0153ff8327b6 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { passthru = { inherit zlib; }; - configureFlags = "--enable-static"; + configureFlags = [ "--enable-static" ]; postInstall = ''mv "$out/bin" "$dev/bin"''; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 4173588ac522..0e5a4a866e8f 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,9 +3,7 @@ assert zlib != null; let - version = "1.6.34"; patchVersion = "1.6.34"; - sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6"; @@ -14,10 +12,11 @@ let in stdenv.mkDerivation rec { name = "libpng" + whenPatched "-apng" + "-${version}"; + version = "1.6.34"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - inherit sha256; + sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig"; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; @@ -26,9 +25,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ]; - # it's hard to cross-run tests and some check programs didn't compile anyway - makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS="; - doCheck = true; # not cross; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; passthru = { inherit zlib; }; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 5c4699d26268..5afed2b2a2f5 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - configureFlags = "--enable-shared"; + configureFlags = [ "--enable-shared" ]; meta = { description = "A C++ library to access PostgreSQL databases"; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 5c7868983708..377d9fe50be7 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "2.6.0b"; + version = "2.6.2"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1g0pmf33vrjabxmx6lyysgkxa6hg8qmwk0n5ncl4pr8sdkimswxw"; + sha256 = "1wfffki5ib65z9ndph2c4a17qx62f07q12adzabs7ij9gv94y9j5"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index d1dae0cfee6e..8cca5333d084 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description= "A Qt5 library to write cross-platfrom clients for Matrix"; homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index a0f5ac737679..5bfa1427ab65 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }: stdenv.mkDerivation rec { - name = "libqmi-1.20.0"; + name = "libqmi-1.20.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "1d3fca477sdwbv4bsq1cl98qc8sixrzp0gqjcmjj8mlwfk9qqhi1"; + sha256 = "0i6aw8jyxv84d5x8lj2g9lb8xxf1dyad8n3q0kw164pyig55jd67"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 633611273a30..422ace462a94 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { # Fix broken DT_NEEDED in lib/redland/librdf_storage_sqlite.so. NIX_CFLAGS_LINK = "-lraptor2"; + doCheck = false; # fails 1 out of 17 tests with a segmentation fault + meta = { homepage = http://librdf.org/; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 464e702acabb..ea24c9da88b9 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.13.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "0rs7ic95kix173kl1ijb1riigjxnp7yqvps35hfxbhjqbjc2wfgn"; + sha256 = "12918gcn0w5h6bqgx6s44w44bs1x2pcndn2833xzya69rddkdv6x"; }; buildInputs = [ @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/IntelRealSense/librealsense; license = licenses.asl20; maintainers = with maintainers; [ brian-dawn ]; - platforms = platforms.unix; + platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 083ea88301a6..521f963e277c 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.16"; + name = "librelp-1.2.17"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "0lzxc2ydjbbs50dalqp2s107ckp63arpk223cigasq0hl395s8qc"; + sha256 = "1w6blhfr3rlmvjj0fbr8rsycrkm5b92n44zaaijg1jnvxjfqpy0v"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index a29257af4c3c..e30f2b0af5d5 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -27,6 +27,7 @@ let meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "https://www.libressl.org"; + license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ]; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; }; @@ -43,4 +44,9 @@ in { version = "2.7.4"; sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy"; }; + + libressl_2_8 = generic { + version = "2.8.0"; + sha256 = "1hwxg14d6a9wgk360dvi0wfzw7b327a95wf6xqc3a1h6bfbblaxg"; + }; } diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix index 115f4cd90a0c..3ca84ed2ce5f 100644 --- a/pkgs/development/libraries/librsync/0.9.nix +++ b/pkgs/development/libraries/librsync/0.9.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared"; + configureFlags = [ + (stdenv.lib.enableFeature stdenv.isCygwin "static") + (stdenv.lib.enableFeature (!stdenv.isCygwin) "shared") + ]; dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index c2f0da910055..3ba80198fd72 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -1,15 +1,14 @@ {stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: stdenv.mkDerivation rec { - version = "3.0.8"; + version = "3.1.0"; name = "libsearpc-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "libsearpc"; - # Tag is missing: https://github.com/haiwen/libsearpc/commit/12a01268825e9c7e17794c58c367e3b4db912ad9 - rev = "12a01268825e9c7e17794c58c367e3b4db912ad9"; - sha256 = "00ck1hl1x0pn22q3ba32dq3ckc4nrsg58irsmrnmalqbsffhcim0"; + rev = "v${version}"; + sha256 = "1zf8xxsl95wdx0372kl8s153hd8q3lhwwvwr2k96ia8scbn2ylkp"; }; patches = [ ./libsearpc.pc.patch ]; @@ -22,13 +21,11 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - buildPhase = "make -j1"; - - meta = { + meta = with stdenv.lib; { homepage = https://github.com/haiwen/libsearpc; description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index e0c77a0cf357..c8d9e21366df 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, getopt, makeWrapper }: +{ stdenv, fetchurl, getopt, makeWrapper, utillinux }: stdenv.mkDerivation rec { name = "libseccomp-${version}"; @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { patchShebangs . ''; + checkInputs = [ utillinux ]; + doCheck = false; # dependency cycle + # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. preFixup = "rm -rfv src"; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index f311d1a03353..fde3c7a7b30e 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl , libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }: -let + +stdenv.mkDerivation rec { pname = "libsecret"; version = "0.18.5"; -in -stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { @@ -12,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww"; }; + postPatch = '' + patchShebangs . + ''; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ glib ]; @@ -19,6 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ]; # optional: build docs with gtk-doc? (probably needs a flag as well) + # checkInputs = [ python2 ]; + + doCheck = false; # fails. with python3 tests fail to evaluate, with python2 they fail to run python3 + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index bad5e7c59622..34d959423a36 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - version = "1.8.1"; + version = "1.8.2"; name = "libsixel-${version}"; src = fetchFromGitHub { repo = "libsixel"; rev = "v${version}"; owner = "saitoha"; - sha256 = "0cbhvd1yk0q08nxva5bga7bpp8yxjfdfnqicvip4l6k28mzz7pmf"; + sha256 = "1jn5z2ylccjkp9i12n5x53x2zzhhsgmgs6xxi7aja6qimfw90h1n"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 9db56aa3a9ec..ad8120d3591a 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.6.34"; + rev = "0.6.35"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7"; + sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index f9ea73089f4c..2804486e2f0a 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -3,22 +3,19 @@ , valaSupport ? true, vala_0_40 , intltool, python3 }: -let - pname = "libsoup"; - version = "2.62.2"; -in stdenv.mkDerivation rec { name = "${pname}-${version}"; + pname = "libsoup"; + version = "2.62.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy"; }; - prePatch = '' + postPatch = '' patchShebangs libsoup/ - '' + stdenv.lib.optionalString valaSupport - '' + '' + stdenv.lib.optionalString valaSupport '' substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" ''; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index b75baf149e1a..8e7b539527e1 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 sqlite zlib proj geos libiconv ]; - configureFlags = "--disable-freexl"; + configureFlags = [ "--disable-freexl" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 408436ca6184..9b5c3d530ebf 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { name = "libssh-0.7.5"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l"; }; + patches = [ + # Fix mysql-workbench compilation + # https://bugs.mysql.com/bug.php?id=91923 + (fetchpatch { + name = "include-fix-segfault-in-getissuebanner-add-missing-wrappers-in-libsshpp.patch"; + url = https://git.libssh.org/projects/libssh.git/patch/?id=5ea81166bf885d0fd5d4bb232fc22633f5aaf3c4; + sha256 = "12q818l3nasqrfrsghxdvjcyya1bfcg0idvsf8xwm5zj7criln0a"; + }) + ]; + postPatch = '' # Fix headers to use libsodium instead of NaCl sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index cc5b19f7a595..5762291568ce 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ texinfo ]; - buildInputs = [ perl ]; + nativeBuildInputs = [ texinfo perl ]; doCheck = true; diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index c8b299034fc7..e6cd140c4e4b 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -31,19 +31,19 @@ let in stdenv.mkDerivation rec { pname = "libtensorflow"; - version = "1.8.0"; + version = "1.9.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz"; sha256 = if system == "linux-x86_64" then if cudaSupport - then "0m1g4sqr9as0jgfx7wlyay2nkad6wgvsyk2gvhfkqkq5sm1vbx85" - else "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha" + then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3" + else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21" else if system == "darwin-x86_64" then if cudaSupport then unavailable - else "0q8lmyj8l50hl6l48c640ixanvhqf2836bicyl9p2x8sj97b7y8l" + else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657" else unavailable; }; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index c5a12432280b..bf0393fd89a6 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { prePatch = let debian = fetchurl { - url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-5.debian.tar.xz; - sha256 = "15lwcsd46gini27akms2ngyxnwi1hs2yskrv5x2wazs5fw5ii62w"; + # When the URL disappears, it typically means that Debian has new patches + # (probably security) and updating to new tarball will apply them as well. + url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz; + sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f"; }; in '' tar xf ${debian} diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 39860414791c..f19e9d274313 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,11 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf, zlib -, boost, openssl, libtool, python, libiconv, geoip }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf +, zlib, boost, openssl, libtool, python, libiconv, geoip, ncurses +}: let version = "1.1.9"; formattedVersion = lib.replaceChars ["."] ["_"] version; - boostPython = boost.override { enablePython = true; }; + # Make sure we override python, so the correct version is chosen + # for the bindings, if overridden + boostPython = boost.override { enablePython = true; inherit python; }; in stdenv.mkDerivation { name = "libtorrent-rasterbar-${version}"; @@ -19,9 +22,16 @@ in stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = [ boostPython openssl zlib python libiconv geoip ]; + buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ]; preConfigure = "./autotool.sh"; + postInstall = '' + moveToOutput "include" "$dev" + moveToOutput "lib/${python.libPrefix}" "$python" + ''; + + outputs = [ "out" "dev" "python" ]; + configureFlags = [ "--enable-python-binding" "--with-libgeoip=system" diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index a005c8b37465..b3636eef2621 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack +{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack , libvpx, check, libconfig, pkgconfig }: let @@ -20,7 +20,7 @@ let ]; buildInputs = [ - libsodium libmsgpack ncurses libconfig + libsodium msgpack ncurses libconfig ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; @@ -30,8 +30,6 @@ let enableParallelBuilding = true; doCheck = false; # hangs, tries to access the net? - - # for some reason the tests are not running - it says "No tests found!!" checkInputs = [ check ]; checkPhase = "ctest"; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix new file mode 100644 index 000000000000..f9f0b2b65551 --- /dev/null +++ b/pkgs/development/libraries/libunity/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool +, glib, vala, dee, gobjectIntrospection, libdbusmenu +, gtk3, intltool, gnome-common, python3, icu }: + +stdenv.mkDerivation rec { + pname = "libunity"; + version = "7.1.4"; + + name = "${pname}-${version}"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}+15.10.20151002.orig.tar.gz"; + sha256 = "1sf98qcjkxfibxk03firnc12dm6il8jzaq5763qam8ydg4li4gij"; + }; + + nativeBuildInputs = [ + autoconf + automake + gnome-common + gobjectIntrospection + intltool + libtool + pkgconfig + python3 + vala + ]; + + buildInputs = [ + glib + gtk3 + ]; + + propagatedBuildInputs = [ dee libdbusmenu ]; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + + configureFlags = [ + "--disable-static" + "--with-pygi-overrides-dir=$(out)/${python3.sitePackages}/gi/overrides" + ]; + + NIX_LDFLAGS = "-L${icu}/lib"; + + meta = with stdenv.lib; { + description = "A library for instrumenting and integrating with all aspects of the Unity shell"; + homepage = https://launchpad.net/libunity; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ worldofpeace ]; + }; +} diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 85f8b6df2959..58da13044523 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw"; }; - nativeBuildInputs = stdenv.lib.optional doCheck perl; + checkInputs = [ perl ]; preCheck = "patchShebangs tests/unit"; doCheck = true; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index ae53178e88d9..08aeba1254e5 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -1,25 +1,26 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libplist }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libplist }: stdenv.mkDerivation rec { - name = "libusbmuxd-1.0.10"; - src = fetchurl { - url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; - sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs"; - }; + pname = "libusbmuxd"; + version = "2018-07-23"; + + name = "${pname}-${version}"; - patches = [ - (fetchpatch { - name = "CVE-2016-5104.patch"; - url = "https://github.com/libimobiledevice/libusbmuxd/commit/4397b3376dc4e4cb1c991d0aed61ce6482614196.patch"; - sha256 = "0cl3vys7bkwbdzf64d0rz3zlqpfc30w4l7j49ljv01agh42ywhgk"; - }) - ]; + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "78df9be5fc8222ed53846cb553de9b5d24c85c6c"; + sha256 = "05hbn0mbmv5ln9hfsvnf7i1mnp6ncbyfnl5w331kg4fi12wjshc5"; + }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libplist ]; - meta = { - homepage = http://www.libimobiledevice.org; - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "A client library to multiplex connections from and to iOS devices"; + homepage = https://github.com/libimobiledevice/libusbmuxd; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index ce8d741adf23..a0ace84bc67d 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot" "multiple_listen" "delayed_accept" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" + "tty_pty" ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 02c13e413e33..fd35864fe343 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen @@ -66,6 +66,7 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/var/lib" "--with-libpcap" + "--with-qemu" "--with-vmware" "--with-vbox" "--with-test" diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 2f89c0abdfc6..b0449d8205d1 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.9"; + version = "0.4.10"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.bz2"; - sha256 = "1wn5lvx7c9dp98d9akqjhkv5fk94725hbvqzbjpy1v8y4mm9knb6"; + sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index bbaa6b089610..b0730452db89 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libx86emu-${version}"; - version = "1.14"; + version = "2.0"; src = fetchFromGitHub { owner = "wfeldt"; repo = "libx86emu"; rev = version; - sha256 = "120a01jrrd4rwwjfr5f612xq9hbh35c87a6wnqn7zzw3fqydc2lw"; + sha256 = "12rlkwnl5zgmmpm6n6cqnkyhkji4jw1d27y8x1krvlpi1z4bjidx"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index aa78d0d33c08..2f0f0f1425d1 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , zlib, xz, python2, findXMLCatalogs , buildPlatform, hostPlatform , pythonSupport ? buildPlatform == hostPlatform @@ -19,6 +19,19 @@ in stdenv.mkDerivation rec { sha256 = "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-14567_CVE-2018-9251.patch"; + url = https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74.patch; + sha256 = "1xpqsfkzhrqasza51c821mnds5l317djrz8086fmzpyf68vld03h"; + }) + (fetchpatch { + name = "CVE-2018-14404.patch"; + url = https://gitlab.gnome.org/GNOME/libxml2/commit/a436374994c47b12d5de1b8b1d191a098fa23594.patch; + sha256 = "19vp7p32vrninnfa7vk9ipw7n4cl1gg16xxbhjy2d0kwp1crvzqh"; + }) + ]; + outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py" ++ lib.optional enableStatic "static"; @@ -32,12 +45,13 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib findXMLCatalogs ] ++ lib.optional icuSupport icu; - configureFlags = - lib.optional pythonSupport "--with-python=${python}" - ++ lib.optional icuSupport "--with-icu" - ++ [ "--exec_prefix=$dev" ] - ++ lib.optional enableStatic "--enable-static" - ++ lib.optional (!enableShared) "--disable-shared"; + configureFlags = [ + "--exec_prefix=$dev" + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + (lib.withFeature icuSupport "icu") + (lib.withFeatureAs pythonSupport "python" python) + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 7bd0d1970f4e..45e15c82966e 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl }: let + # 0.2.1 broke the tests of pythonPackages.pyyaml 3.13 version = "0.1.7"; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix index 8af7d5d8797c..710e7a3f0729 100644 --- a/pkgs/development/libraries/libytnef/default.nix +++ b/pkgs/development/libraries/libytnef/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { name = "libytnef-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "Yeraze"; repo = "ytnef"; rev = "v${version}"; - sha256 = "1aavckl7rjbiakwcf4rrkhchrl450p3vq3dy78cxfmgg0jqnvxqy"; + sha256 = "07h48s5qf08503pp9kafqbwipdqghiif22ghki7z8j67gyp04l6l"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 131b64c1c7f2..50ed00711df7 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -9,13 +9,19 @@ stdenv.mkDerivation rec { sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9"; }; + postPatch = '' + patchShebangs test-driver + patchShebangs man/handle_links + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ perl ]; propagatedBuildInputs = [ zlib ]; - preInstall = '' - patchShebangs man/handle_links + preCheck = '' + # regress/runtests is a generated file + patchShebangs regress ''; # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice @@ -26,9 +32,10 @@ stdenv.mkDerivation rec { ( cd $dev/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h ) ''; - meta = { + meta = with stdenv.lib; { homepage = https://www.nih.at/libzip; description = "A C library for reading, creating and modifying zip archives"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index 6050a7080df9..695effe2ea92 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; }; - buildInputs = [boost icu libpng librevenge zlib cppunit]; - nativeBuildInputs = [doxygen pkgconfig]; - configureFlags = " --disable-werror "; + buildInputs = [ boost icu libpng librevenge zlib cppunit ]; + nativeBuildInputs = [ doxygen pkgconfig ]; + configureFlags = [ "--disable-werror" ]; meta = { inherit version; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 8e38b7b61927..2ad14efa3223 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v"; }; - buildInputs = stdenv.lib.optional doCheck libopcodes; + checkInputs = [ libopcodes ]; doCheck = true; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index c4ff0e892a82..a9a649e2de76 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , givaro , pkgconfig -, openblas +, blas , fflas-ffpack , gmpxx , optimize ? false # impure @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { buildInputs = [ givaro - openblas + blas gmpxx fflas-ffpack ]; configureFlags = [ - "--with-blas-libs=-lopenblas" + "--with-blas-libs=-l${blas.linkName}" "--disable-optimization" ] ++ stdenv.lib.optionals (!optimize) [ # disable SIMD instructions (which are enabled *when available* by default) @@ -65,12 +65,14 @@ stdenv.mkDerivation rec { doCheck = true; + enableParallelBuilding = true; + meta = { inherit version; description = "C++ library for exact, high-performance linear algebra"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.timokau]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://linalg.org/; }; } diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix new file mode 100644 index 000000000000..34dfe26ad70b --- /dev/null +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchFromGitHub +, lmdb }: + +stdenv.mkDerivation rec { + name = "lmdbxx-${version}"; + version = "0.9.14.0"; + + src = fetchFromGitHub { + owner = "bendiken"; + repo = "lmdbxx"; + rev = "${version}"; + sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6"; + }; + + buildInputs = [ lmdb ]; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + homepage = "https://github.com/bendiken/lmdbxx#readme"; + description = "C++11 wrapper for the LMDB embedded B+ tree database library"; + license = stdenv.lib.licenses.unlicense; + maintainers = with stdenv.lib.maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index e014e38c3f97..aecd75656dae 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ]; - configureFlags = "--with-ssl=openssl"; + configureFlags = [ "--with-ssl=openssl" ]; propagatedBuildInputs = [ openssl libidn glib zlib ]; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index a1a096b096d7..d99944228c73 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "mbedtls-${version}"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "1d4a0jc08q3h051amv8hhh3hmqp4f1rk5z7ffyfs2g8dassm78ir"; + sha256 = "09snlzlbn8yq95dnfbj2g5bh6y4q82xkaph7qp9ddnlqiaqcji2h"; }; nativeBuildInputs = [ cmake ninja perl ]; diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index f18c1e693cbc..2bfdb679156c 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -50,6 +50,12 @@ let configurePhase = ":"; + configureFlags = [ + # NOTE: Patents expired on June 17 2018. + # For details see: https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed + "texture-float" + ]; + makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 480afcf607a6..e1a9477dcd63 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -4,11 +4,7 @@ , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 , libglvnd -, grsecEnabled ? false , enableRadv ? true -# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. -# It's overridden for mesa_drivers. -, enableTextureFloats ? false , galliumDrivers ? null , driDrivers ? null , vulkanDrivers ? null @@ -67,7 +63,7 @@ let in let - version = "18.1.4"; + version = "18.1.5"; branch = head (splitString "." version); in @@ -81,7 +77,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h"; + sha256 = "69dbe6f1a6660386f5beb85d4fcf003ee23023ed7b9a603de84e9a37e8d98dea"; }; prePatch = "patchShebangs ."; @@ -90,9 +86,9 @@ let self = stdenv.mkDerivation { # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ - ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl + ./disk_cache-include-dri-driver-path-in-cache-key.patch ]; outputs = [ "out" "dev" "drivers" "osmesa" ]; @@ -115,8 +111,6 @@ let self = stdenv.mkDerivation { ("--with-vulkan-drivers=" + builtins.concatStringsSep "," vulkanDrivers)) ++ [ - (enableFeature enableTextureFloats "texture-float") - (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine "--enable-libglvnd" @@ -135,7 +129,6 @@ let self = stdenv.mkDerivation { "--enable-xvmc" "--enable-vdpau" "--enable-shared-glapi" - "--enable-sysfs" "--enable-llvm-shared-libs" "--enable-omx-bellagio" "--enable-va" @@ -272,7 +265,7 @@ let self = stdenv.mkDerivation { homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files platforms = platforms.linux; - maintainers = with maintainers; [ eduarrrd vcunat ]; + maintainers = with maintainers; [ vcunat ]; }; }; in self diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch new file mode 100644 index 000000000000..47391567fb9b --- /dev/null +++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -0,0 +1,52 @@ +From 9c9df280b318c26aece9873cf77b32e4f95634c1 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Mon, 6 Aug 2018 15:52:11 -0300 +Subject: [PATCH] disk_cache: include dri driver path in cache key + +This fixes invalid cache hits on NixOS where all shared library +timestamps in /nix/store are zero. +--- + src/util/Makefile.am | 3 +++ + src/util/disk_cache.c | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/src/util/Makefile.am b/src/util/Makefile.am +index 07bf052175..aea09f60b3 100644 +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am +@@ -30,6 +30,9 @@ noinst_LTLIBRARIES = \ + libmesautil.la \ + libxmlconfig.la + ++AM_CFLAGS = \ ++ -DDISK_CACHE_KEY=\"$(drivers)\" ++ + AM_CPPFLAGS = \ + $(PTHREAD_CFLAGS) \ + -I$(top_srcdir)/include +diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c +index 4a762eff20..8086c0be75 100644 +--- a/src/util/disk_cache.c ++++ b/src/util/disk_cache.c +@@ -388,8 +388,10 @@ disk_cache_create(const char *gpu_name, const char *timestamp, + + /* Create driver id keys */ + size_t ts_size = strlen(timestamp) + 1; ++ size_t key_size = strlen(DISK_CACHE_KEY) + 1; + size_t gpu_name_size = strlen(gpu_name) + 1; + cache->driver_keys_blob_size += ts_size; ++ cache->driver_keys_blob_size += key_size; + cache->driver_keys_blob_size += gpu_name_size; + + /* We sometimes store entire structs that contains a pointers in the cache, +@@ -410,6 +412,7 @@ disk_cache_create(const char *gpu_name, const char *timestamp, + uint8_t *drv_key_blob = cache->driver_keys_blob; + DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) + DRV_KEY_CPY(drv_key_blob, timestamp, ts_size) ++ DRV_KEY_CPY(drv_key_blob, DISK_CACHE_KEY, key_size) + DRV_KEY_CPY(drv_key_blob, gpu_name, gpu_name_size) + DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) + DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) +-- +2.18.0 + diff --git a/pkgs/development/libraries/mesa/glx_ro_text_segm.patch b/pkgs/development/libraries/mesa/glx_ro_text_segm.patch deleted file mode 100644 index 95f01ba9e52c..000000000000 --- a/pkgs/development/libraries/mesa/glx_ro_text_segm.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5068913..3d4271e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -429,6 +429,20 @@ AC_SUBST([GLESv2_LIB_GLOB]) - AC_SUBST([VG_LIB_GLOB]) - AC_SUBST([GLAPI_LIB_GLOB]) - -+ -+dnl readonly text segment on x86 hardened platforms -+AC_ARG_ENABLE([glx_rts], -+ [AS_HELP_STRING([--enable-glx-rts], -+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], -+ [enable_glx_rts="$enableval"], -+ [enable_glx_rts=no]) -+if test "x$enable_glx_rts" = xyes; then -+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" -+else -+ enable_glx_rts=no -+fi -+ -+ - dnl - dnl Arch/platform-specific settings - dnl diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index d9bac46230ac..c88a978574a7 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation { sourceRoot = "zlib-${zlib.version}/contrib/minizip"; meta = { + inherit (zlib.meta) license homepage; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich/default.nix index b5a36c184ff7..87d24854255a 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, gfortran -, slurm, openssh, hwloc +, openssh, hwloc } : stdenv.mkDerivation rec { @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { "--enable-sharedlib" ]; - buildInputs = [ perl gfortran slurm openssh hwloc ]; + enableParallelBuilding = true; + + buildInputs = [ perl gfortran openssh hwloc ]; doCheck = true; @@ -26,8 +28,12 @@ stdenv.mkDerivation rec { echo "fix rpath: $entry" patchelf --set-rpath "$out/lib" $entry done - ''; + # Ensure the default compilers are the ones mpich was built with + sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc + sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx + sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort + ''; meta = with stdenv.lib; { description = "Implementation of the Message Passing Interface (MPI) standard"; @@ -43,6 +49,6 @@ stdenv.mkDerivation rec { fullName = "MPICH license (permissive)"; }; maintainers = [ maintainers.markuskowa ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 2ecae98387e1..fe9cd6f492e5 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = ''A highly optimised library for bignum arithmetic forked from GMP''; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; downloadPage = "http://mpir.org/downloads.html"; homepage = http://mpir.org/; updateWalker = true; diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix index 8feacd4e3653..bf51f8954025 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/msgpack/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.1.5"; + version = "3.0.1"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "cpp-${version}"; - sha256 = "0n4kvma3dldfsvv7b0zw23qln6av5im2aqqd6m890i75zwwkw0zv"; + sha256 = "0nr6y9v4xbvzv717j9w9lhmags1y2s5mq103v044qlyd2jkbg2p4"; }; }) diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 947960d23592..67418b6666d4 100644 --- a/pkgs/development/libraries/libmsgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libmsgpack-${version}"; + name = "msgpack-${version}"; inherit src patches; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 0cb69f937564..861b387a993a 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da"; }; - patches = lib.optional (!stdenv.cc.isClang) ./clang.patch; + # The patch st-0.7.patch needs to be removed, if ncurses is upgraded in the future. + # It is necessary for the 6.1 version of ncurses. + patches = [ ./st-0.7.patch ] ++ lib.optional (!stdenv.cc.isClang) ./clang.patch; outputs = [ "out" "dev" "man" ]; setOutputFlags = false; # some aren't supported diff --git a/pkgs/development/libraries/ncurses/st-0.7.patch b/pkgs/development/libraries/ncurses/st-0.7.patch new file mode 100644 index 000000000000..956f9b68d68f --- /dev/null +++ b/pkgs/development/libraries/ncurses/st-0.7.patch @@ -0,0 +1,13 @@ +diff --git a/misc/terminfo.src b/misc/terminfo.src +index 84f4810..ac300a7 100644 +--- a/misc/terminfo.src ++++ b/misc/terminfo.src +@@ -6260,7 +6260,7 @@ st-0.7|simpleterm 0.7, + %=%t3%e%p1%d%;m, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| + %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, +- Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, ++ Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, + kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~, + kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~, + kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A, diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index dbde83c2d94b..d0f992efb2bc 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -28,13 +28,12 @@ stdenv.mkDerivation rec { buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; - configureFlags = '' - ${if shared then "--enable-shared" else "--disable-shared"} - ${if static then "--enable-static" else "--disable-static"} - ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl" else "--without-ssl"} - --enable-shared - ''; + configureFlags = [ + (stdenv.lib.enableFeature shared "shared") + (stdenv.lib.enableFeature static "static") + (stdenv.lib.withFeature compressionSupport "zlib") + (stdenv.lib.withFeature sslSupport "ssl") + ]; passthru = {inherit compressionSupport sslSupport;}; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 9c2a3265491a..7aad5be36f70 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -28,13 +28,12 @@ stdenv.mkDerivation rec { buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; - configureFlags = '' - ${if shared then "--enable-shared" else "--disable-shared"} - ${if static then "--enable-static" else "--disable-static"} - ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl" else "--without-ssl"} - --enable-shared - ''; + configureFlags = [ + (stdenv.lib.enableFeature shared "shared") + (stdenv.lib.enableFeature static "static") + (stdenv.lib.withFeature compressionSupport "zlib") + (stdenv.lib.withFeature sslSupport "ssl") + ]; passthru = {inherit compressionSupport sslSupport;}; diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 8446a91cceca..7d0e934d911c 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -16,6 +16,15 @@ in stdenv.mkDerivation rec { sha256 = "0hi61cdihwwvz5jz1l7yq712j7ca1cj4bhr8x0x7c2vlb1s9biw9"; }; + postPatch = '' + patchShebangs . + + # this test requires the net + for a in ncdap_test/Makefile.am ncdap_test/Makefile.in; do + substituteInPlace $a --replace testurl.sh " " + done + ''; + nativeBuildInputs = [ m4 ]; buildInputs = [ hdf5 curl mpi ]; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 0e9ff5d9105e..8db3a3d92ff6 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; - checkTarget = "test"; - enableParallelBuilding = true; cmakeFlags = [ @@ -26,6 +23,8 @@ stdenv.mkDerivation rec { "-DCMAKE_SYSTEM_NAME=Windows" ]; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + meta = with stdenv.lib; { description = "Header only C++ library for the JSON file format"; homepage = https://github.com/nlohmann/json; diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 3696578b8e04..904cdc6a3daa 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -10,11 +10,18 @@ stdenv.mkDerivation rec { buildInputs = [ octave ]; - configureFlags = "--with-cxx --enable-shared --with-pic --without-guile --without-python - --without-matlab " + - stdenv.lib.optionalString (octave != null) ("--with-octave " + - "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " + - "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct "); + configureFlags = [ + "--with-cxx" + "--enable-shared" + "--with-pic" + "--without-guile" + "--without-python" + "--without-matlab" + ] ++ stdenv.lib.optionals (octave != null) [ + "--with-octave" + "M_INSTALL_DIR=$(out)/${octave.sitePath}/m" + "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct" + ]; meta = { homepage = http://ab-initio.mit.edu/nlopt/; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 5387272a2f05..3089e6da23ae 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -55,6 +55,11 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; + # TODO(@oxij): investigate this: `make -n check` works but `make + # check` fails with "no rule", same for "installcheck". + doCheck = false; + doInstallCheck = false; + postInstall = '' rm -rf $out/private mv $out/public $out/include @@ -108,9 +113,10 @@ in stdenv.mkDerivation rec { rm -f "$out"/lib/*.a ''; - meta = { + meta = with stdenv.lib; { homepage = https://developer.mozilla.org/en-US/docs/NSS; description = "A set of libraries for development of security-enabled client and server applications"; - platforms = stdenv.lib.platforms.all; + license = licenses.mpl20; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index ab50cf1e17ca..63a51a90ccd2 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -14,10 +14,11 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { name = "ntl-${version}"; - version = "11.2.1"; + version = "11.3.0"; + src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489"; + sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s"; }; buildInputs = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { else "generic" # "chooses options that should be OK for most platforms" }" + "CXX=c++" ] ++ lib.optionals withGf2x [ "NTL_GF2X_LIB=on" "GF2X_PREFIX=${gf2x}" @@ -62,6 +64,8 @@ stdenv.mkDerivation rec { length integers, and for vectors, matrices, and polynomials over the integers and over finite fields. ''; + # Upstream contact: maintainer is victorshoup on GitHub. Alternatively the + # email listed on the homepage. homepage = http://www.shoup.net/ntl/; maintainers = with maintainers; [ timokau ]; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index fb36839fe233..44c8f51e856a 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python ]; - configureFlags = "--without-gobject CFLAGS=--std=gnu99"; + configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ]; # Remove this patch after version 016 patches = [ ./libnl-fix.patch ]; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 61024a33113e..bfbf6f1212fb 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.all; maintainers = [ ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix index 9f75bff40e9a..a9559c6abfba 100644 --- a/pkgs/development/libraries/openbsm/default.nix +++ b/pkgs/development/libraries/openbsm/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.openbsm.org/; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ matthewbauer ]; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 19d3d4f888fe..bd7d252e1a08 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -6,20 +6,20 @@ , pkgconfig , nettle , gnutls -, libmsgpack +, msgpack , readline , libargon2 }: stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.7.2"; + version = "1.7.4"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "0nia3gkn5jqs7lf0v6jkhh1c0czdx9743imgi77kcvn98k2n6sjc"; + sha256 = "1wqib5plak9bw2bla7y4qyjqi0b00kf8mfwlml16qj3i0aq6h2cp"; }; buildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pkgconfig nettle gnutls - libmsgpack + msgpack readline libargon2 ]; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 05370ad4a0bd..a4e15f5dbafc 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.6.8"; + version = "1.6.9"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "1ngak7qwanf8n1gqghh7snjl4lsp6xhks4y00b16isrm4rk3cnms"; + sha256 = "1nlbk7qarz2qv3apz1cxf5avjhlqfq2r8kxad0095kfyqz05jnfy"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 907f071d5c55..16e00e9f2b95 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,21 +1,13 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { - name = "openldap-2.4.45"; + name = "openldap-2.4.46"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "091qvwk5dkcpp17ziabcnh3rg3m7qwzw2pihfcd1d5fdxgywzmnd"; + sha256 = "0bab1km8f2nan1x0zgwliknbxg0zlf2pafxrr867kblrdfwdr44s"; }; - patches = [ - (fetchurl { - url = "https://bz-attachments.freebsd.org/attachment.cgi?id=183223"; - sha256 = "1fiy457hrxmydybjlvn8ypzlavz22cz31q2rga07n32dh4x759r3"; - }) - ]; - patchFlags = [ "-p0" ]; - # TODO: separate "out" and "bin" outputs = [ "out" "dev" "man" "devdoc" ]; @@ -59,6 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.openldap.org/; description = "An open source implementation of the Lightweight Directory Access Protocol"; + license = licenses.openldap; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 1748ebd5f3cd..a279fe79940f 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib +, numactl # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -24,7 +25,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optional isLinux libnl + ++ lib.optionals isLinux [ libnl numactl ] ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 8d0839041890..cddc2038791e 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,33 +1,72 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip -, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11 -, cairo, poppler, librsvg, libpng, libtiff, libXrandr -, xineLib, boost -, withApps ? false -, withSDL ? false, SDL -, withQt4 ? false, qt4 +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, + libX11, libXinerama, libXrandr, libGLU_combined, + glib, ilmbase, libxml2, pcre, zlib, + jpegSupport ? true, libjpeg, + jasperSupport ? true, jasper, + exrSupport ? false, openexr, + gifSupport ? true, giflib, + pngSupport ? true, libpng, + tiffSupport ? true, libtiff, + gdalSupport ? false, gdal, + curlSupport ? true, curl, + colladaSupport ? false, opencollada, + opencascadeSupport ? false, opencascade, + ffmpegSupport ? false, ffmpeg, + nvttSupport ? false, nvidia-texture-tools, + freetypeSupport ? true, freetype, + svgSupport ? false, librsvg, + pdfSupport ? false, poppler, + vncSupport ? false, libvncserver, + lasSupport ? false, libLAS, + luaSupport ? false, lua, + sdlSupport ? false, SDL2, + restSupport ? false, asio, boost, + withApps ? false, + withExamples ? false, fltk, wxGTK, }: stdenv.mkDerivation rec { name = "openscenegraph-${version}"; - version = "3.4.0"; + version = "3.6.2"; - src = fetchurl { - url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; - sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw"; + src = fetchFromGitHub { + owner = "openscenegraph"; + repo = "OpenSceneGraph"; + rev = "fb40a0d1db018ff39a08699a7f17f7eb6d949c36"; + sha256 = "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id"; }; - nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; + nativeBuildInputs = [ pkgconfig cmake doxygen ]; buildInputs = [ - freetype libjpeg jasper libxml2 zlib gdal curl libX11 - cairo poppler librsvg libpng libtiff libXrandr boost - xineLib - ] ++ lib.optional withSDL SDL - ++ lib.optional withQt4 qt4; + libX11 libXinerama libXrandr libGLU_combined + glib ilmbase libxml2 pcre zlib + ] ++ lib.optional jpegSupport libjpeg + ++ lib.optional jasperSupport jasper + ++ lib.optional exrSupport openexr + ++ lib.optional gifSupport giflib + ++ lib.optional pngSupport libpng + ++ lib.optional tiffSupport libtiff + ++ lib.optional gdalSupport gdal + ++ lib.optional curlSupport curl + ++ lib.optional colladaSupport opencollada + ++ lib.optional opencascadeSupport opencascade + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional nvttSupport nvidia-texture-tools + ++ lib.optional freetypeSupport freetype + ++ lib.optional svgSupport librsvg + ++ lib.optional pdfSupport poppler + ++ lib.optional vncSupport libvncserver + ++ lib.optional lasSupport libLAS + ++ lib.optional luaSupport lua + ++ lib.optional sdlSupport SDL2 + ++ lib.optionals restSupport [ asio boost ] + ++ lib.optionals withExamples [ fltk wxGTK ] + ; enableParallelBuilding = true; - cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; + cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; meta = with stdenv.lib; { description = "A 3D graphics toolkit"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4df0e08e6a72..380c0c4af638 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -24,11 +24,19 @@ let ++ optional (versionOlder version "1.0.2" && hostPlatform.isDarwin) ./darwin-arch.patch; - postPatch = if (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) then '' - substituteInPlace crypto/async/arch/async_posix.h \ - --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ - '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' - '' else null; + postPatch = '' + patchShebangs Configure + '' + optionalString (versionOlder version "1.1.0") '' + patchShebangs test/* + for a in test/t* ; do + substituteInPlace "$a" \ + --replace /bin/rm rm + done + '' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) '' + substituteInPlace crypto/async/arch/async_posix.h \ + --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ + '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' + ''; outputs = [ "bin" "dev" "out" "man" ]; setOutputFlags = false; @@ -38,6 +46,7 @@ let buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; # TODO(@Ericson2314): Improve with mass rebuild + configurePlatforms = []; configureScript = { "x86_64-darwin" = "./Configure darwin64-x86_64-cc"; "x86_64-solaris" = "./Configure solaris64-x86_64-gcc"; @@ -56,13 +65,6 @@ let throw "Not sure what configuration to use for ${hostPlatform.config}" ); - # TODO(@Ericson2314): Make unconditional on mass rebuild - ${if buildPlatform != hostPlatform then "configurePlatforms" else null} = []; - - preConfigure = '' - patchShebangs Configure - ''; - configureFlags = [ "shared" # "shared" builds both shared and static libraries "--libdir=lib" @@ -107,11 +109,12 @@ let fi ''; - meta = { + meta = with stdenv.lib; { homepage = https://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.peti ]; + license = licenses.openssl; + platforms = platforms.all; + maintainers = [ maintainers.peti ]; priority = 10; # resolves collision with ‘man-pages’ }; }; @@ -119,13 +122,13 @@ let in { openssl_1_0_2 = common { - version = "1.0.2o"; - sha256 = "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc"; + version = "1.0.2p"; + sha256 = "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah"; }; openssl_1_1_0 = common { - version = "1.1.0h"; - sha256 = "05x509lccqjscgyi935z809pwfm708islypwhmjnb6cyvrn64daq"; + version = "1.1.0i"; + sha256 = "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb"; }; } diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 1aa0f2684571..2122a7b23f1b 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags="$cmakeFlags -DPACKAGE_ARCHITECTURE=$(uname -m)"; ''; - configureFlags = "--disable-more-warnings"; + configureFlags = [ "--disable-more-warnings" ]; meta = with stdenv.lib; { description = "Openwsman server implementation and client API with bindings"; diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 56f0cc084d14..0c05e2ec5f61 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,13 +1,15 @@ -{ stdenv, requireFile, autoPatchelfHook, unzip, libaio, makeWrapper, odbcSupport ? false, unixODBC }: +{ stdenv, requireFile, autoPatchelfHook, fixDarwinDylibNames, unzip, libaio, makeWrapper, odbcSupport ? false, unixODBC }: assert odbcSupport -> unixODBC != null; let + inherit (stdenv.lib) optional optionals optionalString; + baseVersion = "12.2"; version = "${baseVersion}.0.1.0"; requireSource = component: arch: version: rel: hash: (requireFile rec { - name = "instantclient-${component}-${arch}-${version}" + (stdenv.lib.optionalString (rel != "") "-${rel}") + ".zip"; + name = "instantclient-${component}-${arch}-${version}" + (optionalString (rel != "") "-${rel}") + ".zip"; url = "http://www.oracle.com/technetwork/database/database-technologies/instant-client/downloads/index.html"; sha256 = hash; }); @@ -24,34 +26,46 @@ let (requireSource "basic" arch version "" "5015e3c9fba84e009f7519893f798a1622c37d1ae2c55104ff502c52a0fe5194") (requireSource "sdk" arch version "" "7f404c3573c062ce487a51ac4cfe650c878d7edf8e73b364ec852645ed1098cb") (requireSource "sqlplus" arch version "" "d49b2bd97376591ca07e7a836278933c3f251875c215044feac73ba9f451dfc2") ] - ++ stdenv.lib.optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d"); + ++ optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d"); "x86_64-darwin" = [ (requireSource "basic" arch version "2" "3ed3102e5a24f0da638694191edb34933309fb472eb1df21ad5c86eedac3ebb9") (requireSource "sdk" arch version "2" "e0befca9c4e71ebc9f444957ffa70f01aeeec5976ea27c40406471b04c34848b") (requireSource "sqlplus" arch version "2" "d147cbb5b2a954fdcb4b642df4f0bd1153fd56e0f56e7fa301601b4f7e2abe0e") ] - ++ stdenv.lib.optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e"); + ++ optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e"); }."${stdenv.system}" or throwSystem; + extLib = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation rec { inherit version srcs; name = "oracle-instantclient-${version}"; buildInputs = [ stdenv.cc.cc.lib ] - ++ stdenv.lib.optionals (stdenv.isLinux) [ libaio ] - ++ stdenv.lib.optional odbcSupport unixODBC; - nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ]; + ++ optionals (stdenv.isLinux) [ libaio ] + ++ optional odbcSupport unixODBC; + + nativeBuildInputs = [ makeWrapper unzip ] + ++ optional stdenv.isLinux autoPatchelfHook + ++ optional stdenv.isDarwin fixDarwinDylibNames; unpackCmd = "unzip $curSrc"; installPhase = '' mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"} - install -Dm755 {sqlplus,adrci,genezi} $out/bin - ln -s $out/bin/sqlplus $out/bin/sqlplus64 - install -Dm644 *${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib + ${optionalString stdenv.isDarwin '' + for exe in "$out/bin/"* ; do + install_name_tool -add_rpath "$out/lib" "$exe" + done + ''} + ln -sfn $out/bin/sqlplus $out/bin/sqlplus64 + install -Dm644 *${extLib}* $out/lib install -Dm644 *.jar $out/share/java install -Dm644 sdk/include/* $out/include install -Dm644 sdk/demo/* $out/share/${name}/demo + + # PECL::oci8 will not build without this + # this symlink only exists in dist zipfiles for some platforms + ln -sfn $out/lib/libclntsh${extLib}.12.1 $out/lib/libclntsh${extLib} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index febba5d5703f..b7033ea4ddf6 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = https://nzjrs.github.io/osm-gps-map; license = licenses.gpl2Plus; maintainers = with maintainers; [ hrdinka ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 212547c63a0e..e0e0b59a9a9f 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "p11-kit-${version}"; - version = "0.23.12"; + version = "0.23.13"; src = fetchFromGitHub { owner = "p11-glue"; repo = "p11-kit"; rev = version; - sha256 = "0pb3qlddzbw7dglwnrl7fs9g71vhqk7qzxnb1i4nw633qgy21ga1"; + sha256 = "1z2rbw2qbwj64i88llc1mkf0263qa0kxc2350kg25r7mghxbw1y6"; }; outputs = [ "out" "dev"]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index a9a8c5c2563e..28f8a221700d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { configureFlags = optional stdenv.isDarwin "--without-x"; + doCheck = false; # fails 1 out of 12 tests with "Fontconfig error: Cannot load default config file" + meta = with stdenv.lib; { description = "A library for laying out and rendering of text, with an emphasis on internationalization"; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index e8bfb51cf9ee..04104346748e 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; + url = "https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.bz2"; sha256 = "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c"; }; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index e0819cde679b..bbc4dfae86cf 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pcre2-${version}"; version = "10.31"; src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; + url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2"; sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0"; }; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; + doCheck = false; # fails 1 out of 3 tests, looks like a bug + postFixup = '' moveToOutput bin/pcre2-config "$dev" ''; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 8c4a9288a15b..639da1687a72 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rivet-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv"; + sha256 = "08lhr10h97vqhy6ci4zna4ngx9875j32zs8ad5sy38xgbbrx3474"; }; patches = [ @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; preConfigure = '' + substituteInPlace Makefile.in \ + --replace "SUBDIRS = src pyext data include bin analyses doc test" "SUBDIRS = src pyext data include bin analyses test" + substituteInPlace analyses/Makefile.in \ + --replace "!(tmp)" "" substituteInPlace bin/rivet-buildplugin.in \ --replace '"which"' '"${which}/bin/which"' \ --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 1dacdba1b1ce..c86b0ed3d1c8 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yoda-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "0fyf6ld1klzlfmr5sl1jxzck4a0h14zfkrff8397rn1fqnqbzmmk"; + sha256 = "0yq20fnckf6h0a53ghxsgia6ikq71ch9a0w0khq188r7rlg9gmzd"; }; pythonPath = []; # python wrapper support diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 2987c67ae757..af4e12a014b7 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool autoreconfHook ]; - buildInputs = stdenv.lib.optional doCheck libpng; + buildInputs = [ libpng ]; configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 3e69bbde75a2..3667aa696357 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pkcs11-helper-${version}"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${name}"; - sha256 = "07ij6i76abf6bdhczsq1wkln3q0y0wkfbsi882vj3gl2wvxh0d1i"; + sha256 = "1m7vd3f9dphcwnwz4vn2gh7byxzjfc836z0lg440yrilww20yhpy"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 9a43470de3b7..51e2b5059749 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { # TODO(@Dridus) remove the ++ libc at next hash break buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc; + preConfigure = '' + CC=${stdenv.cc.targetPrefix}cc + CXX=${stdenv.cc.targetPrefix}c++ + ''; + cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; meta = { diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 2b5f7cacd4b3..6675bbf91836 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,49 +1,25 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam -, intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl -, docbook_xml_dtd_412, gtk-doc +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam, perl +, intltool, spidermonkey_52 , gobjectIntrospection, libxslt, docbook_xsl, dbus +, docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? stdenv.isLinux, systemd -, doCheck ? false +, doCheck ? stdenv.isLinux }: let - system = "/var/run/current-system/sw"; + system = "/run/current-system/sw"; setuid = "/run/wrappers/bin"; #TODO: from <nixos> config.security.wrapperDir; - foolVars = { - SYSCONF = "/etc"; - DATA = "${system}/share"; # to find share/polkit-1/actions of other apps at runtime - }; - in stdenv.mkDerivation rec { - name = "polkit-0.113"; + name = "polkit-0.115"; src = fetchurl { url = "https://www.freedesktop.org/software/polkit/releases/${name}.tar.gz"; - sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71"; + sha256 = "0c91y61y4gy6p91cwbzg32dhavw4b7fflg370rimqhdxpzdfr1rg"; }; - patches = [ - (fetchpatch { - url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; - sha256 = "1cxnhj0y30g7ldqq1y6zwsbdwcx7h97d3mpd3h5jy7dhg3h9ym91"; - }) - (fetchpatch { - url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; - sha256 = "1h1rkd4avqyyr8q6836zzr3w10jf521gcqnvhrhzwdpgp1ay4si7"; - }) - (fetchpatch { - url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; - sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh"; - }) - (fetchpatch { - name = "netgroup-optional.patch"; - url = "https://bugs.freedesktop.org/attachment.cgi?id=118753"; - sha256 = "1zq51dhmqi9zi86bj9dq4i4pxlxm41k3k4a091j07bd78cjba038"; - }) - ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i -e "s/-Wl,--as-needed//" configure.ac @@ -52,35 +28,34 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ gtk-doc pkgconfig autoreconfHook intltool gobjectIntrospection ] + [ gtk-doc pkgconfig autoreconfHook intltool gobjectIntrospection perl ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = - [ glib expat pam spidermonkey_17 gobjectIntrospection ] + [ glib expat pam spidermonkey_52 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; - # Ugly hack to overwrite hardcoded directories - # TODO: investigate a proper patch which will be accepted upstream - # After update it's good to check the sources via: - # grep '\<PACKAGE_' '--include=*.[ch]' -R - CFLAGS = stdenv.lib.concatStringsSep " " - ( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var foolVars}"\"'') - (builtins.attrNames foolVars) ); + NIX_CFLAGS_COMPILE = " -Wno-deprecated-declarations "; # for polkit 0.114 and glib 2.56 preConfigure = '' + chmod +x test/mocklibc/bin/mocklibc{,-test}.in patchShebangs . - '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ '' - sed '/libsystemd autoconfigured/s/.*/:/' -i configure - '' + # ‘libpolkit-agent-1.so’ should call the setuid wrapper on # NixOS. Hard-coding the path is kinda ugly. Maybe we can just # call through $PATH, but that might have security implications. - + '' substituteInPlace src/polkitagent/polkitagentsession.c \ --replace 'PACKAGE_PREFIX "/lib/polkit-1/' '"${setuid}/' + substituteInPlace test/data/etc/polkit-1/rules.d/10-testing.rules \ + --replace /bin/true ${coreutils}/bin/true \ + --replace /bin/false ${coreutils}/bin/false + + '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ '' + sed '/libsystemd autoconfigured/s/.*/:/' -i configure ''; configureFlags = [ - #"--libexecdir=$(out)/libexec/polkit-1" # this and localstatedir are ignored by configure + "--datadir=${system}/share" + "--sysconfdir=/etc" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS @@ -96,11 +71,19 @@ stdenv.mkDerivation rec { paxmark mr test/polkitbackend/.libs/polkitbackendjsauthoritytest ''; + installFlags=["datadir=$(out)/share" "sysconfdir=$(out)/etc"]; + inherit doCheck; + checkInputs = [dbus]; + checkPhase = '' + # tests need access to the system bus + dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check' + ''; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/polkit; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; + license = licenses.gpl2; platforms = platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/polkit/system_bus.conf b/pkgs/development/libraries/polkit/system_bus.conf new file mode 100644 index 000000000000..435b4740a2f7 --- /dev/null +++ b/pkgs/development/libraries/polkit/system_bus.conf @@ -0,0 +1,58 @@ +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <!-- Our well-known bus type, do not change this --> + <type>system</type> + + <!-- Fork into daemon mode --> + <fork/> + + <!-- Enable logging to syslog --> + <syslog/> + + <!-- Only allow socket-credentials-based authentication --> + <auth>EXTERNAL</auth> + + <!-- Only listen on a local socket. (abstract=/path/to/socket + means use abstract namespace, don't really create filesystem + file; only Linux supports this. Use path=/whatever on other + systems.) --> + <listen>unix:path=/tmp/system_bus_socket</listen> + + <policy context="default"> + <!-- All users can connect to system bus --> + <allow user="*"/> + + <!-- Holes must be punched in service configuration files for + name ownership and sending method calls --> + <deny own="*"/> + <deny send_type="method_call"/> + + <!-- Signals and reply messages (method returns, errors) are allowed + by default --> + <allow send_type="signal"/> + <allow send_requested_reply="true" send_type="method_return"/> + <allow send_requested_reply="true" send_type="error"/> + + <!-- All messages may be received by default --> + <allow receive_type="method_call"/> + <allow receive_type="method_return"/> + <allow receive_type="error"/> + <allow receive_type="signal"/> + + <!-- Allow anyone to talk to the message bus --> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" /> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Introspectable"/> + <!-- But disallow some specific bus services --> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" + send_member="UpdateActivationEnvironment"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + +</busconfig> diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix new file mode 100644 index 000000000000..a56b14384e5b --- /dev/null +++ b/pkgs/development/libraries/prototypejs/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, ... }: +let + version = "1.7.3.0"; +in fetchurl { + name = "prototype-${version}.js"; + url = "https://ajax.googleapis.com/ajax/libs/prototype/${version}/prototype.js"; + sha256 = "0q43vvrsb22h4jvavs1gk3v4ps61yx9k85b5n6q9mxivhmxprg26"; + + meta = with stdenv.lib; { + description = "A foundation for ambitious web user interfaces"; + longDescription = '' + Prototype takes the complexity out of client-side web + programming. Built to solve real-world problems, it adds + useful extensions to the browser scripting environment + and provides elegant APIs around the clumsy interfaces + of Ajax and the Document Object Model. + ''; + homepage = http://prototypejs.org/; + downloadPage = http://prototypejs.org/download/; + license = licenses.mit; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index 6118d9c41d6f..90dc647233d8 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pth-2.0.7"; - + src = fetchurl { url = "mirror://gnu/pth/${name}.tar.gz"; sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") ''; - meta = { + meta = with stdenv.lib; { description = "The GNU Portable Threads library"; homepage = http://www.gnu.org/software/pth; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl21Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 568e7ce07b3b..ec32c44a91fc 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -10,16 +10,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ (stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security) qt ]; + buildInputs = [ qt ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; enableParallelBuilding = true; # tells CMake to use this CA bundle file if it is accessible - preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; + preConfigure = '' + export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt + ''; # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; + postPatch = '' + sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt + ''; + meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 829765d85499..596dc543e335 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,28 +1,22 @@ -{stdenv, fetchurl, cmake}: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "qhull-2012.1"; + name = "qhull-2016.1"; - src = fetchurl { - url = "${meta.homepage}/download/${name}-src.tgz"; - sha256 = "127zpjp6sm8c101hz239k82lpxqcqf4ksdyfqc2py2sm22kclpm3"; + src = fetchFromGitHub { + owner = "qhull"; + repo = "qhull"; + rev = "5bbc75608c817b50383a0c24c3977cc09d0bbfde"; + sha256 = "0wrgqc2mih7h8fs9v5jcn9dr56afqi9bgh2w9dcvzvzvxizr9kjj"; }; nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DMAN_INSTALL_DIR=share/man/man1 -DDOC_INSTALL_DIR=share/doc/qhull"; - - hardeningDisable = [ "format" ]; - - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }/#include <iterator>/' ./src/libqhullcpp/QhullIterator.h - sed -i 's/namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }/#include <iterator>/' ./src/libqhullcpp/QhullLinkedList.h - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://www.qhull.org/; - description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more"; + license = licenses.free; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 471f11ad107b..f7ddf8ff780c 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -6,7 +6,7 @@ , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) , flashplayerFix ? false, gdk_pixbuf -, gtkStyle ? true, gtk2 +, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs , developerBuild ? false , docs ? false @@ -139,37 +139,40 @@ stdenv.mkDerivation rec { prefixKey = "-prefix "; - ${if stdenv.hostPlatform == stdenv.buildPlatform then null else "configurePlatforms"} = []; + configurePlatforms = []; configureFlags = let + mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}"; platformFlag = if stdenv.hostPlatform != stdenv.buildPlatform then "-xplatform" else "-platform"; - in (if stdenv.hostPlatform == stdenv.buildPlatform then '' - -v -no-separate-debug-info -release -fast -confirm-license -opensource - - -${if stdenv.isFreeBSD then "no-" else ""}opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig - -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked - - ${if mysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite - - -exceptions -xmlpatterns - - -make libs -make tools -make translations - -${if demos then "" else "no"}make demos - -${if examples then "" else "no"}make examples - -${if docs then "" else "no"}make docs - - -no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend - ${if developerBuild then "-developer-build" else ""} - '' else '' - -static -release -confirm-license -opensource - -no-opengl -no-phonon - -no-svg - -make qmake -make libs -nomake tools - -nomake demos -nomake examples -nomake docs - '') + lib.optionalString stdenv.hostPlatform.isDarwin "${platformFlag} unsupported/macx-clang-libc++" - + lib.optionalString stdenv.hostPlatform.isMinGW "${platformFlag} win32-g++-4.6"; + in (if stdenv.hostPlatform != stdenv.buildPlatform then [ + # I've not tried any case other than i686-pc-mingw32. + # -nomake tools: it fails linking some asian language symbols + # -no-svg: it fails to build on mingw64 + "-static" "-release" "-confirm-license" "-opensource" + "-no-opengl" "-no-phonon" + "-no-svg" + "-make" "qmake" "-make" "libs" "-nomake" "tools" + ] else [ + "-v" "-no-separate-debug-info" "-release" "-fast" "-confirm-license" "-opensource" + + (mk (!stdenv.isFreeBSD) "opengl") "-xrender" "-xrandr" "-xinerama" "-xcursor" "-xinput" "-xfixes" "-fontconfig" + "-qdbus" (mk (cups != null) "cups") "-glib" "-dbus-linked" "-openssl-linked" + + "-${if mysql != null then "plugin" else "no"}-sql-mysql" "-system-sqlite" + + "-exceptions" "-xmlpatterns" + + "-make" "libs" "-make" "tools" "-make" "translations" + "-no-phonon" (mk buildWebkit "webkit") (mk buildMultimedia "multimedia") "-audio-backend" + ]) ++ [ + "-${if demos then "" else "no"}make" "demos" + "-${if examples then "" else "no"}make" "examples" + "-${if docs then "" else "no"}make" "docs" + ] ++ lib.optional developerBuild "-developer-build" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ platformFlag "unsupported/macx-clang-libc++" ] + ++ lib.optionals stdenv.hostPlatform.isWindows [ platformFlag "win32-g++-4.6" ]; propagatedBuildInputs = [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi @@ -219,7 +222,7 @@ stdenv.mkDerivation rec { cp bin/qmake* $out/bin ''; - dontStrip = if stdenv.hostPlatform == stdenv.buildPlatform then null else true; + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { homepage = http://qt-project.org/; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index dc5f2ae96b3e..7d342330491c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -103,8 +103,6 @@ EOF # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - substituteInPlace src/3rdparty/chromium/sandbox/mac/bootstrap_sandbox.cc \ - --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" ''; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 62da679157f0..833433fabeca 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -17,6 +17,9 @@ let url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-${name}.tar.gz"; sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; }; + postPatch = '' + patchShebangs tests + ''; buildInputs = [ perl ]; }; in @@ -60,6 +63,8 @@ qtModule { ] ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; + doCheck = false; # fails 13 out of 13 tests (ctest) + # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 5baeb76820ac..15be8490c1e9 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -9,13 +9,13 @@ assert stdenv.isDarwin -> darwin != null; stdenv.mkDerivation rec { name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; - version = "0.8.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` + version = "0.9.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = "v${version}"; - sha256 = "1r6qp9l2lp5jpc6ciklbg1swvvzcpc37rg9py46hk0wxy6klnm0b"; # v0.8.0 + sha256 = "1vff0jrycq6c204ch0w7fix5bsv90aw8pl9yiicx9r5ady0i29m7"; # v0.9.0 }; cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ] diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 484e58568721..4446226fedef 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; + configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 5a4306a63a78..1c777e849a46 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat zlib geos libspatialite ]; - configureFlags = "--disable-freexl"; + configureFlags = [ "--disable-freexl" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 2144a7f78935..48548bd72652 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 lzma curl ]; - configureFlags = "--enable-libcurl"; # optional but strongly recommended + configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended installFlags = "prefix=$(out)"; diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix new file mode 100644 index 000000000000..6ecc5159a3bc --- /dev/null +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, gtest, fetchgit, cmake, boost, eigen, python, vtk, zlib }: + +stdenv.mkDerivation rec { + version = "2.0.0"; + name = "mirtk-${version}"; + + # uses submodules so can't use fetchFromGitHub + src = fetchgit { + url = "https://github.com/BioMedIA/MIRTK.git"; + rev = "v${version}"; + sha256 = "0i2v97m66ir5myvi5b123r7zcagwy551b73s984gk7lksl5yiqxk"; + }; + + cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON"; + + doCheck = true; + + checkPhase = '' + ctest -E '(Polynomial|ConvolutionFunction|Downsampling|EdgeTable|InterpolateExtrapolateImage)' + ''; + # testPolynomial - segfaults for some reason + # testConvolutionFunction, testDownsampling - main not called correctly + # testEdgeTable, testInterpolateExtrapolateImageFunction - setup fails + + postInstall = '' + install -Dm644 -t "$out/share/bash-completion/completions/mirtk" share/completion/bash/mirtk + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake gtest ]; + buildInputs = [ boost eigen python vtk zlib ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/BioMedIA/MIRTK"; + description = "Medical image registration library and tools"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix index ae916b84ea33..19e5644b9930 100644 --- a/pkgs/development/libraries/science/biology/nifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/nifticlib/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; checkPhase = "ctest"; + doCheck = false; # fails 7 out of 293 tests meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/niftilib; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 9955af046597..286be260052b 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -59,4 +59,10 @@ stdenv.mkDerivation rec { homepage = http://www.netlib.org/blas/; platforms = stdenv.lib.platforms.unix; }; + + # We use linkName to pass a different name to --with-blas-libs for + # fflas-ffpack and linbox, because we use blas on darwin but openblas + # elsewhere. + # See see https://github.com/NixOS/nixpkgs/pull/45013. + passthru.linkName = "blas"; } diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix new file mode 100644 index 000000000000..645a865eb955 --- /dev/null +++ b/pkgs/development/libraries/science/math/ecos/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "ecos-${version}"; + version = "2.0.6"; + + src = fetchFromGitHub { + owner = "embotech"; + repo = "ecos"; + rev = "v${version}"; + sha256 = "11v958j66wq30gxpjpkgl7n3rvla845lygz8fl39pgf1vk9sdyc7"; + }; + + buildPhase = '' + make all shared + ''; + + doCheck = true; + checkPhase = '' + make test + ./runecos + ''; + + installPhase = '' + mkdir -p $out/lib + cp lib*.a lib*.so $out/lib + cp -r include $out/ + ''; + + meta = with stdenv.lib; { + description = "A lightweight conic solver for second-order cone programming"; + homepage = https://www.embotech.com/ECOS; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 6bbd43b0c848..51fbd9f14cb4 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -57,7 +57,27 @@ stdenv.mkDerivation rec { # based on gentoos makefile patch -- fix paths, adhere to flags ./makefile.patch - ]; + + # (fetchpatch { + # name = "default-double.patch"; + # url = "https://github.com/dimpase/lcalc/pull/1/commits/0500c67b6aa1f492715591669f6647c8f7a3ea59.patch"; + # sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vla"; + # }) + + (fetchpatch { + name = "c++11.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71"; + sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch"; + sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18"; + }); + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/Makefile --replace g++ c++ + ''; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix new file mode 100644 index 000000000000..be650f3c3ce8 --- /dev/null +++ b/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "1.0"; + name = "libbraiding-${version}"; + + src = fetchFromGitHub { + owner = "miguelmarco"; + repo = "libbraiding"; + rev = version; + sha256 = "0l68rikfr7k2l547gb3pp3g8cj5zzxwipm79xrb5r8ffj466ydxg"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + # no tests included for now (2018-08-05), but can't hurt to activate + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://github.com/miguelmarco/libbraiding/; + description = "C++ library for computations on braid groups"; + longDescription = '' + A library to compute several properties of braids, including centralizer and conjugacy check. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix new file mode 100644 index 000000000000..e96ee475d7d2 --- /dev/null +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, boehmgc +}: + +stdenv.mkDerivation rec { + version = "1.02r5"; + name = "llibhomfly-${version}"; + + src = fetchFromGitHub { + owner = "miguelmarco"; + repo = "libhomfly"; + rev = version; + sha256 = "1szv8iwlhvmy3saigi15xz8vgch92p2lbsm6440v5s8vxj455bvd"; + }; + + buildInputs = [ + boehmgc + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://github.com/miguelmarco/libhomfly/; + description = "Library to compute the homfly polynomial of knots and links"; + license = licenses.unlicense; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index fe90fa2e171d..33e8baada834 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "liblbfgs-1.10"; - configureFlags = "--enable-sse2"; + configureFlags = [ "--enable-sse2" ]; src = fetchurl { url = https://github.com/downloads/chokkan/liblbfgs/liblbfgs-1.10.tar.gz; sha256 = "1kv8d289rbz38wrpswx5dkhr2yh4fg4h6sszkp3fawxm09sann21"; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index e00a5ca9f8d9..18483f9e327c 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -143,4 +143,10 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ ttuegel ]; }; + + # We use linkName to pass a different name to --with-blas-libs for + # fflas-ffpack and linbox, because we use blas on darwin but openblas + # elsewhere. + # See see https://github.com/NixOS/nixpkgs/pull/45013. + passthru.linkName = "openblas"; } diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix new file mode 100644 index 000000000000..0539083e823c --- /dev/null +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, blas, liblapack, gfortran }: + +stdenv.mkDerivation rec { + name = "scs-${version}"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "cvxgrp"; + repo = "scs"; + rev = "v${version}"; + sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9"; + }; + + buildInputs = [ blas liblapack gfortran.cc.lib ]; + + # Actually link and add libgfortran to the rpath + patchPhase = '' + sed -i 's/#-lgfortran/-lgfortran/' scs.mk + ''; + + doCheck = true; + + # Test demo requires passing any int as $1; 42 chosen arbitrarily + checkPhase = '' + ./out/demo_socp_indirect 42 + ''; + + installPhase = '' + mkdir -p $out/lib + cp -r include $out/ + cp out/*.a out/*.so $out/lib/ + ''; + + meta = with stdenv.lib; { + description = "Splitting Conic Solver"; + longDescription = '' + Numerical optimization package for solving large-scale convex cone problems + ''; + homepage = https://github.com/cvxgrp/scs; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index bc322d4c5341..19d63d89834e 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { libname = "libzn_poly${stdenv.targetPlatform.extensions.sharedLibrary}"; + makeFlags = [ "CC=cc" ]; + # Tuning (either autotuning or with hand-written paramters) is possible # but not implemented here. # It seems buggy anyways (see homepage). @@ -45,6 +47,6 @@ stdenv.mkDerivation rec { description = "Polynomial arithmetic over Z/nZ"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix new file mode 100644 index 000000000000..ba291dc97ff2 --- /dev/null +++ b/pkgs/development/libraries/scriptaculous/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec { + name = "scriptaculous-${version}"; + version = "1.9.0"; + + src = fetchurl { + url = "https://script.aculo.us/dist/scriptaculous-js-${version}.zip"; + sha256 = "1xpnk3cq8n07lxd69k5jxh48s21zh41ihq10z4a6lcnk238rp8qz"; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir $out + cp src/*.js $out + ''; + + meta = with stdenv.lib; { + description = "A set of JavaScript libraries to enhance the user interface of web sites"; + longDescription = '' + script.aculo.us provides you with + easy-to-use, cross-browser user + interface JavaScript libraries to make + your web sites and web applications fly. + ''; + homepage = https://script.aculo.us/; + downloadPage = https://script.aculo.us/dist/; + license = licenses.mit; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 30a99415981b..dc3f4a118f6d 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, cmake }: +{ stdenv, fetchurl, pkgconfig, freetype, cmake, python }: stdenv.mkDerivation rec { version = "1.3.6"; @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ]; + checkInputs = [ python ]; + doCheck = false; # fails, probably missing something + meta = { description = "An advanced font engine"; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix new file mode 100644 index 000000000000..941e75b8ba92 --- /dev/null +++ b/pkgs/development/libraries/smarty3-i18n/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { + name = "smarty-i18n-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "kikimosha"; + repo = "smarty3-i18n"; + rev = "${version}"; + sha256 = "0rjxq4wka73ayna3hb5dxc5pgc8bw8p5fy507yc6cv2pl4h4nji2"; + }; + + installPhase = '' + mkdir $out + cp block.t.php $out + ''; + + meta = with stdenv.lib; { + description = "gettext for the smarty3 framework"; + license = licenses.lgpl21; + homepage = https://github.com/kikimosha/smarty3-i18n; + maintainers = with maintainers; [ das_j ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix new file mode 100644 index 000000000000..2fce5b3368f7 --- /dev/null +++ b/pkgs/development/libraries/smarty3/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { + name = "smarty3-${version}"; + version = "3.1.32"; + + src = fetchFromGitHub { + owner = "smarty-php"; + repo = "smarty"; + rev = "v${version}"; + sha256 = "1rfa5pzr23db1bivpivljgmgpn99m6ksgli64kmii5cmpvxi00y2"; + }; + + installPhase = '' + mkdir $out + cp -r libs/* $out + ''; + + meta = with stdenv.lib; { + description = "Smarty 3 template engine"; + longDescription = '' + Smarty is a template engine for PHP, facilitating the + separation of presentation (HTML/CSS) from application + logic. This implies that PHP code is application + logic, and is separated from the presentation. + ''; + homepage = https://www.smarty.net; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 1b5564dc1590..acf10cc497c8 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb"; }; - configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib"; + configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ]; postUnpack = ''sourceRoot="$sourceRoot/unix"''; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 9070423d8c76..4ea7de0b1a38 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ]; - configureFlags = "--disable-freexl"; + configureFlags = [ "--disable-freexl" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index aeab43c889d6..f4f10978ec13 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -2,7 +2,7 @@ , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , withPolkit ? true, polkit, acl, usbutils -, vala, gtk3, epoxy, libdrm, gst_all_1, phodav }: +, vala, gtk3, epoxy, libdrm, gst_all_1, phodav, opusfile }: # If this package is built with polkit support (withPolkit=true), # usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. @@ -30,13 +30,13 @@ with stdenv.lib; let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "spice-gtk-0.34"; + name = "spice-gtk-0.35"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; + sha256 = "11lymg467gvj5ys8k22ihnfbxjn4x34ygyzirpg2nphjwlyhgrml"; }; postPatch = '' @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { buildInputs = [ spice-protocol celt_0_5_1 openssl libpulseaudio gst_all_1.gst-plugins-base pixman - libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav + libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav opusfile ] ++ optionals withPolkit [ polkit acl usbutils ] ; nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ]; @@ -58,6 +58,7 @@ in stdenv.mkDerivation rec { "--with-gtk3" "--enable-introspection" "--enable-vala" + "--enable-celt051" ]; dontDisableStatic = true; # Needed by the coroutine test diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 031dd8f4f9c8..5b68b4901f9a 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "A tool that shows statistics about SQLite databases"; downloadPage = http://sqlite.org/download.html; homepage = http://www.sqlite.org; + license = licenses.publicDomain; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ed25fcb5b801..166ea39493bf 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -71,10 +71,13 @@ stdenv.mkDerivation rec { sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" ''; + doCheck = false; # fails to link against tcl + meta = { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = http://sqlite.org/download.html; homepage = http://www.sqlite.org/; + license = licenses.publicDomain; maintainers = with maintainers; [ eelco np ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index 734d68ca3d49..e5d322330e8e 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://sqlite.org/sqlar; description = "SQLite Archive utilities"; + license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 7bf314997433..fc9abdc24c7c 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "3.1.1"; + version = "3.1.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "090s8ymhd0g1s1d44fa73r5yi32hb4biwahhbfi327zd64yn8kd2"; + sha256 = "05p19y3vv0vi3nggrvy6ymqkvhab2dxncl044qj0xnaix2qmp658"; }; preConfigure = '' diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 0c3bb3b13064..afb168d5aa2a 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = "--without-conf --enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable"; + configureFlags = [ "--without-conf" "--enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable" ]; meta = with stdenv.lib; { description = "A software framework that allows research manipulation of Biblical texts"; diff --git a/pkgs/development/libraries/tachyon/darwin.patch b/pkgs/development/libraries/tachyon/darwin.patch new file mode 100644 index 000000000000..dbede586f073 --- /dev/null +++ b/pkgs/development/libraries/tachyon/darwin.patch @@ -0,0 +1,31 @@ +diff --git a/unix/Make-arch b/unix/Make-arch +index 08afb85..822c4fc 100644 +--- a/unix/Make-arch ++++ b/unix/Make-arch +@@ -924,7 +924,7 @@ macosx-thr: + $(MAKE) all \ + "ARCH = macosx-thr" \ + "CC = cc" \ +- "CFLAGS = -Os -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \ ++ "CFLAGS = -Os -ffast-math -DBsd -DTHR $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ +@@ -946,7 +946,7 @@ macosx-x86-thr: + $(MAKE) all \ + "ARCH = macosx-x86-thr" \ + "CC = cc" \ +- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \ ++ "CFLAGS = -O2 -ffast-math -DBsd -DTHR $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ +@@ -957,7 +957,7 @@ macosx-x86-thr-ogl: + $(MAKE) all \ + "ARCH = macosx-x86-thr-ogl" \ + "CC = cc" \ +- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include -F/System/Library/Frameworks $(MISCFLAGS) -DUSEOPENGL" \ ++ "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include $(MISCFLAGS) -DUSEOPENGL" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 4f711a639f73..d5d12e44df0a 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -50,7 +50,9 @@ stdenv.mkDerivation rec { ./no-absolute-paths.patch # Include new targets (like arm) ./make-archs.patch - ]; + ] ++ + # Ensure looks for nix-provided Carbon, not system frameworks + stdenv.lib.optional stdenv.isDarwin ./darwin.patch; installPhase = '' cd ../compile/${arch} @@ -66,8 +68,7 @@ stdenv.mkDerivation rec { description = ''A Parallel / Multiprocessor Ray Tracing System''; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; - # darwin fails due to missing Carbon.h, even though Carbon is a build input - platforms = with stdenv.lib.platforms; linux ++ cygwin; + platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin; homepage = http://jedi.ks.uiuc.edu/~johns/tachyon/; }; } diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index cb200b82e207..dee441a0c2f6 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # TODO: package boost-test, so we can run the test suite. (Currently it fails # to find libboost_unit_test_framework.a.) - configureFlags = "--enable-tests=no"; + configureFlags = [ "--enable-tests=no" ]; doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 7e18e7402273..232c95e6257e 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { ln -s $i private_headers/generic; done; ''; - configureFlags = '' - --with-tclinclude=${tcl}/include - --with-tclconfig=. - --with-tkinclude=${tk.dev}/include - --with-tkconfig=. - --libdir=''${prefix}/lib - ''; + configureFlags = [ + "--with-tclinclude=${tcl}/include" + "--with-tclconfig=." + "--with-tkinclude=${tk.dev}/include" + "--with-tkconfig=." + "--libdir=\${prefix}/lib" + ]; meta = with stdenv.lib; { description = "A widget library for Tcl/Tk"; diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 12f7e4c765d2..901b6aa097fd 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index a65254fea24e..a752da8cb57d 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libsndfile ]; + doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found" + meta = with stdenv.lib;{ description = "A MP2 encoder"; longDescription = '' diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index ccd243e1f735..1275df69f596 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unixODBC-${version}"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; - sha256 = "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8"; + sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5"; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 9b4e3a74afe1..c716ae7f8dbb 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -2,27 +2,20 @@ stdenv.mkDerivation rec { name = "uriparser-${version}"; - version = "0.8.5"; + version = "0.8.6"; + # Release tarball differs from source tarball src = fetchurl { - url = "mirror://sourceforge/project/uriparser/Sources/${version}/${name}.tar.bz2"; - sha256 = "1p9c6lr39rjl4bbzi7wl2nsg72gcz8qhicxh9v043qyr0dfcvsjq"; + url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2"; + sha256 = "0m2a5bf5b00ybagxmsa8mdj9mhc62vcm0qimy1ivfza1fbjsf287"; }; + nativeBuildInputs = [ pkgconfig cpptest doxygen graphviz ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cpptest doxygen graphviz ]; - - # There is actually no .map files to install in doc for v0.8.4 - # (dot outputs only SVG and PNG in this release) - preBuild = '' - substituteInPlace doc/Makefile.am --replace " html/*.map" "" - substituteInPlace doc/Makefile.in --replace " html/*.map" "" - ''; - + doCheck = true; meta = with stdenv.lib; { - homepage = http://uriparser.sourceforge.net/; + homepage = https://uriparser.github.io/; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 25ddfb355241..3d09545c9317 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "usbredir-${version}"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { url = "https://spice-space.org/download/usbredir/${name}.tar.bz2"; - sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"; + sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47"; }; NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 89dbeaab04ae..5b05f9ffef4a 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "utf8proc-${version}"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz"; - sha256 = "1cnpigrazhslw65s4j1a56j7p6d7d61wsxxjf1218i9mkwv2yw17"; + sha256 = "1gsxxp7vk36z1g5mg19kq10j35dks5f9slsab2xfazh5vgdx33rz"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index 9c252004656c..57a1cbf73c2c 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { dontBuild = false; - buildInputs = stdenv.lib.optional doCheck perl; - doCheck = true; + checkInputs = [ perl ]; checkTarget = "-C tests/"; installPhase = '' @@ -30,4 +29,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index e1a9336e3a56..a7dddd141246 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -6,7 +6,7 @@ let arch = if stdenv.isAarch32 then (if stdenv.is64bit then "arm64" else "arm") else (if stdenv.is64bit then "x64" else "ia32"); - armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard"; + armHardFloat = stdenv.isAarch32 && (stdenv.hostPlatform.platform.gcc.float or null) == "hard"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 099794f6623d..2b9fa5cc04c0 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu -, patchelf, coreutils, cctools +, patchelf, coreutils, xcbuild , doCheck ? false , static ? false }: @@ -124,13 +124,7 @@ stdenv.mkDerivation rec { # 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 - ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; - - prePatch = '' - chmod +w tools/gyp/pylib/gyp - chmod +w tools/gyp/pylib/gyp/xcode_emulation.py - ''; + patches = lib.optional (!doCheck) ./libv8-5.4.232.patch; postPatch = '' sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' gypfiles/gyp_v8 @@ -157,7 +151,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; buildInputs = [ readline python icu ] - ++ stdenv.lib.optional stdenv.isDarwin cctools + ++ 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" diff --git a/pkgs/development/libraries/v8/no-xcode.patch b/pkgs/development/libraries/v8/no-xcode.patch deleted file mode 100644 index 5562ffaf64e1..000000000000 --- a/pkgs/development/libraries/v8/no-xcode.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/tools/gyp/pylib/gyp/xcode_emulation.py -+++ a/tools/gyp/pylib/gyp/xcode_emulation.py -@@ -473,10 +473,16 @@ - - def _XcodeSdkPath(self, sdk_root): - if sdk_root not in XcodeSettings._sdk_path_cache: -- sdk_path = self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-path') -- XcodeSettings._sdk_path_cache[sdk_root] = sdk_path -- if sdk_root: -- XcodeSettings._sdk_root_cache[sdk_path] = sdk_root -+ try: -+ sdk_path = self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-path') -+ XcodeSettings._sdk_path_cache[sdk_root] = sdk_path -+ if sdk_root: -+ XcodeSettings._sdk_root_cache[sdk_path] = sdk_root -+ except: -+ # if this fails it's because xcodebuild failed, which means -+ # the user is probably on a CLT-only system, where there -+ # is no valid SDK root -+ XcodeSettings._sdk_path_cache[sdk_root] = None - return XcodeSettings._sdk_path_cache[sdk_root] - - def _AppendPlatformVersionMinFlags(self, lst): -@@ -606,10 +612,11 @@ - framework_root = sdk_root - else: - framework_root = '' -- config = self.spec['configurations'][self.configname] -- framework_dirs = config.get('mac_framework_dirs', []) -- for directory in framework_dirs: -- cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root)) -+ if 'SDKROOT' in self._Settings(): -+ config = self.spec['configurations'][self.configname] -+ framework_dirs = config.get('mac_framework_dirs', []) -+ for directory in framework_dirs: -+ cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root)) - - self.configname = None - return cflags -@@ -861,10 +868,11 @@ - sdk_root = self._SdkPath() - if not sdk_root: - sdk_root = '' -- config = self.spec['configurations'][self.configname] -- framework_dirs = config.get('mac_framework_dirs', []) -- for directory in framework_dirs: -- ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) -+ if 'SDKROOT' in self._Settings(): -+ config = self.spec['configurations'][self.configname] -+ framework_dirs = config.get('mac_framework_dirs', []) -+ for directory in framework_dirs: -+ ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) - - platform_root = self._XcodePlatformPath(configname) - if sdk_root and platform_root and self._IsXCTest(): -@@ -1358,7 +1366,7 @@ - if version: - version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0] - else: -- raise GypError("No Xcode or CLT version detected!") -+ version = "7.0.0" - # The CLT has no build information, so we return an empty string. - version_list = [version, ''] - version = version_list[0] diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 2fa6710c4faf..c2ab61c6bd17 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { yasm vapoursynth fftwFloat ]; - configureFlags = "--libdir=$(out)/lib/vapoursynth"; + configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ]; meta = with stdenv.lib; { description = "A set of filters for motion estimation and compensation"; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 14211ea65e9a..4a002becdb3b 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -26,6 +26,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory" + doCheck = false; + meta = with stdenv.lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; homepage = https://hci.iwr.uni-heidelberg.de/vigra; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index a8515975c353..b91c091c6c6f 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -24,6 +24,8 @@ in stdenv.mkDerivation rec { "pythondir=$(py)/${python3.sitePackages}" ]; + doCheck = false; # fails 1 out of 1 tests, needs `certutil` + meta = with stdenv.lib; { description = "A library for manipulating storage volume encryption keys and storing them separately from volumes to handle forgotten passphrases, and the associated command-line tool"; homepage = https://pagure.io/volume_key/; diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index 3555a9232285..750a786c3fca 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; }; - configureFlags = "--with-scanner --disable-documentation"; + configureFlags = [ "--with-scanner" "--disable-documentation" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 5dd79980680f..7c4d275e05fe 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "5.18"; + version = "5.19.1"; name = "wcslib-${version}"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; - sha256 ="16jh568k99c9p0y3qzcgps2rii933x9wlay7q1xm0lr59zqzp4xn"; + sha256 ="160gvz9xk4hvliwb75ry770qdf899kc89ij6r0y7fh60lbjz1far"; }; prePatch = '' diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index e234e3e66ad9..bb493d16a369 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.20.3"; + version = "2.20.5"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "1n0dy94bm7wvxln4jis1gp8plv8n4a01g41724zsf5psg1yk16sp"; + sha256 = "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"; }; patches = optionals stdenv.isDarwin [ @@ -39,12 +39,6 @@ stdenv.mkDerivation rec { patchShebangs . ''; - postConfigure = '' - # A stopgap for a non-deterministic build failure when using only one core - # Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=183788#c4 - ninja JavaScriptCoreForwardingHeaders WTFForwardingHeaders - ''; - cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 056ab8c51387..96e7b4c4a20d 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,18 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, darwin }: stdenv.mkDerivation rec { - name = "webrtc-audio-processing-0.3"; + name = "webrtc-audio-processing-0.3.1"; src = fetchurl { url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz"; - sha256 = "1yl0187xjh1j2zkb7v9cs9i868zcaj23pzn4a36qhzam9wfjjvkm"; + sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; }; - # Avoid this error: - # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode - patchPhase = stdenv.lib.optionalString stdenv.isAarch32 '' - substituteInPlace configure --replace 'armv7*|armv8*' 'disabled' - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + + patchPhase = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 309d9be274d1..5d3086fc5049 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -14,17 +14,15 @@ assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null with stdenv.lib; -let - version = "3.0.3.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "3.0.4"; name = "wxwidgets-${version}"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "1b90in65k1ij6kyk41knxs86i6hx5lkz30gpvzdvh0cbjagv5asq"; + sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; }; buildInputs = @@ -44,11 +42,7 @@ stdenv.mkDerivation { + "fix_assertion_using_hide_in_destroy.diff"; sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; }) - # "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4 - ] ++ optional (!withGtk2) (fetchpatch { - url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch"; - sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q"; - }); + ]; configureFlags = [ "--disable-precomp-headers" "--enable-mediactrl" @@ -87,7 +81,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; - + meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 8c0d065247b4..f93f7ed87460 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -11,7 +11,7 @@ let inherit sha256; }; - patches = [ + patches = stdenv.lib.optional (version == "1.4.7") [ # fix notmuch build, see https://notmuchmail.org/faq/#index12h2 # cannot fetchpatch this because base directory differs # TODO: remove on next xapian update diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 720e394afc70..e6f23a8a2703 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }: let - version = "0.11"; + version = "0.99"; in stdenv.mkDerivation rec { name = "xdg-desktop-portal-gtk-${version}"; @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { owner = "flatpak"; repo = "xdg-desktop-portal-gtk"; rev = version; - sha256 = "03ysv29k7fp14hx0gakjigzzlniwicqd81nrhnc6w4pgin0y0zwg"; + sha256 = "0jnmrl55gpvz06hy0832kcby4y84f0a1hiali6qy1lcmyqhm3v59"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 98bd8ba23bb5..9651f642a011 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }: let - version = "0.11"; + version = "0.99"; in stdenv.mkDerivation rec { name = "xdg-desktop-portal-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "flatpak"; repo = "xdg-desktop-portal"; rev = version; - sha256 = "06gipd51snvlp2jp68v2c8rwbsv36kjzg9xacm81n1w4b2dpz4g0"; + sha256 = "05garhdxylphrizyaqnz4sfpp28fd00v877q7cf1gyhpk1sr8i83"; }; patches = [ diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 063d64c69058..4369a9765e58 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { --replace xcrun "" ''; + preConfigure = '' + CC=${stdenv.cc.targetPrefix}cc + CXX=${stdenv.cc.targetPrefix}c++ + ''; + makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index b8537896d791..fa6b8fb13b5a 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + homepage = https://zlib.net; description = "Lossless data-compression library"; license = licenses.zlib; platforms = platforms.all; |