diff options
Diffstat (limited to 'pkgs/development')
120 files changed, 980 insertions, 797 deletions
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 05fd9406377d6..b8dccf9fcc575 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -135,6 +135,8 @@ let # We pick "/" path to effectively avoid sysroot offset and make it work # as a native case. "--with-build-sysroot=/" + # Same with the stdlibc++ headers embedded in the gcc output + "--with-gxx-include-dir=${placeholder "out"}/include/c++/${version}/" ] # Basic configuration diff --git a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch index 4e6c392ce76e3..51078925eeb84 100644 --- a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch +++ b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch @@ -12,9 +12,20 @@ inputs to be retained in runtime closure. Typical examples are `nix` -> `nlohmann_json` and `pipewire` -> `lttng-ust.dev`. +For this reason we want to remove the occurrences of hashes in the +expansion of `__FILE__`. `nuke-references` does it by replacing hashes +by `eeeeee...` but those paths are also used for debug symbols. It is +handy to be able to invert the transformation to go back to the original +store path for debuginfod servers. The chosen solution is to make the +hash uppercase: +- it does not trigger runtime references (except for all digit hashes, + which are unlikely enough) +- it visually looks like a bogus store path +- it is easy to find the original store path if required + Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: - -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver + -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/$HASH1-nlohmann-json-ver -fmacro-prefix-map=/nix/... In practice it quickly exhausts argument length limit due to `gcc` @@ -25,9 +36,9 @@ is present in the environment. Tested as: - $ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - + $ printf "# 0 \"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - ... - .string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv" + .string "/nix/store/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA-pppppp-vvvvvvv" ... Mangled successfully. @@ -43,7 +54,7 @@ Mangled successfully. /* Perform user-specified mapping of filename prefixes. Return the GC-allocated new name corresponding to FILENAME or FILENAME if no remapping was performed. */ -@@ -76,7 +79,30 @@ remap_filename (file_prefix_map *maps, const char *filename) +@@ -76,7 +79,31 @@ remap_filename (file_prefix_map *maps, const char *filename) if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0) break; if (!map) @@ -51,8 +62,7 @@ Mangled successfully. + { + if (maps == macro_prefix_maps) + { -+ /* Remap all fo $NIX_STORE/.{32} paths to -+ * equivalent $NIX_STORE/e{32}. ++ /* Remap the 32 characters after $NIX_STORE/ to uppercase + * + * That way we avoid argument parameters explosion + * and still avoid embedding headers into runtime closure: @@ -66,7 +76,9 @@ Mangled successfully. + { + s = (char *) ggc_alloc_atomic (name_len + 1); + memcpy(s, name, name_len + 1); -+ memset(s + nix_store_len + 1, 'e', 32); ++ for (int i = nix_store_len + 1; i < nix_store_len + 1 + 32; i++) { ++ s[i] = TOUPPER(s[i]); ++ } + return s; + } + } @@ -75,7 +87,7 @@ Mangled successfully. name = filename + map->old_len; name_len = strlen (name) + 1; -@@ -90,7 +116,6 @@ remap_filename (file_prefix_map *maps, const char *filename) +@@ -90,7 +117,6 @@ remap_filename (file_prefix_map *maps, const char *filename) ignore it in DW_AT_producer (dwarf2out.cc). */ /* Linked lists of file_prefix_map structures. */ diff --git a/pkgs/development/compilers/gcc/patches/13/ICE-PR110280.patch b/pkgs/development/compilers/gcc/patches/13/ICE-PR110280.patch new file mode 100644 index 0000000000000..7338b3dd1ede3 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/13/ICE-PR110280.patch @@ -0,0 +1,60 @@ +From f4029de35fb1b293a4fd586574b1b4b73ddf7880 Mon Sep 17 00:00:00 2001 +From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org> +Date: Wed, 26 Jul 2023 22:36:26 +0530 +Subject: [PATCH] [aarch64/match.pd] Fix ICE observed in PR110280. + +gcc/ChangeLog: + PR tree-optimization/110280 + * match.pd (vec_perm_expr(v, v, mask) -> v): Explicitly build vector + using build_vector_from_val with the element of input operand, and + mask's type if operand and mask's types don't match. + +gcc/testsuite/ChangeLog: + PR tree-optimization/110280 + * gcc.target/aarch64/sve/pr110280.c: New test. + +(cherry picked from commit 85d8e0d8d5342ec8b4e6a54e22741c30b33c6f04) +--- + gcc/match.pd | 9 ++++++++- + gcc/testsuite/gcc.target/aarch64/sve/pr110280.c | 12 ++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/pr110280.c + +diff --git a/gcc/match.pd b/gcc/match.pd +index 9118244825054..c3bb4fbc0a7a2 100644 +--- a/gcc/match.pd ++++ b/gcc/match.pd +@@ -8292,7 +8292,14 @@ and, + + (simplify + (vec_perm vec_same_elem_p@0 @0 @1) +- @0) ++ (if (types_match (type, TREE_TYPE (@0))) ++ @0 ++ (with ++ { ++ tree elem = uniform_vector_p (@0); ++ } ++ (if (elem) ++ { build_vector_from_val (type, elem); })))) + + /* Push VEC_PERM earlier if that may help FMA perception (PR101895). */ + (simplify +diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c +new file mode 100644 +index 0000000000000..d3279f383629f +--- /dev/null ++++ b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c +@@ -0,0 +1,12 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O3 -fdump-tree-optimized" } */ ++ ++#include "arm_sve.h" ++ ++svuint32_t l() ++{ ++ _Alignas(16) const unsigned int lanes[4] = {0, 0, 0, 0}; ++ return svld1rq_u32(svptrue_b8(), lanes); ++} ++ ++/* { dg-final { scan-tree-dump-not "VEC_PERM_EXPR" "optimized" } } */ diff --git a/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch index ea0673219eb1f..351d6d0f764ba 100644 --- a/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch +++ b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch @@ -12,9 +12,20 @@ inputs to be retained in runtime closure. Typical examples are `nix` -> `nlohmann_json` and `pipewire` -> `lttng-ust.dev`. +For this reason we want to remove the occurrences of hashes in the +expansion of `__FILE__`. `nuke-references` does it by replacing hashes +by `eeeeee...` but those paths are also used for debug symbols. It is +handy to be able to invert the transformation to go back to the original +store path for debuginfod servers. The chosen solution is to make the +hash uppercase: +- it does not trigger runtime references (except for all digit hashes, + which are unlikely enough) +- it visually looks like a bogus store path +- it is easy to find the original store path if required + Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: - -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver + -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/$HASH1-nlohmann-json-ver -fmacro-prefix-map=/nix/... In practice it quickly exhausts argument length limit due to `gcc` @@ -25,9 +36,9 @@ is present in the environment. Tested as: - $ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - + $ printf "# 0 \"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - ... - .string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv" + .string "/nix/store/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA-pppppp-vvvvvvv" ... Mangled successfully. @@ -43,14 +54,13 @@ Mangled successfully. /* Perform user-specified mapping of filename prefixes. Return the GC-allocated new name corresponding to FILENAME or FILENAME if no remapping was performed. */ -@@ -102,6 +105,29 @@ remap_filename (file_prefix_map *maps, const char *filename) +@@ -102,6 +105,30 @@ remap_filename (file_prefix_map *maps, const char *filename) break; if (!map) { + if (maps == macro_prefix_maps) + { -+ /* Remap all fo $NIX_STORE/.{32} paths to -+ * equivalent $NIX_STORE/e{32}. ++ /* Remap all fo $NIX_STORE/.{32} paths to uppercase + * + * That way we avoid argument parameters explosion + * and still avoid embedding headers into runtime closure: @@ -64,7 +74,9 @@ Mangled successfully. + { + s = (char *) ggc_alloc_atomic (name_len + 1); + memcpy(s, name, name_len + 1); -+ memset(s + nix_store_len + 1, 'e', 32); ++ for (int i = nix_store_len + 1; i < nix_store_len + 1 + 32; i++) { ++ s[i] = TOUPPER(s[i]); ++ } + if (realname != filename) + free (const_cast <char *> (realname)); + return s; @@ -73,7 +85,7 @@ Mangled successfully. if (realname != filename) free (const_cast <char *> (realname)); return filename; -@@ -124,7 +150,6 @@ remap_filename (file_prefix_map *maps, const char *filename) +@@ -124,7 +151,6 @@ remap_filename (file_prefix_map *maps, const char *filename) ignore it in DW_AT_producer (gen_command_line_string in opts.cc). */ /* Linked lists of file_prefix_map structures. */ @@ -81,4 +93,3 @@ Mangled successfully. static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map */ static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map */ - diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 55636b8ab51cd..9cb2f701df577 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -74,6 +74,7 @@ in ++ optional langFortran (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch) ++ optional atLeast7 ./ppc-musl.patch ++ optional is12 ./12/lambda-ICE-PR109241.patch # backport ICE fix on ccache code +++ optional is13 ./13/ICE-PR110280.patch # backport ICE fix on const_unop ++ optional (atLeast9 && langD) ./libphobos.patch diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index ff55201ebd03f..5387eb15b713b 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "13.1.1"; + version = "14.0.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-fuzNsVYdnThMzd4tLN/sTbCBXg6qXKLDJRziOKyOBGg="; + hash = "sha256-7kIIU45pe+IF7lGltpIKSvQBmcXR+TWFvmx7ztMNrpc="; }; # These get set at all-packages, keep onto them for child drvs diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 5dec10e3e477f..06391b1740a6e 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.5"; + version = "1.21.6"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-KFy730tubmLtWPNw8/bYwwgl1uVsWFPGbTwjvNsJ2xk="; + hash = "sha256-Ekkmpi5F942qu67bnAEdl2MxhqM8I4/8HiUyDAIEYkg="; }; strictDeps = true; diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index bc72be0ce7a16..16238221e279e 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -158,6 +158,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index c09ec676e9ea7..534d38e866639 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -248,7 +248,7 @@ in stdenv.mkDerivation (rec { ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 2d9790fe61ace..3044199e28112 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -173,6 +173,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index 01e6483ad6408..423b08396666b 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -256,7 +256,7 @@ in stdenv.mkDerivation (rec { ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 4de0488270715..a38e35e91f6d0 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -173,6 +173,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 97d8f27672e3d..3263c4ddaf359 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -244,7 +244,7 @@ in stdenv.mkDerivation (rec { ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index c46ebee1d0dba..c811b24c48ef4 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -213,6 +213,7 @@ in let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 2a7c1c1867cb3..1e71cdd89c6c0 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -206,7 +206,7 @@ in stdenv.mkDerivation (rec { ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 3513833c6f560..090eec2348869 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -216,6 +216,7 @@ in let (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; }; clangNoLibcxx = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 6eec4c563f9c1..eab49d326ad4b 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -205,7 +205,7 @@ in stdenv.mkDerivation (rec { ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 307198b5e9a39..d9ca0819f2e07 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -221,6 +221,7 @@ in let (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; }; clangNoLibcxx = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/15/libcxx/default.nix b/pkgs/development/compilers/llvm/15/libcxx/default.nix index ed5f48e8c38fe..be56770039d80 100644 --- a/pkgs/development/compilers/llvm/15/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -56,6 +56,14 @@ stdenv.mkDerivation rec { hash = "sha256-AaM9A6tQ4YAw7uDqCIV4VaiUyLZv+unwcOqbakwW9/k="; relative = "libcxx"; }) + # fix for https://github.com/NixOS/nixpkgs/issues/269548 + # https://github.com/llvm/llvm-project/pull/77218 + (fetchpatch { + name = "darwin-system-libcxxabi-link-flags.patch"; + url = "https://github.com/llvm/llvm-project/commit/c5b89b29ee6e3c444a355fd1cf733ce7ab2e316a.patch"; + hash = "sha256-LNoPg1KCoP8RWxU/AzHR52f4Dww24I9BGQJedMhFxyQ="; + relative = "libcxx"; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch ]; diff --git a/pkgs/development/compilers/llvm/15/llvm/default.nix b/pkgs/development/compilers/llvm/15/llvm/default.nix index 0b9e83259b2c5..4f17678ba14f7 100644 --- a/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -343,7 +343,7 @@ in stdenv.mkDerivation (rec { ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 878806ff85aba..db9385043be26 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -226,6 +226,7 @@ in let (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; }; clangNoLibcxx = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/16/libcxx/default.nix b/pkgs/development/compilers/llvm/16/libcxx/default.nix index 78cd632024cda..d6c8c57c17437 100644 --- a/pkgs/development/compilers/llvm/16/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, llvm_meta -, monorepoSrc, runCommand +, monorepoSrc, runCommand, fetchpatch , cmake, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi , libcxxabi, libcxxrt, libunwind @@ -47,6 +47,14 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch + # fix for https://github.com/NixOS/nixpkgs/issues/269548 + # https://github.com/llvm/llvm-project/pull/77218 + (fetchpatch { + name = "darwin-system-libcxxabi-link-flags.patch"; + url = "https://github.com/llvm/llvm-project/commit/c5b89b29ee6e3c444a355fd1cf733ce7ab2e316a.patch"; + hash = "sha256-LNoPg1KCoP8RWxU/AzHR52f4Dww24I9BGQJedMhFxyQ="; + relative = "libcxx"; + }) ]; postPatch = '' diff --git a/pkgs/development/compilers/llvm/16/llvm/default.nix b/pkgs/development/compilers/llvm/16/llvm/default.nix index a6faf9fd635d4..73fb6a7854131 100644 --- a/pkgs/development/compilers/llvm/16/llvm/default.nix +++ b/pkgs/development/compilers/llvm/16/llvm/default.nix @@ -331,7 +331,7 @@ in ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/llvm/17/libcxx/default.nix b/pkgs/development/compilers/llvm/17/libcxx/default.nix index 7b99966416638..8a5272ea07af0 100644 --- a/pkgs/development/compilers/llvm/17/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/17/libcxx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, llvm_meta -, monorepoSrc, runCommand +, monorepoSrc, runCommand, fetchpatch , cmake, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi , libcxxabi, libcxxrt, libunwind @@ -45,6 +45,17 @@ stdenv.mkDerivation rec { chmod -R u+w . ''; + patches = [ + # fix for https://github.com/NixOS/nixpkgs/issues/269548 + # https://github.com/llvm/llvm-project/pull/77218 + (fetchpatch { + name = "darwin-system-libcxxabi-link-flags.patch"; + url = "https://github.com/llvm/llvm-project/commit/c5b89b29ee6e3c444a355fd1cf733ce7ab2e316a.patch"; + hash = "sha256-LNoPg1KCoP8RWxU/AzHR52f4Dww24I9BGQJedMhFxyQ="; + relative = "libcxx"; + }) + ]; + postPatch = '' cd ../runtimes ''; diff --git a/pkgs/development/compilers/llvm/17/llvm/default.nix b/pkgs/development/compilers/llvm/17/llvm/default.nix index b38fef333135e..627679ce812fc 100644 --- a/pkgs/development/compilers/llvm/17/llvm/default.nix +++ b/pkgs/development/compilers/llvm/17/llvm/default.nix @@ -330,7 +330,7 @@ stdenv.mkDerivation (rec { ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 0483916a620b7..83e19e7e90a29 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -161,6 +161,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 7cef04347429c..c2f9243310981 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -222,7 +222,7 @@ in stdenv.mkDerivation (rec { ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index fbd2e57805be2..a6274c8b2b9c0 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -161,6 +161,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index 75c7868559734..c0ef7801c348a 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -237,7 +237,7 @@ in stdenv.mkDerivation (rec { ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 41ce6076da5f3..efa8daf5d98b9 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -216,6 +216,7 @@ in let (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; }; clangNoLibcxx = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index 7b99966416638..8a5272ea07af0 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, llvm_meta -, monorepoSrc, runCommand +, monorepoSrc, runCommand, fetchpatch , cmake, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi , libcxxabi, libcxxrt, libunwind @@ -45,6 +45,17 @@ stdenv.mkDerivation rec { chmod -R u+w . ''; + patches = [ + # fix for https://github.com/NixOS/nixpkgs/issues/269548 + # https://github.com/llvm/llvm-project/pull/77218 + (fetchpatch { + name = "darwin-system-libcxxabi-link-flags.patch"; + url = "https://github.com/llvm/llvm-project/commit/c5b89b29ee6e3c444a355fd1cf733ce7ab2e316a.patch"; + hash = "sha256-LNoPg1KCoP8RWxU/AzHR52f4Dww24I9BGQJedMhFxyQ="; + relative = "libcxx"; + }) + ]; + postPatch = '' cd ../runtimes ''; diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 36edfee8a091a..a6e9f9289d030 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -329,7 +329,7 @@ stdenv.mkDerivation (rec { ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" ( diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 4db3b93217d7f..fb5b5b0b7ba53 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -48,7 +48,14 @@ disable-warnings-if-gcc13 (stdenv.mkDerivation { inherit (branch) rev hash; }; - patches = lib.optionals (llvmMajor == "16") [ + patches = [ + # Fixes build after spirv-headers breaking change + (fetchpatch { + url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch"; + excludes = ["spirv-headers-tag.conf"]; + hash = "sha256-17JJG8eCFVphElY5fVT/79hj0bByWxo8mVp1ZNjQk/M="; + }) + ] ++ lib.optionals (llvmMajor == "16") [ # Fixes builds that link against external LLVM dynamic library (fetchpatch { url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/f3b9b604d7eda18d0d1029d94a6eebd33aa3a3fe.patch"; diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index d09555b00c9ca..75925ed81bece 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -57,7 +57,7 @@ let isJdk8 = lib.versions.major dist.jdkVersion == "8"; jdk = stdenv.mkDerivation rec { - pname = "zulu${dist.zuluVersion}-${javaPackage}"; + pname = "zulu-${javaPackage}"; version = dist.jdkVersion; src = fetchurl { diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 95a6fb077eb12..dd89e0cd41d79 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.5.3"; + version = "3.5.5"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-8xFe6AgJkvJXwBYbgR4HsBLyAXXtiTSfsayYl33cXJw="; + hash = "sha256-ErKsKMIEvs4oA8eS9v1ASfqlMOJOxeTVfCA99AIcTh0="; }; patches = [ diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 284671b43f171..f818e35c458e8 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.7.7"; + version = "0.7.10"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-GO3Sfbi1dwsqQM6rlnEHyE7wolQjdVwD5BAu5ychEuY="; + hash = "sha256-yJ0sgw0y9tIiIHgTPVnfYd8zAGjO83qfeeEzstGH9CE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix index f064eb7a4fdb5..6bf982aa75fb4 100644 --- a/pkgs/development/libraries/catch2/3.nix +++ b/pkgs/development/libraries/catch2/3.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.4.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - hash = "sha256-DqGGfNjKPW9HFJrX9arFHyNYjB61uoL6NabZatTWrr0="; + hash = "sha256-xGPfXjk+oOnR7JqTrZd2pKJxalrlS8CMs7HWDClXaS8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index a809eda31c0d1..cb5fe9e4fbd3e 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { ''; outputs = [ "out" "dev" "lib" "doc" "man" ]; + separateDebugInfo = true; strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 15a056edb6911..4f891a24f1f0a 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { url = "https://github.com/troglobit/editline/commit/265c1fb6a0b99bedb157dc7c320f2c9629136518.patch"; sha256 = "sha256-9fhQH0hT8BcykGzOUoT18HBtWjjoXnePSGDJQp8GH30="; }) + + # Pending autoconf-2.72 upstream support: + # https://github.com/troglobit/editline/pull/64 + (fetchpatch { + name = "autoconf-2.72.patch"; + url = "https://github.com/troglobit/editline/commit/f444a316f5178b8e20fe31e7b2d979e651da077e.patch"; + hash = "sha256-m3jExTkPvE+ZBwHzf/A+ugzzfbLmeWYn726l7Po7f10="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 43f9093848b8f..c843fef4a0efe 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { hash = "sha256-wcVxnypZfOPgbJOM+5n7aX2gk96nuFfMAE3B3PG7oYI="; }; + strictDeps = true; + nativeBuildInputs = [ groff pkg-config @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { nuspell ]; - nativeCheckInputs = [ + checkInputs = [ unittest-cpp ]; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 9d4369003e47d..12347318696c7 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -44,7 +44,6 @@ , withFreetype ? withHeadlessDeps # Needed for drawtext filter , withFrei0r ? withFullDeps # frei0r video filtering , withFribidi ? withFullDeps # Needed for drawtext filter -, withGlslang ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" , withGme ? withFullDeps # Game Music Emulator , withGnutls ? withHeadlessDeps , withGsm ? withFullDeps # GSM de/encoder @@ -73,6 +72,7 @@ , withRtmp ? false # RTMP[E] support , withSamba ? withFullDeps && !stdenv.isDarwin # Samba protocol , withSdl2 ? withSmallDeps +, withShaderc ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" , withSoxr ? withHeadlessDeps # Resampling via soxr , withSpeex ? withHeadlessDeps # Speex de/encoder , withSrt ? withHeadlessDeps # Secure Reliable Transport (SRT) protocol @@ -189,7 +189,6 @@ , frei0r , fribidi , game-music-emu -, glslang , gnutls , gsm , intel-media-sdk @@ -213,6 +212,7 @@ , libopenmpt , libopus , libplacebo +, libplacebo_5 , libpulseaudio , libraw1394 , librsvg @@ -244,6 +244,7 @@ , rtmpdump , samba , SDL2 +, shaderc , soxr , speex , srt @@ -356,7 +357,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FQV9/PiarPXCm45ldtCsxGHjlrriL8DKpn1LaKJ8owI="; } ) - ++ (lib.optional (stdenv.isDarwin && lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") + ++ (lib.optional (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") { # this can be removed post 6.1 name = "fix_build_failure_due_to_PropertyKey_EncoderID"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; @@ -524,7 +525,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withZimg "libzimg") (enableFeature withZlib "zlib") (enableFeature withVulkan "vulkan") - (enableFeature withGlslang "libglslang") + (optionalString (lib.versionAtLeast version "5") (enableFeature withShaderc "libshaderc")) (enableFeature withSamba "libsmbclient") /* * Developer flags @@ -577,14 +578,13 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withFreetype [ freetype ] ++ optionals withFrei0r [ frei0r ] ++ optionals withFribidi [ fribidi ] - ++ optionals withGlslang [ glslang ] ++ optionals withGme [ game-music-emu ] ++ optionals withGnutls [ gnutls ] ++ optionals withGsm [ gsm ] ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it? ++ optionals withJack [ libjack2 ] ++ optionals withLadspa [ ladspaH ] - ++ optionals withLibplacebo [ libplacebo vulkan-headers ] + ++ optionals withLibplacebo [ (if (lib.versionAtLeast version "6.1") then libplacebo else libplacebo_5) vulkan-headers ] ++ optionals withLzma [ xz ] ++ optionals withMfx [ intel-media-sdk ] ++ optionals withModplug [ libmodplug ] @@ -604,6 +604,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withRtmp [ rtmpdump ] ++ optionals withSamba [ samba ] ++ optionals withSdl2 [ SDL2 ] + ++ optionals withShaderc [ shaderc ] ++ optionals withSoxr [ soxr ] ++ optionals withSpeex [ speex ] ++ optionals withSrt [ srt ] diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 4d98c163c6d3d..22d395785434a 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -4,7 +4,6 @@ , boost , cmake , double-conversion -, fetchpatch , fmt_8 , gflags , glog @@ -64,12 +63,21 @@ stdenv.mkDerivation rec { # temporary hack until folly builds work on aarch64, # see https://github.com/facebook/folly/issues/1880 "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.isx86_64 then "x86_64" else "dummy"}" + + # ensure correct dirs in $dev/lib/pkgconfig/libfolly.pc + # see https://github.com/NixOS/nixpkgs/issues/144170 + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; + # split outputs to reduce downstream closure sizes + outputs = [ "out" "dev" ]; + + # patch prefix issues again + # see https://github.com/NixOS/nixpkgs/issues/144170 postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/libfolly.pc \ - --replace '=''${prefix}//' '=/' \ - --replace '=''${exec_prefix}//' '=/' + substituteInPlace $dev/lib/cmake/${pname}/${pname}-targets-release.cmake \ + --replace '$'{_IMPORT_PREFIX}/lib/ $out/lib/ ''; # folly-config.cmake, will `find_package` these, thus there should be diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index eadb30352e9a9..9ff72c2021932 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch2 , pkg-config , python3 , freetype @@ -15,25 +14,15 @@ stdenv.mkDerivation rec { pname = "fontconfig"; - version = "2.14.2"; + version = "2.15.0"; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config src = fetchurl { url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz"; - hash = "sha256-26aVtXvOFQI9LO7e+CBiwrkl5R9dTMSu9zbPE/YKRos="; + hash = "sha256-Y6BljQ4G4PqIYQZFK1jvBPIfWCAuoCqUw53g0zNdfA4="; }; - patches = [ - # Provide 11-lcdfilter-none.conf for NixOS module - # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/268 - (fetchpatch2 { - name = "add-optional-11-lcdfilter-none-configuration.patch"; - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/c2666a6d9a6ed18b1bfcef8176e25f62993e24db.patch"; - hash = "sha256-UBzkxy3uxFO+g0aQtPnBZv7OncgQdinwzNwWS8ngjcE="; - }) - ]; - nativeBuildInputs = [ autoreconfHook gperf diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index aa84de4dcecdb..cfe0a21e1d35c 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -1,16 +1,29 @@ -{ runCommand, stdenv, lib, libxslt, fontconfig, dejavu_fonts, fontDirectories }: +{ runCommand, stdenv, lib, libxslt, fontconfig, dejavu_fonts, fontDirectories +, impureFontDirectories ? [ + # nix user profile + "~/.nix-profile/lib/X11/fonts" "~/.nix-profile/share/fonts" + ] + ++ lib.optional stdenv.isDarwin "~/Library/Fonts" + ++ [ + # FHS paths for non-NixOS platforms + "/usr/share/fonts" "/usr/local/share/fonts" + ] + # darwin paths + ++ lib.optionals stdenv.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ] + # nix default profile + ++ [ "/nix/var/nix/profiles/default/lib/X11/fonts" "/nix/var/nix/profiles/default/share/fonts" ] }: runCommand "fonts.conf" { nativeBuildInputs = [ libxslt ]; buildInputs = [ fontconfig ]; + inherit fontDirectories; # Add a default font for non-nixos systems, <1MB and in nixos defaults. - fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ] - # further non-nixos fonts on darwin - ++ lib.optionals stdenv.isDarwin [ "/System/Library/Fonts" "/Library/Fonts" "~/Library/Fonts" ]; + impureFontDirectories = impureFontDirectories ++ [ dejavu_fonts.minimal ]; } '' xsltproc --stringparam fontDirectories "$fontDirectories" \ + --stringparam impureFontDirectories "$impureFontDirectories" \ --path ${fontconfig.out}/share/xml/fontconfig \ ${./make-fonts-conf.xsl} ${fontconfig.out}/etc/fonts/fonts.conf \ > $out diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl index ed51b62a1d088..d04e4ffab967b 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -15,6 +15,7 @@ <xsl:output method='xml' encoding="UTF-8" doctype-system="urn:fontconfig:fonts.dtd" /> <xsl:param name="fontDirectories" /> + <xsl:param name="impureFontDirectories" /> <xsl:template match="/fontconfig"> @@ -23,29 +24,26 @@ <!-- the first cachedir will be used to store the cache --> <cachedir prefix="xdg">fontconfig</cachedir> + <xsl:text>
</xsl:text> <!-- /var/cache/fontconfig is useful for non-nixos systems --> <cachedir>/var/cache/fontconfig</cachedir> + <xsl:text>
</xsl:text> <!-- system-wide config --> <include ignore_missing="yes">/etc/fonts/conf.d</include> + <xsl:text>
</xsl:text> <dir prefix="xdg">fonts</dir> + <xsl:text>
</xsl:text> <xsl:for-each select="str:tokenize($fontDirectories)"> <dir><xsl:value-of select="." /></dir> <xsl:text>
</xsl:text> </xsl:for-each> - <!-- nix user profile --> - <dir>~/.nix-profile/lib/X11/fonts</dir> - <dir>~/.nix-profile/share/fonts</dir> - - <!-- FHS paths for non-NixOS platforms --> - <dir>/usr/share/fonts</dir> - <dir>/usr/local/share/fonts</dir> - - <!-- nix default profile --> - <dir>/nix/var/nix/profiles/default/lib/X11/fonts</dir> - <dir>/nix/var/nix/profiles/default/share/fonts</dir> + <xsl:for-each select="str:tokenize($impureFontDirectories)"> + <dir><xsl:value-of select="." /></dir> + <xsl:text>
</xsl:text> + </xsl:for-each> </fontconfig> diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index c9845feb96783..af96d9d06d27b 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libavif ] - ++ lib.optional withXorg libXpm; + buildInputs = [ zlib freetype libpng libjpeg libwebp libtiff libavif ] + ++ lib.optionals withXorg [ fontconfig libXpm ]; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index bbbdf19a19095..b8c95653e366b 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-52XlAW/6m53SQ+NjoEYNV3B0RE7iSRJn2y6WycKt73c="; + hash = "sha256-90/FlUsn1Oxt+7Ed6ph4iLWxJCiaNwOvytoO5SD0Fz4="; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index da40c66e9fe53..132ae64577a71 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -4,6 +4,7 @@ , fetchpatch , autoreconfHook , libunwind +, perl }: stdenv.mkDerivation rec { @@ -29,7 +30,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # tcmalloc uses libunwind in a way that works correctly only on non-ARM dynamically linked linux - buildInputs = lib.optional (stdenv.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic )) libunwind; + buildInputs = [ perl ] + ++ lib.optional (stdenv.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic )) libunwind; # Disable general dynamic TLS on AArch to support dlopen()'ing the library: # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 590818546a4bf..a6797786ee539 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.113/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.114/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 06b5e6b04cfa9..d51c74cc4e64f 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/attica-5.113.0.tar.xz"; - sha256 = "0p6n2jvky5x9gpwmp31mdxf0bzywaljgnkszgbklyc35xk9i6j14"; - name = "attica-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/attica-5.114.0.tar.xz"; + sha256 = "0gkdsm1vyyyxxyl4rni9s2bdz5w6zphzjl58fddjl899da06hqfq"; + name = "attica-5.114.0.tar.xz"; }; }; baloo = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/baloo-5.113.0.tar.xz"; - sha256 = "1jv7202dj2w0vcv49bgp0iv1sfy3kdqr974rcr77pcfzhhda9bix"; - name = "baloo-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/baloo-5.114.0.tar.xz"; + sha256 = "19sib1y0m5h2gnnpr9rfk810p6pdfm4zzxlm0a44r7910llp8i50"; + name = "baloo-5.114.0.tar.xz"; }; }; bluez-qt = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/bluez-qt-5.113.0.tar.xz"; - sha256 = "1y6nkl9zc5298jc6klxz88h6srmma085w1q5l4jmjihgys2zkcx7"; - name = "bluez-qt-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/bluez-qt-5.114.0.tar.xz"; + sha256 = "1ni50jwnb5ww8mkql0p3q8660c0srj8p0ik27lvxakwdq4wf6l9s"; + name = "bluez-qt-5.114.0.tar.xz"; }; }; breeze-icons = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/breeze-icons-5.113.0.tar.xz"; - sha256 = "0kb3wchx84dpi77zsi1b9pzlkhg3sjagxcsf1pdappagq3xn1p48"; - name = "breeze-icons-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/breeze-icons-5.114.0.tar.xz"; + sha256 = "0z5cpv10jyjdwjfkm7nj6hyp4vj29apm476hvbpb4gan27jyb91y"; + name = "breeze-icons-5.114.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/extra-cmake-modules-5.113.0.tar.xz"; - sha256 = "1i1vpf9860cwrq5b01yrgf94hmzk9dx637j638shgjmyxr058pi6"; - name = "extra-cmake-modules-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/extra-cmake-modules-5.114.0.tar.xz"; + sha256 = "0z4nqravsfzlsgvkg5rha2d0qxfr3pfncw7z2fxzzqvzj7mfk6im"; + name = "extra-cmake-modules-5.114.0.tar.xz"; }; }; frameworkintegration = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/frameworkintegration-5.113.0.tar.xz"; - sha256 = "17i7frachq23kfg78ar33x5acwf7pmwl1a5c02qif44mml8b09hi"; - name = "frameworkintegration-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/frameworkintegration-5.114.0.tar.xz"; + sha256 = "1dqgzhhh8gnvl8jsvh2i6pjn935d61avh63b4z9kpllhvp9a2lnd"; + name = "frameworkintegration-5.114.0.tar.xz"; }; }; kactivities = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kactivities-5.113.0.tar.xz"; - sha256 = "1d9lkhp344wdss9vab3gh9h31f1k6fifdhp17fblpkykgyvbb26y"; - name = "kactivities-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kactivities-5.114.0.tar.xz"; + sha256 = "10pyynqz8c22la9aqms080iqlisj3irbi1kwnn3s0vg5dsjxr1p3"; + name = "kactivities-5.114.0.tar.xz"; }; }; kactivities-stats = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kactivities-stats-5.113.0.tar.xz"; - sha256 = "136z2njw3k2l71xp4vg10sm5q925xh8yfr9a784wnr0kwngdb71i"; - name = "kactivities-stats-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kactivities-stats-5.114.0.tar.xz"; + sha256 = "1zhrs2p3c831rwx7ww87i82k5i236vfywdxv7zhz93k3vffyqby7"; + name = "kactivities-stats-5.114.0.tar.xz"; }; }; kapidox = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kapidox-5.113.0.tar.xz"; - sha256 = "05407c01wnjyslbbz0w5wipjpx6ng3izya41mg13g700ainj9q1x"; - name = "kapidox-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kapidox-5.114.0.tar.xz"; + sha256 = "0xxw3lvipyax8r1af3ypwjj6waarbp2z9n11fjb4kvyigsypglmb"; + name = "kapidox-5.114.0.tar.xz"; }; }; karchive = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/karchive-5.113.0.tar.xz"; - sha256 = "03a3p85hmx4ycfp0y5l9yw4cy3i9jwy7jd27psmckr4q0538k91d"; - name = "karchive-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/karchive-5.114.0.tar.xz"; + sha256 = "015gc1zarny8r478p7g9m6r67l5dk3r0vcp28ilmfmznxy0k0hda"; + name = "karchive-5.114.0.tar.xz"; }; }; kauth = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kauth-5.113.0.tar.xz"; - sha256 = "0ncpyq2l53p4yhhxkvk23x0ji9amrbnm6kbz8dp573cqww79pih2"; - name = "kauth-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kauth-5.114.0.tar.xz"; + sha256 = "1rkf9mc9718wn8pzd3d3wcg3lsn0vkr9a2cqnz86rbg3cf2qdbir"; + name = "kauth-5.114.0.tar.xz"; }; }; kbookmarks = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kbookmarks-5.113.0.tar.xz"; - sha256 = "1fgnh8amy2ghn50i59al0iyqvj05pzdxai9qxqzbvi65f1pibi7d"; - name = "kbookmarks-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kbookmarks-5.114.0.tar.xz"; + sha256 = "06lnsyjhh80mdcqjww40glinmrjydbmkhv27a267vf34r7kam9rc"; + name = "kbookmarks-5.114.0.tar.xz"; }; }; kcalendarcore = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kcalendarcore-5.113.0.tar.xz"; - sha256 = "18psjzqcfzaplcfjpjda983mrpv306il0j49q3rm9hj9ycj54wc2"; - name = "kcalendarcore-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kcalendarcore-5.114.0.tar.xz"; + sha256 = "0aimda01zqw4fz5ldvz4vh767bi10r00kvm62n89nxhsq46wlk7p"; + name = "kcalendarcore-5.114.0.tar.xz"; }; }; kcmutils = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kcmutils-5.113.0.tar.xz"; - sha256 = "1xbfzw2zfl966zp70jzfp3hjzn334zf4hnwr82priffafgrin57s"; - name = "kcmutils-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kcmutils-5.114.0.tar.xz"; + sha256 = "1pblf3c60m0gn3vhdprw28f8y54kij02jwz91r2vnmng8d1xkrp9"; + name = "kcmutils-5.114.0.tar.xz"; }; }; kcodecs = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kcodecs-5.113.0.tar.xz"; - sha256 = "1xvaq0yg4n4lwyq3yx2m8jrvfg7f0qrwgxxam4rmp2l245bvn34i"; - name = "kcodecs-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kcodecs-5.114.0.tar.xz"; + sha256 = "080zvcqd8iq05p5x3qaf3rryx75lg2l2j1dr18sp50ir50zfwh2w"; + name = "kcodecs-5.114.0.tar.xz"; }; }; kcompletion = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kcompletion-5.113.0.tar.xz"; - sha256 = "016280h98j1ssvc3a4b3vyh4s93s9y9hn1jrpbfbkm9xxnvi7k79"; - name = "kcompletion-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kcompletion-5.114.0.tar.xz"; + sha256 = "0qvdxqlh1dklkbmqfjg5gc3dkdicgzn6q5lgvyf8cv46dinj6mwc"; + name = "kcompletion-5.114.0.tar.xz"; }; }; kconfig = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kconfig-5.113.0.tar.xz"; - sha256 = "0fwhn3yp4gfwjiy5dx7gs0zd65yjlrrzkqpy7fpg7n97qf99q2a8"; - name = "kconfig-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kconfig-5.114.0.tar.xz"; + sha256 = "0hghdh4p6cq9ckp4g5jdgd8w47pdsxxvzimrdfjrs71lmy8ydiy2"; + name = "kconfig-5.114.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kconfigwidgets-5.113.0.tar.xz"; - sha256 = "0bmk5qxiss7a71xpfsbqj831wkcf94b7wfbw9xisvnxlfmf60y4v"; - name = "kconfigwidgets-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kconfigwidgets-5.114.0.tar.xz"; + sha256 = "16layydkcwfbvzxqjzprkq8bbxifn0z0wm7mc9bzwrfxy761rjnj"; + name = "kconfigwidgets-5.114.0.tar.xz"; }; }; kcontacts = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kcontacts-5.113.0.tar.xz"; - sha256 = "1y9cdv1g2ypwl4b0hk1sxk7lvb5qkbm4n1gh62plqsran62jsimm"; - name = "kcontacts-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kcontacts-5.114.0.tar.xz"; + sha256 = "0lyqvbs216p5zpssaf4pyccph7nbwkbvhpmhbi32y2rm23cmxlwf"; + name = "kcontacts-5.114.0.tar.xz"; }; }; kcoreaddons = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kcoreaddons-5.113.0.tar.xz"; - sha256 = "1bhanzfjw2i49sx2hjnim8k72vvbs7gyig7nkqkgbaxzpa8qgwrf"; - name = "kcoreaddons-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kcoreaddons-5.114.0.tar.xz"; + sha256 = "1wv3s3xsiii96k17nzs2fb0ih2lyg52krf58v44nlk9wfi4wmnqx"; + name = "kcoreaddons-5.114.0.tar.xz"; }; }; kcrash = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kcrash-5.113.0.tar.xz"; - sha256 = "1mg90xm6ckcd30s07psn30sgh81lx8kfs0p1h6cblg4q8bkgkndv"; - name = "kcrash-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kcrash-5.114.0.tar.xz"; + sha256 = "1avi4yd3kpjqxrvci1nicxbh9mjafj1w2vgfmqanq66b76s4kxj1"; + name = "kcrash-5.114.0.tar.xz"; }; }; kdav = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kdav-5.113.0.tar.xz"; - sha256 = "1djng9c741xairr84nvjbkq4dk551p7yk91g8d4nndy8s1kiz1dv"; - name = "kdav-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kdav-5.114.0.tar.xz"; + sha256 = "11959fxz24snk2l31kw8w96wah0s2fjimimrxh6xhppiy5qp2fp2"; + name = "kdav-5.114.0.tar.xz"; }; }; kdbusaddons = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kdbusaddons-5.113.0.tar.xz"; - sha256 = "101a406f8i0wgaxd0ilvfcb3plzjgvxw9bhhm5pin6fpr0xkjrnk"; - name = "kdbusaddons-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kdbusaddons-5.114.0.tar.xz"; + sha256 = "0pzzznyxhi48z5hhdsdxz3vaaihrdshpx65ha2v2nn2gh3ww7ikm"; + name = "kdbusaddons-5.114.0.tar.xz"; }; }; kdeclarative = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kdeclarative-5.113.0.tar.xz"; - sha256 = "1wj9arkmjdrac04cq2w5bw5184jnlq5xn2cw6n7lajc31yrbc0rk"; - name = "kdeclarative-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kdeclarative-5.114.0.tar.xz"; + sha256 = "0w98pj8acxb4m9645963rzq5vja1fbih5czz24mf9zdqlg2dkz8g"; + name = "kdeclarative-5.114.0.tar.xz"; }; }; kded = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kded-5.113.0.tar.xz"; - sha256 = "1vb3z7r2l206n7p70a4cbkrm7fvyk7hqqf0bz7514r4g86l4l5n4"; - name = "kded-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kded-5.114.0.tar.xz"; + sha256 = "00n4isc4ahii0ldrg761lkmnq27kmrfqs9zkmpvmgbg57259mvc3"; + name = "kded-5.114.0.tar.xz"; }; }; kdelibs4support = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/portingAids/kdelibs4support-5.113.0.tar.xz"; - sha256 = "1z843zq1g5n3b8gb20y8266hyikvbzdsgc77gvcgzvqfdxk19l24"; - name = "kdelibs4support-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/portingAids/kdelibs4support-5.114.0.tar.xz"; + sha256 = "17473him2fjfcw5f88diarqac815wsakfyb9fka82a4qqh9l41mc"; + name = "kdelibs4support-5.114.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/portingAids/kdesignerplugin-5.113.0.tar.xz"; - sha256 = "05hwq8rpm1f9ad5fyk2gjqxm6gvvx2gx2zdbklww9ghlh8qndl9i"; - name = "kdesignerplugin-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/portingAids/kdesignerplugin-5.114.0.tar.xz"; + sha256 = "0zlvkayv6zl5rp1076bscmdzyw93y7sxqb5848w11vs0g9amcj9n"; + name = "kdesignerplugin-5.114.0.tar.xz"; }; }; kdesu = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kdesu-5.113.0.tar.xz"; - sha256 = "085d3d6qpl4m7z8smm0bq9khfjjglpb1gd9n8q0d541127y2cpq4"; - name = "kdesu-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kdesu-5.114.0.tar.xz"; + sha256 = "14dcf32izn4lxr8vx372rfznflc1rcxwanx06phkd8mx9zyg4jxr"; + name = "kdesu-5.114.0.tar.xz"; }; }; kdewebkit = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/portingAids/kdewebkit-5.113.0.tar.xz"; - sha256 = "18bmg88xj07h8y5f3f2ckjs9m61mf8jrxrg4vg8hrf4nabxz20xn"; - name = "kdewebkit-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/portingAids/kdewebkit-5.114.0.tar.xz"; + sha256 = "04zc2qs13k04gsn124mnh6sqi3pax8c014jcb0qdh3h2r2y72bz3"; + name = "kdewebkit-5.114.0.tar.xz"; }; }; kdnssd = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kdnssd-5.113.0.tar.xz"; - sha256 = "1hbb9zy1f13m45b6kzndxw619vnmx0s418brqgkdaxgsh12j5anq"; - name = "kdnssd-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kdnssd-5.114.0.tar.xz"; + sha256 = "1zw5rkprr54j05ic8zljk57zahp2v6333slr253r3n1679zqlv64"; + name = "kdnssd-5.114.0.tar.xz"; }; }; kdoctools = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kdoctools-5.113.0.tar.xz"; - sha256 = "0cfs4znhp7psrz99j3brp8q39gg0bpzvkrdx90zl6vvrc06d2zaa"; - name = "kdoctools-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kdoctools-5.114.0.tar.xz"; + sha256 = "15s58r2zvdckw30x9q9ir8h1i8q2ncfgjn9h4jnmylwm79z3z27v"; + name = "kdoctools-5.114.0.tar.xz"; }; }; kemoticons = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kemoticons-5.113.0.tar.xz"; - sha256 = "127frvsp1h9hg755vz2i609wxqqgzgsz15iqr7hcpbmmf6xvm8i2"; - name = "kemoticons-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kemoticons-5.114.0.tar.xz"; + sha256 = "0w87prkhdmba7y8ylbycdpwdzd2djmp7hvv5ljb9s4aqqhnn3vw4"; + name = "kemoticons-5.114.0.tar.xz"; }; }; kfilemetadata = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kfilemetadata-5.113.0.tar.xz"; - sha256 = "1ap25y66y1r185fghvkkkkp4f6acnkazny8wxw5hv1gg25ilpsir"; - name = "kfilemetadata-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kfilemetadata-5.114.0.tar.xz"; + sha256 = "15va29chlsrxii02w1ax718hp1b14ym59lcfyzh7w30zlf681560"; + name = "kfilemetadata-5.114.0.tar.xz"; }; }; kglobalaccel = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kglobalaccel-5.113.0.tar.xz"; - sha256 = "0ibm1wd7fhi3j5za0agyq2zrs9nx5a8b47iijkzgkpz9ylxniwrs"; - name = "kglobalaccel-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kglobalaccel-5.114.0.tar.xz"; + sha256 = "19mmav055fnzyl760fyhf0pdvaidd5i1h04l2hcnpin4p1jnpfap"; + name = "kglobalaccel-5.114.0.tar.xz"; }; }; kguiaddons = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kguiaddons-5.113.0.tar.xz"; - sha256 = "1ykhxgx89x1qv916pcz3j0q14ylalg9v23jjw0dbwpg5hlj4qlyc"; - name = "kguiaddons-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kguiaddons-5.114.0.tar.xz"; + sha256 = "0riya9plcz9c1ndhdbsradssndshbm12705swn7vf7am17n7f947"; + name = "kguiaddons-5.114.0.tar.xz"; }; }; kholidays = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kholidays-5.113.0.tar.xz"; - sha256 = "1wq397j3m3s9a45k9h5hsdsfansvb3a5q8biag2w3fsb1i84id0i"; - name = "kholidays-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kholidays-5.114.0.tar.xz"; + sha256 = "19r8dxglz5ll6iyvigsccil3ikvcsnyy5nwcpjvjr1c0brigcjmy"; + name = "kholidays-5.114.0.tar.xz"; }; }; khtml = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/portingAids/khtml-5.113.0.tar.xz"; - sha256 = "0m284rwq8f49j71lcapzr4qi0f72a0adnv67mfg5blar867161mq"; - name = "khtml-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/portingAids/khtml-5.114.0.tar.xz"; + sha256 = "1mf84zs9hjvmi74f8rgqzrfkqjq597f9k64dn1bqcj13v0w10vry"; + name = "khtml-5.114.0.tar.xz"; }; }; ki18n = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/ki18n-5.113.0.tar.xz"; - sha256 = "0hl0qp3653xiwa5ndk82ygy2kgrc0pygqkknb1cx5w54s56bm57w"; - name = "ki18n-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/ki18n-5.114.0.tar.xz"; + sha256 = "1yg03awcx5ay6lgbgwv91i0ankrm94z9m0wky4v03gnwnvw8pa0v"; + name = "ki18n-5.114.0.tar.xz"; }; }; kiconthemes = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kiconthemes-5.113.0.tar.xz"; - sha256 = "0q2c1s8pwl7dnx9v7q061zn5n1prk0vv0j77kki9wfncjaf15g0g"; - name = "kiconthemes-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kiconthemes-5.114.0.tar.xz"; + sha256 = "0ndiqmcs1ybj4acc6k3p9jwq09slqc4nj12ifqvlxrfj3ak6sb28"; + name = "kiconthemes-5.114.0.tar.xz"; }; }; kidletime = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kidletime-5.113.0.tar.xz"; - sha256 = "1cdfhn3mcxvizba1gpf0viba3g0mnva3l226lkca3p9ps8c4z3rm"; - name = "kidletime-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kidletime-5.114.0.tar.xz"; + sha256 = "06sc9w54g4n7s5gjkqz08rgcz6v3pr0bdgx3gbjgzass6l4m8w7p"; + name = "kidletime-5.114.0.tar.xz"; }; }; kimageformats = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kimageformats-5.113.0.tar.xz"; - sha256 = "0gys83sazgbj7h3yiaacqr464z951ixygrhzcw16cnqjm8phic44"; - name = "kimageformats-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kimageformats-5.114.0.tar.xz"; + sha256 = "1nfzpgnrbwncx9zp9cwa169jlfv7i85p00a07d4jc5hrdyvvkn0w"; + name = "kimageformats-5.114.0.tar.xz"; }; }; kinit = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kinit-5.113.0.tar.xz"; - sha256 = "1ydmgxyr5j9zi0a5vlb64kkjxka3rsyvzj10y3dww92qyapnn2bv"; - name = "kinit-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kinit-5.114.0.tar.xz"; + sha256 = "0b6z9gq05vz20hm5y9ai3sbqq3gxwm3a3z88dkvi7dywk7vbqcph"; + name = "kinit-5.114.0.tar.xz"; }; }; kio = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kio-5.113.0.tar.xz"; - sha256 = "1bjmv3wdpmzqbv1xzzl0ydirccbknnjyqn6wzb057zgy7kpi1cd8"; - name = "kio-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kio-5.114.0.tar.xz"; + sha256 = "0nwmxbfhvfw69q07vxvflri7rkdczyc89xv4ll3nrzrhgf15kb2z"; + name = "kio-5.114.0.tar.xz"; }; }; kirigami2 = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kirigami2-5.113.0.tar.xz"; - sha256 = "0zy3s841q2xw4d048a3qh4cfh9kb3qaqxml4ny5zi73crm173h8y"; - name = "kirigami2-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kirigami2-5.114.0.tar.xz"; + sha256 = "1bd232gs4394fa3aq31mjqrn8f3vjsghx7817szi7ryvnn6fnqkw"; + name = "kirigami2-5.114.0.tar.xz"; }; }; kitemmodels = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kitemmodels-5.113.0.tar.xz"; - sha256 = "01i1s7rw7ndp3gnl3bg0pv8a9qz95rmz0jxkw97p72gcah2q2yvk"; - name = "kitemmodels-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kitemmodels-5.114.0.tar.xz"; + sha256 = "1bfmcrbcbrvp2rcaf32vzvarqwp41gn6s4xpf56hnxbwf9kgk1fl"; + name = "kitemmodels-5.114.0.tar.xz"; }; }; kitemviews = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kitemviews-5.113.0.tar.xz"; - sha256 = "0wnmgm72kv7vxadsrkdbnjknb4lkzrmn6gk7car7jx2i91kz7xdd"; - name = "kitemviews-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kitemviews-5.114.0.tar.xz"; + sha256 = "00vl2ck0pq0sqcxvhlr2pimgr27hd9v7y9dz6w4arb5smi5q1ixg"; + name = "kitemviews-5.114.0.tar.xz"; }; }; kjobwidgets = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kjobwidgets-5.113.0.tar.xz"; - sha256 = "0f5shrapjvwp8bc34vypzfsfl07pj7nmdflf9lcwc8h3kwf2rxqr"; - name = "kjobwidgets-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kjobwidgets-5.114.0.tar.xz"; + sha256 = "1ymlqi5cqcs79nj1vff8pqwgvy0dxj5vv7l529w3a3n315hkrny8"; + name = "kjobwidgets-5.114.0.tar.xz"; }; }; kjs = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/portingAids/kjs-5.113.0.tar.xz"; - sha256 = "0h50jyd9mddnavafikn9haqqcq1mql2v8qcc1c233ffplkx1f6hb"; - name = "kjs-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/portingAids/kjs-5.114.0.tar.xz"; + sha256 = "08nh6yr6bqifpb5s9a4wbjwmwnm7zp5k8hcdmyb6mlcbam9qp6j7"; + name = "kjs-5.114.0.tar.xz"; }; }; kjsembed = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/portingAids/kjsembed-5.113.0.tar.xz"; - sha256 = "0bwsj0n3d038vs3n2mw6x8srbg4da40bw59q14cpv70ws1sg2r2n"; - name = "kjsembed-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/portingAids/kjsembed-5.114.0.tar.xz"; + sha256 = "1xglisxv7nfsbj9lgpvc4c5ql4f6m7n71vf7vih5ff3aqybrkgxa"; + name = "kjsembed-5.114.0.tar.xz"; }; }; kmediaplayer = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/portingAids/kmediaplayer-5.113.0.tar.xz"; - sha256 = "1nyn7x28j17yrb7zx31519h2ghp5h3pwk6baxais0q1mv9azyfay"; - name = "kmediaplayer-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/portingAids/kmediaplayer-5.114.0.tar.xz"; + sha256 = "092yvzvrkvr8xxncw7h5ghfd2bggzxsqfj67c2vhymhfw4i0c54x"; + name = "kmediaplayer-5.114.0.tar.xz"; }; }; knewstuff = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/knewstuff-5.113.0.tar.xz"; - sha256 = "0fj17rxyp9wmmc9jh8zjpgwpia9r4xlvabvkb4ynd1vhy58k8w51"; - name = "knewstuff-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/knewstuff-5.114.0.tar.xz"; + sha256 = "15xmx7rnnrsz2cj044aviyr4hi9h8r0nnva9qzcjcq2hkkgj7wjj"; + name = "knewstuff-5.114.0.tar.xz"; }; }; knotifications = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/knotifications-5.113.0.tar.xz"; - sha256 = "1yzpf12wsi3h3v7z68b42rjdrnfkah6avq4y611b0r004shgkl1x"; - name = "knotifications-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/knotifications-5.114.0.tar.xz"; + sha256 = "0cjd5ml9hyzprjgmrc132cmp7g9hnl0h5swlxw2ifqnxxyfkg72b"; + name = "knotifications-5.114.0.tar.xz"; }; }; knotifyconfig = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/knotifyconfig-5.113.0.tar.xz"; - sha256 = "1gdzyxcc371lmnzc153k8wdyxgsv7r2y44j8d5srld36amssxnc6"; - name = "knotifyconfig-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/knotifyconfig-5.114.0.tar.xz"; + sha256 = "049n64qlr69zv1dc1dhgbsca37179hp06xfsxnhg97lblz3p3gds"; + name = "knotifyconfig-5.114.0.tar.xz"; }; }; kpackage = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kpackage-5.113.0.tar.xz"; - sha256 = "04605kr2w0yhwx64lqq1qc1zmmip7vkxnxv3fs2846864814fkk2"; - name = "kpackage-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kpackage-5.114.0.tar.xz"; + sha256 = "0v165az3k5lfszxy0kl2464573y0dcq92fyfiklwnkkcjsvba69d"; + name = "kpackage-5.114.0.tar.xz"; }; }; kparts = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kparts-5.113.0.tar.xz"; - sha256 = "0mx95xrr6pad4q5p0sn2iqmc59787bpfkvkyiz9li56wynh1jf48"; - name = "kparts-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kparts-5.114.0.tar.xz"; + sha256 = "1rrf765p554r7l8j23gx5zxdq6wimh0v91qdkwz7ilm2qr16vd5v"; + name = "kparts-5.114.0.tar.xz"; }; }; kpeople = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kpeople-5.113.0.tar.xz"; - sha256 = "08g44hq1iywycf44imdqkql4gx2vyg87n1nxxqq6ssva0kybia7n"; - name = "kpeople-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kpeople-5.114.0.tar.xz"; + sha256 = "04v0s3amn6lbb16qvp1r6figckva6xk8z7djk8jda8fbnx8dx2r1"; + name = "kpeople-5.114.0.tar.xz"; }; }; kplotting = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kplotting-5.113.0.tar.xz"; - sha256 = "16pfia711y9iqnl0svyg00g7a2x4ln8yaxmrmy74xj7y0dj5jcyj"; - name = "kplotting-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kplotting-5.114.0.tar.xz"; + sha256 = "17x58pplln0plqiyhjpzdiqxngylxq5gkc5gk7b91xzm783x2k0n"; + name = "kplotting-5.114.0.tar.xz"; }; }; kpty = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kpty-5.113.0.tar.xz"; - sha256 = "0hzn18lidiiaxr08fjhk0r5zh0m01ls46w1fyjnv42bvf7vd7v5y"; - name = "kpty-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kpty-5.114.0.tar.xz"; + sha256 = "0fm7bfp89kvg1a64q8piiyal71p6vjnqcm13zak6r9fbfwcm0gs9"; + name = "kpty-5.114.0.tar.xz"; }; }; kquickcharts = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kquickcharts-5.113.0.tar.xz"; - sha256 = "0v47c6mdx72rdz441zk4csc6a2bj6wi7772vlpz2yr3ay70l8f5d"; - name = "kquickcharts-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kquickcharts-5.114.0.tar.xz"; + sha256 = "1f91x92qdzxp31z7ixx9jn41hq9f3w9hjia94pab9vsnaz8prbd1"; + name = "kquickcharts-5.114.0.tar.xz"; }; }; kross = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/portingAids/kross-5.113.0.tar.xz"; - sha256 = "1cqdcm086a4kjrb9k6cwqn05fg5ij3zppc8bi7dxrgrfxc494c8s"; - name = "kross-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/portingAids/kross-5.114.0.tar.xz"; + sha256 = "0bbpi63lxbb4ylx2jd172a2bqyxkd606n7w8zrvcjy466lkv3sz4"; + name = "kross-5.114.0.tar.xz"; }; }; krunner = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/krunner-5.113.0.tar.xz"; - sha256 = "0z7d6nyvrlgr7aw9ibz1xgp62220iwzvhqpqikwlxhc9hjggmdlh"; - name = "krunner-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/krunner-5.114.0.tar.xz"; + sha256 = "1rjs9b87bi4f6pdm9fwnha2sj2mrq260l80iz2jq1zah83p546sw"; + name = "krunner-5.114.0.tar.xz"; }; }; kservice = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kservice-5.113.0.tar.xz"; - sha256 = "09ph72jb40pkw1nzayvzzav4m6240amkj6jvx390dmsvr7jzn0nb"; - name = "kservice-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kservice-5.114.0.tar.xz"; + sha256 = "0jdvlplnsb9w628wh3ip6awxvhgyc097zh7ls9614ymkbnpc9xca"; + name = "kservice-5.114.0.tar.xz"; }; }; ktexteditor = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/ktexteditor-5.113.0.tar.xz"; - sha256 = "02nclhfgqximsl8w6la5w0fshzcj71nrz5kjb2p1s28xdf1ahvgg"; - name = "ktexteditor-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/ktexteditor-5.114.0.tar.xz"; + sha256 = "06amzk6290imi2gj3v1k3f56zdlad7zbz4wwlf34v4iibj9mfgw8"; + name = "ktexteditor-5.114.0.tar.xz"; }; }; ktextwidgets = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/ktextwidgets-5.113.0.tar.xz"; - sha256 = "060grfna4kj8nhxgk38yf3csqfgxg0358dkwmg8aw5y5k0jys2az"; - name = "ktextwidgets-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/ktextwidgets-5.114.0.tar.xz"; + sha256 = "0w1wwyd3fy351rmkhf3i55is5031j2zxvswm0b1sb3pd159v888v"; + name = "ktextwidgets-5.114.0.tar.xz"; }; }; kunitconversion = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kunitconversion-5.113.0.tar.xz"; - sha256 = "1x7gwrz43wvd3r87x545bxxyzhqj87mhhx05dqh0b09vqk6gxzza"; - name = "kunitconversion-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kunitconversion-5.114.0.tar.xz"; + sha256 = "1qyqvl8fy105zwma5nrkz9zg5932w2f33daw0azhj322iffrm39n"; + name = "kunitconversion-5.114.0.tar.xz"; }; }; kwallet = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kwallet-5.113.0.tar.xz"; - sha256 = "0aq8d5c5p9j19bzspd205gh297n7fh5f26m49826fx5mp1im4lwn"; - name = "kwallet-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kwallet-5.114.0.tar.xz"; + sha256 = "1cji8bvy5m77zljyrrgipsw8pxcds1sgikxlq3sdfxymcsw2wr36"; + name = "kwallet-5.114.0.tar.xz"; }; }; kwayland = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kwayland-5.113.0.tar.xz"; - sha256 = "1anhvz4b1q835py451jznnfj9z2jh1fwnx4lfwhi67viaplpiwqg"; - name = "kwayland-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kwayland-5.114.0.tar.xz"; + sha256 = "1lzmlbv5vl656cigjj07hbc0gj6g1i2xqanvnhxj360109kzilf1"; + name = "kwayland-5.114.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kwidgetsaddons-5.113.0.tar.xz"; - sha256 = "01rabfl2v5l9r3fgwgy75krib1486mdc4k3kfi035s6dvg8iy015"; - name = "kwidgetsaddons-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kwidgetsaddons-5.114.0.tar.xz"; + sha256 = "1cc8lsk9v0cp2wiy1q26mlkf8np0yj01sq8a7w13ga5s6hv4sh2n"; + name = "kwidgetsaddons-5.114.0.tar.xz"; }; }; kwindowsystem = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kwindowsystem-5.113.0.tar.xz"; - sha256 = "1hzavawsl14rsl9qb874zahvsvkrbcin7fg1xn1d7ssypphlis51"; - name = "kwindowsystem-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kwindowsystem-5.114.0.tar.xz"; + sha256 = "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9"; + name = "kwindowsystem-5.114.0.tar.xz"; }; }; kxmlgui = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/kxmlgui-5.113.0.tar.xz"; - sha256 = "022l557z9jgrz2hj8hh9z7cjkvfhl5rdp81jhk2gd3wzmyf5zzmq"; - name = "kxmlgui-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/kxmlgui-5.114.0.tar.xz"; + sha256 = "0gvjf32ssc0r0bdpb1912ldsr5rjls8vrscwy5gm9g5gw504hmmr"; + name = "kxmlgui-5.114.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/portingAids/kxmlrpcclient-5.113.0.tar.xz"; - sha256 = "141vlxxnyll5q0wg2va5prg0wf0hpymlzfkg37h1ngjwjs2x2yc1"; - name = "kxmlrpcclient-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/portingAids/kxmlrpcclient-5.114.0.tar.xz"; + sha256 = "1fgjai3vj3yk67ynhd7blilyrdhdn5nvma3v3j1sbdg98pr7qzar"; + name = "kxmlrpcclient-5.114.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/modemmanager-qt-5.113.0.tar.xz"; - sha256 = "069irg7ckws06qzq5mwkxvzx4r2xqwagwif6dq284hjihrz38l8b"; - name = "modemmanager-qt-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/modemmanager-qt-5.114.0.tar.xz"; + sha256 = "16jqhmcpsffl9a7c0bb4hwjy3bw5rakdsnc5n6y8djc6237jl9pi"; + name = "modemmanager-qt-5.114.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/networkmanager-qt-5.113.0.tar.xz"; - sha256 = "03wdbw6dr9a49qcs1j2lm9q894rvdl8xqjpwm3yrrjb866yyhcg1"; - name = "networkmanager-qt-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/networkmanager-qt-5.114.0.tar.xz"; + sha256 = "10anjsnrzawrfjlznjvvl2sbxrajl2ddnq2kgl314b5dk7z3yk4n"; + name = "networkmanager-qt-5.114.0.tar.xz"; }; }; oxygen-icons = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/oxygen-icons-5.113.0.tar.xz"; - sha256 = "0grdn0gz59lfp4n5mmlan71x3iwgm87dnhk8mla02dn7hv0fl0xx"; - name = "oxygen-icons-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/oxygen-icons-5.114.0.tar.xz"; + sha256 = "0f6hv5g8y2ggagrq9x9b78bqxqg6bqcpm1xxhf69ybgjikrqdf2r"; + name = "oxygen-icons-5.114.0.tar.xz"; }; }; plasma-framework = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/plasma-framework-5.113.0.tar.xz"; - sha256 = "0iijawnh9ri1n6qgdrraf3lq5sy7z0jy5ihmfzk22pn10ba992ky"; - name = "plasma-framework-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/plasma-framework-5.114.0.tar.xz"; + sha256 = "058hl76q35bw3rzmv348azk1lmhkpgmfrxr3jd9s1hphijr8sgcx"; + name = "plasma-framework-5.114.0.tar.xz"; }; }; prison = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/prison-5.113.0.tar.xz"; - sha256 = "18y4gxj5zml59a8i7gzr5cbbzi5wyknbva2ihfdpqf85vw3x2wdp"; - name = "prison-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/prison-5.114.0.tar.xz"; + sha256 = "1wbr1lryxmrx65ilq1bhqsdhhikrih977nhpb02fq0cqnvv7v9i7"; + name = "prison-5.114.0.tar.xz"; }; }; purpose = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/purpose-5.113.0.tar.xz"; - sha256 = "0p5zcvrkaw71w8795x2a4lx3z977j6jcnwbi9wi1956gcx4avhhf"; - name = "purpose-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/purpose-5.114.0.tar.xz"; + sha256 = "1lj67f0x4gvbh9by3c3crbbwwnx7b9ifjna9ggziya4m6zj0m4z1"; + name = "purpose-5.114.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/qqc2-desktop-style-5.113.0.tar.xz"; - sha256 = "0sk0sk7cq511m0rjmgsg1z8s4sy064qmbql472ljyblafm71wj6p"; - name = "qqc2-desktop-style-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/qqc2-desktop-style-5.114.0.tar.xz"; + sha256 = "1y5g91vybjvhwmzpfwrc70q5j7jxf5b972f9fh2vzb930jir6c8g"; + name = "qqc2-desktop-style-5.114.0.tar.xz"; }; }; solid = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/solid-5.113.0.tar.xz"; - sha256 = "0vhhkn15axfvlwrf9np91hnipw1lb2x9zh0ajpngvxzcnj6kvn7r"; - name = "solid-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/solid-5.114.0.tar.xz"; + sha256 = "1slxlj5jhp8g745l328932934633nl81sq3n8fd73h655hymsk4s"; + name = "solid-5.114.0.tar.xz"; }; }; sonnet = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/sonnet-5.113.0.tar.xz"; - sha256 = "17v3a2j0vhx7mzv0wfgqky248m57gasyv1xbjqpzjdr3x2f1zhy6"; - name = "sonnet-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/sonnet-5.114.0.tar.xz"; + sha256 = "0zxi96i3gfpx759qc1nyz7jqlswg5ivgr1w9gbbsm1x5fi9ikadx"; + name = "sonnet-5.114.0.tar.xz"; }; }; syndication = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/syndication-5.113.0.tar.xz"; - sha256 = "1nzcfk4qsjvrgci3vk78jjpbig61pm0y73h3qs83yld1zw3az3jx"; - name = "syndication-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/syndication-5.114.0.tar.xz"; + sha256 = "13rjb1zm9yd8vbm9h7avqih5v0rr2srqwglm29l7mcnankqlh4n7"; + name = "syndication-5.114.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/syntax-highlighting-5.113.0.tar.xz"; - sha256 = "1blifnqikvrlkcskwjdk54mvh8yd4r0vzz282mi64w7alimlilgl"; - name = "syntax-highlighting-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/syntax-highlighting-5.114.0.tar.xz"; + sha256 = "1skblg2m0sar63qrgkjsg0w9scixggm5qj7lp4gzjn4hwq6m3n63"; + name = "syntax-highlighting-5.114.0.tar.xz"; }; }; threadweaver = { - version = "5.113.0"; + version = "5.114.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.113/threadweaver-5.113.0.tar.xz"; - sha256 = "1x7i7mdg5v22y04m720k9fqj7xagm8qnlssb1xjs9nj0aqif8jgp"; - name = "threadweaver-5.113.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.114/threadweaver-5.114.0.tar.xz"; + sha256 = "1y07g58w6z3i11y3djg3aaxanhp9hzaciq61l4dn1gqwghn09xgh"; + name = "threadweaver-5.114.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index 076eccb1c26ef..232fb29ecbe53 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.0.5"; + version = "0.1.0"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-rd1YIEosg4+H/FJBYCoxdQlV9F0evU5fckHJrSdVPOE="; + hash = "sha256-icHZtv25QvJEv0DlELT3cDxho3Oz2BJAMNKr5W4bshk="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 5cb8f2cbad8e8..8d8a932f4994e 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.119"; + version = "2.4.120"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-CknxLwm1tuaOqq/z8Cynz/mqkmk5shLTQxYdPorFYpE="; + hash = "sha256-O/VTY/dsclCUZEGrUdOmzArlGAVcD/AXMkq3bN77Mno="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index 820f466d84473..8454f3e1e83b3 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -9,7 +9,7 @@ , libjpeg , libpng , libwebp -, openexr +, openexr_3 , pkg-config , zlib , buildDocs ? true @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { libjpeg libpng libwebp - openexr + openexr_3 zlib ]; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 9965771c1531a..8ceb1b3b03bf3 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.28.4"; + version = "1.30.0"; outputs = [ "out" "dev" ] ++ lib.optionals withDocs [ "man" ]; @@ -29,27 +28,9 @@ stdenv.mkDerivation rec { owner = "mobile-broadband"; repo = "libmbim"; rev = version; - hash = "sha256-aaYjvJ2OMTzkUyqWCyHdmsKJ3VGqBmKQzb1DWK/1cPU="; + hash = "sha256-sHTpu9WeMZroT+1I18ObEHWSzcyj/Relyz8UNe+WawI="; }; - patches = [ - # Intel Mutual Authentication - FCC lock. Part of 1.30, backported to - # openSUSE and Fedora and ChromeOS. - # https://src.fedoraproject.org/rpms/libmbim/blob/rawhide/f/libmbim.spec - (fetchpatch { - url = "https://cgit.freedesktop.org/libmbim/libmbim/patch/?id=910db9cb2b6fde303d3b4720890cf6dc6fc00880"; - hash = "sha256-412sXdWb8WsSexe1scI/C57dwENgNWoREGO1GxSF4hs="; - }) - - # Intel Tools. Allows tracing various commands. Part of 1.30, backported to - # openSUSE, Fedora and ChromeOS. - # https://src.fedoraproject.org/rpms/libmbim/blob/rawhide/f/libmbim.spec - (fetchpatch { - url = "https://cgit.freedesktop.org/libmbim/libmbim/patch/?id=8a6dec6ed11931601e605c9537da9904b3be5bc0"; - hash = "sha256-tU4zkUl5aZJE+g/qbnWprUHe/PmZvqVKB9qecSaUBhk="; - }) - ]; - mesonFlags = [ "-Dudevdir=${placeholder "out"}/lib/udev" (lib.mesonBool "introspection" withIntrospection) diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 60a3f89895784..c303ffb295589 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -10,21 +10,22 @@ , shaderc , lcms2 , libGL -, xorg +, libX11 , libunwind , libdovi +, xxHash }: stdenv.mkDerivation rec { pname = "libplacebo"; - version = "5.264.1"; + version = "6.338.1"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - hash = "sha256-YEefuEfJURi5/wswQKskA/J1UGzessQQkBpltJ0Spq8="; + hash = "sha256-NZmwR3+lIC2PF+k+kqCjoMYkMM/PKOJmDwAq7t6YONY="; }; nativeBuildInputs = [ @@ -41,18 +42,19 @@ stdenv.mkDerivation rec { shaderc lcms2 libGL - xorg.libX11 + libX11 libunwind libdovi + xxHash ]; - mesonFlags = [ - "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" - "-Ddemos=false" # Don't build and install the demo programs - "-Dd3d11=disabled" # Disable the Direct3D 11 based renderer - "-Dglslang=disabled" # rely on shaderc for GLSL compilation instead - ] ++ lib.optionals stdenv.isDarwin [ - "-Dunwind=disabled" # libplacebo doesn’t build with `darwin.libunwind` + mesonFlags = with lib; [ + (mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml") + (mesonBool "demos" false) # Don't build and install the demo programs + (mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer + (mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead + ] ++ optionals stdenv.isDarwin [ + (mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` ]; postPatch = '' diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 6f7583d563b10..58fadd30ee8d5 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.32.4"; + version = "1.34.0"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "mobile-broadband"; repo = "libqmi"; rev = version; - hash = "sha256-cczGvoD+2+G6uiAt0Iv1BO4/FqzO9bkqhFsEwOfp7qw="; + hash = "sha256-l9ev9ZOWicVNZ/Wj//KNd3NHcefIrLVriqJhEpwWvtQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index b03be435aac51..d8e9f1f5a2f5d 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , lcms2 , pkg-config @@ -16,23 +15,15 @@ stdenv.mkDerivation rec { pname = "libraw"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "LibRaw"; repo = "LibRaw"; rev = version; - sha256 = "sha256-K9mULf6V/TCl5Vu4iuIdSGF9HzQlgNQLRFHIpNbmAlY"; + hash = "sha256-p9CmOCulvV7+KKn1lXwpcysOo0+mD5UgPqy2ki0cIFE="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-1729.patch"; - url = "https://github.com/LibRaw/LibRaw/commit/9ab70f6dca19229cb5caad7cc31af4e7501bac93.patch"; - hash = "sha256-OAyqphxvtSM15NI77HwtGTmTmP9YNu3xhZ6D1CceJ7I="; - }) - ]; - outputs = [ "out" "lib" "dev" "doc" ]; propagatedBuildInputs = [ lcms2 ]; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 6f05307381a09..7330e42ff323a 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,22 +1,16 @@ -{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, buildPackages }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, xz, buildPackages }: stdenv.mkDerivation rec { pname = "libunwind"; - version = "1.6.2"; + version = "1.7.2"; - src = fetchurl { - url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz"; - sha256 = "sha256-SmrsZmmR+0XQiJxErt6K1usQgHHDVU/N/2cfnJR5SXY="; + src = fetchFromGitHub { + owner = "libunwind"; + repo = "libunwind"; + rev = "v${version}"; + hash = "sha256-z5YCue0zadQnMEbGFniFvDjXNy6dSHQDQnXRXS6Uh/Y="; }; - patches = [ - # Fix for aarch64 and non-4K pages. Remove once upgraded past 1.6.2. - (fetchpatch { - url = "https://github.com/libunwind/libunwind/commit/e85b65cec757ef589f28957d0c6c21c498a03bdf.patch"; - sha256 = "1lnlygvhqrdrjgw303pg2k2k4ms4gaghpjsgmhk47q83vy1yjwfg"; - }) - ]; - postPatch = if (stdenv.cc.isClang || stdenv.hostPlatform.isStatic) then '' substituteInPlace configure.ac --replace "-lgcc_s" "" '' else lib.optionalString stdenv.hostPlatform.isMusl '' @@ -46,7 +40,7 @@ stdenv.mkDerivation rec { description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; # https://github.com/libunwind/libunwind#libunwind - platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ]; + platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "loongarch64-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ]; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 391874e531d73..522d3546b8e0a 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.14"; + version = "0.3.15"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - hash = "sha256-lpVXl/n/ecDLbbLQg9T+o4GdGZM7pNXGYTyVogNCl2E="; + hash = "sha256-S0wBVhfRa81mAmqpYYAKAyKLnfnVsXJEcGA21i5tdzo="; }; patches = [ diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index dbca7f7fc2b79..95ecbbc44deea 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -60,6 +60,8 @@ stdenv.mkDerivation rec { "--without-crypto" ]; + enableParallelBuilding = true; + postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 14e2f44808242..b343184760330 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , cmake +, fetchpatch2 , fetchurl , perl , zlib @@ -24,6 +25,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-lmmuXf46xbOJdTbchGaodMjPLA47H90I11snOIQpk2M="; }; + patches = [ + # https://github.com/nih-at/libzip/issues/404 + (fetchpatch2 { + name = "Check-for-zstd_TARGET-before-using-it-in-a-regex.patch"; + url = "https://github.com/nih-at/libzip/commit/c719428916b4d19e838f873b1a177b126a080d61.patch"; + hash = "sha256-4ksbXEM8kNvs3wtbIaXLEQNSKaxl0es/sIg0EINaTHE="; + }) + ]; + outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ cmake perl groff ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 1a135fa6d4a80..6d45ca33e982c 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "2.5.8"; + version = "2.5.10"; outputs = [ "bin" "dev" "out" "doc" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "sha256-N7XdDaDsYdx4TXvHplQDTvhHNUmW5rntdaTKua4C0es="; + hash = "sha256-xdC+T79ZQBx/XhuIXtP93Roj0N9lF+E65ReEKQ4kIsg="; }; patches = [ @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-DrpldpNgN5pWKzIuuPIrynGX3EpP8YhJlu+lLfNFGxQ="; }) - # Backport gcc-13 fix: - # https://github.com/AcademySoftwareFoundation/openexr/pull/1264 + # GCC 13 fixes ./gcc-13.patch ]; diff --git a/pkgs/development/libraries/openexr/gcc-13.patch b/pkgs/development/libraries/openexr/gcc-13.patch index d508b6028f76d..6264a8df24331 100644 --- a/pkgs/development/libraries/openexr/gcc-13.patch +++ b/pkgs/development/libraries/openexr/gcc-13.patch @@ -1,33 +1,25 @@ -https://github.com/AcademySoftwareFoundation/openexr/pull/1264 -https://github.com/AcademySoftwareFoundation/openexr/commit/d0088a3c6943a9a53fc24e29885414d082d531fe.patch +From 8aa103fe6e815514990e59708468eabc36f7f332 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=A9clairevoyant?= + <848000+eclairevoyant@users.noreply.github.com> +Date: Fri, 5 Jan 2024 18:12:16 -0500 +Subject: [PATCH] gcc13 ---- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp -+++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp -@@ -159,6 +159,7 @@ - #include <limits> - - #include <cstddef> -+#include <cstdint> - - - // Windows specific addition to prevent the indirect import of the redefined min/max macros ---- a/OpenEXR/IlmImf/ImfHuf.cpp -+++ b/OpenEXR/IlmImf/ImfHuf.cpp -@@ -53,6 +53,7 @@ - #include <cstring> - #include <cassert> +--- + OpenEXR/IlmImf/ImfTiledMisc.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/OpenEXR/IlmImf/ImfTiledMisc.cpp b/OpenEXR/IlmImf/ImfTiledMisc.cpp +index 06ea3144..749537d4 100644 +--- a/OpenEXR/IlmImf/ImfTiledMisc.cpp ++++ b/OpenEXR/IlmImf/ImfTiledMisc.cpp +@@ -46,6 +46,7 @@ + #include <ImfTileDescription.h> #include <algorithm> + #include <limits> +#include <cstdint> - - using namespace std; ---- a/OpenEXR/IlmImf/ImfMisc.cpp -+++ b/OpenEXR/IlmImf/ImfMisc.cpp -@@ -52,6 +52,7 @@ - #include <ImfConvert.h> - #include <ImfPartType.h> - #include <ImfTileDescription.h> -+#include <cstdint> #include "ImfNamespace.h" - OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER +-- +2.42.0 + diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index fa5cb97b214fa..0d1e3b03a09a8 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "1.0.0"; + version = "1.0.1"; outputs = [ "out" @@ -97,7 +97,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-mfnMluxJAxDbB6JlIM6HJ0zg7e1q3ia3uFbht6zeHCk="; + sha256 = "sha256-rvf0sZRgDDLcqroLg7hcMUqXD/4JT+3lBRX6/m+3Ry8="; }; patches = [ diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 76ec2244c8338..121bb03f4caca 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchurl +, meson +, ninja , pkg-config , libpng , glib /*just passthru*/ @@ -12,41 +14,57 @@ , tigervnc , wlroots , xwayland + +, gitUpdater }: stdenv.mkDerivation rec { pname = "pixman"; - version = "0.42.2"; + version = "0.43.0"; src = fetchurl { urls = [ "mirror://xorg/individual/lib/${pname}-${version}.tar.gz" "https://cairographics.org/releases/${pname}-${version}.tar.gz" ]; - hash = "sha256-6hSA762i/ZSLx1Nm98NJ4cltMpfQmj/mJibjjiNKYl4="; + hash = "sha256-plwoIJhY+xa+5Q2AnID5Co5BXA5P2DIQeKGCJ4WlVgo="; }; separateDebugInfo = !stdenv.hostPlatform.isStatic; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libpng ]; - configureFlags = lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt" - # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved - ++ lib.optional (stdenv.isAarch64 && !stdenv.cc.isGNU) "--disable-arm-a64-neon"; + # Default "enabled" value attempts to enable CPU features on all + # architectures and requires used to disable them: + # https://gitlab.freedesktop.org/pixman/pixman/-/issues/88 + mesonAutoFeatures = "auto"; + mesonFlags = [ + "-Diwmmxt=disabled" + ] + # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved + ++ lib.optional (stdenv.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled"; preConfigure = '' # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62 export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 184 ? 184 : NIX_BUILD_CORES)) ''; + enableParallelBuilding = true; + doCheck = true; postInstall = glib.flattenInclude; - passthru.tests = { - inherit cairo qemu scribus tigervnc wlroots xwayland; + passthru = { + tests = { + inherit cairo qemu scribus tigervnc wlroots xwayland; + }; + updateScript = gitUpdater { + url = "https://gitlab.freedesktop.org/pixman/pixman.git"; + rev-prefix = "pixman-"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index a0e23813ade2c..83c20fcd51207 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv, libobjc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "qrencode"; version = "4.1.1"; @@ -16,13 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv libpng ] ++ lib.optionals stdenv.isDarwin [ libobjc ]; - configureFlags = [ - "--with-tests" - ]; - nativeCheckInputs = [ SDL2 ]; - doCheck = true; + doCheck = false; checkPhase = '' runHook preCheck @@ -34,6 +30,11 @@ stdenv.mkDerivation rec { runHook postCheck ''; + passthru.tests = finalAttrs.finalPackage.overrideAttrs (_: { + configureFlags = [ "--with-tests" ]; + doCheck = true; + }); + meta = with lib; { homepage = "https://fukuchi.org/works/qrencode/"; description = "C library for encoding data in a QR Code symbol"; @@ -47,4 +48,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "qrencode"; }; -} +}) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 7a5ff60c9acbb..b0e92290fe5b7 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -51,6 +51,8 @@ let ./qtdeclarative.patch # prevent headaches from stale qmlcache data ./qtdeclarative-default-disable-qmlcache.patch + # add version specific QML import path + ./qtdeclarative-qml-paths.patch ]; qtlocation = lib.optionals stdenv.cc.isClang [ # Fix build with Clang 16 diff --git a/pkgs/development/libraries/qt-5/5.15/qtdeclarative-qml-paths.patch b/pkgs/development/libraries/qt-5/5.15/qtdeclarative-qml-paths.patch new file mode 100644 index 0000000000000..e207fa4df3bd4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtdeclarative-qml-paths.patch @@ -0,0 +1,33 @@ +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index 289f11d006..9b0a48c6c7 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1897,17 +1897,22 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + addImportPath(installImportsPath); + + // env import paths +- if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { +- const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); ++ auto addEnvImportPath = [this](const char *var) { + #if defined(Q_OS_WIN) + QLatin1Char pathSep(';'); + #else + QLatin1Char pathSep(':'); + #endif +- QStringList paths = envImportPath.split(pathSep, Qt::SkipEmptyParts); +- for (int ii = paths.count() - 1; ii >= 0; --ii) +- addImportPath(paths.at(ii)); +- } ++ if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty(var))) { ++ const QString envImportPath = qEnvironmentVariable(var); ++ QStringList paths = envImportPath.split(pathSep, Qt::SkipEmptyParts); ++ for (int ii = paths.count() - 1; ii >= 0; --ii) ++ addImportPath(paths.at(ii)); ++ } ++ }; ++ ++ addEnvImportPath("QML2_IMPORT_PATH"); ++ addEnvImportPath("NIXPKGS_QT5_QML_IMPORT_PATH"); + + addImportPath(QStringLiteral("qrc:/qt-project.org/imports")); + addImportPath(QCoreApplication::applicationDirPath()); diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 2127be5e0a2a0..94df0a1a8e661 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -31,7 +31,7 @@ qtHostPathHook() { local qmlDir="$1/${qtQmlPrefix:?}" if [ -d "$qmlDir" ] then - qtWrapperArgs+=(--prefix QML2_IMPORT_PATH : "$qmlDir") + qtWrapperArgs+=(--prefix NIXPKGS_QT5_QML_IMPORT_PATH : "$qmlDir") fi } addEnvHooks "$targetOffset" qtHostPathHook diff --git a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh index 8b135a7d7492f..2d858055693cc 100644 --- a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh @@ -31,7 +31,7 @@ if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then local qmlDir="$1/${qtQmlPrefix:?}" if [ -d "$qmlDir" ]; then - qtWrapperArgs+=(--prefix QML2_IMPORT_PATH : "$qmlDir") + qtWrapperArgs+=(--prefix NIXPKGS_QT6_QML_IMPORT_PATH : "$qmlDir") fi } addEnvHooks "$targetOffset" qtHostPathHook diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index afdb24d1d291a..697556e30edc5 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -12,5 +12,7 @@ qtModule { patches = [ # prevent headaches from stale qmlcache data ../patches/qtdeclarative-default-disable-qmlcache.patch + # add version specific QML import path + ../patches/qtdeclarative-qml-paths.patch ]; } diff --git a/pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch b/pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch new file mode 100644 index 0000000000000..39b7a30892cf3 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch @@ -0,0 +1,12 @@ +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index 2e482c220d..4873809bec 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1517,6 +1517,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + // env import paths + addEnvImportPath("QML_IMPORT_PATH"); + addEnvImportPath("QML2_IMPORT_PATH"); ++ addEnvImportPath("NIXPKGS_QT6_QML_IMPORT_PATH"); + + addImportPath(QStringLiteral("qrc:/qt/qml")); + addImportPath(QStringLiteral("qrc:/qt-project.org/imports")); diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 8375d55e40567..2668025bcbe1b 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "2.2.3"; + version = "3.0.0"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-yEDihPvTGGL5gsd4QMYNRyfLucKLItIQM4pm6W0i2W8="; + hash = "sha256-N9yGOxlk1+wgRXWLbDIXWQz+/pwbnYVs3ub4/16Nzws="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/readline/readline-8.2-patches.nix b/pkgs/development/libraries/readline/readline-8.2-patches.nix index bc075df237c7b..77d5c495bac1c 100644 --- a/pkgs/development/libraries/readline/readline-8.2-patches.nix +++ b/pkgs/development/libraries/readline/readline-8.2-patches.nix @@ -8,4 +8,7 @@ patch: [ (patch "005" "16ac25jz1a1mgkpfp1sydqf6qpsfh0s0dcmrnjpqbhg5va3s6av2") (patch "006" "18gmh6y3klh0vv28cyqz4is3rlb32pl7f1kf5r482kfjq3w5zd67") (patch "007" "1xmnpahs983n4w0gn3j0wr8nh1dpva33yj7fvfmhm46ph2wsa4ar") +(patch "008" "0smjjzhwxi2ibpdisnk53lh1pzgka6rhlqyh3662xy69v34ysxx1") +(patch "009" "05m1fwbs7mbs3pz3pg87gbbayandrrcgaqawzliqb6g1jbk8b61x") +(patch "010" "0k3vyrjs2g6y2cfs03l2gp37fhxgqpiwvxb1c7z4q88cbb32x3km") ] diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 3bf16057f835f..595ba2aa57136 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblapack"; - version = "3.11"; + version = "3.12.0"; src = fetchFromGitHub { owner = "Reference-LAPACK"; repo = "lapack"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-AYD78u70y8cY19hmM/aDjQEzxO8u9lPWhCFxRe5cqXI="; + sha256 = "sha256-xn9HL4YF8JPka1gwet5bGGo2k505H3RfWpxkUIYNecQ="; }; nativeBuildInputs = [ gfortran cmake ]; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 3e18424d6b74e..64362243229b2 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-uOnSTih14bUPtrJgp7vVb3/UfdKsF6jFQqjlFeJ81AI="; + hash = "sha256-/I9dJlBE0kvFvqooKuqMETtOE72Jmva3zIGnq0o4+aE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index 5ba8039ccff80..be81970413b84 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "srt"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "sha256-HW5l26k9w4F6IJrtiahU/8/CPY6M/cKn8AgESsntC6A="; + sha256 = "sha256-HmfbBPyR+z5d9/XBvNhosk8pSSPToNtM+V0hEyb2G2w="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index f8540d4ffaa06..28b14d3a8a5be 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -58,6 +58,9 @@ stdenv.mkDerivation rec { cmake/Modules/FindOpenSSL_EP.cmake ''; + # upstream will hopefully fix this in some newer release + env.CXXFLAGS = "-include random"; + # (bundled) blosc headers have a warning on some archs that it will be using # unaccelerated routines. cmakeFlags = [ diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index f6c9dcb953e39..dc17404c84802 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.268.0"; + version = "1.3.275.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-CDjWTXXnUgj9QaLDNuSVy+wf8If5LehwOZ0t0Fuh2Ro="; + hash = "sha256-kBOkj7mr4stPXUCBhNJpNL3A+9BebEwrIBEIroxdH8Y="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/development/libraries/vulkan-headers/update.sh index da4e42ded84a2..dd3fac2ee4dd1 100755 --- a/pkgs/development/libraries/vulkan-headers/update.sh +++ b/pkgs/development/libraries/vulkan-headers/update.sh @@ -11,6 +11,7 @@ SDK_PACKAGES=( "vulkan-tools-lunarg" "vulkan-extension-layer" "vulkan-utility-libraries" + "vulkan-volk" "spirv-headers" "spirv-cross" "spirv-tools" diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 068c1d3d2c2a8..958cc2dadc7ba 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${version}"; - hash = "sha256-TDn8eVz1fhGfvUiGcxqOk2BN9tuIF5+ssIXtOo3weS0="; + hash = "sha256-53PUXAWiK38ciV6oMvD7ZHdXi4RU4r0RmDWUUHU3mE0="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix index 41d1854692fd9..301311e124128 100644 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.268"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; - rev = "v${finalAttrs.version}"; - hash = "sha256-l6PiHCre/JQg8PSs1k/0Zzfwwv55AqVdZtBbjeKLS6E="; + rev = "vulkan-sdk-${finalAttrs.version}"; + hash = "sha256-gvia+Xb9BpOjPARKo3Sgp85Bfh1roFZ2PzCtXVFYeIU="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 243ec53a3234c..f9fe5bac07fe5 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -28,7 +28,12 @@ let enableParallelBuilding = true; doCheck = true; - env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git + + env = { + AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git + } // lib.optionalAttrs stdenv.is32bit { + NIX_CFLAGS_COMPILE = "-fpermissive"; + }; # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index 87da2c546b866..d775cef4d6734 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ wrappers for SIMD intrinsics"; homepage = "https://github.com/xtensor-stack/xsimd"; license = licenses.bsd3; - maintainers = with maintainers; [ tobim ]; + maintainers = with maintainers; [ tobim doronbehar ]; platforms = platforms.all; }; }) diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index 1c010638693e7..cd5d105511920 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zxing-cpp"; - version = "2.1.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "zxing-cpp"; repo = "zxing-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-B/jGsHImRfj0iEio2b6R6laWBI1LL3OI407O7sren8s="; + hash = "sha256-teFspdATn9M7Z1vSr/7PdJx/xAv+TVai8rIekxqpBZk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index 538b8dff964ac..65e930e07414a 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -3,7 +3,7 @@ , cryptography , pyasn1 , pyopenssl -, pyRFC3339 +, pyrfc3339 , josepy , pytz , requests @@ -20,7 +20,7 @@ buildPythonPackage rec { format = "setuptools"; propagatedBuildInputs = [ - cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six + cryptography pyasn1 pyopenssl pyrfc3339 pytz requests requests-toolbelt six werkzeug ndg-httpsclient josepy ]; diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 3e20875ac15d5..788148d5e441f 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -5,7 +5,7 @@ , fetchpatch , isPy27 , pytestCheckHook -, autoconf +, autoconf271 , automake , cmake , gcc @@ -44,7 +44,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ simplejson ]; - nativeBuildInputs = [ autoconf automake cmake libtool perl setuptools ]; + nativeBuildInputs = [ autoconf271 automake cmake libtool perl setuptools ]; buildInputs = [ gcc ]; diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 621a0f991856f..0689319840e61 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -10,7 +10,7 @@ , distro , josepy , parsedatetime -, pyRFC3339 +, pyrfc3339 , pyopenssl , pytz , requests @@ -47,7 +47,7 @@ buildPythonPackage rec { distro josepy parsedatetime - pyRFC3339 + pyrfc3339 pyopenssl pytz requests diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index db66e46f3d9d4..e07ab3c0d9536 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.concatLists (lib.attrVals ([ "woff" - "interpolatable" + # "interpolatable" is not included because it only contains 2 tests at the time of writing but adds 270 extra dependencies "ufo" ] ++ lib.optionals (!skia-pathops.meta.broken) [ "pathops" # broken diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 1a69525d84388..2dc389f70ecc1 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -12,7 +12,7 @@ , exiftool , ghostscript , imagemagick -, mupdf +, mupdf-headless , netpbm , numpy , poppler_utils @@ -74,7 +74,7 @@ buildPythonPackage rec { exiftool ghostscript imagemagick - mupdf + mupdf-headless netpbm numpy poppler_utils diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 1b154f90d3864..1c260e37c7b0b 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -9,79 +9,83 @@ , pytestCheckHook , sphinxHook , pallets-sphinx-themes +, setuptools , sphinxcontrib-log-cabinet , sphinx-issues }: buildPythonPackage rec { - pname = "Jinja2"; - version = "3.1.2"; + pname = "jinja2"; + version = "3.1.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-MTUacCpAip51laj8YVD8P0O7a/fjGXcMvA2535Q36FI="; + pname = "Jinja2"; + inherit version; + hash = "sha256-rIvWVE1Lssl5K/OhWegLuo/afwfoG8Ou1WVDLVklupA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - babel markupsafe ]; + passthru.optional-dependencies = { + i18n = [ + babel + ]; + }; + # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 doCheck = !stdenv.is32bit; nativeCheckInputs = [ pytestCheckHook - ]; - - pytestFlagsArray = [ - # Avoid failure due to deprecation warning - # Fixed in https://github.com/python/cpython/pull/28153 - # Remove after cpython 3.9.8 - "-p no:warnings" - ]; + ] ++ passthru.optional-dependencies.i18n; - passthru = { - doc = stdenv.mkDerivation { - # Forge look and feel of multi-output derivation as best as we can. - # - # Using 'outputs = [ "doc" ];' breaks a lot of assumptions. - name = "${pname}-${version}-doc"; - inherit src pname version; + passthru.doc = stdenv.mkDerivation { + # Forge look and feel of multi-output derivation as best as we can. + # + # Using 'outputs = [ "doc" ];' breaks a lot of assumptions. + name = "${pname}-${version}-doc"; + inherit src pname version; - patches = [ - # Fix import of "sphinxcontrib-log-cabinet" - ./patches/import-order.patch - ]; + patches = [ + # Fix import of "sphinxcontrib-log-cabinet" + ./patches/import-order.patch + ]; - postInstallSphinx = '' - mv $out/share/doc/* $out/share/doc/python$pythonVersion-$pname-$version - ''; + postInstallSphinx = '' + mv $out/share/doc/* $out/share/doc/python$pythonVersion-$pname-$version + ''; - nativeBuildInputs = [ - sphinxHook - sphinxcontrib-log-cabinet - pallets-sphinx-themes - sphinx-issues - ]; + nativeBuildInputs = [ + sphinxHook + sphinxcontrib-log-cabinet + pallets-sphinx-themes + sphinx-issues + ]; - inherit (python) pythonVersion; - inherit meta; - }; + inherit (python) pythonVersion; + inherit meta; }; meta = with lib; { - homepage = "https://jinja.palletsprojects.com/"; - description = "Stand-alone template engine"; + changelog = "https://github.com/pallets/jinja/blob/${version}/CHANGES.rst"; + description = "Very fast and expressive template engine"; + downloadPage = "https://github.com/pallets/jinja"; + homepage = "https://jinja.palletsprojects.com"; license = licenses.bsd3; longDescription = '' Jinja is a fast, expressive, extensible templating engine. Special placeholders in the template allow writing code similar to Python syntax. Then the template is passed data to render the final document. - an optional sandboxed environment. ''; maintainers = with maintainers; [ pierron ]; }; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 1100d1bdbc99d..8fb5c7c292cf8 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -6,10 +6,8 @@ , isPyPy , pythonOlder -# https://github.com/matplotlib/matplotlib/blob/main/doc/devel/dependencies.rst # build-system , certifi -, oldest-supported-numpy , pkg-config , pybind11 , setuptools @@ -109,19 +107,11 @@ buildPythonPackage rec { substituteInPlace src/_c_internal_utils.c \ --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \ --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 - '' + - # bring our own system libraries - # https://github.com/matplotlib/matplotlib/blob/main/doc/devel/dependencies.rst#c-libraries - '' - echo "[libs] - system_freetype=true - system_qhull=true" > mplsetup.cfg ''; nativeBuildInputs = [ certifi numpy - oldest-supported-numpy # TODO remove after updating to 3.8.0 pkg-config pybind11 setuptools @@ -184,16 +174,17 @@ buildPythonPackage rec { libs = { system_freetype = true; system_qhull = true; - } // lib.optionalAttrs stdenv.isDarwin { # LTO not working in darwin stdenv, see #19312 - enable_lto = false; + enable_lto = !stdenv.isDarwin; }; }; env.MPLSETUPCFG = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config); - # Matplotlib needs to be built against a specific version of freetype in - # order for all of the tests to pass. + # Encountering a ModuleNotFoundError, as describved and investigated at: + # https://github.com/NixOS/nixpkgs/issues/255262 . It could be that some of + # which may fail due to a freetype version that doesn't match the freetype + # version used by upstream. doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 9d34cb27c8cdc..deaab05a6574e 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Meson Python build backend (PEP 517)"; homepage = "https://github.com/mesonbuild/meson-python"; license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.fridh ]; + maintainers = with lib.maintainers; [ fridh doronbehar ]; }; } diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 1104bcc02f823..9b4e1d0287eb5 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -25,15 +25,14 @@ , tqdm , typing-extensions , unpaper -, wheel , installShellFiles }: buildPythonPackage rec { pname = "ocrmypdf"; - version = "15.4.4"; + version = "16.0.4"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; pyproject = true; @@ -47,7 +46,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-Ff0OrSJFglVPpSNB0KvDMnatj+P57zWdcVAFaM+Sg0s="; + hash = "sha256-1Bg1R8c5VtJsd8NHd+WWdJRA39Jjgv9JUMcijZm942o="; }; patches = [ @@ -64,7 +63,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm - wheel installShellFiles ]; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 4ba20f5aef315..386f64718eb09 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -7,7 +7,7 @@ , jbig2dec , deprecated , lxml -, mupdf +, mupdf-headless , numpy , packaging , pillow @@ -20,12 +20,11 @@ , qpdf , setuptools , substituteAll -, wheel }: buildPythonPackage rec { pname = "pikepdf"; - version = "8.9.0"; + version = "8.11.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,14 +39,14 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-ia+D0OeB/MQWRniYkBEWZsDCwEApYGgu0++I/HupK6w="; + hash = "sha256-mxUXXD7/ERC6mfmLLo+zdsVblIplrlcnzTNQ7YUk3Q4="; }; patches = [ (substituteAll { src = ./paths.patch; - jbig2dec = "${lib.getBin jbig2dec}/bin/jbig2dec"; - mudraw = "${lib.getBin mupdf}/bin/mudraw"; + jbig2dec = lib.getExe' jbig2dec "jbig2dec"; + mutool = lib.getExe' mupdf-headless "mutool"; }) ]; @@ -63,7 +62,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 setuptools - wheel ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/paths.patch b/pkgs/development/python-modules/pikepdf/paths.patch index c9c61176aa6f4..1bd030c186c23 100644 --- a/pkgs/development/python-modules/pikepdf/paths.patch +++ b/pkgs/development/python-modules/pikepdf/paths.patch @@ -1,18 +1,18 @@ diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py -index d27c660..6796984 100644 +index da40043f..4f566f01 100644 --- a/src/pikepdf/_methods.py +++ b/src/pikepdf/_methods.py -@@ -72,7 +72,7 @@ def _mudraw(buffer, fmt) -> bytes: +@@ -74,7 +74,7 @@ def _mudraw(buffer, fmt) -> bytes: tmp_in.flush() proc = run( -- ['mudraw', '-F', fmt, '-o', '-', tmp_in.name], -+ ['@mudraw@', '-F', fmt, '-o', '-', tmp_in.name], +- ['mutool', 'draw', '-F', fmt, '-o', '-', tmp_in.name], ++ ['@mutool@', 'draw', '-F', fmt, '-o', '-', tmp_in.name], capture_output=True, check=True, ) diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py -index f89b4f9..f187ebd 100644 +index f89b4f90..f187ebdf 100644 --- a/src/pikepdf/jbig2.py +++ b/src/pikepdf/jbig2.py @@ -63,7 +63,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 4b37a0765f0e4..444d673100bbb 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -10,14 +10,14 @@ let in buildPythonPackage rec { pname = "pycryptodome"; - version = "3.19.0"; + version = "3.19.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Legrandin"; repo = "pycryptodome"; rev = "refs/tags/v${version}"; - hash = "sha256-WD+OEjePVtqlmn7h1CIfraLuEQlodkvjmYQ8q7nNoGU="; + hash = "sha256-+m0gF47l3c9gZ9dLdOUNW0I2W1O+OGrmsdysu7QdjvI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 29c4a2034b2f7..80a9458e32c63 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -70,6 +70,7 @@ buildPythonPackage rec { # https://github.com/pycurl/pycurl/issues/819 "test_multi_socket_select" # https://github.com/pycurl/pycurl/issues/729 + "test_easy_pause_unpause" "test_multi_socket_action" # https://github.com/pycurl/pycurl/issues/822 "test_request_with_verifypeer" diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index 68925fe7f4a9d..74784a35ff953 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -5,6 +5,7 @@ , mock , six , pytestCheckHook +, python-memcached , pythonOlder , zstd , stdenv @@ -32,6 +33,7 @@ buildPythonPackage rec { faker mock pytestCheckHook + python-memcached zstd ]; @@ -39,10 +41,7 @@ buildPythonPackage rec { sed -i "/--cov/d" setup.cfg ''; - disabledTests = [ - # python-memcached is not available (last release in 2017) - "TestClientSocketConnect" - ] ++ lib.optionals stdenv.is32bit [ + disabledTests = lib.optionals stdenv.is32bit [ # test_compressed_complex is broken on 32-bit platforms # this can be removed on the next version bump # see also https://github.com/pinterest/pymemcache/pull/480 diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index 9345b819f75cc..368f3cda24de7 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -14,12 +14,13 @@ }: buildPythonPackage rec { - pname = "pyRFC3339"; + pname = "pyrfc3339"; version = "1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + pname = "pyRFC3339"; + inherit version; sha256 = "06jv7ar7lpvvk0dixzwdr3wgm0g1lipxs429s2z7knwwa7hwpf41"; }; diff --git a/pkgs/development/python-modules/python-memcached/default.nix b/pkgs/development/python-modules/python-memcached/default.nix index 27a9eed537bb2..e82b6b51643aa 100644 --- a/pkgs/development/python-modules/python-memcached/default.nix +++ b/pkgs/development/python-modules/python-memcached/default.nix @@ -1,25 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub -, six +, setuptools , mock , pytestCheckHook }: buildPythonPackage rec { pname = "python-memcached"; - version = "1.59"; - format = "setuptools"; + version = "1.61"; + pyproject = true; src = fetchFromGitHub { owner = "linsomniac"; repo = "python-memcached"; rev = version; - hash = "sha256-tHqkwNloPTXOrEGtuDLu1cTw4SKJ4auv8UUbqdNp698="; + hash = "sha256-7bUCVAmOJ6znVmTZg9AJokOuym07NHL12gZgQ2uhfNo="; }; - propagatedBuildInputs = [ - six + nativeBuildInputs = [ + setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 047a4ea1af07e..3e62fa882cc9b 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -25,14 +25,14 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.14.0"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; rev = version; - hash = "sha256-in0ty0aBAIx7Is13hjiHZGS8eKbhxb6TL3bENzfx5vQ="; + hash = "sha256-TpD8YZnnv48PKYrUqR0/qvJG1XRbcMBcrkcERh6Q4q0="; }; patches = [ @@ -41,17 +41,12 @@ in buildPythonPackage rec { src = ./0001-hardcode-path-to-libgomp.patch; gomp = "${if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; }) - (fetchpatch { - # Python 3.12 support - url = "https://github.com/serge-sans-paille/pythran/commit/258ab9aaf26172f669eab1bf2a346b5f65db3ac0.patch"; - hash = "sha256-T+FLptDYIgzHBSXShULqHr/G8ttBFamq1M5JlB2HxDM="; - }) ]; # xsimd: unvendor this header-only C++ lib postPatch = '' - rm -r third_party/xsimd - ln -s '${lib.getDev xsimd}'/include/xsimd third_party/ + rm -r pythran/xsimd + ln -s '${lib.getDev xsimd}'/include/xsimd pythran/ ''; nativeBuildInputs = [ @@ -84,5 +79,6 @@ in buildPythonPackage rec { description = "Ahead of Time compiler for numeric kernels"; homepage = "https://github.com/serge-sans-paille/pythran"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 97f2a09e55e21..3dcffdd2ecc53 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.5.2"; - format = "pyproject"; + version = "3.6.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-D7Z0xKqAJAPKSAEK+3Mpz/LaEKqKYczp+m6SqfzufwA="; + hash = "sha256-QJVRT+d/IIGxkWfSNoXFSmbW017+8CTKuWD4W+TzvBs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index caca48153b72b..ec6e966d79bf4 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -13,6 +13,9 @@ , pkg-config , pythran , wheel +, nose +, setuptools +, hypothesis , pytestCheckHook , pytest-xdist , numpy @@ -31,8 +34,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.11.4"; - srcHash = "sha256-hNAZOMDFYqZpb67Pzg/WALWagFYvqYO1jOmcipDDRbE="; + version = "1.12.0"; + srcHash = "sha256-PuiyYTgSegDTV9Kae5N68FOXT1jyJrNv9p2aFP70Z20="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -75,13 +78,11 @@ in buildPythonPackage { }) ]; - # Relax deps a bit + # Upstream complicated numpy version pinning is causing issues in the + # configurePhase, so we pass on it. postPatch = '' substituteInPlace pyproject.toml \ - --replace 'meson-python>=0.12.1,<0.15.0' 'meson-python' \ - --replace 'numpy==' 'numpy>=' \ - --replace "pybind11>=2.10.4,<2.11.1" "pybind11>=2.10.4,<2.12.0" \ - --replace 'wheel<0.41.0' 'wheel' + --replace-fail 'numpy==' 'numpy>=' \ ''; nativeBuildInputs = [ @@ -91,6 +92,7 @@ in buildPythonPackage { pythran pkg-config wheel + setuptools ]; buildInputs = [ @@ -108,6 +110,8 @@ in buildPythonPackage { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ + nose + hypothesis pytestCheckHook pytest-xdist ]; @@ -157,42 +161,9 @@ in buildPythonPackage { # hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - checkPhase = '' - runHook preCheck - - # Adapted from pytestCheckHook because scipy uses a custom check phase. - # It needs to pass `$args` as a Python list to `scipy.test` rather than as - # arguments to pytest on the command-line. - args="" - if [ -n "$disabledTests" ]; then - disabledTestsString=$(_pytestComputeDisabledTestsString "''${disabledTests[@]}") - args+="'-k','$disabledTestsString'" - fi - - if [ -n "''${disabledTestPaths-}" ]; then - eval "disabledTestPaths=($disabledTestPaths)" - fi - - for path in ''${disabledTestPaths[@]}; do - if [ ! -e "$path" ]; then - echo "Disabled tests path \"$path\" does not exist. Aborting" - exit 1 - fi - args+="''${args:+,}'--ignore=\"$path\"'" - done - args+="''${args:+,}$(printf \'%s\', "''${pytestFlagsArray[@]}")" - args=''${args%,} - - pushd "$out" + preCheck = '' export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) - ${python.interpreter} -c "import scipy, sys; sys.exit(scipy.test( - 'fast', - verbose=10, - extra_argv=[$args], - parallel=$NIX_BUILD_CORES - ) != True)" - popd - runHook postCheck + cd $out ''; requiredSystemFeatures = [ "big-parallel" ]; # the tests need lots of CPU time diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index 3945f8bf4c4f3..327ff267eebc8 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchPypi , pbr +, setuptools }: buildPythonPackage rec { pname = "sphinxcontrib-apidoc"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,8 +20,9 @@ buildPythonPackage rec { rm test-requirements.txt requirements.txt ''; - propagatedBuildInputs = [ + nativeBuildInputs = [ pbr + setuptools ]; # Check is disabled due to circular dependency of sphinx diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 05d1bfbf64e64..04e6a6d35a111 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.5.3"; - source.sha256 = "sha256-JJzQdaxPM1rnD3iMm+D0wYgJOk2n0FvVO+K67z8l58s="; + version = "2.5.5"; + source.sha256 = "sha256-E8f+JpAw4qZAKmVMBt7/Aa72dM7WSds76YtVA6CApGI="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 7ae9168975ab6..409c2c9d027b8 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -34,7 +34,7 @@ lib.makeOverridable ( , stdenv ? ruby.stdenv , namePrefix ? (let rubyName = builtins.parseDrvName ruby.name; - in "${rubyName.name}${rubyName.version}-") + in "${rubyName.name}${lib.versions.majorMinor rubyName.version}-") , nativeBuildInputs ? [] , buildInputs ? [] , meta ? {} diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 3b1a1fa0aa1fb..ddf27b35dbd05 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -8,18 +8,18 @@ , qt5 , CoreServices , libiconv -, withSqlite ? true, sqlite +, sqlite }: stdenv.mkDerivation rec { pname = "doxygen"; - version = "1.9.8"; + version = "1.10.0"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-uQ1Fl2kmY7qmzy34NOmZCgPxVGwmqRqDvV6yEab5P4w="; + sha256 = "sha256-FPI5ICdn9Tne/g9SP6jAQS813AAyoDNooDR/Hyvq6R4="; }; nativeBuildInputs = [ @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { bison ]; - buildInputs = [ libiconv ] - ++ lib.optionals withSqlite [ sqlite ] + buildInputs = [ libiconv sqlite ] ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) ++ lib.optionals stdenv.isDarwin [ CoreServices ]; - cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] - ++ lib.optional withSqlite "-Duse_sqlite3=ON" - ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; + cmakeFlags = [ + "-DICONV_INCLUDE_DIR=${libiconv}/include" + "-Duse_sys_sqlite3=ON" + ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix deleted file mode 100644 index 687b69cf20278..0000000000000 --- a/pkgs/development/tools/gocode/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "gocode-unstable"; - version = "2020-04-06"; - rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c"; - - goPackagePath = "github.com/mdempsky/gocode"; - - # we must allow references to the original `go` package, - # because `gocode` needs to dig into $GOROOT to provide completions for the - # standard packages. - allowGoReference = true; - - src = fetchFromGitHub { - inherit rev; - - owner = "mdempsky"; - repo = "gocode"; - sha256 = "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb"; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "An autocompletion daemon for the Go programming language"; - longDescription = '' - Gocode is a helper tool which is intended to be integrated with your - source code editor, like vim, neovim and emacs. It provides several - advanced capabilities, which currently includes: - - - Context-sensitive autocompletion - - It is called daemon, because it uses client/server architecture for - caching purposes. In particular, it makes autocompletions very fast. - Typical autocompletion time with warm cache is 30ms, which is barely - noticeable. - ''; - homepage = "https://github.com/mdempsky/gocode"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix deleted file mode 100644 index b2518109171a9..0000000000000 --- a/pkgs/development/tools/gocode/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; - sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; - }; - } -] diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index 6becc6f4002d4..36e38163e2a77 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -21,7 +21,11 @@ buildGoModule rec { CGO_ENABLED = "0"; - ldflags = "-s -w -X main.version=v${version}"; + ldflags = [ + "-s" + "-w" + "-X main.version=v${version}" + ]; checkFlags = [ # Requires network access (Error: module lookup disabled by GOPROXY=off). diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 63f6fff66b623..1f58fd637a6de 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { CGO_ENABLED = 0; GOFLAGS = [ "-trimpath" ]; - ldflags = [ "-buildid=" "-w" ]; + ldflags = [ "-w" ]; doCheck = false; diff --git a/pkgs/development/tools/misc/autoconf/2.71.nix b/pkgs/development/tools/misc/autoconf/2.71.nix new file mode 100644 index 0000000000000..1fcb819bd4b72 --- /dev/null +++ b/pkgs/development/tools/misc/autoconf/2.71.nix @@ -0,0 +1,69 @@ +{ lib, stdenv, fetchurl, m4, perl, texinfo }: + +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + +stdenv.mkDerivation rec { + pname = "autoconf"; + version = "2.71"; + outputs = [ "out" "doc" ]; + + src = fetchurl { + url = "mirror://gnu/autoconf/autoconf-${version}.tar.xz"; + sha256 = "197sl23irn6s9pd54rxj5vcp5y8dv65jb9yfqgr2g56cxg7q6k7i"; + }; + patches = [ + # fix stale autom4te cache race condition: + # https://savannah.gnu.org/support/index.php?110521 + ./2.71-fix-race.patch + ]; + + strictDeps = true; + nativeBuildInputs = [ m4 perl texinfo ]; + buildInputs = [ m4 ]; + postBuild = " + make html + "; + + postInstall = " + make install-html + "; + + # Work around a known issue in Cygwin. See + # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for + # details. + # There are many test failures on `i386-pc-solaris2.11'. + doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + + # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + enableParallelBuilding = true; + + # Make the Autotest test suite run in parallel. + preCheck ='' + export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + ''; + + meta = { + homepage = "https://www.gnu.org/software/autoconf/"; + description = "Part of the GNU Build System"; + + longDescription = '' + GNU Autoconf is an extensible package of M4 macros that produce + shell scripts to automatically configure software source code + packages. These scripts can adapt the packages to many kinds of + UNIX-like systems without manual user intervention. Autoconf + creates a configuration script for a package from a template + file that lists the operating system features that the package + can use, in the form of M4 macro calls. + ''; + + license = lib.licenses.gpl3Plus; + + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 1fcb819bd4b72..8039e36a4f209 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -7,18 +7,13 @@ stdenv.mkDerivation rec { pname = "autoconf"; - version = "2.71"; + version = "2.72"; outputs = [ "out" "doc" ]; src = fetchurl { url = "mirror://gnu/autoconf/autoconf-${version}.tar.xz"; - sha256 = "197sl23irn6s9pd54rxj5vcp5y8dv65jb9yfqgr2g56cxg7q6k7i"; + hash = "sha256-uohcExlXjWyU1G6bDc60AUyq/iSQ5Deg28o/JwoiP1o="; }; - patches = [ - # fix stale autom4te cache race condition: - # https://savannah.gnu.org/support/index.php?110521 - ./2.71-fix-race.patch - ]; strictDeps = true; nativeBuildInputs = [ m4 perl texinfo ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 0c19b59c5c35e..b1fb9c83e8d0e 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "2.13.6"; - sha256 = "sha256-5+BFlt1zrHqpnifNAA+UnbsP7VG9KQmfmwiiXB3wztU="; + version = "2.13.7"; + sha256 = "sha256-X7TxfDB8jBt5xoVh6JvpVi0H50Jb9A5yjE1mdVNCpes="; } diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index aeca3c437ff4d..ae741234a8e26 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchFromGitHub, cmake, ninja, python -, withGocode ? true, gocode , withGodef ? true, godef , withGotools? true, gotools , withTypescript ? true, typescript @@ -63,10 +62,6 @@ stdenv.mkDerivation { mkdir -p $out/lib/ycmd/third_party cp -r third_party/* $out/lib/ycmd/third_party/ - '' + lib.optionalString withGocode '' - TARGET=$out/lib/ycmd/third_party/gocode - mkdir -p $TARGET - ln -sf ${gocode}/bin/gocode $TARGET '' + lib.optionalString withGodef '' TARGET=$out/lib/ycmd/third_party/godef mkdir -p $TARGET diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 37cec14ee4c4c..fa17f4f036241 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-MVmu9m+9XhWuPBEEoaYmsSbMFziSZaM5Gg5kOr1DT54="; + hash = "sha256-mD/7wWeclV5Xqii9hcZMustvR6tf7MoyTZ3WsvEc61U="; }; - cargoHash = "sha256-hrdrGFtL2vGczINnvDa4rclkXsNWnEqtTt3NVaRay8w="; + cargoHash = "sha256-w8XpCJ8GS2VszW/9/O2suy82zVO1UpWTrU1lFGYwhvw="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 8827d6b709e7b..648b2615166c1 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-Bned5Pa6zCFByfNvqD0M5t3l4uAJYkDlpe6wu8e7a3U="; + hash = "sha256-RzGvoDt1Qc+f6mZsfs99MxX4YB3yFc5FP92Yx/WGrsI="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 09a11cef84f4e..1d0a39fb2b8bd 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-DwkSUclStYKe54tC1H3jMv1KOSScgqf25tR5ajQZ6os="; + hash = "sha256-hJx8gn0zCN3+DhO6niylZJXPHgQ+VhQV5tL8qAeRaUg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 5868c5d9a990b..d1a75dcdf7e5c 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.10.0"; - sha256 = "sha256-MuslbuvYys1VdOZjHlS0K+fsjr4lrUeoymhUA7rRVTU="; + version = "20.11.0"; + sha256 = "sha256-MYB+vu6wScU/F2XkqVrtaUdqS2lt0QDLU5q2aNeVC0A="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch |