diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-23 18:00:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-23 18:00:56 +0000 |
| commit | 01a65d81f31318c45659b5cdf6870d7ffe835baa (patch) | |
| tree | 3e676001d4a925f6338e7ee31b10a1950bddc896 /pkgs/development/libraries | |
| parent | 4b679cb90a8053896326c68115d98d561c929662 (diff) | |
| parent | 947661df11f87f987b8d9df0bc00b7d873c22018 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libime/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/science/biology/EBTKS/default.nix | 32 |
3 files changed, 7 insertions, 37 deletions
diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 4c12e261f442c..5f914485993a0 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -11,9 +11,10 @@ }: let + tableVer = "20240108"; table = fetchurl { - url = "https://download.fcitx-im.org/data/table.tar.gz"; - sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; + url = "https://download.fcitx-im.org/data/table-${tableVer}.tar.gz"; + hash = "sha256-cpxZbYaQfecnx00Pw/0kHEBsXevStMt07v4CI4funa4="; }; arpaVer = "20230712"; arpa = fetchurl { @@ -28,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-cjlclemt4xsQcpmZ8CflN79QkOE4m07O4hLOQcLF1nA="; + hash = "sha256-AvlQOpjrHSifUtWSTft2bywlWhwka26VcqqReqAlcv8="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 8b9542511b72f..564c5c60eb516 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -105,8 +105,9 @@ qtModule { which gn nodejs - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook + ] ++ lib.optionals stdenv.isDarwin [ bootstrap_cmds cctools xcbuild diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix deleted file mode 100644 index 7a6122fbc8db1..0000000000000 --- a/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libminc }: - -stdenv.mkDerivation rec { - pname = "EBTKS"; - version = "unstable-2017-09-23"; - - src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c"; - sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq"; - }; - - # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? - postPatch = '' - substituteInPlace templates/EBTKS/SimpleArray.h \ - --replace "#define FINITE(x) finite(x)" "#define FINITE(x) isfinite(x)" - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libminc ]; - - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; - - meta = with lib; { - homepage = "https://github.com/BIC-MNI/${pname}"; - description = "Library for working with MINC files"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.free; - }; -} |