nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot]
2021-12-24 00:08:47 +00:00
committed by GitHub
parent 6acba2617b dde1557825
commit b2d797154c
5 changed files with 406 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "95.0.1";
ffversion = "95.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "54887c3adbf7202b835ae1ac928c3c95516ef11f9894456561dad500a1a61623f926b37f6e02fef0898e7ee0fd9147a71e5432634e6e0a2c2fecd08509799c37";
sha512 = "1b9eb91d72a6975b4d2558a7c5de0e008095398b9862498623656ab6d8056e3cffc12263f58aa07feeddc91ccfb512aa4b582dfeadb142d548d96c3d50204196";
};
meta = {

8
pkgs/development/python-modules/flask-appbuilder/default.nix
View File

@@ -25,12 +25,12 @@
buildPythonPackage rec {
pname = "flask-appbuilder";
version = "3.3.2";
version = "3.3.4";
src = fetchPypi {
pname = "Flask-AppBuilder";
inherit version;
sha256 = "1js1nbal020ilqdrmd471zjab9jj6489fxy4583n55bh5fyiac6i";
sha256 = "180swqkcp34vkarqb50dpn2300a6qdgihliqfflp0brab9v2n1hg";
};
# See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch
@@ -63,8 +63,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3, <5" \
--replace "click>=6.7, <8" "click" \
--replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3" \
--replace "Flask>=0.12, <2" "Flask" \
--replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3, <0.6" \
--replace "Flask-Babel>=1, <2" "Flask-Babel >=1, <3" \
@@ -72,6 +71,7 @@ buildPythonPackage rec {
--replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \
--replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended>=4.1.0" \
--replace "PyJWT>=1.7.1, <2.0.0" "PyJWT>=2.0.1" \
--replace "prison>=0.2.1, <1.0.0" "prison" \
--replace "SQLAlchemy<1.4.0" "SQLAlchemy"
'';

4
pkgs/tools/misc/graylog/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "graylog";
version = "3.3.15";
version = "3.3.16";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "sha256-/ECHhgLhmLoZ9fjpwGQrGuOW5PBtkB3JUCC9Bgvxr30=";
sha256 = "sha256-P/cnfYKnMSnDD4otEyirKlLaFduyfSO9sao4BY3c3Z4=";
};
dontBuild = true;

10
pkgs/tools/security/ghidra/default.nix
View File

@@ -14,15 +14,15 @@ let
log4j-api = fetchMavenArtifact {
groupId = "org.apache.logging.log4j";
artifactId = "log4j-api";
version = "2.15.0";
sha256 = "0m8admb2sbcjj9p54r516zczyb09qg4al36gd6p6sj85irz3xhy8";
version = "2.12.3";
sha256 = "0z9snl8h31dkwqisd6sfsh5yvf6fbg6imjc7mryzflnq1dfnk2d8";
};
log4j-core = fetchMavenArtifact {
groupId = "org.apache.logging.log4j";
artifactId = "log4j-core";
version = "2.15.0";
sha256 = "02r2d95dv7dhfh24p41bap4yam0j6q6n4gpkyjsbfwari498b6j1";
version = "2.12.3";
sha256 = "16idm7w073cjbk7nzbc4vcnahh9097dgp1nipj99hh6vamai32q4";
};
pkg_path = "$out/lib/ghidra";
@@ -73,7 +73,7 @@ in stdenv.mkDerivation rec {
mv "$f" "$out/share/icons/hicolor/$res/apps/ghidra.png"
done;
# workaround for CVE-2021-44228
# workaround for CVE-2021-44228, CVE-2021-45046, CVE-2021-45105
rm -f $out/lib/ghidra/Ghidra/Framework/Generic/lib/{log4j-api-2.12.1.jar,log4j-core-2.12.1.jar}
cp ${log4j-api}/share/java/*.jar ${log4j-core}/share/java/*.jar $out/lib/ghidra/Ghidra/Framework/Generic/lib
'';