Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
1bf7a721 5962ac37

+22 -25
+3 -3
pkgs/applications/editors/vscode/vscode.nix
··· 11 11 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; 12 12 13 13 sha256 = { 14 - x86_64-linux = "0yv6584y4idkl9vvmpxj5ix5brshm1vadiwf7ima84snm0fipb0n"; 15 - x86_64-darwin = "0igndxkwkxyjc9rkf9hbj8903hvfv7ab41q0s3gw8w5qh4b8s48x"; 14 + x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c"; 15 + x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r"; 16 16 }.${system}; 17 17 in 18 18 callPackage ./generic.nix rec { ··· 21 21 22 22 # Please backport all compatible updates to the stable release. 23 23 # This is important for the extension ecosystem. 24 - version = "1.51.1"; 24 + version = "1.52.1"; 25 25 pname = "vscode"; 26 26 27 27 executableName = "code" + lib.optionalString isInsiders "-insiders";
+5 -5
pkgs/applications/networking/mailreaders/imapfilter.nix
··· 1 - { stdenv, fetchFromGitHub, openssl, lua, pcre }: 1 + { stdenv, fetchFromGitHub, openssl, lua, pcre2 }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "imapfilter"; 5 - version = "2.6.16"; 5 + version = "2.7.5"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "lefcha"; 9 9 repo = "imapfilter"; 10 10 rev = "v${version}"; 11 - sha256 = "0f65sg6hhv6778fxwsz4hvarbm97dsb8jj0mg7a9qs273r35pqck"; 11 + sha256 = "nbVwbPkNbJz4GHhvOp+QVgiBqKA/HR34p4x3NXJB7ig="; 12 12 }; 13 13 makeFlags = [ 14 14 "SSLCAFILE=/etc/ssl/certs/ca-bundle.crt" 15 15 "PREFIX=$(out)" 16 16 ]; 17 17 18 - propagatedBuildInputs = [ openssl pcre lua ]; 18 + buildInputs = [ openssl pcre2 lua ]; 19 19 20 20 meta = { 21 21 homepage = "https://github.com/lefcha/imapfilter"; 22 22 description = "Mail filtering utility"; 23 23 license = stdenv.lib.licenses.mit; 24 24 platforms = stdenv.lib.platforms.unix; 25 - maintainers = with stdenv.lib.maintainers; [ ]; 25 + maintainers = with stdenv.lib.maintainers; [ doronbehar ]; 26 26 }; 27 27 }
+1 -1
pkgs/build-support/cc-wrapper/default.nix
··· 437 437 '' + optionalString targetPlatform.isNetBSD '' 438 438 hardening_unsupported_flags+=" stackprotector fortify" 439 439 '' + optionalString cc.langAda or false '' 440 - hardening_unsupported_flags+=" stackprotector strictoverflow" 440 + hardening_unsupported_flags+=" format stackprotector strictoverflow" 441 441 '' + optionalString cc.langD or false '' 442 442 hardening_unsupported_flags+=" format" 443 443 '' + optionalString targetPlatform.isWasm ''
+5 -4
pkgs/development/libraries/libnice/default.nix
··· 16 16 }: 17 17 18 18 stdenv.mkDerivation rec { 19 - name = "libnice-0.1.16"; 19 + pname = "libnice"; 20 + version = "0.1.18"; 20 21 21 22 outputs = [ "bin" "out" "dev" "devdoc" ]; 22 23 23 24 src = fetchurl { 24 - url = "https://nice.freedesktop.org/releases/${name}.tar.gz"; 25 - sha256 = "1pzgxq0qrqlrhd78qnvpfgp8bl5c4znqh599ljaybpcldw37idh6"; 25 + url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz"; 26 + sha256 = "1x3kj9b3dy9m2h6j96wgywfamas1j8k2ca43k5v82kmml9dx5asy"; 26 27 }; 27 28 28 29 patches = [ ··· 77 78 78 79 It provides a GLib-based library, libnice and a Glib-free library, 79 80 libstun as well as GStreamer elements.''; 80 - homepage = "https://nice.freedesktop.org/wiki/"; 81 + homepage = "https://libnice.freedesktop.org/"; 81 82 platforms = platforms.linux; 82 83 license = with licenses; [ lgpl21 mpl11 ]; 83 84 };
+2 -2
pkgs/development/python-modules/zstd/default.nix
··· 4 4 5 5 buildPythonPackage rec { 6 6 pname = "zstd"; 7 - version = "1.4.5.1"; 7 + version = "1.4.8.1"; 8 8 9 9 src = fetchPypi { 10 10 inherit pname version; 11 - sha256 = "2a1806d625bd2d8944ead4b3018fc6444a31467fa09935e9c1d4296275f024c6"; 11 + sha256 = "b62b21eb850abd6b8c0046bfc1c5c773c873eeb94f1904ef1ff304e98b62b80e"; 12 12 }; 13 13 14 14 postPatch = ''
+2 -7
pkgs/os-specific/linux/alsa-firmware/default.nix
··· 1 1 { stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "alsa-firmware-1.2.1"; 4 + name = "alsa-firmware-1.2.4"; 5 5 6 6 src = fetchurl { 7 7 url = "mirror://alsa/firmware/${name}.tar.bz2"; 8 - sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; 8 + sha256 = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs="; 9 9 }; 10 - 11 - patches = [ (fetchpatch { 12 - url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch"; 13 - sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78"; 14 - }) ]; 15 10 16 11 nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ]; 17 12
+4 -3
pkgs/os-specific/linux/alsa-lib/default.nix
··· 1 1 { stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "alsa-lib-1.2.3"; 4 + pname = "alsa-lib"; 5 + version = "1.2.4"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://alsa/lib/${name}.tar.bz2"; 8 - sha256 = "13k7dx1g749z74rz71hs5j8z0pqdjgx7l69pn0vsy7jizhi0kw02"; 8 + url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; 9 + sha256 = "sha256-91VL4aVs3/RotY/BwpuVtkhkxZADjdMJx6l4xxFpCPc="; 9 10 }; 10 11 11 12 patches = [