diff options
Diffstat (limited to 'pkgs/development/libraries')
200 files changed, 407 insertions, 346 deletions
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index ea72bfb434b..7fecae0a66e 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.8.3"; src = fetchurl { - url = "http://www.coin-or.org/download/source/CoinMP/${name}.tgz"; + url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz"; sha256 = "1xr2iwbbhm6l9hwiry5c10pz46xfih8bvzrzwp0nkzf76vdnb9m1"; }; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index d40b25cd804..c7e4a9c29ac 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { version = "1.2.15"; src = fetchurl { - url = "http://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${name}.tar.gz"; sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index c32f59636a9..5e01a83b7c0 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "2.0.8"; src = fetchurl { - url = "http://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${name}.tar.gz"; sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd"; }; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index ea5f37513af..17a2dd14b27 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.3"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; sha256 = "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m"; }; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index f31fe33ea09..3819aeb3c31 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2.0.2"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf"; }; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 5cadfb9d905..1cb74ac1b2d 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.1"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 83a2ffc077c..68c8c16ed4e 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.26"; src = fetchurl { - url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; + url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; }; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index c8cab33ed57..56701e80b1f 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.12"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"; }; diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index e471c3cc556..2a009a3b710 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.3"; src = fetchurl { - url = "http://icculus.org/SDL_sound/downloads/${name}.tar.gz"; + url = "https://icculus.org/SDL_sound/downloads/${name}.tar.gz"; sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r"; }; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index f98e4a3b0ad..cf6b53021f7 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.11"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"; }; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 3db15892a14..0f0e30ef0f3 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - "http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" + "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz" "mirror://gnu/adns/adns-${version}.tar.gz" ]; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index a59641e99d3..ea70e645453 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: +{stdenv, fetchFromGitHub, fetchpatch, mpir, gmp, mpfr, flint}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arb"; @@ -17,6 +17,14 @@ 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 = { inherit version; description = ''A library for arbitrary-precision interval arithmetic''; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 51ae14be404..adcb86cedf8 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "aubio-0.4.6"; src = fetchurl { - url = "http://aubio.org/pub/${name}.tar.bz2"; + url = "https://aubio.org/pub/${name}.tar.bz2"; sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx"; }; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 427625d6fc6..710c5b1a92c 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.24.2"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p"; }; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 1df696c0ec6..7f1e3d941a1 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0jkqnhc2pq31nmq4daxhmqdjgv2qi4ib27hwms2r5zhnmvvzlr67"; }; + enableParallelBuilding = true; + buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ]; preConfigure = '' diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 022c5504596..0f3f1fce42b 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "11pl45lp8sq5xkpipwk622w508nw0qcxr03ibicqn1lsws0hva96"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake libtool libjack2 alsaLib ]; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index d30cb1d369e..4709d034853 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4"; }; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 63f43ac7a2c..e29c7b5cb12 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; src = fetchurl { - url = "http://download.drobilla.net/${pname}-${version}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq"; }; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 182471acf4a..1ed457aa5fe 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "http://audiofile.68k.org/${name}.tar.gz"; + url = "https://audiofile.68k.org/${name}.tar.gz"; sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index f3e7fc7f162..a82f4e7dfda 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "babl-0.1.50"; src = fetchurl { - url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; + url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; sha256 = "0bavr2y4v88pip7vlca4kwmnksk2qxcvkkdp9jyfi6pzh701sb5m"; }; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 14479a56091..f33ee862358 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/musl/85b6a600996bdd71162b357e9ba93d8559342432/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; + url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3"; }) ] ++ # https://github.com/ivmai/bdwgc/pull/208 diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 00c6d279c7a..34e837f7cd2 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -9,8 +9,8 @@ , enableMultiThreaded ? true , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now , enableStatic ? !enableShared -, enablePython ? hostPlatform == buildPlatform -, enableNumpy ? enablePython && stdenv.lib.versionAtLeast version "1.65" +, enablePython ? false +, enableNumpy ? false , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , patches ? [] , mpi ? null diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index a384a770783..6f9b94fc872 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "c-ares-1.14.0"; src = fetchurl { - url = "http://c-ares.haxx.se/download/${name}.tar.gz"; + url = "https://c-ares.haxx.se/download/${name}.tar.gz"; sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"; }; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 44cdfc4e0ee..4486149cfce 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { name = "cairo-${version}"; src = fetchurl { - url = "http://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; + url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn"; }; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 09d162db853..47250f2b3da 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "http://www.cairographics.org/releases/${name}.tar.gz"; + url = "https://www.cairographics.org/releases/${name}.tar.gz"; # gnome doesn't have the latest version ATM; beware: same name but different hash # url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 1e2017ef0e7..432e49c4354 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -20,19 +20,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ glog ] + buildInputs = [ eigen glog ] ++ stdenv.lib.optional (google-gflags != null) google-gflags; - inherit eigen; - doCheck = runTests; checkTarget = "test"; - cmakeFlags = " - -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 - "; - meta = with stdenv.lib; { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 236d634a514..1f4b43db16c 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { - sha256 = "0qf2nqp28ahypnzjrr37f54i06ylni40y18q9kwp5s7i5cwbjqgc"; + sha256 = "0mfpz349c3arihvngw1a1gfhwlcw6wiwyc44bghjx1q109w7wm1m"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 7b48ffcaccf..0690bd425ae 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.14.0"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.gz"; + url = "https://dev-www.libreoffice.org/src/${name}.tar.gz"; sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"; }; diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index fd8fa1a994d..d50aca1679b 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.4"; src = fetchurl { - url = "http://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz"; + url = "https://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz"; sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s"; }; diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 06dde2ad407..fb129218175 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { name = "db-${version}"; src = fetchurl { - url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; + url = "https://download.oracle.com/berkeley-db/${name}.tar.gz"; sha256 = sha256; }; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4f6bd829099..ade6c98df94 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -14,7 +14,7 @@ self = stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; + url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 8841855a24e..015aeaed55b 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "eigen-${v}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; + url = "https://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; name = "eigen-${v}.tar.bz2"; sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj"; }; diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix index 7de05926da5..e6d13a5915a 100644 --- a/pkgs/development/libraries/eigen/3.3.nix +++ b/pkgs/development/libraries/eigen/3.3.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "eigen-${version}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; + url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2"; }; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 4e1559e5c73..c120132dcb8 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "eigen-${version}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; + url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04"; }; diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix new file mode 100644 index 00000000000..c973c2bd944 --- /dev/null +++ b/pkgs/development/libraries/embree/2.x.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, +openimageio, libjpeg, libpng, libpthreadstubs, libX11 +}: + +stdenv.mkDerivation rec { + name = "embree-${version}"; + version = "2.17.4"; + + src = fetchFromGitHub { + owner = "embree"; + repo = "embree"; + rev = "v2.17.4"; + sha256 = "0q3r724r58j4b6cbyy657fsb78z7a2c7d5mwdp7552skynsn2mn9"; + }; + + cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ]; + enableParallelBuilding = true; + + buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; + meta = with stdenv.lib; { + description = "High performance ray tracing kernels from Intel"; + homepage = https://embree.github.io/; + maintainers = with maintainers; [ hodapp ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 1f58fd698da..ac2c21d4cf0 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "exempi-2.4.5"; src = fetchurl { - url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; + url = "https://libopenraw.freedesktop.org/download/${name}.tar.bz2"; sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; }; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 5dd96c22584..97ad0c08ad9 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.06.11.00"; + version = "2018.06.18.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "005p2i36vxy2nppxqhdd4a5x58yx7zljb2diyqb820jygz2hfz8a"; + sha256 = "0698wazz99wzfbz29jgkl4rlakypg3v2cnsjg9a0yq83a4y038p7"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index e15f2583f4d..813ea050465 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg"; }; diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 7a80ce7fdb6..7d0b70ec627 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; + url = "https://download.osgeo.org/gdal/${version}/${name}.tar.gz"; sha256 = "561588bdfd9ca91919d4679a77a2b44214b158934ee8b425295ca5be33a1014d"; }; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 3fd0bb08244..a1980d62490 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.14.1"; + name = "gdbm-1.15"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd"; + sha256 = "03nwsbixdp3nx3fzn3gjy0n7rcppmkkxb2nxbmd8mvb7gwhf7zgr"; }; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index dcdb6a2297b..a4eab462046 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.6"; + version = "2.8.7"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "07q7w2qvpknvncp3g6m5f6b3m1ld4pzns52bqah8da7pabgwspjy"; + sha256 = "1psl4r0i3hfhjjm9y8q5ml9lnlal4212bm8df21087dddi9nfl62"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 161153b7e3d..287c3324386 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "gegl-0.3.34"; src = fetchurl { - url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; + url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw"; }; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index e9230b218be..623ee5b3375 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "gegl-${version}"; src = fetchurl { - url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; sha256 = "13bzl0k5l12pk8bkcq4ar7wscbnw7jswhp34mwfsrf10kp0qndba"; }; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 4d348c92171..eb7a6d6aaf2 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "geoclue-2.4.8"; src = fetchurl { - url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj"; }; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 24e3b4842fa..b92f6e61f56 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "geos-3.6.2"; src = fetchurl { - url = "http://download.osgeo.org/geos/${name}.tar.bz2"; + url = "https://download.osgeo.org/geos/${name}.tar.bz2"; sha256 = "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4"; }; diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 7ab06afdad6..1a449f57be7 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz"; sha256 = "17w4b39j9dvri5s278pxi8ha7mf47j87kq1lr802l4408rh02gqd"; }; diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index 1980c633474..dd72637f2eb 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz" - "http://www.linas.org/gle/pub/gle-3.1.0.tar.gz" + "https://www.linas.org/gle/pub/gle-3.1.0.tar.gz" ]; sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw"; }; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index b6de369a1ec..eeeff731a6e 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { - url = "http://camaya.net/download/gloox-${version}.tar.bz2"; + url = "https://camaya.net/download/gloox-${version}.tar.bz2"; sha256 = "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw"; }; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix new file mode 100644 index 00000000000..051228aeb15 --- /dev/null +++ b/pkgs/development/libraries/gspell/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobjectIntrospection, gnome3 }: + +let + pname = "gspell"; + version = "1.8.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" ]; + outputBin = "dev"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1"; + }; + + propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig + + nativeBuildInputs = [ pkgconfig vala gobjectIntrospection libxml2 ]; + buildInputs = [ glib gtk3 isocodes ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A spell-checking library for GTK+ applications"; + homepage = https://wiki.gnome.org/Projects/gspell; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 36da2fb72aa..d0a2d3691b4 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -6,7 +6,7 @@ let version="1.4"; name="${baseName}-${version}"; hash="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; - url="http://foicica.com/gtdialog/download/gtdialog_1.4.zip"; + url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip"; sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 81a2c869179..7c67ab48ad4 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; src = fetchurl { - url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; + url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; sha256 = "18wnbq919k5h8pfm1pfy38gs1qzj1hnfr1wq989bix1n2jiii1d1"; }; diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 82a4ec33755..a48908f41dd 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx"; - url = "http://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz"; + url = "https://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index cdb018d297b..20a60f1a102 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { - url = "http://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; + url = "https://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"; }; diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 23adfd80caa..daee9adb1fd 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "dbus-java-2.7"; src = fetchurl { - url = http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz; + url = https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz; sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 13b4df395e5..6af8885464a 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "GeoIPJava-1.2.5"; src = fetchurl { - url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; + url = https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 87753533169..ad5192f94ce 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = http://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; + url = https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 6435e9fc32d..321ebb46e46 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jbigkit-2.1"; src = fetchurl { - url = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 7b6834166d8..a269069fb04 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { - sha256 = "0n516gqv501ymj99bickbr2cbhr109azh9hc1hn7flbcjzz3aljc"; + sha256 = "0lhdncwg2xbd3gy65rx8w2qcxvcwfirzkl762zdwqxf6bj6p2hvb"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 1e7720b0656..de796307de1 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { - url = "http://download.osgeo.org/liblas/${name}.tar.bz2"; + url = "https://download.osgeo.org/liblas/${name}.tar.bz2"; sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 187e06239c1..fe2229bcea6 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1.2"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"; }; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index 5f0b1ccd18e..ef583818859 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libantlr3c-3.4"; src = fetchurl { - url = http://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; + url = https://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index aab8fcd4beb..eebe667badb 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.5-rc2"; src = fetchurl { - url = "http://distfiles.audacious-media-player.org/${name}.tar.bz2"; + url = "https://distfiles.audacious-media-player.org/${name}.tar.bz2"; sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; }; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 5ccfb0d1b26..04bd3f3d71e 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, tecla +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: stdenv.mkDerivation rec { @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git doxygen help2man tecla libusb1 udev ]; + # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 + buildInputs = [ cmake git doxygen help2man tecla libusb1 ] + ++ lib.optionals stdenv.isLinux [ udev ] + ++ lib.optionals stdenv.isDarwin [ ncurses ]; # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; @@ -24,17 +27,19 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Debug" + "-DBUILD_DOCUMENTATION=ON" + ] ++ lib.optionals stdenv.isLinux [ "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" - "-DBUILD_DOCUMENTATION=ON" ]; - meta = with stdenv.lib; { - homepage = https://www.nuand.com/; + hardeningDisable = [ "fortify" ]; + + meta = with lib; { + homepage = https://nuand.com/libbladeRF-doc; description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; maintainers = with maintainers; [ funfunctor ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index ff9412ceb58..36410e842a5 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.8.7"; src = fetchurl { - url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; + url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz"; sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m"; }; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 6d8cafcfaa6..8b5130b0eac 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libcdr-0.1.4"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/${name}.tar.xz"; sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7"; }; diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index ea27046279c..6d37eb19c71 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.4.0"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6"; }; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 3386b081a10..ce67a8efa80 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.9.0"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; }; diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index 7b4d39f955a..81122a6eb52 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { }; src = fetchurl { - url = "http://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2"; + url = "https://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2"; sha1 = "0e8d255145afbc339a3284ef85a43f4baf3fec43"; }; diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index fc0221b9388..5a0006ad6c6 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid curl libxml2 ]; src = fetchurl { - url = "http://www.opendap.org/pub/source/${name}.tar.gz"; + url = "https://www.opendap.org/pub/source/${name}.tar.gz"; sha256 = "0gnki93z3kkzp65x7n1kancy7bd503j4qja5fhzvm1gkmi5l65aj"; }; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index a09e48dcc1d..c94806b50c1 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.0"; src = fetchurl { - url = "http://www.libdivecomputer.org/releases/${name}.tar.gz"; + url = "https://www.libdivecomputer.org/releases/${name}.tar.gz"; sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0"; }; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4d1b4e4c3fd..93ef1957d2c 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libdrm-2.4.92"; src = fetchurl { - url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; + url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2"; sha256 = "1yirzx8hmlvv6r0l7lb3zxmgy5la2mri9al0k16xqfg19pdqzr79"; }; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 6057dae4be2..e81ea18103d 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -3,7 +3,7 @@ let version = "20180129"; src = fetchurl { - url = "http://www.prevanders.net/libdwarf-${version}.tar.gz"; + url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; # Upstream displays this hash broken into three parts: sha512 = "02f8024bb9959c91a1fe322459f7587a589d096595" + "6d643921a173e6f9e0a184db7aef66f0fd2548d669" diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 5f422f7018b..5127231dab6 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libeatmydata-105"; src = fetchurl { - url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; + url = "https://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx"; }; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 4b233301cce..b5b2b8e3734 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libebml-1.3.5"; src = fetchurl { - url = "http://dl.matroska.org/downloads/libebml/${name}.tar.xz"; + url = "https://dl.matroska.org/downloads/libebml/${name}.tar.xz"; sha256 = "005a0ipqnfbsq47zrc61zszi439jw32q5xd6dc1jyb3lc0zl266q"; }; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index da4bbcad4fb..bc4cea1b470 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libedit-20180525-3.1"; src = fetchurl { - url = "http://thrysoee.dk/editline/${name}.tar.gz"; + url = "https://thrysoee.dk/editline/${name}.tar.gz"; sha256 = "05iicng4kag5hxdc7adbyj1gm3qbmvcc33m9cyx5gys0s67yl6y4"; }; diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 0ba703585bb..8d264c929a5 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libexttextcat-3.4.5"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"; }; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 6aca1d2be6d..fa04655341d 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1"; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz"; + url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz"; sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index c6deb1fc929..b59bf9a06ac 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "libftdi1-1.4"; src = fetchurl { - url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; + url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; }; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index f90e741a57e..74b87a46ef0 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libftdi-0.20"; src = fetchurl { - url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; + url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix index dec9676d572..42e812ec1f5 100644 --- a/pkgs/development/libraries/libgap/default.nix +++ b/pkgs/development/libraries/libgap/default.nix @@ -1,10 +1,17 @@ -{stdenv, fetchurl, gmp}: +{ stdenv +, fetchurl +, gmp +}: +# will probably be obsolte (or at leat built from the upstream gap sources) soon (gap 4.9?). See +# - https://github.com/gap-system/gap/projects/5#card-6239828 +# - https://github.com/markuspf/gap/issues/2 +# - https://trac.sagemath.org/ticket/22626 stdenv.mkDerivation rec { name = "libgap-${version}"; + # Has to be the same version as "gap" version = "4.8.6"; - # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { - url = "http://mirrors.mit.edu/sage/spkg/upstream/libgap/libgap-${version}.tar.gz"; + url = "mirror://sageupstream/libgap/libgap-${version}.tar.gz"; sha256 = "1h5fx5a55857w583ql7ly2jl49qyx9mvs7j5abys00ra9gzrpn5v"; }; buildInputs = [gmp]; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 79f49c629b8..05c320c42ae 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libgdiplus-2.10.9"; src = fetchurl { - url = "http://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2"; sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd"; }; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 3d49fa06450..48a1490caec 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libgeotiff-${version}"; src = fetchurl { - url = "http://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz"; + url = "https://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz"; sha256 = "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"; }; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 90d41e30502..08fce9c521e 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.0"; src = fetchurl { - url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; sha256 = "02xx6bqxzgkvrawwnzrnxx1ypk244q4kpwfd58266f9ji8kq18h6"; }; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 106de68d367..7569f2613bb 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.0"; + version = "1.38.2"; src = fetchurl { url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; - sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3"; + sha256 = "16v2lpi9c0vnic2x0vpszmckh0x39bmf6x7y00vvzbwhszshxx3w"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index fd9c8dc9a5e..1efc16b2bf5 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,29 +1,53 @@ -{ stdenv, fetchFromGitHub, perl, cmake }: +{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobjectIntrospection +, python3, tzdata, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glib, libxml2, icu }: stdenv.mkDerivation rec { name = "libical-${version}"; - version = "2.0.0"; + version = "3.0.3"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "0xsvqy1hzmwxn783wrb2k8p751544pzv39v9ynr9pj4yzkwjzsvb"; + sha256 = "0dhlfn6n136di4fbqd74gdaibyh5zz1vac5x8ii3bjc2d5h7hw8h"; }; - nativeBuildInputs = [ perl cmake ]; + nativeBuildInputs = [ + perl pkgconfig cmake ninja vala gobjectIntrospection + (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests + gtk-doc docbook_xsl docbook_xml_dtd_43 # docs + ]; + buildInputs = [ glib libxml2 icu ]; + + cmakeFlags = [ + "-DGOBJECT_INTROSPECTION=True" + "-DICAL_GLIB_VAPI=True" + ]; patches = [ # TODO: upstream this patch + # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch ]; - doCheck = false; # fails all the tests (ctest) + # Using install check so we do not have to manually set + # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + export TZDIR=${tzdata}/share/zoneinfo + ctest --output-on-failure + + runHook postInstallCheck + ''; meta = with stdenv.lib; { homepage = https://github.com/libical/libical; description = "An Open Source implementation of the iCalendar protocols"; - license = licenses.mpl10; + license = licenses.mpl20; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index 715ba1fa842..59d23e490e5 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,9 +1,9 @@ --- a/src/libical/icaltz-util.c +++ b/src/libical/icaltz-util.c -@@ -96,9 +96,9 @@ typedef struct - static char *zdir = NULL; +@@ -94,9 +94,9 @@ + static const char *zdir = NULL; - static char *search_paths[] = { + static const char *search_paths[] = { + "/etc/zoneinfo", "/usr/share/zoneinfo", "/usr/lib/zoneinfo", @@ -11,13 +11,13 @@ "/usr/share/lib/zoneinfo" }; -@@ -179,6 +179,15 @@ static void set_zonedir(void) +@@ -178,6 +178,15 @@ const char *fname = ZONES_TAB_SYSTEM_FILENAME; size_t i, num_search_paths; + const char *env_tzdir = getenv ("TZDIR"); + if (env_tzdir) { -+ snprintf(file_path, MAXPATHLEN, "%s/%s", env_tzdir, fname); ++ sprintf (file_path, "%s/%s", env_tzdir, fname); + if (!access (file_path, F_OK|R_OK)) { + zdir = env_tzdir; + return; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 0e900ca9db6..24dd4f2465c 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { sed -i -e '/preload/d' Makefile.in ''; - configureFlags = lib.optional stdenv.isFreeBSD "--with-pic" - ++ lib.optional enableStatic "--enable-static" - ++ lib.optional (!enableShared) "--disable-shared"; + configureFlags = [ + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; meta = { description = "An iconv(3) implementation"; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 3b4e3233d55..bf08db6d3b7 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "1.11.0"; src = fetchurl { - url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; sha256 = "04mwl1v51b785h7q3v23hahr0qzr48qq1jzj7d3msjvgh97nr8v4"; }; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index fcecd3a9d13..798aef8e7da 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libX11 libXext libpng ]; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2"; + url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2"; sha256 = "0lvv44s3bf96zvkysa4ansxj2ffgj3b5kgpliln538q4wd9ank15"; }; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 1b17ff0dd43..8e429875b36 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ guile ]; src = fetchurl { - url = "http://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz"; + url = "https://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz"; sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab"; }; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 764f4442e6c..e7bce0e8018 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libmatroska-1.4.8"; src = fetchurl { - url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; + url = "https://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq"; }; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 2dbdb60b4b6..7c4b451ae6d 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libmnl-1.0.4"; src = fetchurl { - url = "http://netfilter.org/projects/libmnl/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libmnl/files/${name}.tar.bz2"; sha256 = "108zampspaalv44zn0ar9h386dlfixpd149bnxa5hsi8kxlqj7qp"; }; diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index 084d7ba7370..a5a4d68ad96 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libmpcdec-1.2.6"; src = fetchurl { - url = http://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; + url = https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index b0adcf23754..f1a061e5ab5 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libmrss-0.19.2"; src = fetchurl { - url = "http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz"; + url = "https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz"; sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507"; }; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 79d4c056341..ef250441dab 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libmspack-0.6alpha"; src = fetchurl { - url = "http://www.cabextract.org.uk/libmspack/${name}.tar.gz"; + url = "https://www.cabextract.org.uk/libmspack/${name}.tar.gz"; sha256 = "08gr2pcinas6bdqz3k0286g5cnksmcx813skmdwyca6bmj1fxnqy"; }; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 9eefbcfdb49..2b7258031c3 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.9"; src = fetchurl { - url = "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; + url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; sha256 = "1r6j17sy5816a2ld759iis2k6igc2w9p70y4nw9w3rd4d5x88c9y"; }; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index fa94fa549e4..a680e009ab6 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.0"; src = fetchurl { - url = "http://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2"; sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index 5395b5b2e99..fa6461d8691 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libnfnetlink-1.0.1"; src = fetchurl { - url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2"; sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"; }; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index c7967c3fb6f..cdf93b0b2ff 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libnice-0.1.14"; src = fetchurl { - url = "http://nice.freedesktop.org/releases/${name}.tar.gz"; + url = "https://nice.freedesktop.org/releases/${name}.tar.gz"; sha256 = "17404z0fr6z3k7s2pkyyh9xp5gv7yylgyxx01mpl7424bnlhn4my"; }; diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index f34c421a120..8d97a13b0a0 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libnxml-0.18.3"; src = fetchurl { - url = "http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz"; + url = "https://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz"; sha256 = "0ix5b9bxd7r517vhgcxwdviq4m0g0pq46s5g3h04gcqnpbin150g"; }; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 94555438693..f94f327ea02 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libpcap-1.8.1"; src = fetchurl { - url = "http://www.tcpdump.org/release/${name}.tar.gz"; + url = "https://www.tcpdump.org/release/${name}.tar.gz"; sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7"; }; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index d8ebc2e83a6..8da097c3d38 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; + url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis"; }; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 3ce4b3f2d3f..9803e09610e 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.18.12"; src = fetchurl { - url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; + url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"; }; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 5b3beda1eb8..2f78222cebb 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sourceName = "librep_${version}"; src = fetchurl { - url = "http://download.tuxfamily.org/librep/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/librep/${sourceName}.tar.xz"; sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 78e7036bdcc..82caacf93e6 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; major = "1"; minor = "8"; - level = "6"; + level = "7"; version = "${major}.${minor}.${level}"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz"; - sha256 = "0lzivfdq0crmfr01c6f5h883yr7wvagq198xkk3srdmvshhxmwnw"; + sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da"; }; nativeBuildInputs = [ pkgconfig ] diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index aa3aaa1c59b..8018b84a52b 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libspatialindex-${version}"; src = fetchurl { - url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; + url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; sha256 = "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw"; }; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 253c5365c8a..b75baf149e1 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libspatialite-4.3.0a"; src = fetchurl { - url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz"; sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"; }; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 647e6f16fdf..f1e4169bd48 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libspectre-0.2.7"; src = fetchurl { - url = "http://libspectre.freedesktop.org/releases/${name}.tar.gz"; + url = "https://libspectre.freedesktop.org/releases/${name}.tar.gz"; sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; }; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 72d73e35848..fb7b3be6b69 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libstatgrab-0.91"; src = fetchurl { - url = "http://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; + url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83"; }; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 6676944d529..c492a15bfa4 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { - url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; + url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"; }; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index d0b2d79e9fa..1cc42613859 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -4,6 +4,9 @@ let version = "1.1.7"; formattedVersion = lib.replaceChars ["."] ["_"] version; + + boostPython = boost.override { enablePython = true; }; + in stdenv.mkDerivation { name = "libtorrent-rasterbar-${version}"; @@ -27,15 +30,15 @@ in stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = [ boost openssl zlib python libiconv geoip ]; + buildInputs = [ boostPython openssl zlib python libiconv geoip ]; preConfigure = "./autotool.sh"; configureFlags = [ "--enable-python-binding" "--with-libgeoip=system" "--with-libiconv=yes" - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" + "--with-boost=${boostPython.dev}" + "--with-boost-libdir=${boostPython.out}/lib" "--with-libiconv=yes" ]; diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 58b052b8fae..18ceb530229 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libtsm-3"; src = fetchurl { - url = "http://freedesktop.org/software/kmscon/releases/${name}.tar.xz"; + url = "https://freedesktop.org/software/kmscon/releases/${name}.tar.xz"; sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"; }; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 97757005015..21e3a15449c 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libtxc_dxtn-${version}"; src = fetchurl { - url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 3d15b698b48..ae53178e88d 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libusbmuxd-1.0.10"; src = fetchurl { - url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; + url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs"; }; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 4dc601745a4..1e01497c762 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.20.3"; + version = "1.21.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1a8a679wni560z7x6w5i431vh2g0f34cznflcn52klx1vwcggrg7"; + sha256 = "1jjg34ppnlrnb634q9mla7whl7rm9xmjgnzckrznqcycwzir074b"; }; postPatch = let diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 04d621e29c8..097ac0e3e98 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.7.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; }; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 0dbe30251bd..2d83955de69 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "http://libvirt.org/sources/glib/${name}.tar.gz"; + url = "https://libvirt.org/sources/glib/${name}.tar.gz"; sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa"; }; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 49c1b054b77..f2be3b7831a 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -93,7 +93,10 @@ in stdenv.mkDerivation rec { "sysconfdir=$(out)/var/lib" ]; - postInstall = '' + + postInstall = let + binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; + in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ --replace "$out/bin" '${gettext}/bin' \ @@ -106,7 +109,7 @@ in stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ]} + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index d73d67a39cf..d56c20cb75a 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libx86-${version}"; version = "1.1"; src = fetchurl { - url = "http://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz"; + url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz"; sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; }; patches = [./constants.patch ./non-x86.patch ]; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index d225831f702..b4ad501c2ef 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; - url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; + url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libjpeg libpng libX11 zlib ]; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 20053190e3b..150da3d4599 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "libyaml-${version}"; src = fetchurl { - url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; + url = "https://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240"; }; diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 4a5aa057a5c..f3cbddf1ec4 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec src = fetchurl { - url = "http://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; + url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; sha256 = "1596njvy518x7vsvsykmnk1ky82x8jxd6nmmp551y6hxn2qsn08g"; }; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 0f5442bd63b..c4ff0e892a8 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -5,7 +5,6 @@ , givaro , pkgconfig , openblas -, liblapack , fflas-ffpack , gmpxx , optimize ? false # impure @@ -30,7 +29,6 @@ stdenv.mkDerivation rec { buildInputs = [ givaro - (liblapack.override {shared = true;}) openblas gmpxx fflas-ffpack @@ -38,7 +36,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lopenblas" - "--with-lapack-libs=-llapack" "--disable-optimization" ] ++ stdenv.lib.optionals (!optimize) [ # disable SIMD instructions (which are enabled *when available* by default) diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index 762d23e240a..e014e38c3f9 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "loudmouth-${version}"; src = fetchurl { - url = "http://mcabber.com/files/loudmouth/${name}.tar.bz2"; + url = "https://mcabber.com/files/loudmouth/${name}.tar.bz2"; sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 152d7bdc37b..a1a096b096d 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,7 +1,16 @@ -{ stdenv, fetchFromGitHub, perl }: +{ stdenv +, fetchFromGitHub + +, cmake +, ninja +, perl # Project uses Perl for scripting and testing + +, enableThreading ? true # Threading can be disabled to increase security https://tls.mbed.org/kb/development/thread-safety-and-multi-threading +}: stdenv.mkDerivation rec { - name = "mbedtls-2.11.0"; + name = "mbedtls-${version}"; + version = "2.11.0"; src = fetchFromGitHub { owner = "ARMmbed"; @@ -10,47 +19,19 @@ stdenv.mkDerivation rec { sha256 = "1d4a0jc08q3h051amv8hhh3hmqp4f1rk5z7ffyfs2g8dassm78ir"; }; - nativeBuildInputs = [ perl ]; - - postPatch = '' - patchShebangs . - '' + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace library/Makefile --replace "-soname" "-install_name" - substituteInPlace tests/scripts/run-test-suites.pl --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" - # Necessary for install_name_tool below - echo "LOCAL_LDFLAGS += -headerpad_max_install_names" >> programs/Makefile - ''; + nativeBuildInputs = [ cmake ninja perl ]; - makeFlags = [ - "SHARED=1" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - "DLEXT=dylib" - ]; - - installFlags = [ - "DESTDIR=\${out}" - ]; - - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib - - for exe in $out/bin/*; do - if [[ $exe != *.sh ]]; then - install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe - fi - done + postConfigure = stdenv.lib.optionals enableThreading '' + perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer + perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD # POSIX thread wrapper layer for the threading layer. ''; - doCheck = true; + cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; meta = with stdenv.lib; { homepage = https://tls.mbed.org/; - description = "Portable cryptographic and SSL/TLS library, aka polarssl"; - license = licenses.gpl3; + description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; + license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ wkennington fpletz ]; }; diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix index 1c6134d0480..11bd437d377 100644 --- a/pkgs/development/libraries/mdds/0.12.1.nix +++ b/pkgs/development/libraries/mdds/0.12.1.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "mdds-${version}"; src = fetchurl { - url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2"; + url = "https://kohei.us/files/mdds/src/mdds_${version}.tar.bz2"; sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"; }; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 592b6d7a677..90d86ea9165 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "mdds-${version}"; src = fetchurl { - url = "http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; + url = "https://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w"; }; diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 4b8e2b651e4..6c5a0e5279c 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; src = fetchurl { - url = "http://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; + url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; sha256 = "1w9h4g7d46d9l5jbcyfxpaqzpjrc5hyvr9d0ns7278psxpr3pdax"; }; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 31081d69a27..5387272a2f0 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.36.4"; + version = "3.38"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_36_4_RTM/src/${name}.tar.gz"; - sha256 = "0si4g5bnhzkxy2f7rnaw86jfdzni5gvc7svxcf7ms8n97nrrdpik"; + url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz"; + sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c"; }; buildInputs = [ perl zlib sqlite ] diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 48ec5141e34..20a62ef67f9 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "opendbx-1.4.6"; src = fetchurl { - url = "http://linuxnetworks.de/opendbx/download/${name}.tar.gz"; + url = "https://linuxnetworks.de/opendbx/download/${name}.tar.gz"; sha256 = "0z29h6zx5f3gghkh1a0060w6wr572ci1rl2a3480znf728wa0ii2"; }; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 93ba3f15a09..907f071d5c5 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "openldap-2.4.45"; src = fetchurl { - url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; + url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; sha256 = "091qvwk5dkcpp17ziabcnh3rg3m7qwzw2pihfcd1d5fdxgywzmnd"; }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 31e9d661a58..0251de77d03 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -12,7 +12,7 @@ let name = "openssl-${version}"; src = fetchurl { - url = "http://www.openssl.org/source/${name}.tar.gz"; + url = "https://www.openssl.org/source/${name}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index dad138c8433..f837d807219 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "cernlib-${version}"; src = fetchurl { - url = "http://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; + url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky"; }; diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index e568e159797..e3291907d31 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3.1pre-2402"; src = fetchurl { - url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; + url = "https://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index ce6ea4c56a8..9993060eb72 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "7.1.3"; src = fetchurl { - url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm"; }; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 93e0fa99c34..7f89c92772c 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "6.2.1"; src = fetchurl { - url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; + url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd"; }; diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index aabe132e73b..32a05d10d3a 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.2"; src = fetchurl { - url = "http://www.hepforge.org/archive/mcgrid/${name}.tar.gz"; + url = "https://www.hepforge.org/archive/mcgrid/${name}.tar.gz"; sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy"; }; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 88fafaf3ae6..0c9d879fbd0 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.3"; src = fetchurl { - url = "http://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz"; + url = "https://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz"; sha256 = "18qfn5kjzvnyh29x40zm2maqzfmrnay9r58n8pfpq5lcphdhhv8p"; }; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index c13b659f792..8c4a9288a15 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.6.0"; src = fetchurl { - url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv"; }; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 0a84fe20da7..feffa5c11d5 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.1.3"; src = fetchurl { - url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n"; }; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 6cda6bd310b..eb34b94118a 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.7.0"; src = fetchurl { - url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; sha256 = "0fyf6ld1klzlfmr5sl1jxzck4a0h14zfkrff8397rn1fqnqbzmmk"; }; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 98937308191..2b5f7cacd4b 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { name = "polkit-0.113"; src = fetchurl { - url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz"; + url = "https://www.freedesktop.org/software/polkit/releases/${name}.tar.gz"; sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71"; }; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index bfc94e1fac8..f8a17c9f5c3 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.65.0"; + version = "0.66.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "01wgvpi1l7nqkvixnmhmlpld0fjryhl7rlwvba6agz9yz1rwzj49"; + sha256 = "1rzar5f27xzkjih07yi8kxcinvk4ny4nhimyacpvqx7vmlqn829c"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 9a72e03ef2c..aa9a3f9fdc0 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { name = "postgis-${version}"; src = fetchurl { - url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; + url = "https://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index b92aa49a092..0ebf299a8bf 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "proj-4.9.3"; src = fetchurl { - url = http://download.osgeo.org/proj/proj-4.9.3.tar.gz; + url = https://download.osgeo.org/proj/proj-4.9.3.tar.gz; sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139"; }; diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index a1708ba59c3..96a2347c50f 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "rabbitmq-java-client-3.3.4"; src = fetchurl { - url = "http://www.rabbitmq.com/releases/rabbitmq-java-client/v3.3.4/rabbitmq-java-client-3.3.4.tar.gz"; + url = "https://www.rabbitmq.com/releases/rabbitmq-java-client/v3.3.4/rabbitmq-java-client-3.3.4.tar.gz"; sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh"; }; diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 7faee7e69a2..5a4306a63a7 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "readosm-1.1.0"; src = fetchurl { - url = "http://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; }; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 5629164f160..681fc3a012f 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sourceName = "rep-gtk_${version}"; src = fetchurl { - url = "http://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz"; sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; }; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 167fe419076..25126edbc0f 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz - http://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz + https://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz ]; sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 0af00f75d99..4a6aabb447f 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.12.10"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; + url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; sha256 = "004pd90knnnzcx727knb7ffkabb1ggbskb8s607bfvfgdd7wlli9"; }; diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 90393cff001..6bbd43b0c84 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available # "newer" version at google code https://code.google.com/archive/p/l-calc/source/default/source - url = "http://mirrors.mit.edu/sage/spkg/upstream/lcalc/lcalc-${version}.tar.bz2"; + url = "mirror://sageupstream/lcalc/lcalc-${version}.tar.bz2"; sha256 = "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43"; }; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 26ec501f1a7..8444d88809a 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -7,7 +7,7 @@ let version = "2.0.2"; in stdenv.mkDerivation { name = "magma-${version}"; src = fetchurl { - url = "http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; + url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk"; name = "magma-${version}.tar.gz"; }; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index bd095a11f08..fc8f11f2f11 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -76,14 +76,13 @@ let if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system; - - version = "0.3.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "openblas-${version}"; + version = "0.3.1"; src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; - sha256 = "18giv3lsh8cva01z4rhsx8jvgliknni0jp7vxkc69qxb14vm8lfg"; + sha256 = "0czbs2afmcxxij1ivqrm04p0qcksg5fravjifhydvb7k6mpraphz"; name = "openblas-${version}.tar.gz"; }; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 195b90c86e1..3e8524b4014 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "openlibm-${version}"; - version = "0.5.5"; + version = "0.6.0"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "1z8cj5q8ca8kmrakwkpjxf8svi81waw0c568cx8v8pv9kvswbp07"; + sha256 = "0a5fpm8nra5ldhjk0cqd2rx1qh32wiarkxmcqcm5xl8z7l4kjm6l"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix index f38fce5831e..fda54fe44ab 100644 --- a/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "http://mirrors.mit.edu/sage/spkg/upstream/rw/rw-${version}.tar.gz"; + url = "mirror://sageupstream/rw/rw-${version}.tar.gz"; sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0"; }; diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index fe448106b15..624885c501a 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "http://mirrors.mit.edu/sage/spkg/upstream/rubiks/rubiks-${version}.tar.bz2"; + url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2"; sha256 = "0zdmkb0j1kyspdpsszzb2k3279xij79jkx0dxd9f3ix1yyyg3yfq"; }; diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index c83b3d1737c..c34701e3f91 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { # Original website no longer reachable - url = "http://mirrors.mit.edu/sage/spkg/upstream/sympow/sympow-${version}.tar.bz2"; + url = "mirror://sageupstream/sympow/sympow-${version}.tar.bz2"; sha256 = "0hphs7ia1wr5mydf288zvwj4svrymfpadcg3pi6w80km2yg5bm3c"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -d datafiles "$out/share/sympow/datafiles" + install -D datafiles/* --target-directory "$out/share/sympow/datafiles/" install *.gp "$out/share/sympow/" install -Dm755 sympow "$out/share/sympow/sympow" install -D new_data "$out/bin/new_data" diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 96449a8ed96..ac9183cffe9 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.28.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "1v4ai4zyj1q3255nghicns9817jkwb3bh60ssprsjmnjfj41mwhx"; }; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 3234d1bb89b..09d3efa64b2 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "shapelib-1.4.1"; src = fetchurl { - url = "http://download.osgeo.org/shapelib/${name}.tar.gz"; + url = "https://download.osgeo.org/shapelib/${name}.tar.gz"; sha256 = "1cr3b5jfglwisbyzj7fnxp9xysqad0fcmcqvqaja6qap6qblijd4"; }; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index bcce457e78e..ec59ae0e819 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "slang-2.3.2"; src = fetchurl { - url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2"; + url = "https://www.jedsoft.org/releases/slang/${name}.tar.bz2"; sha256 = "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw"; }; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 233ba91d299..665f025ffcf 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "slib-3b5"; src = fetchurl { - url = "http://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip"; + url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip"; sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq"; }; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 17195febe13..1b5564dc159 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "snack-2.2.10"; src = fetchurl { - url = http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz; + url = https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz; sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb"; }; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 995ac631580..207c6f2d30a 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.16.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x"; }; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index c338d6762a4..95a97f30b6e 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pName = "soundtouch"; name = "${pName}-2.0.0"; src = fetchurl { - url = "http://www.surina.net/soundtouch/${name}.tar.gz"; + url = "https://www.surina.net/soundtouch/${name}.tar.gz"; sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j"; }; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index ea3013c78bc..be2fc503e39 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.0.6"; name = "spandsp-${version}"; src=fetchurl { - url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; + url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; }; buildInputs = []; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index ff461f1b8e6..9070423d8c7 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "spatialite-tools-4.1.1"; src = fetchurl { - url = "http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz"; sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv"; }; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 21359c4f0d0..aeab43c889d 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/gtk/${name}.tar.bz2"; sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; }; diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 19b68a0c43d..fc337f22b56 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "spice-protocol-0.12.14"; src = fetchurl { - url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; sha256 = "170ckpgazvqv7hxy209myg67pqnd6c0gvr4ysbqgsfch6320nd90"; }; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index ee54ad55553..0b815f9095f 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "spice-0.14.0"; src = fetchurl { - url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; sha256 = "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs"; }; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index ce4fca6da70..fc771a493b6 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "libstartup-notification-${version}"; src = fetchurl { - url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; + url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 362881a2f42..63060bf5553 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.7.8"; src = fetchurl { - url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2"; + url = "https://www.vandenoever.info/software/strigi/${name}.tar.bz2"; sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; }; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 810420fe6b7..1759258e666 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl boost ]; src = fetchurl { - url = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; + url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; }; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 13497f7727f..0c3bb3b1306 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.7.4"; src = fetchurl { - url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz"; + url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz"; sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr"; }; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 53e48eb8931..0185bd2733b 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { arch = if stdenv.system == "x86_64-linux" then "linux-64-thr" else if stdenv.system == "i686-linux" then "linux-thr" else if stdenv.system == "aarch64-linux" then "linux-arm-thr" else + if stdenv.system == "armv7l-linux" then "linux-arm-thr" else if stdenv.system == "x86_64-darwin" then "macosx-thr" else if stdenv.system == "i686-darwin" then "macosx-64-thr" else if stdenv.system == "i686-cygwin" then "win32" else diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 41308a7ef4e..fae51aea477 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "telepathy-farstream"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g"; }; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 90dd47c11e2..24dc3667d17 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { name = "telepathy-qt-0.9.7"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1"; }; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 45e5174ed57..cb200b82e20 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.11.0"; src = fetchurl { - url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; + url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; sha256 = "1hk0zb9289gf920rdl0clmwqx6kvygz92nj01lqrhd2arfv3ibf4"; }; diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 25d7849b1b4..12f7e4c765d 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "tre-0.8.0"; src = fetchurl { - url = "http://laurikari.net/tre/${name}.tar.gz"; + url = "https://laurikari.net/tre/${name}.tar.gz"; sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my"; }; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index aa983b1394b..933a3afef35 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ucl-1.03"; src = fetchurl { - url = http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz; + url = https://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz; sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"; }; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 604a1b7012a..1aa5e671702 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version="0.9.12"; src = fetchurl { - url = "http://www.unicap-imaging.org/downloads/${name}.tar.gz"; + url = "https://www.unicap-imaging.org/downloads/${name}.tar.gz"; sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 515c3b2ca3b..25ddfb35524 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7.1"; src = fetchurl { - url = "http://spice-space.org/download/usbredir/${name}.tar.bz2"; + url = "https://spice-space.org/download/usbredir/${name}.tar.bz2"; sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"; }; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 013af68cb6c..07ca9d2e62e 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "libva-vdpau-driver-0.7.4"; src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; }; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 53faf07623e..4dd01f664d1 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "16qdi5s6ycsh0iyc362gly7ggrwamky8i0zgbd4ajp3ymk9vqdva"; }; - outputs = [ "out" "man" "dev" ]; + outputs = [ "out" "man" "dev" "py" ]; nativeBuildInputs = [ autoreconfHook pkgconfig gettext python2 swig ]; @@ -28,6 +28,11 @@ in stdenv.mkDerivation rec { }) ]; + makeFlags = [ + "pyexecdir=$(py)/${python2.sitePackages}" + "pythondir=$(py)/${python2.sitePackages}" + ]; + 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/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index bfb07c2df33..e706c730ddd 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.13"; src = fetchurl { - url = "http://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz"; + url = "https://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz"; sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237"; }; diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix new file mode 100644 index 00000000000..797c64729ec --- /dev/null +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + name = "vulkan-headers-${version}"; + version = "1.1.77.0"; + + buildInputs = [ cmake ]; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Headers"; + rev = "sdk-${version}"; + sha256 = "1k01y5cj154mw7853w5xh135b2jp6k83kzwknw0dbs5adj4dx0kf"; + }; + + meta = with stdenv.lib; { + description = "Vulkan Header files and API registry"; + homepage = "http://www.lunarg.com"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 0d9bc3ca345..4b84f696eec 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,65 +1,31 @@ -{ stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, - python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, - libXext, wayland, libGL_driver, makeWrapper }: +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, + x11, libxcb, libXrandr, libXext, wayland, libGL_driver }: +let version = "1.1.77.0"; in +assert version == vulkan-headers.version; +stdenv.mkDerivation rec { + name = "vulkan-loader-${version}"; + inherit version; -let - version = "1.1.70.0"; src = fetchFromGitHub { owner = "KhronosGroup"; - repo = "Vulkan-LoaderAndValidationLayers"; + repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "1a7xwl65bi03l4zbjq54qkxjb8kb4m78qvw8bas5alhf9v6i6yqp"; + sha256 = "1nzzkqh0i3j1d3h7kgmaxzi748l338m2p31lxkwxm4y81xp56a94"; }; -in - -stdenv.mkDerivation rec { - name = "vulkan-loader-${version}"; - inherit version src; - nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ cmake git python3 python3Packages.lxml - glslang x11 libxcb libXrandr libXext wayland - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ - "-DBUILD_WSI_MIR_SUPPORT=OFF" "-DFALLBACK_DATA_DIRS=${libGL_driver.driverLink}/share:/usr/local/share:/usr/share" + "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; - outputs = [ "out" "dev" "demos" ]; - patches = [ ./rev-file.patch ]; - - postUnpack = '' - # Hack so a version header can be generated. Relies on ./rev-file.patch to work. - mkdir -p "$sourceRoot/external/glslang/External" - echo "${spirv-tools.src.rev}" > "$sourceRoot/external/glslang/External/spirv-tools" - ''; - - preConfigure = '' - checkRev() { - [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1) - } - checkRev glslang "${glslang.src.rev}" - ''; + outputs = [ "out" "dev" ]; - installPhase = '' - mkdir -p $out/lib $out/bin - cp -d loader/libvulkan.so* $out/lib - cp demos/vulkaninfo $out/bin - mkdir -p $out/lib $out/share/vulkan/explicit_layer.d - cp -L layers/*.so $out/lib/ - cp -L layers/*.json $out/share/vulkan/explicit_layer.d/ - sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json - mkdir -p $dev/include - cp -rv ../include $dev/ - mkdir -p $demos/share/vulkan-demos - cp demos/*.spv demos/*.ppm $demos/share/vulkan-demos - mkdir -p $demos/bin - find demos -type f -executable -not -name vulkaninfo -exec cp -v {} $demos/bin \; - for p in cube cubepp; do - wrapProgram $demos/bin/$p --run "cd $demos/share/vulkan-demos" - done + postInstall = '' + cp -r "${vulkan-headers}/include" "$dev" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/rev-file.patch b/pkgs/development/libraries/vulkan-loader/rev-file.patch deleted file mode 100644 index e8f9f92c8ea..00000000000 --- a/pkgs/development/libraries/vulkan-loader/rev-file.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c9f73ce96..d14ffeed9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -339,13 +339,13 @@ macro(run_vk_xml_generate dependency output) - endmacro() - - # Define macro used for generating header files containing commit IDs for external dependencies --macro(run_external_revision_generate source_dir symbol_name output) -+macro(run_external_revision_generate rev_file symbol_name output) - add_custom_command(OUTPUT ${output} - # NOTE: If you modify this call to use --rev_file instead of --git_dir (to read the commit ID from a file instead of - # parsing from a Git repository), you probably also want to add the revision file to the list of DEPENDS on the - # subsequent line (to ensure that the script is re-run when the revision file is modified). -- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --git_dir ${source_dir} -s ${symbol_name} -o ${output} -- DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index -+ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${rev_file} -s ${symbol_name} -o ${output} -+ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${rev_file} - ) - endmacro() - diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index efb365958eb..d832becbed8 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.9.0"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; }; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 4bb7cd153cf..33bce4d6216 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.14"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n"; }; diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index d3fffa2dd32..e234e3e66ad 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${name}.tar.xz"; sha256 = "1n0dy94bm7wvxln4jis1gp8plv8n4a01g41724zsf5psg1yk16sp"; }; diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 39a76a74711..1a17ae53313 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${name}.tar.xz"; sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq"; }; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 529091518eb..056ab8c5138 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "webrtc-audio-processing-0.3"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz"; sha256 = "1yl0187xjh1j2zkb7v9cs9i868zcaj23pzn4a36qhzam9wfjjvkm"; }; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 47686451eee..2b69f6283d6 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.15.0"; + version = "3.15.3"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1jqhq0dl2zxks7dm6g3dm1zvrl646ab073kgg8ypv19nkd5cvbdv"; + sha256 = "00mpq1z8j37a873dbk9knb835m3qlwqnd1rslirqkc44hpz1i64j"; }; outputs = [ "out" "dev" "doc" "lib" ]; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 06ed123c735..276f509772c 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "x264-${version}"; src = fetchurl { - url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; + url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; sha256 = "01sgk1ps4qfifdnblwa3fxnd8ah6n6zbmfc1sy09cgqcdgzxgj0z"; }; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 482c765dcda..5dd81af2b1a 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -7,7 +7,7 @@ let passthru = { inherit version; }; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; + url = "https://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; inherit sha256; }; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 17855011297..1203f19d6c8 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { inherit (xapian) version; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; + url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr"; }; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index bbbf9af29e5..fec4bbe8efe 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.7.3"; src = fetchurl { - url = "http://www.apache.org/dist/santuario/c-library/${name}.tar.gz"; + url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz"; sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583"; }; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index e17ac6d1507..94f1d187267 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { - url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; + url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"; }; diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index bef2e46e073..051a194af98 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "4.0.0"; src = fetchurl { - url = "http://codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2"; + url = "https://codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2"; sha256 = "05wqhmd5cd4pdky8i8qysnh96d2h16ly8r73whmbxkajiyf2m9gc"; }; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index de2e0b62f9e..b8537896d79 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = - [ "http://www.zlib.net/fossils/${name}.tar.gz" # stable archive path + [ "https://www.zlib.net/fossils/${name}.tar.gz" # stable archive path "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz" ]; sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; |