dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-24 06:23:13 +00:00 committed by GitHub
commit 1bf7a72105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/vscode/vscode.nix
View File

@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0yv6584y4idkl9vvmpxj5ix5brshm1vadiwf7ima84snm0fipb0n";
x86_64-darwin = "0igndxkwkxyjc9rkf9hbj8903hvfv7ab41q0s3gw8w5qh4b8s48x";
x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c";
x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r";
}.${system};
in
callPackage ./generic.nix rec {
@ -21,7 +21,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.51.1";
version = "1.52.1";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

10
pkgs/applications/networking/mailreaders/imapfilter.nix
View File

@ -1,27 +1,27 @@
{ stdenv, fetchFromGitHub, openssl, lua, pcre }:
{ stdenv, fetchFromGitHub, openssl, lua, pcre2 }:
stdenv.mkDerivation rec {
pname = "imapfilter";
version = "2.6.16";
version = "2.7.5";
src = fetchFromGitHub {
owner = "lefcha";
repo = "imapfilter";
rev = "v${version}";
sha256 = "0f65sg6hhv6778fxwsz4hvarbm97dsb8jj0mg7a9qs273r35pqck";
sha256 = "nbVwbPkNbJz4GHhvOp+QVgiBqKA/HR34p4x3NXJB7ig=";
};
makeFlags = [
"SSLCAFILE=/etc/ssl/certs/ca-bundle.crt"
"PREFIX=$(out)"
];
propagatedBuildInputs = [ openssl pcre lua ];
buildInputs = [ openssl pcre2 lua ];
meta = {
homepage = "https://github.com/lefcha/imapfilter";
description = "Mail filtering utility";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ ];
maintainers = with stdenv.lib.maintainers; [ doronbehar ];
};
}

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -437,7 +437,7 @@ stdenv.mkDerivation {
'' + optionalString targetPlatform.isNetBSD ''
hardening_unsupported_flags+=" stackprotector fortify"
'' + optionalString cc.langAda or false ''
hardening_unsupported_flags+=" stackprotector strictoverflow"
hardening_unsupported_flags+=" format stackprotector strictoverflow"
'' + optionalString cc.langD or false ''
hardening_unsupported_flags+=" format"
'' + optionalString targetPlatform.isWasm ''

9
pkgs/development/libraries/libnice/default.nix
View File

@ -16,13 +16,14 @@
}:
stdenv.mkDerivation rec {
name = "libnice-0.1.16";
pname = "libnice";
version = "0.1.18";
outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://nice.freedesktop.org/releases/${name}.tar.gz";
sha256 = "1pzgxq0qrqlrhd78qnvpfgp8bl5c4znqh599ljaybpcldw37idh6";
url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz";
sha256 = "1x3kj9b3dy9m2h6j96wgywfamas1j8k2ca43k5v82kmml9dx5asy";
};
patches = [
@ -77,7 +78,7 @@ stdenv.mkDerivation rec {
It provides a GLib-based library, libnice and a Glib-free library,
libstun as well as GStreamer elements.'';
homepage = "https://nice.freedesktop.org/wiki/";
homepage = "https://libnice.freedesktop.org/";
platforms = platforms.linux;
license = with licenses; [ lgpl21 mpl11 ];
};

4
pkgs/development/python-modules/zstd/default.nix
View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "zstd";
version = "1.4.5.1";
version = "1.4.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "2a1806d625bd2d8944ead4b3018fc6444a31467fa09935e9c1d4296275f024c6";
sha256 = "b62b21eb850abd6b8c0046bfc1c5c773c873eeb94f1904ef1ff304e98b62b80e";
};
postPatch = ''

9
pkgs/os-specific/linux/alsa-firmware/default.nix
View File

@ -1,18 +1,13 @@
{ stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
name = "alsa-firmware-1.2.1";
name = "alsa-firmware-1.2.4";
src = fetchurl {
url = "mirror://alsa/firmware/${name}.tar.bz2";
sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf";
sha256 = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs=";
};
patches = [ (fetchpatch {
url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch";
sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78";
}) ];
nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ];
configureFlags = [

7
pkgs/os-specific/linux/alsa-lib/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }:
stdenv.mkDerivation rec {
name = "alsa-lib-1.2.3";
pname = "alsa-lib";
version = "1.2.4";
src = fetchurl {
url = "mirror://alsa/lib/${name}.tar.bz2";
sha256 = "13k7dx1g749z74rz71hs5j8z0pqdjgx7l69pn0vsy7jizhi0kw02";
url = "mirror://alsa/lib/${pname}-${version}.tar.bz2";
sha256 = "sha256-91VL4aVs3/RotY/BwpuVtkhkxZADjdMJx6l4xxFpCPc=";
};
patches = [