diff options
Diffstat (limited to 'pkgs/development/libraries')
38 files changed, 104 insertions, 70 deletions
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 77851269731d5..fed3a94afdb6c 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://activemq.apache.org/"; description = "Messaging and Integration Patterns server written in Java"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 34f0e8b5b495f..b73c11893edf8 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -22,6 +22,6 @@ tcl.mkTclDerivation rec { description = "High-level widget set for Tcl/Tk"; maintainers = with lib.maintainers; [ agbrooks ]; license = lib.licenses.tcltk; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 7551c15649e67..a98a06118550c 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -14,12 +14,12 @@ assert withGmp -> gmp != null; stdenv.mkDerivation rec { - version = "4.65"; + version = "5.0"; pname = "glpk"; src = fetchurl { url = "mirror://gnu/glpk/${pname}-${version}.tar.gz"; - sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; + sha256 = "sha256-ShAT7rtQ9yj8YBvdgzsLKHAzPDs+WoFu66kh2VvsbxU="; }; buildInputs = @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/20710#comment:18 (fetchpatch { name = "error_recovery.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0z99z9gd31apb6x5n5n26411qzx0ma3s6dnznc4x61x86bhq31qf"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=d3c1f607e32f964bf0cab877a63767c86fd00266"; + sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA="; }) ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 25de793ceac8e..18361f15ae802 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -76,9 +76,6 @@ stdenv.mkDerivation rec { qtbase ]) ++ lib.optionals stdenv.isLinux [ wayland-protocols - ] ++ lib.optionals qt5Support [ - qt5.qttools.dev - qt5.qtbase.dev # For moc-qt5 ]; buildInputs = [ diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index ffe534ede4af2..b29b64c2a7577 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "hidapi"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; rev = "${pname}-${version}"; - sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko="; + sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index adb3b5dc0f31c..b598d846f9e2e 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-t0GC6FVFcbVbmZ74XNSPCRRUsSr1Z8rRw6Rf++qk4I0="; + hash = "sha256-Zb9F4kFUNA/MtoYYEKGJ5JyKxtG0DHSdGaUpDLKmAAc="; }; postPatch = '' diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index 489b44a4e5c40..bc4df3f99ba5d 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "jabcode-${subproject}"; - version = "unstable-2020-05-13"; + version = "unstable-2021-02-16"; src = fetchFromGitHub { repo = "jabcode"; owner = "jabcode"; - rev = "a7c25d4f248078f257b014e31c791bfcfcd083e1"; - sha256 = "1c4cv9b0d7r4bxzkwzdv9h651ziq822iya6fbyizm57n1nzdkk4s"; + rev = "e342b647525fa294127930d836b54a6b21957cdc"; + sha256 = "04ngw5aa43q7kxfn1v8drmir2i2qakvq0ni0lgf0zw8150mww52x"; }; nativeBuildInputs = diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 104320a8d89fe..0a121d923146b 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-bcel/"; description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ copumpkin ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix index 22a9fae358d25..f55029335e588 100644 --- a/pkgs/development/libraries/java/commons/bsf/default.nix +++ b/pkgs/development/libraries/java/commons/bsf/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Interface to scripting languages, including JSR-223"; homepage = "https://commons.apache.org/proper/commons-bsf/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index c685eb691c5fb..ba17eb1532d5a 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-compress"; description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix index 6a5749b9905f1..7b5be45e200cf 100644 --- a/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-daemon"; description = "Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes."; maintainers = with lib.maintainers; [ rsynnest ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 73b5d0d140a2e..40c66909213e1 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-fileupload"; description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index d8b32607a9e50..7c1c9f361145a 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-io"; description = "A library of utilities to assist with developing IO functionality"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index 07e94148817e6..b9ccfef8382c4 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-lang"; description = "Provides additional methods to manipulate standard Java library classes"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix index f98c8bd72e0cd..71832498c34a2 100644 --- a/pkgs/development/libraries/java/commons/logging/default.nix +++ b/pkgs/development/libraries/java/commons/logging/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper around a variety of logging API implementations"; homepage = "https://commons.apache.org/proper/commons-logging"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix index 5543532015e0b..4f928db4cf3b5 100644 --- a/pkgs/development/libraries/java/commons/math/default.nix +++ b/pkgs/development/libraries/java/commons/math/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-math/"; description = "A library of lightweight, self-contained mathematics and statistics components"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index 8f678ce7555b7..ae9df24c55acf 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://hsqldb.org"; description = "A relational, embedable database management system written in Java and a set of related tools"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 4eee98157d50f..3cc046ac119bd 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A library that can write a lot of boilerplate for your Java project"; platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.mit; homepage = "https://projectlombok.org/"; maintainers = [ lib.maintainers.CrystalGamma ]; diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index 93b222357840d..022f68a9d3511 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generic unit testing framework and methodology for testing any kind of code"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index da1e6120da635..484f9017ae703 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -29,6 +29,7 @@ let meta = with lib; { inherit description license; homepage = "http://saxon.sourceforge.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ rvl ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index 5c032f5469ce0..fd263d91d426e 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A XMPP (Jabber) client library for instant messaging and presence"; homepage = "http://www.igniterealtime.org/projects/smack/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; license = lib.licenses.asl20; }; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index f7bef8af2e4a3..0ea75e2a25295 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.1.1"; + version = "1.1.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-iCMCQyhCUhp1f20+Qost9nnmfIUFE0iLKMKT/PfwOd4="; + hash = "sha256-OyjuUWfKE8GoGFCmaCS7YAf5GAS0VwMPht7cvFtkA/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index d4712efd6f1e1..19efea263c07d 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -7,6 +7,12 @@ stdenv.mkDerivation { sourceRoot = "agar-1.5.0/tests"; + # Workaround build failure on -fno-common toolchains: + # ld: textdlg.o:(.bss+0x0): multiple definition of `someString'; + # configsettings.o:(.bss+0x0): first defined here + # TODO: the workaround can be removed once nixpkgs updates to 1.6.0. + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' substituteInPlace configure.in \ --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index a8915e92e58a5..db7db4cce626e 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.85.0"; + version = "1.86.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-bgx1j2ESAv9cRe3Iv6nYOS7bUAQcXj3Ta4rAC800Nf8="; + hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-7ZdN/7CKFuFOIReM7BkMsO/E2lPyDnl4ssPhK5BPLh8="; + hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 7f9c4d6ac94b2..531ff8584facc 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmediaart"; - version = "1.9.5"; + version = "1.9.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7"; + sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc="; }; nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index e65ec32e34ddd..461bcbe025ed3 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "36"; + version = "37"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "sha256-T4GCh++6JFNBBGY1t1eugfh5VJsyakMWtfbml6pRf4w="; + sha256 = "1gpcic6b6xk3g4956jcsqljf33kj5g43cahmydq6m8rn39sadvlv"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 1d3c321038037..e626c3abfe2fa 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { hash = "sha256-AkHsZpYM4EY8SNuF6LhxF2peOjp69ICGc3kOLkDms64="; }; + patches = [ ./nix-2.9.patch ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ nix boost ]; diff --git a/pkgs/development/libraries/nix-plugins/nix-2.9.patch b/pkgs/development/libraries/nix-plugins/nix-2.9.patch new file mode 100644 index 0000000000000..f1dc2909175d9 --- /dev/null +++ b/pkgs/development/libraries/nix-plugins/nix-2.9.patch @@ -0,0 +1,35 @@ +diff --git a/extra-builtins.cc b/extra-builtins.cc +index 617807a..c417cb3 100644 +--- a/extra-builtins.cc ++++ b/extra-builtins.cc +@@ -27,7 +27,7 @@ static ExtraBuiltinsSettings extraBuiltinsSettings; + + static GlobalConfig::Register rp(&extraBuiltinsSettings); + +-static void extraBuiltins(EvalState & state, const Pos & pos, ++static void extraBuiltins(EvalState & state, const PosIdx pos, + Value ** _args, Value & v) + { + static auto extraBuiltinsFile = absPath(extraBuiltinsSettings.extraBuiltinsFile); +@@ -44,10 +44,10 @@ static void extraBuiltins(EvalState & state, const Pos & pos, + auto attrs = state.buildBindings(2); + + auto sExec = state.symbols.create("exec"); +- attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = sExec }); ++ attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = "exec" }); + + auto sImportNative = state.symbols.create("importNative"); +- attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = sImportNative }); ++ attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = "importNative" }); + + arg = state.allocValue(); + arg->mkAttrs(attrs); +@@ -64,7 +64,7 @@ static void extraBuiltins(EvalState & state, const Pos & pos, + static RegisterPrimOp rp1("__extraBuiltins", 0, + extraBuiltins); + +-static void cflags(EvalState & state, const Pos & _pos, ++static void cflags(EvalState & state, const PosIdx _pos, + Value ** _args, Value & v) + { + auto attrs = state.buildBindings(3); diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 6392383c983fa..21f5a83073fe6 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.10"; + version = "3.2.11"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km"; + sha256 = "sha256-/ozMvcHDhYruhzp8xfskKOYCbe/vS4pEOPn1+1Pb+Q0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 0c6f9fb90c0c4..c84740ebcdc9c 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -244,9 +244,9 @@ stdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = - [ zlib pcre hdf5 boost gflags protobuf ] + buildInputs = [ zlib pcre boost gflags protobuf ] ++ lib.optional enablePython pythonPackages.python + ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 ++ lib.optional enableVtk vtk diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 8947c6f423947..f5a414786ac37 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -125,6 +125,7 @@ stdenv.mkDerivation { OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus command line SQL client. ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index ca328e2bac46a..77ad6e201a32b 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS = [ "-Wno-return-type" ]; + # Workaround build failure on -fno-common toolchains: + # ld: libpacklib.a(kedit.o):kuip/klink1.h:11: multiple definition of `klnkaddr'; + # libzftplib.a(zftpcdf.o):zftp/zftpcdf.c:155: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + makeFlags = [ "FORTRANOPTIONS=$(FFLAGS)" "CCOPTIONS=$(NIX_CFLAGS)" diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 9739530f8ba34..1b97997c5c112 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo="; + hash = "sha256-HPbrtqedGBxEHR0MfG1iPEI4F8YQk/NvIa2q4j5nkJA="; }; - patches = [ - # Fixes build - (fetchpatch { - name = "rivet-3.1.5-namespace-fix.patch"; - url = "https://gitlab.com/hepcedar/rivet/-/commit/17a99b38b52e65a4a3fd6289124bd9dd874c30bf.diff"; - sha256 = "sha256-OknqghpMMB5nRHeeRc2ddxybhnkVGRB1x8jfOjrkyms="; - }) - ]; - latex = texlive.combine { inherit (texlive) scheme-basic collection-pstricks diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index a2bb09b58a27c..db7c18a33442d 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-KifrhuZH11szennCDC2sJeHxO9JZJbnJWuKK3JN5NwU="; + hash = "sha256-WRkaDpr6jbU/+qIHn4Uy5bE94b5iJwPW9wYNNhBSi2s="; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index 7cd3a086cdb8b..92aee32c38d1c 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; homepage = "https://www.rabbitmq.com/java-client.html"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = with licenses; [ mpl11 gpl2 ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index c69345193c779..e0ca78df79a41 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib ncurses ]; + # Workaround build failure on -fno-common toolchains: + # ld: libestools.a(editline.o):(.bss+0x28): multiple definition of + # `editline_history_file'; libestools.a(siodeditline.o):(.data.rel.local+0x8): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . ) diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix deleted file mode 100644 index 75004b87ee723..0000000000000 --- a/pkgs/development/libraries/stlport/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "STLport"; - version = "5.2.1"; - - src = fetchurl { - url = "mirror://sourceforge/stlport/${pname}-${version}.tar.bz2"; - sha256 = "1jbgak1m1qk7d4gyn1p2grbws2icsf7grbs3dh44ai9ck1xh0nvm"; - }; - - # fix hardcoded /usr/bin; not recognizing the standard --disable-static flag - configurePhase = '' - echo Preconf: build/Makefiles/gmake/*/sys.mak - for f in build/Makefiles/gmake/*/sys.mak; do - substituteInPlace "$f" --replace /usr/bin/ "" - done - ./configure --prefix=$out - ''; - - meta = { - description = "An implementation of the C++ Standard Library"; - homepage = "https://sourceforge.net/projects/stlport/"; - license = lib.licenses.free; # seems BSD-like - broken = true; # probably glibc-2.20 -related issue - }; -} diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 1f2d2d2546c8b..b0f8f5edd30bb 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "58"; + version = "59"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-LIjNfyfpyvE+Ec6f4aGzRA4ZGoWPFhjtUw4yrenDsUQ="; + sha256 = "sha256-6w7GSC5ZNIhLpulni4sKq0OvuxHlTJRilBFGH5PQW8U="; }; patches = [ |