From 023042cd26f6600b01776ba205a84434007a3118 Mon Sep 17 00:00:00 2001 From: samrose Date: Mon, 6 Jul 2020 13:05:13 -0400 Subject: fluent-bit: 1.3.6 -> 1.4.6 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 4e1a18efde4d..d882c6efb5e8 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.3.6"; + version = "1.4.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "0gkn5axjxaa52f3w2qxwwab4m46xrxymbkcpw1v1jihil34pxw7a"; + sha256 = "0qxyjmgl85q7xk629l548bpzizma5n4j1r6nqbwh9j15ajvq7mq8"; }; nativeBuildInputs = [ cmake flex bison ]; -- cgit v1.2.3 From 5fe4954ffbde313ae5541b2854481f531176179d Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 11 Jul 2020 00:10:56 +0530 Subject: trojita: apply patch for CVE-2020-15047 --- pkgs/applications/networking/mailreaders/trojita/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index f383018e2537..72a95a416598 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -1,6 +1,7 @@ { akonadi-contacts , cmake , fetchgit +, fetchpatch , gnupg , gpgme , kcontacts @@ -27,6 +28,14 @@ mkDerivation rec { sha256 = "0xpxq5bzqaa68lkz90wima5q2m0mdcn0rvnigb66lylb4n20mnql"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-15047.patch"; + url = "https://invent.kde.org/pim/trojita/-/commit/77ddd5d44f2bf4155d0c9b6f7d05f01713b32d5d.diff"; + sha256 = "1pjmy5yvca8sm3nn5p4fxrhhpn6srnfa36fyfspvbfaxpn1n1n1l"; + }) + ]; + buildInputs = [ akonadi-contacts gpgme -- cgit v1.2.3 From 65eebab118fc28bdb8c14462b75ad799a5f521e5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 17 Mar 2020 04:20:00 -0500 Subject: syncthing: 1.3.4 -> 1.4.0 Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.4.0 (cherry picked from commit d27b2f842cf0de852e4aa4baa66715e9f897de71) --- pkgs/applications/networking/syncthing/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 2d7624ed89cb..516acab10f8b 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,19 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.3.4"; + version = "1.4.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "076k06p2vqqz2r5bgvqkjipnhznbfbalp3pa2gjm2j9hy7nldr9f"; + sha256 = "049f9h03qq9a7pa8ngwampwf5xc7kr7mm473zn56yl3nrmv0nid6"; }; - goPackagePath = "github.com/syncthing/syncthing"; - - modSha256 = "10fgfjip5xr8lim2z0dh7399xpcnhxis9s9yd36fk934h1k1hwzd"; + modSha256 = "1qq0979cm42wd3scy3blyi0hg67mkghis9r5rn2x1lqi2b982wfh"; patches = [ ./add-stcli-target.patch -- cgit v1.2.3 From 14966af55b84dee5946e27520042d794b52f6869 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 6 Apr 2020 04:20:00 -0500 Subject: syncthing: 1.4.0 -> 1.4.1 Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.4.1 (cherry picked from commit beeb70c85721b4ef615448bee05263c0edab0712) --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 516acab10f8b..b26eef5f0a75 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.4.0"; + version = "1.4.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "049f9h03qq9a7pa8ngwampwf5xc7kr7mm473zn56yl3nrmv0nid6"; + sha256 = "0knrgzfid9k3fl1r83rgvd8vzpssa41ai53f5didml369jfyjdk7"; }; - modSha256 = "1qq0979cm42wd3scy3blyi0hg67mkghis9r5rn2x1lqi2b982wfh"; + modSha256 = "0qjhb55nd8mlnswbk8bgl2sb9angmv8fnympmmyqj1dqa7lcs87z"; patches = [ ./add-stcli-target.patch -- cgit v1.2.3 From 32498a7bc16297b1f8cc4bc4debbe0f03920f858 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 8 Apr 2020 04:20:00 -0500 Subject: syncthing: 1.4.1 -> 1.4.2 Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.4.2 (cherry picked from commit b3fbd221499e2233a65bfc11e286f161b9e75d51) --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index b26eef5f0a75..c880f7db8669 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.4.1"; + version = "1.4.2"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0knrgzfid9k3fl1r83rgvd8vzpssa41ai53f5didml369jfyjdk7"; + sha256 = "0pfzpbdir2agwsyfjh1rxlyyd225xmyrr4k2g4vlg5r12kpcjwya"; }; modSha256 = "0qjhb55nd8mlnswbk8bgl2sb9angmv8fnympmmyqj1dqa7lcs87z"; -- cgit v1.2.3 From ff02971cf080b63e4e28e8c444b2310c656a3c25 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 5 May 2020 04:20:00 -0500 Subject: syncthing: 1.4.2 -> 1.5.0 Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.5.0 (cherry picked from commit 07f093fb35c4b0c239a723d25a5392e872416bb6) --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index c880f7db8669..1e5d72e1b036 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.4.2"; + version = "1.5.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0pfzpbdir2agwsyfjh1rxlyyd225xmyrr4k2g4vlg5r12kpcjwya"; + sha256 = "0yy31rfvr9d6kidfvvy36ljxlc14x5ir3ln19zg4k02hdqn0xkpj"; }; - modSha256 = "0qjhb55nd8mlnswbk8bgl2sb9angmv8fnympmmyqj1dqa7lcs87z"; + modSha256 = "1vs7lxlqd7jr4r9xkk7w7k6gxzjmm7ic0a1scfpx8rcr5swa9cq1"; patches = [ ./add-stcli-target.patch -- cgit v1.2.3 From dee67adf40d20f5ec8333d2c801a1da67d22a9e9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 3 Jun 2020 04:20:00 -0500 Subject: syncthing: 1.5.0 -> 1.6.1 (cherry picked from commit 056089e7b3dd5189c660ad3b23e02884c2f7e396) --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 1e5d72e1b036..3afaefbc63f8 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.5.0"; + version = "1.6.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0yy31rfvr9d6kidfvvy36ljxlc14x5ir3ln19zg4k02hdqn0xkpj"; + sha256 = "1lhbx1mh2hdjjwks3s17i8y9vbl3fnapc1czaf42pp7nf8245q3j"; }; - modSha256 = "1vs7lxlqd7jr4r9xkk7w7k6gxzjmm7ic0a1scfpx8rcr5swa9cq1"; + vendorSha256 = "12g63a6jsshzqjgww792xmvybhfbkjx5aza4xnyljjsp453iky7k"; patches = [ ./add-stcli-target.patch -- cgit v1.2.3 From 86357b34d8287bc4ac5be3e4b8a77b250a94904d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 15 Jul 2020 12:48:49 +0200 Subject: signal-desktop: 1.34.3 -> 1.34.4 (cherry picked from commit 5d1064a21269d0c0f138c7fdc028b60ca5b4396f) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d324de811498..781847a4fd8c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.34.3"; # Please backport all updates to the stable channel. + version = "1.34.4"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1723h8fwclv07n5lcsqw3snmfhpigkrj609fayg0aycxgi3321h6"; + sha256 = "0250ys1lvfl417n8z9w3z6vqflzdlg0sff8l7wbzhv87nnc9kzg9"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 86cbcb3ff2e7031f2caea0d2e5f809537c71efd4 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 16 Jul 2020 08:14:02 +0200 Subject: kubernetes: 1.17.8 -> 1.17.9 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index cc427feb9da0..d99a72fdf561 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.17.8"; + version = "1.17.9"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0j28m98kgmwhnnw0j1xakprdh62qq2d9yq72ab7p7rhc4v119yqh"; + sha256 = "0h2cbrip2bk1vjavc1lwqgpbxqwlbwdhqjb9kvc687b5na2cm2hc"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; -- cgit v1.2.3 From 76adfc180c0e4bad011e33ee73fba2a56e1f212b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 14 Jul 2020 22:26:20 +0100 Subject: pythonPackages.django: 2.2.13 -> 2.2.14 See https://docs.djangoproject.com/en/2.2/releases/2.2.14/ for release information (cherry picked from commit 9db754433c0939debd66b0fe47d82874213997f4) Signed-off-by: Lancelot SIX --- pkgs/development/python-modules/django/2_2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index a64588bd7f3c..70e0334df13a 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.13"; + version = "2.2.14"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "103db5gmny6bkq9jgr2m6gdfy1n29bj2v87184y1zgpdmkv71ww4"; + sha256 = "14b1w00hrf4n7hla6d6nf2p5r4k6jh3fcmv7bd1v04vpcpvfrw7d"; }; patches = stdenv.lib.optional withGdal -- cgit v1.2.3 From 4cc800b2ba5afbcd1dbe161a4889c5f9e1609932 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 25 Jun 2020 09:18:44 +1000 Subject: gitAndTools.gh: 0.10.0 -> 0.10.1 https://github.com/cli/cli/releases/tag/v0.10.1 (cherry picked from commit b2c8af46fce3d3dfcfdcb255d94fc5601675247d) --- pkgs/applications/version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 2274b3e7889c..9601de85897f 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0m4qgvhd4fzl83acfbpwff0sqshyfhqiy5q4i7ly8h6rdsjysdck"; + sha256 = "0q4zpm10hcci4j0g1gx08q2qwn71ab9f7yaf4k78sfn5p89y7rm2"; }; - modSha256 = "1cw3l6zka4mnis6zd0gc3zspw22b7vkdlcfskmgw1m1207jcscmz"; + vendorSha256 = "0igbqnylryiq36lbb1gha8najijzxmn10asc0xayxygbxc16s1vi"; nativeBuildInputs = [ installShellFiles ]; -- cgit v1.2.3 From 76e92625e060d68927e9886e9cd29d1c37cd634f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 17 Jul 2020 09:21:36 +1000 Subject: gitAndTools.gh: 0.10.1 -> 0.11.0 https://github.com/cli/cli/releases/tag/v0.11.0 (cherry picked from commit 2a45eea7e398e3112edc7ded18f96cce8b0c9784) --- pkgs/applications/version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 9601de85897f..27daf1a30aac 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0q4zpm10hcci4j0g1gx08q2qwn71ab9f7yaf4k78sfn5p89y7rm2"; + sha256 = "13nq7rvxwl9cld9gng7rm534yqrr2ii0bqyzqwlkpzh9m61m3ra2"; }; - vendorSha256 = "0igbqnylryiq36lbb1gha8najijzxmn10asc0xayxygbxc16s1vi"; + vendorSha256 = "1xvrxdxhyj5nz5plypc5mniw5dl17w1wxcrs77w24hisn90jphgd"; nativeBuildInputs = [ installShellFiles ]; -- cgit v1.2.3 From aaa66d8d887c73f643246ac1a684fcb1521543b8 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 16 Jul 2020 14:49:58 -0700 Subject: xdg-desktop-portal-gtk: add gnome-settings-daemon This fixes "xdg-desktop-portal-gtk breaks font hinting". Aka, nixos/nixpkgs#93199. (cherry picked from commit 749418c6b4c0c270b37f3e9616976ec7bbb52c4d) --- pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 3dd6fd245195..041f76c7b1be 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 gnome3.gnome-desktop + gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc) ]; meta = with stdenv.lib; { -- cgit v1.2.3