diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/amf-headers/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/cwiid/default.nix | 39 | ||||
-rw-r--r-- | pkgs/development/libraries/cwiid/fix-ar.diff | 26 | ||||
-rw-r--r-- | pkgs/development/libraries/freetds/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/httplib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libcec/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/opendht/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/podofo/0.10.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/blas/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/toml-f/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/zint/default.nix | 4 |
11 files changed, 78 insertions, 27 deletions
diff --git a/pkgs/development/libraries/amf-headers/default.nix b/pkgs/development/libraries/amf-headers/default.nix index 2d908e043f29a..b1b93d38cedc0 100644 --- a/pkgs/development/libraries/amf-headers/default.nix +++ b/pkgs/development/libraries/amf-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amf-headers"; - version = "1.4.30"; + version = "1.4.32"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; rev = "v${version}"; - sha256 = "sha256-eShqo5EBbhl2Us4feFjiX+NfEl1OQ2jPQUC+Hlm+yFs="; + sha256 = "sha256-3CdC/9o6ur2CeVLImz2QfaZAH2+KtDdxs5zRF7W5/oo="; }; installPhase = '' diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index e640b6cbbbabf..d8c472870c434 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,13 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bison +, flex +, bluez +, pkg-config +, gtk2 +}: stdenv.mkDerivation rec { pname = "cwiid"; version = "unstable-2010-02-21"; src = fetchFromGitHub { - owner = "abstrakraft"; - repo = "cwiid"; - rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; + owner = "abstrakraft"; + repo = "cwiid"; + rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; }; @@ -19,9 +28,21 @@ stdenv.mkDerivation rec { sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in ''; - buildInputs = [ bison flex bluez gtk2 ]; + patches = [ + ./fix-ar.diff + ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ + bluez + gtk2 + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + bison + flex + ]; NIX_LDFLAGS = "-lbluetooth"; @@ -32,9 +53,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux Nintendo Wiimote interface"; - homepage = "http://cwiid.org"; - license = licenses.gpl2Plus; + homepage = "http://cwiid.org"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/cwiid/fix-ar.diff b/pkgs/development/libraries/cwiid/fix-ar.diff new file mode 100644 index 0000000000000..8ca4b885a0a37 --- /dev/null +++ b/pkgs/development/libraries/cwiid/fix-ar.diff @@ -0,0 +1,26 @@ +diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in +index 3afbb14..b8df9d9 100644 +--- a/common/include/lib.mak.in ++++ b/common/include/lib.mak.in +@@ -22,7 +22,7 @@ static: $(STATIC_LIB) + shared: $(SHARED_LIB) + + $(STATIC_LIB): $(OBJECTS) +- ar rcs $(STATIC_LIB) $(OBJECTS) ++ $(AR) rcs $(STATIC_LIB) $(OBJECTS) + + $(SHARED_LIB): $(OBJECTS) + $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \ +diff --git a/configure.ac b/configure.ac +index 82ca3e1..0a78283 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then + AC_MSG_ERROR([bison not found]) + fi + ++AC_CHECK_TOOL([AR], [ar], [:]) ++ + AC_ARG_WITH( + [python], + [AS_HELP_STRING([--without-python],[compile without python support])], diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index c30f69f18fdfc..df7328b2b0436 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.8"; + version = "1.4.10"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-KzXaLxxmxUrE9uQD2zpKuYOhLpi4a7xMgiZxaf+Tq2k="; + hash = "sha256-x+ryJr3LHNwbIhaWUyzNJfTk53VCZaKXd6NAAIS95pg="; }; buildInputs = [ diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index 22c81d57e9df1..a65440848bee8 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-JfxeXHo34MKtAkMO3pNWiPorh3f8s4SVrdAaydVYdrY="; + hash = "sha256-53EBZTpz0INtjVSmjvg7XOQf0Bs2ADVe2//+nK6xRyE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 1d6fd44acb69e..90ffcb01cf91f 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -29,7 +29,11 @@ stdenv.mkDerivation rec { buildInputs = [ udev libcec_platform ] ++ lib.optional withLibraspberrypi libraspberrypi; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=1" + ] ++ lib.optionals stdenv.isLinux [ + "-DHAVE_LINUX_API=1" + ]; meta = with lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 64cf84e36c3fa..e972fa3fb14f9 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.5.5"; + version = "3.1.4"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "v${version}"; - sha256 = "sha256-OXLVuyPFlo7VD8f9wAN71p4PZpfM2ISq9UoUiAYEXUQ="; + hash = "sha256-KtsQ25uStmlf7RZLAcabhPMyGbxKxvpR6Vm632+EBvw="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ asio + fmt nettle gnutls msgpack @@ -47,7 +48,6 @@ stdenv.mkDerivation rec { restinio http-parser openssl - fmt ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix index dbbd5c86b96d4..6c4356e9add9b 100644 --- a/pkgs/development/libraries/podofo/0.10.x.nix +++ b/pkgs/development/libraries/podofo/0.10.x.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "podofo"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "podofo"; repo = "podofo"; rev = finalAttrs.version; - hash = "sha256-BHTfidLn738f9kVIgzRTR4vY6fx5JPPtYNKvD7klyGw="; + hash = "sha256-B+YNTo2rZAL4PqDo+lFOQiWM9bl/TIn8xrJyefrIAYE="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index ed899a02aa783..4431ab63c7b7f 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "blas"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "sha256-LZ/e59NhlU/uUyEApQ5gKCbJzBFT+M0Fe6pl7VfpAoM="; + sha256 = "sha256-zMQbXQiOUNsAMDF66bDJrzdXEME5KsrR/iCWAtpaWq0="; }; passthru = { inherit blas64; }; diff --git a/pkgs/development/libraries/toml-f/default.nix b/pkgs/development/libraries/toml-f/default.nix index 696e41ac71cc4..ed6fc26ee2056 100644 --- a/pkgs/development/libraries/toml-f/default.nix +++ b/pkgs/development/libraries/toml-f/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "toml-f"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-sCU0uMdcXIA5O964hlK37cOrLTlk1CJeTcWD9FhevOs="; + hash = "sha256-+cac4rUNpd2w3yBdH1XoCKdJ9IgOHZioZg8AhzGY0FE="; }; nativeBuildInputs = [ gfortran cmake ]; diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix index 69ec64ada9d20..8ba4a68e4b82d 100644 --- a/pkgs/development/libraries/zint/default.nix +++ b/pkgs/development/libraries/zint/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "zint"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "zint"; repo = "zint"; rev = version; - hash = "sha256-Ay6smir6zUpadmw1WpU+F7e9t7Gk3JNVtf2VVu92bDk="; + hash = "sha256-/ILq/7A8Lffe2NuiABiV3KeYXapuL1SO55Qk3wXfC/8="; }; outputs = [ "out" "dev" ]; |