From d32d0036d6e1d7f840fe4b6e5e4db5860c483796 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 09:22:43 +0000 Subject: ipopt: 3.14.14 -> 3.14.16 --- pkgs/development/libraries/science/math/ipopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index a76c2f878ba7c..286a630f4b411 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.14"; + version = "3.14.16"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-qMPdJVLIXFePhTA6qRr1Pth/BjJ62cj9y8C1HKQJGDQ="; + sha256 = "sha256-ZuiZZMq7NzOm6CCJgMBgEWs8PEfM3pVr2yOWbS42l8U="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; -- cgit 1.4.1 From b0fde6566493960c9604872ea2d05d9f22c6e2f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 11:33:50 +0000 Subject: commonsBcel: 6.8.1 -> 6.8.2 --- pkgs/development/libraries/java/commons/bcel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index f25f4a552b7c0..0387b5dd9e306 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "6.8.1"; + version = "6.8.2"; pname = "commons-bcel"; src = fetchurl { url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz"; - hash = "sha256-a7PqcVvS+7tHSU2uXi5gLpl82ZN9hA03VEnCnc5cnRc="; + hash = "sha256-VRCRxy+P3uPW9gWy9xHfJ35muhWCHtXNimRmTfba+04="; }; installPhase = '' -- cgit 1.4.1 From 3e5c43ea72e41e596634ae925143ce70430e7f74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 14:48:44 +0000 Subject: rapidyaml: 0.5.0 -> 0.6.0 --- pkgs/development/libraries/rapidyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/development/libraries/rapidyaml/default.nix index 68449479278f3..31b8e16f8972f 100644 --- a/pkgs/development/libraries/rapidyaml/default.nix +++ b/pkgs/development/libraries/rapidyaml/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "rapidyaml"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "biojppm"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-1/P6Szgng94UU8cPFAtOKMS+EmiwfW/IJl2UTolDU5s="; + sha256 = "sha256-p9XaMsrOgnEdb0yl52HXhNzz6YxuvTD5GCaq1a+l1bQ="; }; nativeBuildInputs = [ cmake git ]; -- cgit 1.4.1 From f96df5a20d84af47420c7a8a14c745e7c5d25660 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 3 May 2024 22:33:20 +0300 Subject: libsForQt5.qtquick3d: init .nix copied from `qt6Packages.qtquick3d` --- pkgs/development/libraries/qt-5/5.15/default.nix | 1 + pkgs/development/libraries/qt-5/modules/qtquick3d.nix | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/modules/qtquick3d.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 80d75b8cf8803..f051b827c7670 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -285,6 +285,7 @@ let qtpim = callPackage ../modules/qtpim.nix {}; qtpositioning = callPackage ../modules/qtpositioning.nix {}; qtquick1 = null; + qtquick3d = callPackage ../modules/qtquick3d.nix { }; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; qtremoteobjects = callPackage ../modules/qtremoteobjects.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtquick3d.nix b/pkgs/development/libraries/qt-5/modules/qtquick3d.nix new file mode 100644 index 0000000000000..1c84856c0c129 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtquick3d.nix @@ -0,0 +1,11 @@ +{ qtModule +, qtbase +, qtdeclarative +, openssl +}: + +qtModule { + pname = "qtquick3d"; + propagatedBuildInputs = [ qtbase qtdeclarative ]; + buildInputs = [ openssl ]; +} -- cgit 1.4.1 From b5f0de80ae945eb57d10be1cfdd16b8f4240b3b9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 3 May 2024 22:43:57 +0300 Subject: libsForQt5.qtpurchasing: init --- pkgs/development/libraries/qt-5/5.15/default.nix | 3 +++ pkgs/development/libraries/qt-5/modules/qtpurchasing.nix | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/modules/qtpurchasing.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index f051b827c7670..a8885fc5647bc 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -284,6 +284,9 @@ let qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtpim = callPackage ../modules/qtpim.nix {}; qtpositioning = callPackage ../modules/qtpositioning.nix {}; + qtpurchasing = callPackage ../modules/qtpurchasing.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation StoreKit; + }; qtquick1 = null; qtquick3d = callPackage ../modules/qtquick3d.nix { }; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix b/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix new file mode 100644 index 0000000000000..3c1661c7b0004 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix @@ -0,0 +1,14 @@ +{ stdenv +, lib +, qtModule +, qtbase +, qtdeclarative +, StoreKit +, Foundation +}: + +qtModule { + pname = "qtpurchasing"; + propagatedBuildInputs = [ qtbase qtdeclarative ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation StoreKit ]; +} -- cgit 1.4.1 From 365f3060dff49bbf90bfc0ec4cd8b4c3ddff7484 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 00:38:18 +0000 Subject: drogon: 1.9.3 -> 1.9.4 --- pkgs/development/libraries/drogon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 3e155d6f2d902..2cdc6cfafb366 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-en8w8kda0ijg6b6s2WHxHfuGaa+p08928Jw57UBevDU="; + sha256 = "sha256-P6blu3EIBzmK1zikFPiV+tvFLfiQhK+cRdClQOhcBSU="; fetchSubmodules = true; }; -- cgit 1.4.1 From 1d44c066531fa096c5e0ad0f500f346e4ca8a1c8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 4 May 2024 20:22:38 +0200 Subject: glib: fix librarySuffix calculation in cross case The libraries are built for the host platform. glib should be independent of the target platform as it is not a compiler. Fixes build and in some cases eval of pkgsCross.*.buildPackages.glib and in similar situations (e.g. pkgsStatic.buildPackages). --- pkgs/development/libraries/glib/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 5a7f49ce94ae1..60a0f757c1d70 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -47,10 +47,10 @@ let x11Support = false; }; - librarySuffix = if (stdenv.targetPlatform.extensions.library == ".so") then "2.0.so.0" - else if (stdenv.targetPlatform.extensions.library == ".dylib") then "2.0.0.dylib" - else if (stdenv.targetPlatform.extensions.library == ".a") then "2.0.a" - else if (stdenv.targetPlatform.extensions.library == ".dll") then "2.0-0.dll" + librarySuffix = if (stdenv.hostPlatform.extensions.library == ".so") then "2.0.so.0" + else if (stdenv.hostPlatform.extensions.library == ".dylib") then "2.0.0.dylib" + else if (stdenv.hostPlatform.extensions.library == ".a") then "2.0.a" + else if (stdenv.hostPlatform.extensions.library == ".dll") then "2.0-0.dll" else "2.0-0.lib"; in @@ -238,6 +238,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ tzdata desktop-file-utils shared-mime-info ]; + # Conditional necessary to break infinite recursion with passthru.tests preCheck = lib.optionalString finalAttrs.finalPackage.doCheck or config.doCheckByDefault or false '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" -- cgit 1.4.1 From 3e65cc1e5728aff3ed569b3fbd7d9a5b7304b07d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 5 May 2024 20:00:26 +0800 Subject: vte: add blackbox-terminal to passthru.tests --- pkgs/development/libraries/vte/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index d160f74332185..d5194ea299498 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -27,6 +27,7 @@ , systemd , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , nixosTests +, blackbox-terminal }: stdenv.mkDerivation (finalAttrs: { @@ -117,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: { }; tests = { inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal; + blackbox-terminal = blackbox-terminal.override { sixelSupport = true; }; }; }; -- cgit 1.4.1 From 4aa1c01b5c080f4a2bf7268d3d2ed10867e1ed43 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 May 2024 17:53:46 +0200 Subject: rapidyaml: set meta.platforms --- pkgs/development/libraries/rapidyaml/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/development/libraries/rapidyaml/default.nix index 31b8e16f8972f..1275f2fa5452b 100644 --- a/pkgs/development/libraries/rapidyaml/default.nix +++ b/pkgs/development/libraries/rapidyaml/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/biojppm/rapidyaml"; license = licenses.mit; maintainers = with maintainers; [ martfont ]; + platforms = platforms.all; }; } -- cgit 1.4.1